新增转账接口

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserAlipay.java

@@ -2,10 +2,8 @@ package com.github.wxiaoqi.security.admin.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+
+import javax.persistence.*;
 
 /**
  * 支付宝账号表
@@ -40,6 +38,9 @@ public class AppUserAlipay {
     @ApiModelProperty("昵称")
     private String nickname;
 
+    //类型 1、支付宝，2、微信
+    @Transient
+    private Integer type;
 
 
 }
\ No newline at end of file

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

@@ -45,6 +45,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
 
     @Autowired
     AppUserLoginBiz appUserLoginBiz;
+
     @Autowired
     ThirdFeign thirdFeign;
 
@@ -75,10 +76,12 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
     //获取支付宝用户信息
     public List<AppUserAlipay> getByUserId(HttpServletRequest request){
         Example example=new Example(AppUserAlipay.class);
+        Integer userId = null;
         try {
             String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
             if (StringUtils.isNotBlank(username)) {
-                example.createCriteria().andEqualTo("userId", Integer.parseInt(username)).andEqualTo("isDel",0);
+                userId = Integer.parseInt(username);
+                example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel",0);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -86,7 +89,20 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
         example.setOrderByClause("is_default desc");
         AppUserAlipay appUserAlipay = mapper.selectOneByExample(example);
         List<AppUserAlipay> appUserAlipays = new ArrayList<>();
-        appUserAlipays.add(appUserAlipay);
+        //支付宝
+        if(appUserAlipay != null) {
+            appUserAlipay.setType(1);
+            appUserAlipays.add(appUserAlipay);
+        }
+        //微信
+        AppUserLogin appUserLogin = appUserLoginBiz.getUserById(userId);
+        if(appUserLogin != null && StringUtils.isNotBlank(appUserLogin.getWxOpenid())) {
+            AppUserAlipay wxAppUser = new AppUserAlipay();
+            wxAppUser.setType(2);
+            wxAppUser.setUserId(userId);
+            wxAppUser.setTxAlipay(appUserLogin.getWxOpenid());
+            appUserAlipays.add(wxAppUser);
+        }
         return appUserAlipays;
     }