Skip to content

O
order-group
Commit 648b4003 by 徐康
Options

settlement extinfo

parent d9646b66
Showing with 3 additions and 0 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -203,6 +203,7 @@ public class OrderAdapter { ...@@ -203,6 +203,7 @@ public class OrderAdapter {
jsonObject.put("extendType", activityDiscountsDto.getExtendType()); jsonObject.put("extendType", activityDiscountsDto.getExtendType());
} }
if(ActivityTypeEnum.TYPE_35.getCode().equals(activityDiscountsDto.getActivityType()) if(ActivityTypeEnum.TYPE_35.getCode().equals(activityDiscountsDto.getActivityType())
&& StringUtils.isNotBlank(createOrderVo.getBuyThreeGiveOneActivityCode())
&& StringUtils.isNotBlank(createOrderVo.getBuyThreeGiveOneCouponCode()) && StringUtils.isNotBlank(createOrderVo.getBuyThreeGiveOneCouponCode())
&& createOrderVo.getBuyThreeGiveOneCouponCode().equals(activityDiscountsDto.getActivityCode())) { && createOrderVo.getBuyThreeGiveOneCouponCode().equals(activityDiscountsDto.getActivityCode())) {
jsonObject.put("buyThreeGiveOneActivityCode", createOrderVo.getBuyThreeGiveOneActivityCode()); jsonObject.put("buyThreeGiveOneActivityCode", createOrderVo.getBuyThreeGiveOneActivityCode());
...@@ -422,9 +423,11 @@ public class OrderAdapter { ...@@ -422,9 +423,11 @@ public class OrderAdapter {
jsonObject.put("extendType", activityDiscountsDto.getExtendType()); jsonObject.put("extendType", activityDiscountsDto.getExtendType());
} }
if(ActivityTypeEnum.TYPE_35.getCode().equals(activityDiscountsDto.getActivityType()) if(ActivityTypeEnum.TYPE_35.getCode().equals(activityDiscountsDto.getActivityType())
&& StringUtils.isNotBlank(createOrderVo.getBuyThreeGiveOneActivityCode())
&& StringUtils.isNotBlank(createOrderVo.getBuyThreeGiveOneCouponCode()) && StringUtils.isNotBlank(createOrderVo.getBuyThreeGiveOneCouponCode())
&& createOrderVo.getBuyThreeGiveOneCouponCode().equals(activityDiscountsDto.getActivityCode())) { && createOrderVo.getBuyThreeGiveOneCouponCode().equals(activityDiscountsDto.getActivityCode())) {
jsonObject.put("buyThreeGiveOneActivityCode", createOrderVo.getBuyThreeGiveOneActivityCode()); jsonObject.put("buyThreeGiveOneActivityCode", createOrderVo.getBuyThreeGiveOneActivityCode());
jsonObject.put("buyThreeGiveOneCouponCode", createOrderVo.getBuyThreeGiveOneCouponCode());
} }
createOrderAccountDto.setAddInfo(jsonObject.toJSONString()); createOrderAccountDto.setAddInfo(jsonObject.toJSONString());
orderAccountDtos.add(createOrderAccountDto); orderAccountDtos.add(createOrderAccountDto);
......
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