修改app用户管理

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserManageVo.java

@@ -51,22 +51,17 @@ public class AppUserManageVo {
     @Column(name = "source")
     private Integer source;
 
-    /**
-     * 邀请人id
-     */
-    @Column(name = "inviter_account")
-    private String inviterAccount;
     /**
      * 省代码
      */
     @Column(name = "province_code")
-    private String provinceCode;
+    private Integer provinceCode;
 
     /**
      * 市代码
      */
     @Column(name = "city_code")
-    private String cityCode;
+    private Integer cityCode;
 
     /**
      * 用户性别
@@ -160,4 +155,9 @@ public class AppUserManageVo {
      * 头像
      */
     private String headimgurl;
+
+    /**
+     * 邀请人用户名
+     */
+    private String inviter;
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -56,7 +56,6 @@
         d.isdel,
         d.nickname,
         d.source,
-        d.Inviter_account as inviterAccount,
         d.province_code as provinceCode,
         d.city_code as cityCode,
         d.sex,
@@ -69,12 +68,18 @@
         m.rent_free_days as rentFreeDays,
         m.crt_time as timeOfMembership,
         m.recent_recharge as  recentRecharge,
-        m.name as memberName
+        m.name as memberName,
+        ul.username as inviter
         from
         app_user_login l
         left join
         app_user_detail d
-        on d.userid = l.id
+        on
+        d.userid = l.id
+        left  join
+        app_user_login ul
+        on
+        ul.id=d.inviter_account
         left join
         (
         select
@@ -89,10 +94,13 @@
         ) m
         on
         l.id = m.user_id
+
         where 1=1
 
+
+
         <if test="mobile !=null">
-            and l.username=#{mobile}
+            and l.username like  CONCAT('%',#{mobile},'%')
         </if>
         <if test="channel !=null">
             and d.channel=#{channel}
@@ -107,7 +115,7 @@
             and l.createtime &lt;= #{registrationTimeEnd}
         </if>
         <if test="source !=null">
-            and d.source &lt;= #{source}
+            and d.source = #{source}
         </if>
         order by  l.id  ASC
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -73,4 +73,12 @@ public interface VehicleFeign {
      */
     @GetMapping(value = "/vehicleModel/goodList")
     List<GoodDataVO> goodList(@RequestParam(value = "page") Integer page, @RequestParam("limit") Integer limit);
+
+    /**
+     * 根据一个id获取城市
+     * @param id
+     * @return
+     */
+    @GetMapping("/sysRegion/getSysRegionById/{id}")
+   RestResponse getSysRegionById(@PathVariable Integer id);
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/SysRegionController.java

@@ -75,4 +75,23 @@ public class SysRegionController extends BaseController<SysRegionBiz> {
 
     }
 
+    /**
+     * 根据一个id获取城市
+     * @param id
+     * @return
+     */
+    @GetMapping("/getSysRegionById/{id}")
+    public RestResponse getSysRegionById(@PathVariable Integer id){
+        Example exam = Example.builder(SysRegion.class)
+                .where(WeekendSqls.<SysRegion>custom()
+                        .andEqualTo(SysRegion::getId,id)).build();
+        List<SysRegion> sysRegions = baseBiz.selectByExample(exam);
+        if (sysRegions==null||sysRegions.size()!=1) {
+            RestResponse.suc();
+        }
+        return RestResponse.suc( sysRegions.get(0));
+
+    }
+
+
 }