Commit 927453ec by huiyang.chen

加购数量修改和订单类型翻译

parent 6681f016
...@@ -959,8 +959,12 @@ public class OrderAdapter { ...@@ -959,8 +959,12 @@ public class OrderAdapter {
responseVo.setButtonEvaluate(orderViewStatusDto.getButtonEvaluate()); responseVo.setButtonEvaluate(orderViewStatusDto.getButtonEvaluate());
responseVo.setButtonMealCode(orderViewStatusDto.getButtonMealCode()); responseVo.setButtonMealCode(orderViewStatusDto.getButtonMealCode());
responseVo.setOrderType(ordersBean.getType()); responseVo.setOrderType(ordersBean.getType());
responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeGather.getByCode(ordersBean.getType())) if (IappIdType.WC_XCX.getCode().equals(iAppId)) {
.map(OrderTypeGather::getDesc).orElse("")); responseVo.setOrderTypeDesc("围餐");
}else {
responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeGather.getByCode(ordersBean.getType()))
.map(OrderTypeGather::getDesc).orElse(""));
}
responseVo.setOrderRemark(ordersBean.getRemark()); responseVo.setOrderRemark(ordersBean.getRemark());
if (ordersBean.getGmtModified() != null) { if (ordersBean.getGmtModified() != null) {
responseVo.setModifiedTime(DateUtil.convert2String(new Date(ordersBean.getGmtModified()), "yyyy-MM-dd HH:mm:ss")); responseVo.setModifiedTime(DateUtil.convert2String(new Date(ordersBean.getGmtModified()), "yyyy-MM-dd HH:mm:ss"));
......
...@@ -645,8 +645,8 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService { ...@@ -645,8 +645,8 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
CartGoods optionalCartGood = optionalGood.get(); CartGoods optionalCartGood = optionalGood.get();
updateCartGoodId = optionalCartGood.getCartGoodsUid(); updateCartGoodId = optionalCartGood.getCartGoodsUid();
checkGood.setCartGoodsUid(updateCartGoodId); checkGood.setCartGoodsUid(updateCartGoodId);
checkGood.setQty(optionalCartGood.getQty() + 1); checkGood.setQty(optionalCartGood.getQty() + cartGoods.getQty());
optionalCartGood.setQty(optionalCartGood.getQty() + 1); optionalCartGood.setQty(optionalCartGood.getQty() + cartGoods.getQty());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment