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

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

@@ -66,6 +66,8 @@ 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,13 +65,25 @@ 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)
-                        for (GoblinUserCouponVo userCouponVo : userCouponVos)
+                if (!CollectionUtils.isEmpty(userCouponVos)) {
+                    for (GoblinStoreCouponVo storeCouponVo : storeCouponVos) {
+                        if (0 != storeCouponVo.getStock()) {
+                            storeCouponVo.setSurplusStock(goblinRedisUtils.getStoreCouponStock(storeCouponVo.getStoreCouponId()));
+                        }
+                        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);