订单畅学卡总优惠价

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

@@ -310,6 +310,21 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
             List<UserOrderDetailVo> userOrderDetailVos = getUserOrderDetailVos(Lists.newArrayList(userOrderVo.getOrderNo()));
 
+            // 计算畅学卡优惠总金额
+            if (userOrderVo.getCardDiscountPrice() == null) {
+                userOrderVo.setCardDiscountPrice(BigDecimal.ZERO);
+            }
+            userOrderDetailVos.forEach(o -> {
+                if (StringUtils.isNotBlank(o.getDiscountJson())) {
+
+                    Map<String,BigDecimal> decimalMap = JSON.parseObject(o.getDiscountJson(), Map.class);
+                    BigDecimal bigDecimal = decimalMap.get(EDiscountType.DISCOUNT.name());
+                    if (bigDecimal != null) {
+                        userOrderVo.setCardDiscountPrice(userOrderVo.getCardDiscountPrice().add(bigDecimal));
+                    }
+                }
+            });
+
             // 设置recordId
             userOrderDetailVos.forEach(o -> {
                 if (o.getGoodType().equals(GoodTypeEnum.TENANT_ALBUM) && userOrderVo.getOrderClient().equals(ClientEnum.TENANT)) {

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

@@ -45,6 +45,9 @@ public class UserOrderVo extends UserOrder {
 	@ApiModelProperty("优惠券抵扣金额 ")
 	private BigDecimal discountPrice;
 
+	@ApiModelProperty("畅学卡优惠总金额 ")
+	private BigDecimal cardDiscountPrice;
+
 
     @ApiModelProperty("机构名称")
     private String tenantName;