Browse Source

fixed 登录拦截web配置等问题

fushengqian 1 day ago
parent
commit
bd9991d2eb

+ 3 - 1
fuint-application/src/main/java/com/fuint/common/config/WebConfig.java

@@ -84,7 +84,9 @@ public class WebConfig extends WebMvcConfigurationSupport {
                 .excludePathPatterns("/clientApi/cart/**")
                 .excludePathPatterns("/clientApi/user/**")
                 .excludePathPatterns("/clientApi/settlement/submit")
-                .excludePathPatterns("/clientApi/pay/**")
+                .excludePathPatterns("/clientApi/pay/weixinCallback")
+                .excludePathPatterns("/clientApi/pay/weixinRefundNotify")
+                .excludePathPatterns("/clientApi/pay/aliPayCallback")
                 .excludePathPatterns("/clientApi/order/todoCounts")
                 .excludePathPatterns("/clientApi/store/**")
                 .excludePathPatterns("/clientApi/article/**")

+ 3 - 0
fuint-application/src/main/java/com/fuint/common/service/impl/ArticleServiceImpl.java

@@ -178,6 +178,9 @@ public class ArticleServiceImpl extends ServiceImpl<MtArticleMapper, MtArticle>
     @Override
     public ArticleDto getArticleDetail(Integer articleId) {
         MtArticle mtArticle = mtArticleMapper.selectById(articleId);
+        if (mtArticle == null) {
+            return null;
+        }
         ArticleDto articleDto = new ArticleDto();
         BeanUtils.copyProperties(mtArticle, articleDto);
         String baseImage = settingService.getUploadBasePath();

+ 2 - 1
fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java

@@ -355,7 +355,8 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
             mtGoods.setCouponIds("");
         }
         if (mtGoods.getCouponIds() != null && StringUtil.isNotEmpty(mtGoods.getCouponIds())) {
-            String couponIds[] = mtGoods.getCouponIds().split(",");
+            String str = mtGoods.getCouponIds().replace(",", ",").trim();
+            String couponIds[] = str.split(",");
             if (couponIds.length > 0) {
                 for (int i = 0; i < couponIds.length; i++) {
                      MtCoupon mtCoupon = couponService.queryCouponById(Integer.parseInt(couponIds[i]));

+ 1 - 0
fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientPayController.java

@@ -101,6 +101,7 @@ public class ClientPayController extends BaseController {
         String useFor = request.getParameter("type") == null ? "" : request.getParameter("type");
         String merchantNo = request.getHeader("merchantNo");
         UserInfo userInfo = TokenUtil.getUserInfoByToken(token);
+
         MtUser mtUser = memberService.queryMemberById(userInfo.getId());
         Map<String, Object> outParams = new HashMap<>();