!234 修复查询满减活动和优惠券活动报错问题

Merge pull request !234 from OceansDeep/feature/pg
mualoha · Sep 14, 2022 · 178e0d1 · 178e0d1
2 parents 74cc5af + cbdcb6f
commit 178e0d1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java b/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java
@@ -45,21 +45,20 @@ public void setLimitScript(DefaultRedisScript<Long> limitScript) {
     @Before("@annotation(limitPointAnnotation)")
     public void interceptor(LimitPoint limitPointAnnotation) {
         LimitTypeEnums limitTypeEnums = limitPointAnnotation.limitType();
-        String name = limitPointAnnotation.name();
+
         String key;
         int limitPeriod = limitPointAnnotation.period();
         int limitCount = limitPointAnnotation.limit();
-        switch (limitTypeEnums) {
-            case CUSTOMER:
-                key = limitPointAnnotation.key();
-                break;
-            default:
-                key = limitPointAnnotation.key() + IpUtils
-                        .getIpAddress(((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
+        if (limitTypeEnums == LimitTypeEnums.CUSTOMER) {
+            key = limitPointAnnotation.key();
+        } else {
+            key = limitPointAnnotation.key() + IpUtils
+                    .getIpAddress(((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
         }
         ImmutableList<String> keys = ImmutableList.of(StringUtils.join(limitPointAnnotation.prefix(), key));
         try {
             Number count = redisTemplate.execute(limitScript, keys, limitCount, limitPeriod);
+            assert count != null;
             log.info("限制请求{}, 当前请求{},缓存key{}", limitCount, count.intValue(), key);
             //如果缓存里没有值，或者他的值小于限制频率
             if (count.intValue() >= limitCount) {
@@ -72,6 +71,7 @@ public void interceptor(LimitPoint limitPointAnnotation) {
         } catch (ServiceException e) {
             throw e;
         } catch (Exception e) {
+            log.error("限流异常", e);
             throw new ServiceException(ResultCode.ERROR);
         }
     }

diff --git a/.../src/main/java/cn/lili/common/aop/interceptor/PreventDuplicateSubmissionsInterceptor.java b/.../src/main/java/cn/lili/common/aop/interceptor/PreventDuplicateSubmissionsInterceptor.java
@@ -47,6 +47,7 @@ public void interceptor(PreventDuplicateSubmissions preventDuplicateSubmissions)
         } catch (ServiceException e) {
             throw e;
         } catch (Exception e) {
+            log.error("防重复提交拦截器异常", e);
             throw new ServiceException(ResultCode.ERROR);
         }
     }

diff --git a/...work/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java b/...work/src/main/java/cn/lili/modules/verification/service/impl/VerificationServiceImpl.java
@@ -96,6 +96,7 @@ public Map<String, Object> createVerification(VerificationEnums verificationEnum
         } catch (ServiceException e) {
             throw e;
         } catch (Exception e) {
+            log.error("生成验证码失败", e);
             throw new ServiceException(ResultCode.ERROR);
         }
     }

diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java
@@ -35,7 +35,6 @@ public class FullDiscountManagerController {
     @ApiOperation(value = "获取满优惠列表")
     @GetMapping
     public ResultMessage<IPage<FullDiscount>> getCouponList(FullDiscountSearchParams searchParams, PageVO page) {
-        page.setNotConvert(true);
         return ResultUtil.data(fullDiscountService.pageFindAll(searchParams, page));
     }
 

diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java
@@ -41,7 +41,6 @@ public class CouponStoreController {
     @GetMapping
     @ApiOperation(value = "获取优惠券列表")
     public ResultMessage<IPage<CouponVO>> getCouponList(CouponSearchParams queryParam, PageVO page) {
-        page.setNotConvert(true);
         String storeId = Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId();
         queryParam.setStoreId(storeId);
         IPage<CouponVO> coupons = couponService.pageVOFindAll(queryParam, page);