Merge branch 'feature_20200514_1.9.23_discountActiTips'

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

@@ -147,13 +147,14 @@ public class FullPromotionService implements IPromotionService {
         if (Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
             int len = benefitBeanDtos.size();
             // // 购物车中无商品或者存在与满减互斥的活动
-            for (int i = len - 1, j = 0; i >= 0 && j < 2; i--, j++) {
+            for (int i = len - 1; i >= 0; i--) {
                 benefitBeanDto = benefitBeanDtos.get(i);
                 messageBuilder.append("满 <span style=\"color:#fa5555\">")
                         .append(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100))
                         .append("</span> 减 <span style=\"color:#fa5555\">")
                         .append(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100))
                         .append("</span> 元");
+                if (i > 0) messageBuilder.append("，");
             }
         }
     }