liujunchi 3 年之前
父节点
当前提交
60011f8e3b

+ 13 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/queryInfo/CouponInfoQuery.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.queryInfo;
 
 import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Lists;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponCategoryEnum;
 import com.yonge.cooleshow.biz.dal.enums.coupon.CouponTypeEnum;
@@ -10,10 +11,13 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * 优惠券查询条件
@@ -121,5 +125,14 @@ public class CouponInfoQuery implements Serializable {
 
             return Optional.ofNullable(couponTypes).filter(CollectionUtils::isNotEmpty).orElse(null);
         }
+
+
+        public CouponOrderQuery issueIds(String issueIds) {
+            this.issueIds = Lists.newArrayList();
+            if (StringUtils.isNotEmpty(issueIds) && issueIds.contains(",")) {
+                this.issueIds = Arrays.stream(issueIds.split(",")).map(Long::parseLong).collect(Collectors.toList());
+            }
+            return this;
+        }
     }
 }

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

@@ -338,11 +338,11 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                     CouponInfoQuery.CouponOrderQuery.builder()
                             .clientType(orderReq.getOrderClient())
                             .couponTypes(CouponCategoryEnum.getCategory(orderReq.getOrderType().getCode()))
-                            .issueIds(Arrays.stream(orderReq.getCouponId().split(",")).map(Long::parseLong).collect(Collectors.toList()))
                             .useState(CouponUseStateEnum.USABLE)
                             .timestamp(DateTime.now().getMillis())
                             .amount(createRes.getExpectPrice().doubleValue())
-                            .build());
+                            .build()
+                            .issueIds(orderReq.getCouponId()));
 
             // 优惠券优惠金额,暂时为0
             couponAmount =couponAmount.add(BigDecimal.valueOf(couponOrderWrapper.getDiscountedPrices()));