Skip to content

O
order-group
Commit b2824179 by xiaoer.li
Options

test：debug

parent 06bed6cd
Showing with 7 additions and 9 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -1219,6 +1219,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1219,6 +1219,13 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
activityCalculationDiscountRequestDto.setIsMember(isMember); activityCalculationDiscountRequestDto.setIsMember(isMember);
ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto; ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
activityCalculationDiscountRequestDto.setProductChannel("def".toString()); activityCalculationDiscountRequestDto.setProductChannel("def".toString());
if (Objects.equals(orderType, CreateOrderType.COLLECT_GOODS.getCode())) {
activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_PICKUP.getCode());
} else if (Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) {
activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode());
}
try { try {
log.info("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto)); log.info("activityClient discount :{}", JSON.toJSONString(activityCalculationDiscountRequestDto));
activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto); activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
...@@ -1356,21 +1363,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1356,21 +1363,12 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
activityCalculationDiscountRequestDto.setUserId(userId); activityCalculationDiscountRequestDto.setUserId(userId);
activityCalculationDiscountRequestDto.setVer(1); activityCalculationDiscountRequestDto.setVer(1);
activityCalculationDiscountRequestDto.setAppId(appId); activityCalculationDiscountRequestDto.setAppId(appId);
activityCalculationDiscountRequestDto.setProductChannel(orderType==null ? "abc".toString():orderType.toString());
ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeConvert2ActivityChannel(orderType); ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeConvert2ActivityChannel(orderType);
if (!Objects.isNull(activityChannelEnum)) { if (!Objects.isNull(activityChannelEnum)) {
activityCalculationDiscountRequestDto.setChannel(activityChannelEnum.getCode()); activityCalculationDiscountRequestDto.setChannel(activityChannelEnum.getCode());
activityCalculationDiscountRequestDto.setProductChannel("xyz".toString());
} }
if (Objects.equals(orderType, CreateOrderType.COLLECT_GOODS.getCode())) {
activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_PICKUP.getCode());
} else if (Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) {
activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode());
}
return activityCalculationDiscountRequestDto; return activityCalculationDiscountRequestDto;
} }
......
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