Merge branch 'feature/20210609-v2.0.34-下单锁定配送券ID1030707-周晓航-合并张悦33版本' into qa

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java

assortment-ordercenter-sdk/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>4.1.2-SNAPSHOT</version>
+            <version>4.1.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>couponcenter-sdk</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.1.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -1479,6 +1479,7 @@ public class CreateOrderAdapter {
     }
 
     public CouponLockRequest convert2CouponLockRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, ShoppingCartGoodsDto shoppingCartGoodsDto) {
+        //fisherman 已经废弃 20210616
         if (CollectionUtils.isEmpty(shoppingCartGoodsDto.getActivityDiscountsDtos())) {
             return null;
         }
@@ -1494,7 +1495,7 @@ public class CreateOrderAdapter {
         // 订单号 替换成唯一序号
         couponLockRequest.setPartnerId(orderBean.getCompanyId());
         couponLockRequest.setOrderId(orderBean.getOid());
-//        couponLockRequest.setCouponCode(activityDiscountsDto.getActivityCode());
+        //couponLockRequest.setCouponCode(activityDiscountsDto.getActivityCode());
         return couponLockRequest;
 
     }

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

@@ -241,6 +241,7 @@ public class OrderAdapter {
         createOrderDto.setProducts(products);
         boolean hasDeliveryMonthCard = false;
         for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) {
+            // fisherman 3.0.34 运费券 这里塞进去的
             CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
                     .accountId(activityDiscountsDto.getActivityCode())
                     .name(activityDiscountsDto.getActivityName())

order-application-service/src/main/java/cn/freemud/entities/dto/GetCouponDetailResponseDto.java

@@ -22,6 +22,7 @@ public class GetCouponDetailResponseDto {
         private String code;
         private String activeCode;
         private String title;
+        //券类型：0商品券，1代金券，3折扣券，4换购券 5.配送券
         private Integer type;
         private Integer status;
         private String create_time;

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

@@ -436,6 +436,11 @@ public class CreateOrderVo {
          * 顺序
          */
         private Integer index;
+
+        /**
+         * 优惠券类型
+         */
+        private Integer couponType;
     }
 
     /**

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

@@ -199,6 +199,11 @@ public class ShoppingCartInfoRequestVo {
          * 顺序
          */
         private Integer index;
+
+        /**
+         * 优惠券类型
+         */
+        private Integer couponType;
     }
 
     /**

order-application-service/src/main/java/cn/freemud/enums/OrderAccountType.java

@@ -12,6 +12,11 @@
  */
 package cn.freemud.enums;
 
+
+/**
+ * 应该是下面这个type对应
+ * @see  com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType
+ */
 public enum OrderAccountType {
 
     DELIVERY_AMOUNT(1, "配送费"),
@@ -25,6 +30,7 @@ public enum OrderAccountType {
     SECOND_DISCOUNT(23, "第二件N折"),
     BUYM_SENDN(24, "买M赠N"),
     CUSTOMER_SUB(4, "积分扣减"),
+    FREIGHT_COUPON(99, "运费券"),
     CARD_ORIGINAL_AMOUNT(25, "会员卡原价"),
     CARD_DISCOUNT_AMOUNT(26, "会员卡优惠金额"),
     COCO_PRODUCT_CASH_COUPON(36, "coco商品代金券"),

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

@@ -592,6 +592,7 @@ public class CheckOrder {
                 coupon.setCouponCode(couponCode.getCouponCode());
                 coupon.setActivityCode(activeCode);
                 coupon.setIndex(couponCode.getIndex());
+                coupon.setCouponType(getCouponDetailResponseDto.getDetails().get(0).getType());
                 couponCodes.add(coupon);
             });