Merge remote-tracking branch 'origin/qa' into qa

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -239,14 +239,18 @@ public interface ShoppingCartBaseService {
                         cartGoodsStates.setPriceChanged(true);
                         checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                         ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
-                        checkCartRequest.getCartGoodsList().forEach(cartGoods -> {
-                            String spuName = cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "";
+                        String spuName = StringUtils.isEmpty(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg()) ? "" : checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg();
+                        for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
+                            spuName = spuName.concat(cartGoods.getSkuId().equals(validaProduct.getSkuId()) ? cartGoods.getSpuName() : "").concat(",");
                             if (PRODUCT_PRICE_CHANGE == validaProduct.getCode()) {
-                                checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(CART_PRODUCT_PRICE_CHANGE.replace("$spuName", spuName));
                                 List<ProductBeanDTO> productList = validateResult.getFailureList().stream().map(ValiadShopProductResult::getProductType).collect(Collectors.toList());
                                 shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
                             }
-                        });
+                        }
+                        if (spuName.split(",").length > 1){
+                            spuName.substring(0,spuName.length()-1).concat("等");
+                        }
+                        checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(CART_PRODUCT_PRICE_CHANGE.replace("$spuName", spuName.replace("【","").replace("】","")));
                     }
                 }
                 setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);
@@ -990,5 +994,4 @@ public interface ShoppingCartBaseService {
         }
         return null;
     }
-
 }

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

@@ -113,7 +113,13 @@ public class DeliveryAdapter {
         deliveryOrderRequestDto.setDepatchWeight(order.getWeight());
         //deliveryOrderRequestDto.setSerialNumber(order.getOtherCode());
         deliveryOrderRequestDto.setOrderId(order.getOid());
-        deliveryOrderRequestDto.setOrderRemark(order.getRemark());
+        JSONObject json = JSON.parseObject(order.getExtInfo());
+        String needTableWare = json.getString("needTableware");
+        if("0".equals(needTableWare)) {
+            deliveryOrderRequestDto.setOrderRemark("无需餐具（刀、叉、勺），"+order.getRemark());
+        } else {
+            deliveryOrderRequestDto.setOrderRemark("需要餐具（刀、叉、勺），"+order.getRemark());
+        }
         deliveryOrderRequestDto.setOrderTotalAmount(order.getAmount().intValue());
         deliveryOrderRequestDto.setOrderActualAmount(order.getAmount().intValue());
         deliveryOrderRequestDto.setPartnerId(order.getCompanyId());
@@ -203,7 +209,8 @@ public class DeliveryAdapter {
                         deliveryComboProductInfo.setTaxId(StringUtils.isNotEmpty(orderComboProductAddInfoDto.getTaxId()) ? orderComboProductAddInfoDto.getTaxId() : "10");
                         deliveryComboProductInfo.setTaxRate(orderComboProductAddInfoDto.getTax() > 0 ? orderComboProductAddInfoDto.getTax() : 6);
 
-                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().split("_")[0]));
+                        deliveryComboProductInfo.setParentCode(Long.valueOf(comboProduct.getParentProductId().replace("_", "")));
+                        deliveryProductInfo.setProductCode(deliveryComboProductInfo.getParentCode()+"");
 
                         productInfos.add(deliveryComboProductInfo);
                     });

shopping-cart-application-service/pom.xml

@@ -296,6 +296,12 @@
             <groupId>org.apache.skywalking</groupId>
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.freemud</groupId>
+            <artifactId>assortment-shoppingcart-sdk</artifactId>
+            <version>1.1.5.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
     <build>

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

@@ -139,6 +139,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId);
         CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo, goodsId);
         setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
+        if(StringUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getGroupName())) {
+            addCartGoods.setSkuName(addShoppingCartGoodsRequestVo.getGroupName());
+            addCartGoods.setSpuName(addShoppingCartGoodsRequestVo.getGroupName());
+        }
         //查询多个商品库存信息
 //        Integer checkQty = this.checkSkuQty(oldCartGoodsList, addCartGoods);
 //        queryManyGoodsStocks(partnerId, storeId, menuType, productIds, productBeanListSpuClass, skuId, checkQty);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/entity/MCoffeeAddGoodsRequestVo.java

@@ -112,4 +112,9 @@ public class MCoffeeAddGoodsRequestVo {
      */
     private String couponCode;
 
+    /**
+     * 套餐名称
+     */
+    private String groupName;
+
 }