Revert：~店铺活动券列表+券剩余库存字段surplusStock;

调整商铺券stock标记库存是否充足;

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

@@ -31,7 +31,8 @@ public class GoblinStoreCouponVo implements Serializable, Cloneable {
 
     @ApiModelProperty(position = 16, value = "券类型[1-代金券|2-折扣券|3-满减券]")
     private String type;
-    @ApiModelProperty(position = 17, value = "卡券库存，默认：0为无限")
+//    @ApiModelProperty(position = 17, value = "卡券库存，默认：0为无限")
+    @ApiModelProperty(position = 17, value = "库存充足[0-无库存|1-有库存]")
     private Integer stock;
     @ApiModelProperty(position = 18, value = "触发金额")
     private BigDecimal triggers;
@@ -66,8 +67,6 @@ public class GoblinStoreCouponVo implements Serializable, Cloneable {
     /* ========================================================================== */
     @ApiModelProperty(position = 27, value = "当前用户已领取数量")
     private int receiveCount;
-    @ApiModelProperty(position = 28, value = "当前商铺优惠券剩余库存数量")
-    private int surplusStock;
 
 
     private static final GoblinStoreCouponVo obj = new GoblinStoreCouponVo();

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

@@ -65,25 +65,13 @@ public class GoblinCouponController {
             String currentUid = CurrentUtil.getCurrentUid();
             if (StringUtils.isNotEmpty(currentUid)) {
                 List<GoblinUserCouponVo> userCouponVos = goblinRedisUtils.getUserCouponVos(currentUid);
-                if (!CollectionUtils.isEmpty(userCouponVos)) {
-                    for (GoblinStoreCouponVo storeCouponVo : storeCouponVos) {
-                        if (0 != storeCouponVo.getStock()) {
-                            storeCouponVo.setSurplusStock(goblinRedisUtils.getStoreCouponStock(storeCouponVo.getStoreCouponId()));
-                        }
-                        for (GoblinUserCouponVo userCouponVo : userCouponVos) {
+                if (!CollectionUtils.isEmpty(userCouponVos))
+                    for (GoblinStoreCouponVo storeCouponVo : storeCouponVos)
+                        for (GoblinUserCouponVo userCouponVo : userCouponVos)
                             if (storeCouponVo.getStoreCouponId().equals(userCouponVo.getStoreCouponId())) {
                                 storeCouponVo.setReceiveCount(storeCouponVo.getReceiveCount() + 1);
                                 break;
                             }
-                        }
-                    }
-                }
-            } else {
-                for (GoblinStoreCouponVo storeCouponVo : storeCouponVos) {
-                    if (0 != storeCouponVo.getStock()) {
-                        storeCouponVo.setSurplusStock(goblinRedisUtils.getStoreCouponStock(storeCouponVo.getStoreCouponId()));
-                    }
-                }
             }
         }
         return ResponseDto.success(storeCouponVos);

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

@@ -60,7 +60,13 @@ public class GoblinCouponImpl implements GoblinCouponService {
         for (GoblinStoreCouponVo vo : listVo) {
             if ((vo.getType().equals(type) || type.equals("0")) && "1".equals(vo.getReceiveCurb())
                     && now.isAfter(vo.getStartTime()) && now.isBefore(vo.getEndTime())) {
-                vo.setStock(null);
+//                vo.setStock(null);
+                if (0 == vo.getStock()) {// 无限库存
+                    vo.setStock(1);
+                } else {// 有限库存
+                    int surplusStock = goblinRedisUtils.getStoreCouponStock(vo.getStoreCouponId());
+                    vo.setStock(surplusStock == 0 ? 0 : 1);
+                }
                 returnList.add(vo);
             }
         }