Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -965,8 +965,12 @@ public class OrderAdapter {
             responseVo.setButtonEvaluate(orderViewStatusDto.getButtonEvaluate());
             responseVo.setButtonMealCode(orderViewStatusDto.getButtonMealCode());
             responseVo.setOrderType(ordersBean.getType());
+            if (IappIdType.WC_XCX.getCode().equals(iAppId)) {
+                responseVo.setOrderTypeDesc("围餐");
+            }else {
                 responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeGather.getByCode(ordersBean.getType()))
                         .map(OrderTypeGather::getDesc).orElse(""));
+            }
             responseVo.setOrderRemark(ordersBean.getRemark());
             if (ordersBean.getGmtModified() != null) {
                 responseVo.setModifiedTime(DateUtil.convert2String(new Date(ordersBean.getGmtModified()), "yyyy-MM-dd HH:mm:ss"));

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMealServiceImpl.java

@@ -645,8 +645,8 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
                 CartGoods optionalCartGood = optionalGood.get();
                 updateCartGoodId = optionalCartGood.getCartGoodsUid();
                 checkGood.setCartGoodsUid(updateCartGoodId);
-                checkGood.setQty(optionalCartGood.getQty() + 1);
-                optionalCartGood.setQty(optionalCartGood.getQty() + 1);
+                checkGood.setQty(optionalCartGood.getQty() + cartGoods.getQty());
+                optionalCartGood.setQty(optionalCartGood.getQty() + cartGoods.getQty());
             }
         }