Skip to content

O
order-group
Commit 99b5cd02 by 徐康
Options

Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg'

parents ec761c0b 34a15520
Showing with 7 additions and 7 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -183,7 +183,7 @@ public class OrderAdapter { ...@@ -183,7 +183,7 @@ public class OrderAdapter {
} }
} }
createOrderDto.setProducts(products); createOrderDto.setProducts(products);
boolean hasDeliveryMonthCard = false; // boolean hasDeliveryMonthCard = false;
for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) { for (ActivityDiscountsDto activityDiscountsDto : activityDiscountsDtos) {
CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder() CreateOrderAccountRequest createOrderAccountDto = CreateOrderAccountRequest.builder()
.accountId(activityDiscountsDto.getActivityCode()) .accountId(activityDiscountsDto.getActivityCode())
...@@ -200,9 +200,9 @@ public class OrderAdapter { ...@@ -200,9 +200,9 @@ public class OrderAdapter {
jsonObject.put("tenderId", activityDiscountsDto.getTenderId()); jsonObject.put("tenderId", activityDiscountsDto.getTenderId());
} else if(ActivityTypeEnum.TYPE_34.getCode().equals(activityDiscountsDto.getActivityType())) { } else if(ActivityTypeEnum.TYPE_34.getCode().equals(activityDiscountsDto.getActivityType())) {
jsonObject.put("customerCode", activityDiscountsDto.getTenderId()); jsonObject.put("customerCode", activityDiscountsDto.getTenderId());
if(null != activityDiscountsDto.getExtendType() && activityDiscountsDto.getExtendType() == 2) { // if(null != activityDiscountsDto.getExtendType() && activityDiscountsDto.getExtendType() == 2) {
hasDeliveryMonthCard = true; // hasDeliveryMonthCard = true;
} // }
} }
if(null != activityDiscountsDto.getExtendType()) { if(null != activityDiscountsDto.getExtendType()) {
jsonObject.put("extendType", activityDiscountsDto.getExtendType()); jsonObject.put("extendType", activityDiscountsDto.getExtendType());
...@@ -221,9 +221,9 @@ public class OrderAdapter { ...@@ -221,9 +221,9 @@ public class OrderAdapter {
.sequence(orderAccountIndex++) .sequence(orderAccountIndex++)
.actualPrice(discountDeliveryAmount) .actualPrice(discountDeliveryAmount)
.build(); .build();
if(hasDeliveryMonthCard && StringUtils.isNotBlank(storeResponseDto.getBenefitCardDiscountAmount())) { // if(hasDeliveryMonthCard && StringUtils.isNotBlank(storeResponseDto.getBenefitCardDiscountAmount())) {
createOrderAccountDto.setProductId(storeResponseDto.getBenefitCardDiscountAmount()+"00"); // createOrderAccountDto.setProductId(storeResponseDto.getBenefitCardDiscountAmount()+"00");
} // }
orderAccountDtos.add(createOrderAccountDto); orderAccountDtos.add(createOrderAccountDto);
} }
if (packageAmount > 0) { if (packageAmount > 0) {
......
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