Skip to content

O
order-group
Commit 521527dc by ping.wu
Options

注释无用代码

parent b82cc67e
Showing with 43 additions and 43 deletions
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java
...@@ -66,49 +66,49 @@ public class ActivityAdapter { ...@@ -66,49 +66,49 @@ public class ActivityAdapter {
return activityQueryRequestDto; return activityQueryRequestDto;
} }
public ActivityCalculationDiscountRequestDto convert2ActivityCalculationDiscountRequestDto(ShoppingCartInfoDto shoppingCartInfoDto // public ActivityCalculationDiscountRequestDto convert2ActivityCalculationDiscountRequestDto(ShoppingCartInfoDto shoppingCartInfoDto
, String partnerCode, String storeId, String appid, Integer orderType, CouponListResponseDto.CouponBean couponBean, Long promotionAmount) { // , String partnerCode, String storeId, String appid, Integer orderType, CouponListResponseDto.CouponBean couponBean, Long promotionAmount) {
if (shoppingCartInfoDto == null || CollectionUtils.isEmpty(shoppingCartInfoDto.getData())) { // if (shoppingCartInfoDto == null || CollectionUtils.isEmpty(shoppingCartInfoDto.getData())) {
return null; // return null;
} // }
ActivityCalculationDiscountRequestDto result = new ActivityCalculationDiscountRequestDto(); // ActivityCalculationDiscountRequestDto result = new ActivityCalculationDiscountRequestDto();
result.setVer(Integer.valueOf(Version.VERSION_1)); // result.setVer(Integer.valueOf(Version.VERSION_1));
result.setPartnerCode(partnerCode); // result.setPartnerCode(partnerCode);
result.setStoreId(storeId); // result.setStoreId(storeId);
ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeConvert2ActivityChannel(orderType); // ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeConvert2ActivityChannel(orderType);
if(!Objects.isNull(activityChannelEnum)) { // if(!Objects.isNull(activityChannelEnum)) {
result.setChannel(activityChannelEnum.getCode()); // result.setChannel(activityChannelEnum.getCode());
} // }
result.setAppId(appid); // result.setAppId(appid);
result.setIsShowActivities(1); // result.setIsShowActivities(1);
result.setIsShowGoodsActivity(1); // result.setIsShowGoodsActivity(1);
List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> goods = new ArrayList<>(); // List<ActivityCalculationDiscountRequestDto.CalculationDiscountGoods> goods = new ArrayList<>();
// TODO 暂时指定成一个商品，后期优化 // // TODO 暂时指定成一个商品，后期优化
ActivityCalculationDiscountRequestDto.CalculationDiscountGoods calculationDiscountGoods = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods(); // ActivityCalculationDiscountRequestDto.CalculationDiscountGoods calculationDiscountGoods = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods();
calculationDiscountGoods.setGoodsId("1"); // calculationDiscountGoods.setGoodsId("1");
calculationDiscountGoods.setCategory("1"); // calculationDiscountGoods.setCategory("1");
calculationDiscountGoods.setGoodsQuantity(1); // calculationDiscountGoods.setGoodsQuantity(1);
Long amount = 0L; // Long amount = 0L;
if (shoppingCartInfoDto.getAmount() != null) { // if (shoppingCartInfoDto.getAmount() != null) {
amount = shoppingCartInfoDto.getAmount(); // amount = shoppingCartInfoDto.getAmount();
} // }
Long packAmount = 0L; // Long packAmount = 0L;
// 外卖才有打包费 // // 外卖才有打包费
if (shoppingCartInfoDto.getPackAmount() != null && Objects.equals(CreateOrderType.TAKE_OUT.getCode(), orderType)) { // if (shoppingCartInfoDto.getPackAmount() != null && Objects.equals(CreateOrderType.TAKE_OUT.getCode(), orderType)) {
packAmount = shoppingCartInfoDto.getPackAmount(); // packAmount = shoppingCartInfoDto.getPackAmount();
} // }
Long couponAmount = 0L; // Long couponAmount = 0L;
if (couponBean != null && couponBean.getDiscountAmount() != null) { // if (couponBean != null && couponBean.getDiscountAmount() != null) {
couponAmount = Long.valueOf(couponBean.getDiscountAmount()); // couponAmount = Long.valueOf(couponBean.getDiscountAmount());
} // }
if (promotionAmount == null) { // if (promotionAmount == null) {
promotionAmount = 0L; // promotionAmount = 0L;
} // }
calculationDiscountGoods.setOriginalPrice(amount + packAmount - couponAmount - promotionAmount); // calculationDiscountGoods.setOriginalPrice(amount + packAmount - couponAmount - promotionAmount);
goods.add(calculationDiscountGoods); // goods.add(calculationDiscountGoods);
result.setGoods(goods); // result.setGoods(goods);
return result; // return result;
} // }
public PremiumExchangeResponseVo convert2PremiumExchange(CalculationDiscountResult calculationDiscountResult) { public PremiumExchangeResponseVo convert2PremiumExchange(CalculationDiscountResult calculationDiscountResult) {
// 返回构造对象 // 返回构造对象
......
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