Browse Source

Merge branch 'dev_v1.3.4_20220902'

Eric 3 years ago
parent
commit
557674e7af

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

@@ -131,7 +131,7 @@ public class CouponInfoQuery implements Serializable {
 
 
 
 
         public CouponOrderQuery issueIds(String issueIds) {
         public CouponOrderQuery issueIds(String issueIds) {
-            if (StringUtils.isNotEmpty(issueIds) && issueIds.contains(",")) {
+            if (StringUtils.isNotEmpty(issueIds)) {
                 this.issueIds = Arrays.stream(issueIds.split(",")).map(Long::parseLong).collect(Collectors.toList());
                 this.issueIds = Arrays.stream(issueIds.split(",")).map(Long::parseLong).collect(Collectors.toList());
             }
             }
             return this;
             return this;

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

@@ -374,7 +374,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                             .build()
                             .build()
                             .issueIds(orderReq.getCouponId()));
                             .issueIds(orderReq.getCouponId()));
 
 
-            log.debug("executeOrder couponId={}, wrapper={}", orderReq.getCouponId(), couponOrderWrapper.jsonString());
+            //log.info("executeOrder couponId={}, wrapper={}", orderReq.getCouponId(), couponOrderWrapper.jsonString());
 
 
             // 优惠券优惠金额,暂时为0
             // 优惠券优惠金额,暂时为0
             couponAmount =couponAmount.add(BigDecimal.valueOf(couponOrderWrapper.getDiscountedPrices()));
             couponAmount =couponAmount.add(BigDecimal.valueOf(couponOrderWrapper.getDiscountedPrices()));