Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

assortment-ordercenter-sdk/readme.md

@@ -30,4 +30,6 @@
 | 1.1.6-SNAPSHOT| 1.9.11商品组  | 胡超 | 2020-02-05 |
 | 1.1.7.RELEASE| 1.9.11商品组  | 胡超 | 2020-02-13 |
 | 1.1.9.RELEASE| pos渠道  | 丁凯 | 2020-02-22 |
-| 1.2.0.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24 |
+| 1.2.0.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24 |
\ No newline at end of file
+| 1.2.1.RELEASE| 基于1.2.0.RELEASE  | 丁凯 | 2020-03-04 |
+| 1.2.2.RELEASE| 升级RELEASE  | wuping | 2020-03-04 |
\ No newline at end of file

assortment-shoppingcart-sdk/readme.md

+#### 购物车sdk更新记录
+| 版本号        | 版本说明     | 更新人        | 更新时间   |
+| --------------| ------------ | ------------- | ---------- |
+| 1.1.0.RELEASE| 第一个release版本  | 丁凯 | 2020-03-04  |
\ No newline at end of file

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

@@ -200,8 +200,6 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private AssortmentCustomerInfoManager customerInfoManager;
     @Autowired
-    private WechatPushProcessor wechatPushProcessor;
-    @Autowired
     private CheckOrder checkOrder;
     @Autowired
     private RedisCache redisCache;
@@ -465,11 +463,11 @@ public class OrderServiceImpl implements Orderservice {
         buriedPointService.BuriedPointPayment(requestDto, orderBean);
 
         // 推荐优惠插件用户支付完成数据上报
-        if (message.getTotal_fee() != 0) {
-            orderBean.setStatus(OrderStatus.TAKE_ORDER.getCode());
-            wechatPushProcessor.statusOrderPay(orderBean, sessionId, message.getPaid_no(), message.getOut_trade_no()
-                    , message.getEndTransId(), message.getPlatformMchId(), message.getTerminalId());
-        }
+//        if (message.getTotal_fee() != 0) {
+//            orderBean.setStatus(OrderStatus.TAKE_ORDER.getCode());
+//            wechatPushProcessor.statusOrderPay(orderBean, sessionId, message.getPaid_no(), message.getOut_trade_no()
+//                    , message.getEndTransId(), message.getPlatformMchId(), message.getTerminalId());
+//        }
 
         // 开通会员卡
         if (StringUtils.isNotBlank(ruleId)) {
@@ -1824,7 +1822,7 @@ public class OrderServiceImpl implements Orderservice {
             createOrderResponse.setPaySuccess(true);
         }
         // 推荐优惠插件用户下单数据上报
-        wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
+        //wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
         if (!createOrderResponse.getPaySuccess()) {
             return ResponseUtil.success(createOrderResponse);
         } else {
@@ -2204,7 +2202,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         CreateOrderResponseVo createOrderResponse = orderAdapter.convent2CreateFatherSonOrderResponseVo(orderPayResponse, productOrderBean);
         // 推荐优惠插件用户下单数据上报
-        wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
+        //wechatPushProcessor.statusOrderCreate(userLoginInfoDto, createOrderResponse.getOid(), createOrderVo.getPartnerId());
         //设置是否唤起微信支付
         if (totalAmount > 0 && StringUtils.isBlank(createOrderVo.getCardCode()) && StringUtils.isBlank(createOrderVo.getFaceCode())) {
             createOrderResponse.setPaySuccess(false);

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java

@@ -62,6 +62,8 @@ public class ActivityCalculationDiscountRequestDto {
      */
     private List<CalculationDiscountGoods> goods;
 
+    private Long distributionFee;
+
     @Data
     public static class CalculationDiscountCoupon {
         /**

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -22,6 +22,11 @@ public class ActivityCalculationDiscountResponseDto {
     private String msg;
 
     /**
+     * 优惠后运费
+     */
+    private Long distributionFee;
+
+    /**
      * 集合外的为系统按照优先级计算出来的优惠信息
      * ，calculationResults集合中的为多种优惠方案
      * 计算出来的优惠信息列表，并按优惠力度倒序排列
@@ -84,6 +89,17 @@ public class ActivityCalculationDiscountResponseDto {
          */
         private List<SubtractStockVO> stocks;
 
+        /**
+         * 配送费
+         */
+        private Long deliveryAmount;
+
+        /**
+         * 优惠后 配送费
+         */
+        private Long distributionFee;
+
+
         @Data
         public static class ActivityPrompt {
 
@@ -120,6 +136,7 @@ public class ActivityCalculationDiscountResponseDto {
              * 11-每满减
              * 12-阶梯满减
              * 2-单品特价
+             * 14-满额减配送费
              * 21-单品折扣
              * 3-优惠券
              * 5-整单满金额折
@@ -134,6 +151,8 @@ public class ActivityCalculationDiscountResponseDto {
              * 83-整单满数量打折
              */
             private Integer type;
+
+            private Long thresholdAmount;
         }
 
         @Data

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -5,6 +5,7 @@ import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.vo.SubtractStockVO;
 import com.alibaba.fastjson.JSON;
+import lombok.Builder;
 import lombok.Data;
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -93,6 +94,27 @@ public class ShoppingCartGoodsDto {
      */
     private List<SubtractStockVO> stocks;
 
+    /**
+     * 配送费
+     */
+    private Long deliveryAmount;
+
+    /**
+     * 减免后配送费
+     */
+    private Long discountDeliveryAmount;
+
+    /**
+     * 满多少额度 减免
+     */
+    private Long thresholdAmount;
+
+    /**
+     * 是否参加满额减免
+     */
+    @Builder.Default
+    private Boolean isDiscountDelivery = false;
+
 
     @Data
     public static class CartGoodsDetailDto {

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

@@ -12,6 +12,7 @@
  */
 package cn.freemud.entities.vo;
 
+import lombok.Builder;
 import lombok.Data;
 
 import java.util.List;
@@ -96,4 +97,29 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      * 会员卡优惠金额
      */
     private Integer cardDiscountAmount;
+
+    /**
+     * 配送费
+     */
+    private Long deliveryAmount;
+
+    /**
+     * 减免后配送费
+     */
+    private Long discountDeliveryAmount;
+
+    /**
+     * 满多少额度 减免
+     */
+    private Long thresholdAmount;
+
+    /**
+     * 是否参加满额减免
+     */
+    @Builder.Default
+    private Boolean isDiscountDelivery = false;
+
+
+
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -17,6 +17,7 @@ public enum ActivityTypeEnum {
     TYPE_11(11, "每满减"),
     TYPE_12(12, "阶梯满减"),
     TYPE_13(13, "新用户立减"),
+    TYPE_14(14, "满额减配送费"),
     TYPE_104(104,"x件y折"),
 
     /**

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

@@ -95,7 +95,7 @@ public interface ShoppingCartNewService {
                                                                                                             Integer orderType,
                                                                                                             List<CartGoods> cartGoodsList,
                                                                                                             List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
-                                                                                                            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType);
+                                                                                                            List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList,String menuType,Long distributionFee);
 
 
     List<CartGoods> updateCartGoodsLegal(CartGoods cartGoods, String userId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, AddShoppingCartGoodsRequestVo addShoppingCartGoodsRequestVo, List<CartGoods> oldAllCartGoodsList);