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

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

@@ -187,25 +187,25 @@ public class DeliveryAdapter {
                 ProductInfo deliveryProductInfo = new ProductInfo();
                 deliveryProductInfo.setProductCode(productList.getProductId().substring(4));
                 String productName = StringUtils.isBlank(productList.getSpecificationName()) ? productList.getProductName() : productList.getSpecificationName();
+                String grilling = "";
+
                 OrderProductAddInfoDto extInfo = JSON.parseObject(productList.getExtInfo(), OrderProductAddInfoDto.class);
                 if(CollectionUtils.isNotEmpty(extInfo.getSpecialAttrs())) {
-                    String attr = "";
                     for (OrderSpecialExtraAttrRequest special : extInfo.getSpecialAttrs()) {
-                        if(special.getAttributeName().indexOf("冰") >= 0) {
-                            attr = special.getAttributeName();
-                            break;
-                        }
-                    }
-                    if(attr.length() > 0) {
-                        productName += "("+attr+")";
+                        grilling += special.getAttributeName() + "/";
                     }
                 }
 
                 if(CollectionUtils.isNotEmpty(productList.getMaterialProduct())) {
                     for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean material : productList.getMaterialProduct()) {
                         productName += "/"+material.getSpecificationName();
+                        grilling += material.getSpecificationName() + "/";
                     }
                 }
+                if(grilling.length() > 0) {
+                    grilling = grilling.substring(0, grilling.length()-1);
+                }
+                deliveryProductInfo.setGrilling(grilling);
                 deliveryProductInfo.setProductName(productName);
                 deliveryProductInfo.setProductNumber(productList.getNumber());
                 deliveryProductInfo.setProductPrice(productList.getSalePrice().intValue());
@@ -223,25 +223,26 @@ public class DeliveryAdapter {
                         ProductInfo deliveryComboProductInfo = new ProductInfo();
                         deliveryComboProductInfo.setProductCode(comboProduct.getProductId().length()>4?comboProduct.getProductId().substring(4):comboProduct.getProductId());
                         String productNameCombo = StringUtils.isBlank(comboProduct.getSpecificationName()) ? comboProduct.getProductName() : comboProduct.getSpecificationName();
+                        String grillingCombo = "";
+
                         OrderProductAddInfoDto extInfoCombo = JSON.parseObject(comboProduct.getExtInfo(), OrderProductAddInfoDto.class);
                         if(CollectionUtils.isNotEmpty(extInfoCombo.getSpecialAttrs())) {
                             String attr = "";
                             for (OrderSpecialExtraAttrRequest special : extInfoCombo.getSpecialAttrs()) {
-                                if(special.getAttributeName().indexOf("冰") >= 0) {
-                                    attr = special.getAttributeName();
-                                    break;
-                                }
-                            }
-                            if(attr.length() > 0) {
-                                productNameCombo += "("+attr+")";
+                                grillingCombo += special.getAttributeName() + "/";
                             }
                         }
 
                         if(CollectionUtils.isNotEmpty(comboProduct.getMaterialProduct())) {
                             for (QueryOrdersResponseDto.DataBean.OrderBean.ProductBean material : comboProduct.getMaterialProduct()) {
                                 productNameCombo += "/"+material.getSpecificationName();
+                                grillingCombo += material.getSpecificationName() + "/";
                             }
                         }
+                        if(grillingCombo.length() > 0) {
+                            grillingCombo = grillingCombo.substring(0, grillingCombo.length()-1);
+                        }
+                        deliveryComboProductInfo.setGrilling(grillingCombo);
                         deliveryComboProductInfo.setProductName(productNameCombo);
                         deliveryComboProductInfo.setProductNumber(comboProduct.getNumber()/productList.getNumber());
                         deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());

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

@@ -40,6 +40,11 @@ public class ProductInfo {
     private String productName;
 
     /**
+     * 特挑和加料信息
+     */
+    private String grilling;
+
+    /**
      * 商品数量
      * productNumber不能为空
      * productNumber不能小于1

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -988,7 +988,11 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
             if (deliveryResponse == null || RESPONSE_SUCCESS_CODE != deliveryResponse.getCode() || deliveryResponse.getData() == null) {
                 String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : "";
                 String operator =  "系统" ;
-                updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator);
+                String abnormalDesc = "配送异常";
+                if(StringUtils.isNotBlank(deliveryResponse.getMsg())) {
+                    abnormalDesc = deliveryResponse.getMsg();
+                }
+                updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator, abnormalDesc);
                 emailAlertService.sendEmailAlert("创建配送单失败", String.format("request:%s \r\nresponse:%s", JSONObject.toJSONString(createDeliveryVo), JSONObject.toJSONString(deliveryResponse)));
                 return sendPaySuccessNoticeMessage();
             } else {
@@ -1008,9 +1012,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
      * @param orderCode
      * @param deliveryId
      */
-    public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator) {
+    public void updateDeliveryAbnormal(String partnerId, String orderCode, String deliveryId, String operator, String abnormalDesc) {
         AssortmentUpdateDeliveryAbnormalRequest request = AssortmentUpdateDeliveryAbnormalRequest.builder()
-                .abnormalDesc("配送异常")
+                .abnormalDesc(abnormalDesc)
                 .deliveryId(deliveryId)
                 .orderCode(orderCode)
                 .partnerId(partnerId)

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -13,9 +13,11 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.calculate.CalculationSharingDiscountResponseDto;
 import lombok.Builder;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -154,5 +156,12 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     /**
      * 总的优惠信息集合
      */
-    private List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts;
+    private List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> discounts;
+
+    /**
+     * 商品优惠信息
+     */
+    private List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods;
+
+
 }

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

@@ -52,7 +52,7 @@ public class FixDeliveryServiceImpl extends AbstractDeliveryServiceImpl implemen
 
         shoppingCartGoodsResponseVo.setDeliveryFeeZeroReason(0);
 
-        return new Double(storeResponse.getBizVO().getDeliveryPrice()).longValue() * 100;
+        return new Double(storeResponse.getBizVO().getDeliveryPrice() * 100).longValue();
     }
 
 }

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

@@ -332,6 +332,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.ADD_AND_UPDATE);
+
+            buildDiscounts(shoppingCartGoodsResponseVo,discountResult);
         }
         else {
             // 获取优惠信息
@@ -350,8 +352,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, allCartGoodsList, null, partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 
-            // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
         }
         //埋点添加购物车行为
         this.buriedPointShoppingCart(addShoppingCartGoodsRequestVo, spuId, productName);
@@ -455,6 +455,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.ADD_AND_UPDATE);
+
+            buildDiscounts(shoppingCartGoodsResponseVo,discountResult);
         }
         else {
             // 获取优惠信息
@@ -472,8 +474,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             //设置更新响应信息
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.ADD_AND_UPDATE, null);
 
-            // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
         }
 
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
@@ -609,6 +609,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     , menuType
                     , deliveryAmount
                     , ShoppingCartConstant.QUERY_INFO);
+
+            buildDiscounts(shoppingCartGoodsResponseVo,calculationSharingDiscountResult);
         }
         else {
             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
@@ -631,9 +633,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             // 在原价、现价、折扣价上增加第一次使用会员卡的费用
             this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
 
-            // 将促销返回的总的活动信息返回给前端
-            shoppingCartGoodsResponseVo.setDiscounts(calculationDiscountResult == null ? null : calculationDiscountResult.getDiscounts());
-
         }
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
@@ -2068,4 +2067,17 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     }
 
+    /**
+     * 设置总的优惠信息和商品优惠信息
+     * @param shoppingCartGoodsResponseVo
+     * @param discountResult
+     */
+    private void buildDiscounts(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,CalculationSharingDiscountResponseDto.CalculationDiscountResult discountResult) {
+        if(discountResult != null){
+            shoppingCartGoodsResponseVo.setDiscounts(discountResult.getDiscounts());
+            shoppingCartGoodsResponseVo.setGoods(discountResult.getGoods());
+        }
+
+    }
+
 }