+API:店铺券:代领券+校验逻辑;

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

@@ -84,28 +84,37 @@ public class GoblinCouponController {
     public ResponseDto<Boolean> receive(@NotBlank(message = "平台券ID不能为空") @RequestParam("storeCouponId") String storeCouponId) {
 //    public ResponseDto<Boolean> checkOrderResult(@RequestParam("storeCouponId") @Valid String storeCouponId,
 //                                                 @RequestParam("number") @Valid Integer number) {
-        return this.receiveFetchedProcessing(CurrentUtil.getCurrentUid(), storeCouponId);
+        return this.receiveFetchedProcessing(CurrentUtil.getCurrentUid(), storeCouponId, null);
     }
 
     @PostMapping("fetched")
     @ApiOperation("POS机代领券")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeCouponId", value = "平台券ID"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "UID[POS机代领必传]"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "UID"),
     })
-    public ResponseDto<Boolean> fetched(@NotBlank(message = "平台券ID不能为空") @RequestParam("storeCouponId") String storeCouponId,
-                                        @NotBlank(message = "UID不能为空")@RequestParam("uid") String currentUid) {
+    public ResponseDto<Boolean> fetched(@NotBlank(message = "店铺ID不能为空") @RequestParam("storeId") String storeId,
+                                        @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"));
+        }
         // TODO: 2022/3/5 ==zhanggb.UID校验真实性
-        return receiveFetchedProcessing(currentUid, storeCouponId);
+        return receiveFetchedProcessing(uid, storeCouponId, storeId);
     }
 
-    private ResponseDto<Boolean> receiveFetchedProcessing(String uid, String storeCouponId) {
+    private ResponseDto<Boolean> receiveFetchedProcessing(String uid, String storeCouponId, String storeId) {
         GoblinStoreCouponVo storeCouponVo = goblinRedisUtils.getStoreCouponVo(storeCouponId);
         if (null == storeCouponVo) {
             log.warn("商城:用户领取优惠券:优惠券不存在:[uid={},storeCouponId={}]", uid, storeCouponId);
             return ResponseDto.failure(ErrorMapping.get("140050"));
         }
+        if (null != storeId && !storeId.equals(storeCouponVo.getStoreId())) {
+            log.warn("商城:POS机代领优惠券:非法请求，非本店铺优惠券:[uid={},storeCouponId={}]", uid, storeCouponId);
+            return ResponseDto.failure(ErrorMapping.get("140050"));
+        }
         if (!storeCouponVo.getState().equals("1")) {
             return ResponseDto.failure(ErrorMapping.get("140051"));
         }