Skip to content

O
order-group
Commit 17a6b450 by xiaoer.li
Options

add xx

parent a7c44851
Showing with 3 additions and 1 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -1355,6 +1355,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1355,6 +1355,7 @@ 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 ? "xx".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());
...@@ -1362,10 +1363,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1362,10 +1363,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
if (Objects.equals(orderType, CreateOrderType.COLLECT_GOODS.getCode())) { if (Objects.equals(orderType, CreateOrderType.COLLECT_GOODS.getCode())) {
activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_PICKUP.getCode()); activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_PICKUP.getCode());
} else if (Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) { } else if (Objects.equals(orderType, CreateOrderType.TAKE_OUT.getCode())) {
activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode()); activityCalculationDiscountRequestDto.setProductChannel(BusinessTypeEnum.SAAS_DELIVERY.getCode());
} }
log.info("activityCalculationDiscountRequestDto.setProductChannel type:{}",orderType);
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