Merge branch 'feature/1219_opt' into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -238,6 +238,23 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                     userOrderVo.setTenantName(tenantInfo.getName());
                 }
             }
+            Map<String,BigDecimal> orderDiscount = new HashMap<>();
+            orderDetilListByOrderNo.forEach(o -> {
+                if (StringUtils.isNotBlank(o.getDiscountJson())) {
+                    Map<String,BigDecimal> decimalMap = JSON.parseObject(o.getDiscountJson(), Map.class);
+                   decimalMap.forEach((k,v) -> {
+                       if (orderDiscount.containsKey(k)) {
+                           orderDiscount.put(k,orderDiscount.get(k).add(v));
+                       } else {
+                           orderDiscount.put(k,v);
+                       }
+                   });
+                }
+            });
+            // 过滤 金额=0
+            Map<String,BigDecimal> orderDiscountMap = orderDiscount.entrySet().stream().filter(o -> o.getValue().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+            userOrderVo.setOrderDiscountMap(orderDiscountMap);
+
             for (UserOrderDetailVo userOrderDetailVo : orderDetilListByOrderNo) {
                 if (userOrderDetailVo.getGoodType().equals(GoodTypeEnum.TENANT_ALBUM)) {
                     TenantAlbum tenantAlbum = tenantAlbumService.getById(userOrderDetailVo.getBizId());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderVo.java

@@ -14,6 +14,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: liweifan
@@ -58,4 +59,6 @@ public class UserOrderVo extends UserOrder {
 	@ApiModelProperty(value = "活动类型 EVALUATION 评测活动 STANDARD_GIFT 达标赠送 SHARE分享活动", required = true)
 	private ActivityTypeEnum activityType;
 
+	@ApiModelProperty("优惠金额详情")
+	private Map<String,BigDecimal> orderDiscountMap;
 }