购物车兼并 配送券

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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/service/impl/CheckOrder.java

@@ -604,6 +604,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);
             });