Merge branch 'dev_fetched_coupon_spuIds' into dev_0716_online

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

@@ -140,15 +140,30 @@ public class GoblinCouponController {
         if (!CollectionUtils.isEmpty(userCouponVos)) {
             List<GoblinUserCouponVo> userCouponVoList = userCouponVos.stream().filter(vo -> vo.getStoreCouponId().equals(storeCouponId)).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(userCouponVoList) && userCouponVoList.size() >= storeCouponVo.getReceiveLimit()) {
+                // 用户已领取该券且领取数量已达上限时，根据已领取券的状态判断返回（如果已使用提示用，未使用则正常返回）
                 Optional<GoblinUserCouponVo> userCouponVoOptional = userCouponVoList.stream().filter(vo -> vo.getState().equals(1)).findAny();
-                return userCouponVoOptional.map(ResponseDto::success).orElseGet(() -> ResponseDto.failure(ErrorMapping.get("140054")));
+//                return userCouponVoOptional.map(ResponseDto::success).orElseGet(() -> ResponseDto.failure(ErrorMapping.get("140054")));
+                if (userCouponVoOptional.isPresent()) {
+                    GoblinUserCouponVo userCouponVo = userCouponVoOptional.get();
+                    if (StringUtils.equals("1", userCouponVo.getUseScope())) {
+                        userCouponVo.setSpuIds(goblinRedisUtils.getStoreCouponSpuIds(storeCouponId));
+                    }
+                    return ResponseDto.success(userCouponVo);
+                } else {
+                    return ResponseDto.failure(ErrorMapping.get("140054"));
+                }
             }
         }
         if (storeCouponVo.getStock().equals(0) || goblinRedisUtils.getStoreCouponStock(storeCouponId) > 0) {
             if (goblinCouponService.receiveCoupon(uid, userCouponVos, storeCouponVo)) {
                 List<GoblinUserCouponVo> userCouponVoList = userCouponVos.stream()
                         .filter(vo -> vo.getStoreCouponId().equals(storeCouponId) && vo.getState().equals(1)).collect(Collectors.toList());
-                return ResponseDto.success(userCouponVoList.get(0));
+//                return ResponseDto.success(userCouponVoList.get(0));
+                GoblinUserCouponVo userCouponVo = userCouponVoList.get(0);
+                if (StringUtils.equals("1", userCouponVo.getUseScope())) {
+                    userCouponVo.setSpuIds(goblinRedisUtils.getStoreCouponSpuIds(storeCouponId));
+                }
+                return ResponseDto.success(userCouponVo);
             }
             return ResponseDto.failure(ErrorMapping.get("140053"));
         }