Merge branch 'master' into dev-lqc

src/main/java/com/mokamrp/privates/controller/pangu/FosterwxMobileController.java

@@ -101,8 +101,8 @@ public class FosterwxMobileController extends BaseController<FosterwxMobile> {
 //        } else {
             //.正常查询
             res = fosterwxMobileService.getList(getForsterwxMobileHandle);
-//            List<FosterwxMobileVo> list = fosterwxMobileService.setWxFriend(res.getList());
-//            res.setList(list);
+            List<FosterwxMobileVo> list = fosterwxMobileService.setWxFriend(res.getList());
+            res.setList(list);
 //        }
         return AjaxResult.success(res);
     }

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxMobileVo.java

@@ -116,17 +116,18 @@ public class FosterwxMobileVo extends Model<FosterwxMobileVo> {
      */
     private String wxIdentityCardNo;
 
-//    private String wxName1 = "";
-//
-//    private String wxUsername1 = "";
-//
-//    private String wxName2 = "";
-//
-//    private String wxUsername2 = "";
-//
-//    private String wxName3 = "";
-//
-//    private String wxUsername3 = "";
+    @TableField(exist = false)
+    private String wxName1 = "";
+    @TableField(exist = false)
+    private String wxUsername1 = "";
+    @TableField(exist = false)
+    private String wxName2 = "";
+    @TableField(exist = false)
+    private String wxUsername2 = "";
+    @TableField(exist = false)
+    private String wxName3 = "";
+    @TableField(exist = false)
+    private String wxUsername3 = "";
 
     /**
      * 微信注册时间

src/main/java/com/mokamrp/privates/mapper/pangu/pojo/FosterwxMobileWxfriend.java

@@ -45,6 +45,10 @@ public class FosterwxMobileWxfriend extends Model<FosterwxMobileWxfriend> {
      */
     @TableField(exist = false)
     private Integer friendId;
+
+    private String wxName;
+
+    private String wxUsername;
     /**
      * 创建时间
      */

src/main/java/com/mokamrp/privates/service/pangu/FosterwxMobileService.java

@@ -28,7 +28,7 @@ public interface FosterwxMobileService extends IService<FosterwxMobile> {
 
     public VoltaHandle<Boolean> importData(List<Map<String,String>> row, User authUser) throws Exception;
 
-//    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list);
+    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list);
     //.@leon 批量加入变现账号
     public Boolean addCashMobileList(SetIdsHandle setIdsHandle);
     //.@leon 批量加入变现企微账号

src/main/java/com/mokamrp/privates/service/pangu/impl/FosterwxMobileServiceImpl.java

@@ -234,28 +234,28 @@ public class FosterwxMobileServiceImpl extends ServiceImpl<FosterwxMobileMapper,
      * @param list
      * @return
      */
-//    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list) {
-//        for (FosterwxMobileVo fosterwxMobileVo : list) {
-//            List<FosterwxMobileWxfriend> wxfriendList = fosterwxMobileWxfriendService.list(
-//                    new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", fosterwxMobileVo.getId()).orderByAsc("seq"));
-//            if (wxfriendList == null || wxfriendList.size() <= 0) {
-//                continue;
-//            }
-//            for (FosterwxMobileWxfriend fosterwxMobileWxfriend : wxfriendList) {
-//                if (fosterwxMobileWxfriend.getSeq().equals(1)) {
-//                    fosterwxMobileVo.set(fosterwxMobileWxfriend.getWxName());
-//                    fosterwxMobileVo.setWxUsername1(fosterwxMobileWxfriend.getWxUsername());
-//                } else if (fosterwxMobileWxfriend.getSeq().equals(2)) {
-//                    fosterwxMobileVo.setWxName2(fosterwxMobileWxfriend.getWxName());
-//                    fosterwxMobileVo.setWxUsername2(fosterwxMobileWxfriend.getWxUsername());
-//                } else if (fosterwxMobileWxfriend.getSeq().equals(3)) {
-//                    fosterwxMobileVo.setWxName3(fosterwxMobileWxfriend.getWxName());
-//                    fosterwxMobileVo.setWxUsername3(fosterwxMobileWxfriend.getWxUsername());
-//                }
-//            }
-//        }
-//        return list;
-//    }
+    public List<FosterwxMobileVo> setWxFriend(List<FosterwxMobileVo> list) {
+        for (FosterwxMobileVo fosterwxMobileVo : list) {
+            List<FosterwxMobileWxfriend> wxfriendList = fosterwxMobileWxfriendService.list(
+                    new QueryWrapper<FosterwxMobileWxfriend>().eq("mobile_id", fosterwxMobileVo.getId()).orderByAsc("seq"));
+            if (wxfriendList == null || wxfriendList.size() <= 0) {
+                continue;
+            }
+            for (FosterwxMobileWxfriend fosterwxMobileWxfriend : wxfriendList) {
+                if (fosterwxMobileWxfriend.getSeq().equals(1)) {
+                    fosterwxMobileVo.setWxName1(fosterwxMobileWxfriend.getWxName());
+                    fosterwxMobileVo.setWxUsername1(fosterwxMobileWxfriend.getWxUsername());
+                } else if (fosterwxMobileWxfriend.getSeq().equals(2)) {
+                    fosterwxMobileVo.setWxName2(fosterwxMobileWxfriend.getWxName());
+                    fosterwxMobileVo.setWxUsername2(fosterwxMobileWxfriend.getWxUsername());
+                } else if (fosterwxMobileWxfriend.getSeq().equals(3)) {
+                    fosterwxMobileVo.setWxName3(fosterwxMobileWxfriend.getWxName());
+                    fosterwxMobileVo.setWxUsername3(fosterwxMobileWxfriend.getWxUsername());
+                }
+            }
+        }
+        return list;
+    }
 
     /**
      * 批量加入变现账号