优化文案显示

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/DeliverySharingService.java

@@ -77,7 +77,7 @@ public class DeliverySharingService {
             boolean isType34 = verifyActivity(discountResult);
             if (isType34) {
                 String desc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc();
-                shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(desc+ ","+ DELIVERY_DISCOUNT_DESC4);
+                shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(desc+ ",并且"+ DELIVERY_DISCOUNT_DESC4);
                 // 证明使用了配送券 又有活动优惠
                 if (discount.getDiscount().compareTo(0) > 0) {
                     shoppingCartGoodsResponseVo.setVerCompat(discount.getDiscount());
@@ -103,13 +103,13 @@ public class DeliverySharingService {
                 shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
                 shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
                 shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
-                // fisherman 有活动 并且使用了优惠券
+                // fisherman 有活动 使用了优惠券
                 boolean isType34 = verifyActivity(discountResult);
                 if (isType34) {
                     // 使用了优惠券
                     shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(discountResult.getDistributionFee());
                     String deliveryDiscountDesc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc();
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(deliveryDiscountDesc+ ","+ DELIVERY_DISCOUNT_DESC4);
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(deliveryDiscountDesc+ ",但"+ DELIVERY_DISCOUNT_DESC4);
                 }
 
             } else {
@@ -124,7 +124,7 @@ public class DeliverySharingService {
                     // 使用了优惠券
                     shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(discountResult.getDistributionFee());
                     String deliveryDiscountDesc = shoppingCartGoodsResponseVo.getDeliveryDiscountDesc();
-                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(deliveryDiscountDesc+ ","+ DELIVERY_DISCOUNT_DESC4);
+                    shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(deliveryDiscountDesc+ ",但"+ DELIVERY_DISCOUNT_DESC4);
                 }
             }
         }