Commit 27fc644d by huluobin

修改内部券免单券使用顺序

parent 6e6d878d
...@@ -89,7 +89,7 @@ public class CouponCustomerRelevanceController { ...@@ -89,7 +89,7 @@ public class CouponCustomerRelevanceController {
List<Integer> innerCouponIds = StringUtils.isNotEmpty(couponRelevanceIds) List<Integer> innerCouponIds = StringUtils.isNotEmpty(couponRelevanceIds)
? Lists.newArrayList(couponRelevanceIds.split(",")).stream().map(Integer::valueOf).collect(Collectors.toList()) ? Lists.newArrayList(couponRelevanceIds.split(",")).stream().map(Integer::valueOf).collect(Collectors.toList())
: Lists.newArrayList(); : Lists.newArrayList();
//1、使用内部券
marketService.setUpInnerCoupon(SetUpInnerCouponCommand.builder() marketService.setUpInnerCoupon(SetUpInnerCouponCommand.builder()
.innerCouponCustomerRelevanceIds(innerCouponIds) .innerCouponCustomerRelevanceIds(innerCouponIds)
.orderId(orderId) .orderId(orderId)
...@@ -99,11 +99,13 @@ public class CouponCustomerRelevanceController { ...@@ -99,11 +99,13 @@ public class CouponCustomerRelevanceController {
? Lists.newArrayList(timesCardIds.split(",")).stream().map(Integer::valueOf).collect(Collectors.toList()) ? Lists.newArrayList(timesCardIds.split(",")).stream().map(Integer::valueOf).collect(Collectors.toList())
: Lists.newArrayList(); : Lists.newArrayList();
//2、使用外部券
marketService.setTimesCard(SetTimesCardCommand.builder() marketService.setTimesCard(SetTimesCardCommand.builder()
.orderId(orderId) .orderId(orderId)
.timesCardIds(timesCardCustomerIds) .timesCardIds(timesCardCustomerIds)
.build()); .build());
//3、订单结算
marketService.setterOrder(orderId); marketService.setterOrder(orderId);
return JsonResult.success(); return JsonResult.success();
} }
......
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