fix(payment): 调整支付宝绑定和查询功能

mcwl-admin/src/main/java/com/mcwl/web/controller/communityCenter/PlaFormController.java

@@ -38,9 +38,9 @@ public class PlaFormController extends BaseController {
      */
     @ApiOperation(value = "模型列表")
     @GetMapping("/list")
-    public List<PlatForm> list() {
+    public R<List<PlatForm>> list() {
 
-        return platFormService.list();
+        return R.ok(platFormService.list());
     }
 
     /***

mcwl-admin/src/main/resources/application.yml

@@ -34,7 +34,7 @@ server:
 # 日志配置
 logging:
   level:
-    com.mcwl: debug
+    com.mcwl: error
     org.springframework: warn
 
 # 用户配置

mcwl-framework/src/main/java/com/mcwl/framework/web/exception/GlobalExceptionHandler.java

@@ -47,13 +47,13 @@ public class GlobalExceptionHandler {
     }
 
     /**
-     * redis异常
+     * redis连接超时异常
      */
     @ExceptionHandler(QueryTimeoutException.class)
     public AjaxResult commandTimeoutException(QueryTimeoutException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("redis异常{},{}", requestURI, e.getMessage());
-        return AjaxResult.error(HttpStatus.ERROR, "超时");
+        return AjaxResult.error(HttpStatus.WARN, "超时");
     }
 
 

mcwl-framework/src/main/java/com/mcwl/framework/web/service/TokenService.java

@@ -82,9 +82,6 @@ public class TokenService
             }
             catch (Exception e)
             {
-                if (e.getCause() instanceof io.lettuce.core.RedisCommandTimeoutException) {
-                    throw new RedisCommandTimeoutException("连接超时");
-                }
                 log.error("获取用户信息异常'{}'", e.getMessage());
             }
         }

mcwl-pay/src/main/java/com/mcwl/pay/service/impl/AliPayServiceImpl.java

@@ -307,6 +307,8 @@ public class AliPayServiceImpl implements AliPayService {
 
         SysUserPayAccount sysUserPayAccount = sysUserPayAccountService.lambdaQuery()
                 .eq(SysUserPayAccount::getUserId, SecurityUtils.getUserId())
+                .eq(SysUserPayAccount::getAppId, aliConfig.getAppId())
+                .eq(SysUserPayAccount::getType, 0)
                 .one();
 
         if (Objects.isNull(sysUserPayAccount)) {
@@ -476,6 +478,7 @@ public class AliPayServiceImpl implements AliPayService {
                 // 判断是否已经绑定过
                 SysUserPayAccount sysUserPayAccount = sysUserPayAccountService.lambdaQuery()
                         .eq(SysUserPayAccount::getUserId, userId)
+                        .eq(SysUserPayAccount::getAppId, aliConfig.getAppId())
                         .eq(SysUserPayAccount::getType, 0)
                         .one();
                 if (Objects.nonNull(sysUserPayAccount)) {
@@ -486,6 +489,7 @@ public class AliPayServiceImpl implements AliPayService {
                 // 将openId与当前商城用户绑定（保存到数据库）
                 SysUserPayAccount userPayAccount = new SysUserPayAccount();
                 userPayAccount.setUserId(userId);
+                userPayAccount.setAppId(aliConfig.getAppId());
                 userPayAccount.setOpenId(openId);
                 userPayAccount.setType(0);
                 sysUserPayAccountService.save(userPayAccount);

mcwl-system/src/main/java/com/mcwl/system/domain/SysUserPayAccount.java

@@ -21,10 +21,17 @@ public class SysUserPayAccount extends BaseEntity {
      * 用户id
      */
     private Long userId;
+
+    /**
+     * 应用id
+     */
+    private String appId;
+
     /**
      * 账号唯一标识
      */
     private String openId;
+
     /**
      * 账号类型 0 支付宝 1 微信 2 QQ
      */