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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1924,6 +1924,8 @@ public class OrderSdkAdapter {
                 newOrderAccountType=OldOrderAccountType.TOTAL_DISCOUNT.getCode();
             case 220:
                 newOrderAccountType=OldOrderAccountType.MEMBER_PRICE_DISCOUNT.getCode();
+            case 99:
+                newOrderAccountType=OldOrderAccountType.FREIGHT_COUPON.getCode();
             default:
                 break;
         }

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

@@ -18,6 +18,7 @@ import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderProductRequest;
 import com.freemud.sdk.api.assortment.order.request.order.OrderProductAddInfoDto;
 import com.freemud.sdk.api.assortment.order.request.order.OrderSpecialExtraAttrRequest;
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Component;
@@ -191,14 +192,20 @@ public class DeliveryAdapter {
                     String attr = "";
                     for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
                         if(special.getAttributeName().indexOf("冰") >= 0) {
-                            attr += special.getAttributeName()+",";
+                            attr = special.getAttributeName();
+                            break;
                         }
                     }
                     if(attr.length() > 0) {
-                        attr = attr.substring(0, attr.length()-1);
                         productName += "("+attr+")";
                     }
                 }
+
+                if(CollectionUtils.isNotEmpty(productList.getMaterialProduct())) {
+                    for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean material : productList.getMaterialProduct()) {
+                        productName += "/"+material.getSpecificationName();
+                    }
+                }
                 deliveryProductInfo.setProductName(productName);
                 deliveryProductInfo.setProductNumber(productList.getNumber());
                 deliveryProductInfo.setProductPrice(productList.getSalePrice().intValue());
@@ -221,14 +228,20 @@ public class DeliveryAdapter {
                             String attr = "";
                             for (OrderSpecialExtraAttrRequest special : extInfoCombo.getSpecialAttrs()) {
                                 if(special.getAttributeName().indexOf("冰") >= 0) {
-                                    attr += special.getAttributeName()+",";
+                                    attr = special.getAttributeName();
+                                    break;
                                 }
                             }
                             if(attr.length() > 0) {
-                                attr = attr.substring(0, attr.length()-1);
                                 productNameCombo += "("+attr+")";
                             }
                         }
+
+                        if(CollectionUtils.isNotEmpty(comboProduct.getMaterialProduct())) {
+                            for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean material : comboProduct.getMaterialProduct()) {
+                                productNameCombo += "/"+material.getSpecificationName();
+                            }
+                        }
                         deliveryComboProductInfo.setProductName(productNameCombo);
                         deliveryComboProductInfo.setProductNumber(comboProduct.getNumber()/productList.getNumber());
                         deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());

order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java

@@ -42,6 +42,8 @@ public class ProductVo {
      * 商品spu名称
      */
     private String spuName;
+
+    private String couponName;
     /**
      * 商品的规格信息加属性信息
      */

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -99,6 +99,14 @@ public class QueryOrderResponseVo {
      */
     private Long deliveryAmount;
     /**
+     * 配送费原价
+     */
+    private Long originalDeliveryAmount;
+    /**
+     * 运费券名称
+     */
+    private String freightCouponName;
+    /**
      * 限时折扣优惠金额
      */
     private Long discountLimitAmount;

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

@@ -74,8 +74,10 @@ public class SetMealCalculation {
             if(CollectionUtils.isNotEmpty(cartGoods.getProductComboList())){
                 for (CartGoods.ComboxGoods comboxGoods : cartGoods.getProductComboList()){
                     Long comboxmaterialPrice = 0L;
-                    for (CartGoods.MaterialGoods materialGoods : comboxGoods.getProductMaterialList()){
-                        comboxmaterialPrice+= materialGoods.getFinalPrice() * cartGoods.getQty();
+                    if(CollectionUtils.isNotEmpty(comboxGoods.getProductMaterialList())){
+                        for (CartGoods.MaterialGoods materialGoods : comboxGoods.getProductMaterialList()){
+                            comboxmaterialPrice+= materialGoods.getFinalPrice() * cartGoods.getQty();
+                        }
                     }
                     comboxGoods.setAmount(comboxGoods.getAmount()+comboxmaterialPrice);
                     materialPrice = materialPrice + comboxmaterialPrice;