Merge remote-tracking branch 'origin/master-auto-pay' into master-auto-pay

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java

@@ -4,8 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.entity.AppUserAlipay;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
-import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.mapper.AppUserAlipayMapper;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
@@ -96,16 +94,16 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
             appUserAlipays.add(appUserAlipay);
         }
         //微信
-        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
-        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
-            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userId);
-            AppUserAlipay wxAppUser = new AppUserAlipay();
-            wxAppUser.setType(2);
-            wxAppUser.setUserId(userId);
-            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
-            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
-            appUserAlipays.add(wxAppUser);
-        }
+//        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
+//        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
+//            AppUserDetail appUserDetail = appUserDetailBiz.getUserByUserid(userId);
+//            AppUserAlipay wxAppUser = new AppUserAlipay();
+//            wxAppUser.setType(2);
+//            wxAppUser.setUserId(userId);
+//            wxAppUser.setNickname(StringUtils.isEmpty(appUserDetail.getWxNickname())?appUserDetail.getNickname():appUserDetail.getWxNickname());
+//            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
+//            appUserAlipays.add(wxAppUser);
+//        }
         return appUserAlipays;
     }