用券接口增加店铺id

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/GoblinCouponService.java

@@ -23,7 +23,7 @@ public interface GoblinCouponService {
     List<GoblinUserCouponVo> getList(String type);
 
     //是否可用券 [价格] [spuId逗号隔开] [uid]
-    GoblinUserCouponVo canUse(BigDecimal totalPrice, String spuId, String uid);
+    GoblinUserCouponVo canUse(BigDecimal totalPrice, String spuId, String uid,String storeId);
 
     //可用券列表 [价格] [spuId逗号隔开] [uid]
     List<GoblinUserCouponVo> useList(BigDecimal totalPrice, String spuId, String uid);

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

@@ -117,8 +117,8 @@ public class GoblinCouponController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "UID"),
     })
     public ResponseDto<GoblinUserCouponVo> fetched(@NotBlank(message = "店铺ID不能为空") @RequestParam("storeId") String storeId,
-                                        @NotBlank(message = "平台券ID不能为空") @RequestParam("storeCouponId") String storeCouponId,
-                                        @NotBlank(message = "UID不能为空")@RequestParam("uid") String uid) {
+                                                   @NotBlank(message = "平台券ID不能为空") @RequestParam("storeCouponId") String storeCouponId,
+                                                   @NotBlank(message = "UID不能为空") @RequestParam("uid") String uid) {
 //        if (!goblinRedisUtils.hasStoreId(CurrentUtil.getCurrentUid(), storeId)) {
 //            return ResponseDto.failure(ErrorMapping.get("149002"));
 //        }
@@ -172,14 +172,16 @@ public class GoblinCouponController {
             @ApiImplicitParam(type = "form", required = true, dataType = "Number", name = "totalPrice", value = "spuId"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "逗号隔开"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户id"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺id"),
     })
     public ResponseDto<GoblinUserCouponVo> canUse(@RequestParam("totalPrice") @Valid BigDecimal totalPrice,
                                                   @RequestParam("spuId") @Valid String spuId,
+                                                  @RequestParam("storeId") @Valid String storeId,
                                                   @RequestParam(value = "uid", required = false) @Valid String uid) {
         if (uid == null) {
             uid = CurrentUtil.getCurrentUid();
         }
-        return ResponseDto.success(goblinCouponService.canUse(totalPrice, spuId, uid));
+        return ResponseDto.success(goblinCouponService.canUse(totalPrice, spuId, uid,storeId));
     }
 
     @PostMapping("useList")

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

@@ -130,13 +130,13 @@ public class GoblinCouponImpl implements GoblinCouponService {
     }
 
     @Override
-    public GoblinUserCouponVo canUse(BigDecimal totalPrice, String spuId, String uid) {
+    public GoblinUserCouponVo canUse(BigDecimal totalPrice, String spuId, String uid, String storeId) {
         BigDecimal maxPrice = BigDecimal.ZERO;
         GoblinUserCouponVo returnVo = GoblinUserCouponVo.getNew();
         List<GoblinUserCouponVo> voList = goblinRedisUtils.getUserCouponVos(uid);
         for (GoblinUserCouponVo vo : voList) {
             //判断券状态 和 触发金额
-            if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0) {
+            if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0 && vo.getStoreId().equals(storeId)) {
                 if (vo.getUseScope().equals("0")) {
                     BigDecimal tempPrice = BigDecimal.ZERO;
                     if (vo.getType().equals("1")) {//代金券