Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa

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

@@ -165,7 +165,7 @@ public class CreateOrderVo {
     /**
      * 券码列表
      */
-    private List<String> couponCodes;
+    private List<couponCode> couponCodes;
 
     /**
      * 运费券code
@@ -409,4 +409,21 @@ public class CreateOrderVo {
          */
         private Boolean sendCoupon;
     }
+
+    @Data
+    public final static class couponCode {
+        /**
+         * 优惠券
+         */
+        private String couponCode;
+        /**
+         * 活动号
+         */
+        private String activityCode;
+
+        /**
+         * 顺序
+         */
+        private Integer index;
+    }
 }

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

@@ -195,6 +195,11 @@ public class ShoppingCartInfoRequestVo {
          * 活动号
          */
         private String activityCode;
+
+        /**
+         * 顺序
+         */
+        private Integer index;
     }
 
 }

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

@@ -529,7 +529,7 @@ public class CheckOrder {
                 // 校验couponCode
                 GetCouponDetailResponseDto getCouponDetailResponseDto = couponService.getMemberCoupon(GetMemberCouponRequestVo.builder()
                         .partnerId(createOrderVo.getPartnerId())
-                        .couponCode(couponCode).build());
+                        .couponCode(couponCode.getCouponCode()).build());
                 if (Objects.equals(getCouponDetailResponseDto, null) || CollectionUtils.isEmpty(getCouponDetailResponseDto.getDetails())
                         || getCouponDetailResponseDto.getDetails().get(0).getActive() == null
                         || getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode() == null) {
@@ -544,8 +544,9 @@ public class CheckOrder {
                 }
                 String activeCode = getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode();
                 ShoppingCartInfoRequestVo.couponCode coupon = new ShoppingCartInfoRequestVo.couponCode();
-                coupon.setCouponCode(couponCode);
+                coupon.setCouponCode(couponCode.getCouponCode());
                 coupon.setActivityCode(activeCode);
+                coupon.setIndex(couponCode.getIndex());
                 couponCodes.add(coupon);
             });