Merge branch 'feature/20210723_促销满减活动购物车提示语改造新_wanghanghang' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java

@@ -289,8 +289,7 @@ public class FullPromotionService implements IPromotionService {
                     satisfyList.setSatisfy(activityPrompt.getThresholdQuantity().toString());
                     satisfyList.setDeduct(WebUtil.formatAmount(activityPrompt.getDiscountAmout() * 1.00 / 100).toString());
                     satisfyList.setMissing(String.valueOf(activityPrompt.getThresholdQuantity() - activityPrompt.getTotalQuantity()));
-                    Integer getInvokeAmount = Objects.isNull(activityResponseDto.getDelayTimes()) ? 0 : activityResponseDto.getDelayTimes();
-                    satisfyList.setInvokeAmount(WebUtil.formatAmount( getInvokeAmount * 1.00 / 100).toString());
+                    satisfyList.setInvokeAmount(WebUtil.formatAmount(activityResponseDto.getDelayTimes() * 1.00 / 100).toString());
                 }else{
                     // 满足 X 元 减 Y 元 还差 Z元
                     satisfyList.setTipType(ActivityPromptEnum.TipTypeEnum.THREE.getCode());
@@ -313,8 +312,7 @@ public class FullPromotionService implements IPromotionService {
                     satisfyList.setDeduct(WebUtil.formatAmount(activityPrompt.getAlreadyDiscountAmount() * 1.00 / 100).toString());
                     satisfyList.setAgainBuy(String.valueOf(activityPrompt.getThresholdQuantity() - activityPrompt.getTotalQuantity()));
                     satisfyList.setAgianDeduct(WebUtil.formatAmount(toDiscountAmout * 1.00 / 100).toString());
-                    Integer getInvokeAmount = Objects.isNull(activityResponseDto.getDelayTimes()) ? 0 : activityResponseDto.getDelayTimes();
-                    satisfyList.setInvokeAmount(WebUtil.formatAmount( getInvokeAmount * 1.00 / 100).toString());
+                    satisfyList.setInvokeAmount(WebUtil.formatAmount(activityResponseDto.getDelayTimes() * 1.00 / 100).toString());
                 }else{
                     //已减 X 元 再买 Y 元 减 Z 元
                     satisfyList.setTipType(ActivityPromptEnum.TipTypeEnum.FOUR.getCode());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullSubtractionActivityServiceImpl.java

@@ -120,7 +120,7 @@ public class FullSubtractionActivityServiceImpl {
                         benefitBeanDto = benefitBeanDtos.get(i);
                         if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityResponseDto.getCouponType())) {
                             messageBuilder.append("满 <span style=\"color:#fa5555\">")
-                                    .append(WebUtil.formatAmount(benefitBeanDto.getBenefitNumber() * 1.00 / 100))
+                                    .append(benefitBeanDto.getBenefitNumber())
                                     .append("</span>件 减 <span style=\"color:#fa5555\">")
                                     .append(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100))
                                     .append("</span> 元");
@@ -140,7 +140,7 @@ public class FullSubtractionActivityServiceImpl {
                         cn.freemud.entities.vo.ActivityList notInShopping = new ActivityList();
                         if(ActivityPromptEnum.PreferentialTypeEnum.TO_ORDER_ITEM_QUANTITY.getCode().equals(activityResponseDto.getCouponType())) {
                             notInShopping.setTipType(ActivityPromptEnum.TipTypeEnum.SIXTEEN.getCode());
-                            notInShopping.setSatisfy(WebUtil.formatAmount(benefitBeanDto.getBenefitNumber() * 1.00 / 100).toString());
+                            notInShopping.setSatisfy(benefitBeanDto.getBenefitNumber().toString());
                             notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
                             notInShopping.setInvokeAmount(WebUtil.formatAmount(activityResponseDto.getDelayTimes() * 1.00 / 100).toString());