Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/test/java/TestAdam.java

@@ -76,6 +76,7 @@ public class TestAdam {
                 "goblin:sku:relation:226416501783461229",
                 "goblin:bsc:goods:2264185547679ZZ87427",
                 "goblin:bsc:goods_sku:226418554767964895ZZ87427",
+                "goblin:user_coupon:926591841436344323959830",
                 "goblin:bsc:ustore:809406",
                 "goblin:bsc:ustore:922833055536291845022973",
                 "goblin:bsc:store:839fa8dde17b5bf248575370f1249eab",

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.goblin.dto.vo.GoblinUserCouponVo;
 import com.liquidnet.service.goblin.param.BackCouponParam;
 import com.liquidnet.service.goblin.service.GoblinCouponService;
 import com.liquidnet.service.goblin.util.GoblinRedisUtils;
+import com.liquidnet.service.goblin.util.ObjectUtil;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -96,9 +97,10 @@ public class GoblinCouponController {
         }
         List<GoblinUserCouponVo> userCouponVos = goblinRedisUtils.getUserCouponVos(uid);
         if (!CollectionUtils.isEmpty(userCouponVos)) {
-            int beforeSize = userCouponVos.size();
-            userCouponVos.removeIf(vo -> vo.getStoreCouponId().equals(storeCouponId));
-            if ((beforeSize - userCouponVos.size()) >= storeCouponVo.getReceiveLimit()) {
+            ArrayList<GoblinUserCouponVo> userCouponVosTmp = ObjectUtil.getGoblinUserCouponVo();
+            userCouponVosTmp.addAll(userCouponVos);
+            userCouponVosTmp.removeIf(vo -> vo.getStoreCouponId().equals(storeCouponId));
+            if ((userCouponVos.size() - userCouponVosTmp.size()) >= storeCouponVo.getReceiveLimit()) {
                 return ResponseDto.failure(ErrorMapping.get("140052"));
             }
         }