Skip to content

O
order-group
Commit b8f690f2 by 周晓航
Options

Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

parents d527d1d4 d87ed64b
Showing with 4 additions and 4 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/DeliverySharingService.java
...@@ -77,7 +77,7 @@ public class DeliverySharingService { ...@@ -77,7 +77,7 @@ public class DeliverySharingService {
boolean isType34 = verifyActivity(discountResult); boolean isType34 = verifyActivity(discountResult);
if (isType34) { if (isType34) {
String desc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc(); String desc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc();
shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(desc+ ","+ DELIVERY_DISCOUNT_DESC4); shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(desc+ ",并且"+ DELIVERY_DISCOUNT_DESC4);
// 证明使用了配送券 又有活动优惠 // 证明使用了配送券 又有活动优惠
if (discount.getDiscount().compareTo(0) > 0) { if (discount.getDiscount().compareTo(0) > 0) {
shoppingCartGoodsResponseVo.setVerCompat(discount.getDiscount()); shoppingCartGoodsResponseVo.setVerCompat(discount.getDiscount());
...@@ -103,13 +103,13 @@ public class DeliverySharingService { ...@@ -103,13 +103,13 @@ public class DeliverySharingService {
shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount); shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount); shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
shoppingCartGoodsResponseVo.setIsDiscountDelivery(false); shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
// fisherman 有活动 并且使用了优惠券 // fisherman 有活动 使用了优惠券
boolean isType34 = verifyActivity(discountResult); boolean isType34 = verifyActivity(discountResult);
if (isType34) { if (isType34) {
// 使用了优惠券 // 使用了优惠券
shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(discountResult.getDistributionFee()); shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(discountResult.getDistributionFee());
String deliveryDiscountDesc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc(); String deliveryDiscountDesc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc();
shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(deliveryDiscountDesc+ ","+ DELIVERY_DISCOUNT_DESC4); shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(deliveryDiscountDesc+ ",但"+ DELIVERY_DISCOUNT_DESC4);
} }
} else { } else {
...@@ -124,7 +124,7 @@ public class DeliverySharingService { ...@@ -124,7 +124,7 @@ public class DeliverySharingService {
// 使用了优惠券 // 使用了优惠券
shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(discountResult.getDistributionFee()); shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(discountResult.getDistributionFee());
String deliveryDiscountDesc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc(); String deliveryDiscountDesc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc();
shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(deliveryDiscountDesc+ ","+ DELIVERY_DISCOUNT_DESC4); shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(deliveryDiscountDesc+ ",但"+ DELIVERY_DISCOUNT_DESC4);
} }
} }
} }
......
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