Commit 13d8b1f6 by 刘鹏飞

coco批量使用优惠券的时候,要有顺序

parent 56c89ccb
...@@ -157,7 +157,7 @@ public class CreateOrderVo { ...@@ -157,7 +157,7 @@ public class CreateOrderVo {
/** /**
* 券码列表 * 券码列表
*/ */
private List<String> couponCodes; private List<couponCode> couponCodes;
/** /**
* 运费券code * 运费券code
...@@ -401,4 +401,21 @@ public class CreateOrderVo { ...@@ -401,4 +401,21 @@ public class CreateOrderVo {
*/ */
private Boolean sendCoupon; private Boolean sendCoupon;
} }
@Data
public final static class couponCode {
/**
* 优惠券
*/
private String couponCode;
/**
* 活动号
*/
private String activityCode;
/**
* 顺序
*/
private Integer index;
}
} }
...@@ -194,6 +194,11 @@ public class ShoppingCartInfoRequestVo { ...@@ -194,6 +194,11 @@ public class ShoppingCartInfoRequestVo {
* 活动号 * 活动号
*/ */
private String activityCode; private String activityCode;
/**
* 顺序
*/
private Integer index;
} }
} }
...@@ -520,7 +520,7 @@ public class CheckOrder { ...@@ -520,7 +520,7 @@ public class CheckOrder {
// 校验couponCode // 校验couponCode
GetCouponDetailResponseDto getCouponDetailResponseDto = couponService.getMemberCoupon(GetMemberCouponRequestVo.builder() GetCouponDetailResponseDto getCouponDetailResponseDto = couponService.getMemberCoupon(GetMemberCouponRequestVo.builder()
.partnerId(createOrderVo.getPartnerId()) .partnerId(createOrderVo.getPartnerId())
.couponCode(couponCode).build()); .couponCode(couponCode.getCouponCode()).build());
if (Objects.equals(getCouponDetailResponseDto, null) || CollectionUtils.isEmpty(getCouponDetailResponseDto.getDetails()) if (Objects.equals(getCouponDetailResponseDto, null) || CollectionUtils.isEmpty(getCouponDetailResponseDto.getDetails())
|| getCouponDetailResponseDto.getDetails().get(0).getActive() == null || getCouponDetailResponseDto.getDetails().get(0).getActive() == null
|| getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode() == null) { || getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode() == null) {
...@@ -535,8 +535,9 @@ public class CheckOrder { ...@@ -535,8 +535,9 @@ public class CheckOrder {
} }
String activeCode = getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode(); String activeCode = getCouponDetailResponseDto.getDetails().get(0).getActive().getActiveCode();
ShoppingCartInfoRequestVo.couponCode coupon = new ShoppingCartInfoRequestVo.couponCode(); ShoppingCartInfoRequestVo.couponCode coupon = new ShoppingCartInfoRequestVo.couponCode();
coupon.setCouponCode(couponCode); coupon.setCouponCode(couponCode.getCouponCode());
coupon.setActivityCode(activeCode); coupon.setActivityCode(activeCode);
coupon.setIndex(couponCode.getIndex());
couponCodes.add(coupon); couponCodes.add(coupon);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment