修改券列表

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserCouponVo.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 商城:用户优惠券展示信息（缓存）
@@ -61,6 +62,8 @@ public class GoblinUserCouponVo implements Serializable, Cloneable {
 
     @ApiModelProperty(position = 35, value = "店铺ID")
     private String storeId;
+    @ApiModelProperty(position = 36, value = "spuIds")
+    private List<String> spuIds;
 
 
     /* -------------------------------------------------------------------- */

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinCouponImpl.java

@@ -211,6 +211,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
             //判断券状态 和 触发金额
             if (vo.getDuedAt().isAfter(now) && vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0) {
                 if (vo.getUseScope().equals("0")) {
+                    vo.setSpuIds(CollectionUtil.linkedListString());
                     returnList.add(vo);
                 } else {
                     List<String> spuIds = goblinRedisUtils.getStoreCouponSpuIds(vo.getStoreCouponId());
@@ -221,6 +222,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
                     for (String item : spuIds) {
                         List<String> spuList = Arrays.asList(spuId.split(","));
                         if (spuList.contains(item)) {
+                            vo.setSpuIds(spuIds);
                             returnList.add(vo);
                             break;
                         }
@@ -242,6 +244,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
             //判断券状态 和 触发金额
             if (vo.getDuedAt().isAfter(now) && vo.getState().equals(1)) {
                 if (vo.getUseScope().equals("0")) {
+                    vo.setSpuIds(CollectionUtil.linkedListString());
                     returnList.add(vo);
                 } else {
                     List<String> spuIds = goblinRedisUtils.getStoreCouponSpuIds(vo.getStoreCouponId());
@@ -249,6 +252,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
                     for (String item : spuIds) {
                         List<String> spuList = param.getSpuIds();
                         if (spuList.contains(item)) {
+                            vo.setSpuIds(spuIds);
                             returnList.add(vo);
                             break;
                         }
@@ -273,6 +277,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
             //判断券状态 和 触发金额
             if (vo.getDuedAt().isAfter(now) && vo.getState().equals(1)) {//&& vo.getTriggers().compareTo(totalPrice) <= 0
                 if (vo.getUseScope().equals("0") && vo.getTriggers().compareTo(totalPrice) <= 0) {
+                    vo.setSpuIds(CollectionUtil.linkedListString());
                     returnList.add(vo);
                 } else {
                     List<String> spuIds = goblinRedisUtils.getStoreCouponSpuIds(vo.getStoreCouponId());
@@ -283,12 +288,18 @@ public class GoblinCouponImpl implements GoblinCouponService {
                     BigDecimal contentPrice = BigDecimal.ZERO;
                     for (String item : spuIds) {
                         for (CouponCanUse2Param param2 : param.getParam()) {
-                            if (param2.getSpuId().equals(item)) {
+                            String pre = GoblinStatusConst.MarketPreStatus.getPre(param2.getSpuId());
+                            String spuId = param2.getSpuId();
+                            if (pre != null) {
+                                spuId = param2.getSpuId().split(pre)[0];
+                            }
+                            if (spuId.equals(item)) {
                                 contentPrice = contentPrice.add(param2.getPrice());
                             }
                         }
                     }
                     if (vo.getTriggers().compareTo(contentPrice) <= 0) {
+                        vo.setSpuIds(spuIds);
                         returnList.add(vo);
                     }
                 }