diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ADisGroupController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ADisGroupController.java index 212c6dcef..1442753cd 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ADisGroupController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ADisGroupController.java @@ -41,7 +41,7 @@ public class ADisGroupController { if (share == null) { return CzgResult.success(mkDistributionGroupService.save(group)); } else { - return CzgResult.success(mkDistributionGroupService.updateById(group, false)); + return CzgResult.success(mkDistributionGroupService.updateById(group)); } } } \ No newline at end of file diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/AShareBaseController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/AShareBaseController.java index 6d10b3d3e..7a5c88a19 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/AShareBaseController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/AShareBaseController.java @@ -41,6 +41,7 @@ public class AShareBaseController { if (share == null) { return CzgResult.success(mkShareBaseService.save(shareBase)); } else { + shareBase.setCreateTime(share.getCreateTime()); return CzgResult.success(mkShareBaseService.updateById(shareBase, false)); } } diff --git a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java index 90915c136..98daf88cd 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java @@ -181,11 +181,9 @@ public class OrderPayController { @PostMapping("/shopPayApi/js2Pay") @Debounce(value = "#payParam.checkOrderPay.orderId") public CzgResult> js2PayOrder(HttpServletRequest request, @RequestBody OrderPayParamDTO payParam) { - if ("alipay".equals(payParam.getPayType())) { + if ("ALIPAY".equals(payParam.getPayType())) { payParam.setPayType(PayCst.Type.ALIPAY); - } else if ("aliPay".equals(payParam.getPayType())) { - payParam.setPayType(PayCst.Type.ALIPAY); - } else if ("wechatPay".equals(payParam.getPayType())) { + } else if ("WECHAT".equals(payParam.getPayType())) { payParam.setPayType(PayCst.Type.WECHAT); } else { throw new CzgException(payParam.getPayType() + "支付方式错误"); diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java index df1ac3e23..7146d1cb8 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java @@ -1,6 +1,5 @@ package com.czg.config; -import cn.dev33.satoken.application.ApplicationInfo; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.interceptor.SaInterceptor; @@ -58,14 +57,17 @@ public class SaTokenConfigure implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { // 注册路由拦截器,自定义认证规则 registry.addInterceptor(new SaInterceptor(handler -> { - log.info(SaHolder.getRequest().getRequestPath()); - // 重置根路径,防止satoken切割根路径导致匹配不到路径 - ApplicationInfo.routePrefix = ""; - + log.info("{}: {}", SaHolder.getRequest().getMethod(), SaHolder.getRequest().getRequestPath()); + if ("OPTIONS".equalsIgnoreCase(SaHolder.getRequest().getMethod())) { + SaRouter.back(); + return; + } SaRouter + .match(r -> "OPTIONS".equalsIgnoreCase(SaHolder.getRequest().getMethod())) + .stop() // 完全开放的路径(不需要任何认证) .match("/user/login", "/user/geo/**", "/user/home/**", - "/user/dict/**", "/user/openId","/admin/auth/**", + "/user/dict/**", "/user/openId", "/admin/auth/**", "/admin/shopMsgPush/subscribe/**", "/admin/coupon/grant", "/pay/**", diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java index 989ea06eb..78d3c4691 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShareBaseServiceImpl.java @@ -62,7 +62,9 @@ public class MkShareBaseServiceImpl extends ServiceImpl distributionUserService.bindInviteUser(fromUserId, toUserId, shopId), "shareClaim 绑定上下级"); + FunUtils.safeRunVoid(() -> { + distributionUserService.bindInviteUser(fromUserId, toUserId, shopId); + }, "shareClaim绑定上下级"); } MkShareBase shareBase = getById(shopId); if (shareBase == null || !shareBase.getIsEnabled().equals(1) || StrUtil.isBlank(shareBase.getRewardSharePages())) {