Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -132,6 +132,14 @@ public interface UserFeign {
     @GetMapping("/app/user/finduserIdsByphones")
     Map<String, Integer> findAppusersByUserNames(@RequestParam(value = "phones") List<String> phones);
 
+    /**
+     * 批量获取用户基本信息
+     * @param ids
+     * @return
+     */
+    @GetMapping("/public/getUsersByUserIds")
+     ObjectRestResponse<List<AppUserVo>> getUsersByUserIds(@RequestParam("ids") List<Integer> ids);
+
     @GetMapping("/member/user")
     BaseUserMember findBaseUserMemberByUserId(@RequestParam(value = "userId") Integer userId);
 

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

@@ -167,4 +167,8 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         criteria.andEqualTo("userid",userId);
         mapper.updateByExampleSelective(appUserDetail,example);
     }
+
+    public List<AppUserVo> getUserByUserIds(List<Integer> ids) {
+        return mapper.getUserVo(ids);
+    }
 }

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

@@ -194,4 +194,24 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
         }
         return appUserManageVos.get(0);
     }
+
+    public PageInfo<AppUserManageVo> getAllAppUsers(AppUserManageDTO appUserManageDTO) {
+        PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
+        PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
+        if (pageInfo.getList()==null||pageInfo.getList().size()==0) {
+            return  pageInfo;
+        }
+        return getAppUserManageVoPageInfo(pageInfo);
+    }
+
+    public PageInfo<AppUserManageVo> getAllAppUsersAndCity(AppUserManageDTO appUserManageDTO) {
+        PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
+        if (CollectionUtils.isEmpty(appUserManageVos)) {
+            return  new PageInfo<AppUserManageVo>();
+        }
+        PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
+        return getAppUserManageVoPageInfo(pageInfo);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

@@ -22,5 +22,7 @@ public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
 
     List<Integer> getUserIdByUsername(@Param("keywords") String keywords);
 
-    AppUserVo getUserVo();
+    List<AppUserVo> getUserVo(@Param("list") List<Integer> ids);
+
+    List<AppUserManageVo> selectAppUser(AppUserManageDTO appUserManageDTO);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -46,7 +46,7 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
 
     private Integer ALL_PERMISSIONS=1;
     /**
-     * 查询所有
+     * 查询所有,获取详细信息
      * @return
      */
     @PostMapping("/findAll")
@@ -66,6 +66,27 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
         return  ObjectRestResponse.succ(baseBiz.findAllByQueryAndCity(appUserManageDTO));
     }
 
+    /**
+     * 查询所有,获取具体信息
+     * @return
+     */
+    @PostMapping("/all")
+    public ObjectRestResponse<PageInfo<AppUserManageVo>> getAllAppUsers(@RequestBody AppUserManageDTO appUserManageDTO) throws Exception {
+        String token = userAuthConfig.getToken(request);
+        ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
+        User  user  = (User) objectRestResponse.getData();
+        if (user==null){
+            throw new BaseException("User error!");
+        }
+        if (ALL_PERMISSIONS.equals(user.getDataAll())) {
+            return ObjectRestResponse.succ(baseBiz.getAllAppUsers(appUserManageDTO));
+        }
+        ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
+        Set<Integer> cityList =  setObjectRestResponse.getData();
+        appUserManageDTO.setCitySet(cityList);
+        return  ObjectRestResponse.succ(baseBiz.getAllAppUsersAndCity(appUserManageDTO));
+    }
+
     @GetMapping("/user_info/{id}")
     public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){
          AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java

 package com.github.wxiaoqi.security.admin.rest;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.entity.*;
@@ -156,7 +157,20 @@ public class PublicController {
             AppUserVo userVo = detailBiz.getUserInfoById(id);
             appUserVos.add(userVo);
         }
+        return ObjectRestResponse.succ(appUserVos);
+    }
 
+
+    @GetMapping("/getUsersByUserIds")
+    public ObjectRestResponse<List<AppUserVo>> getUsersByUserIds(@RequestParam("ids") List<Integer> ids) {
+        if(CollectionUtil.isEmpty(ids)) {
+            return ObjectRestResponse.createFailedResult(500, "参数id为空");
+        }
+
+        List<AppUserVo>  appUserVos =   detailBiz.getUserByUserIds(ids);
+        if(CollectionUtil.isEmpty(appUserVos)) {
+            return ObjectRestResponse.succ(new ArrayList<AppUserVo>());
+        }
         return ObjectRestResponse.succ(appUserVos);
     }
 

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

@@ -40,6 +40,15 @@
 
     <!--  获取用户信息 -->
     <select id="getUserInfo" resultMap="AppUserVoMap">
+    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
+    left join  app_user_detail d
+    on d.userid = l.id
+     where d.userid = #{userId}  limit 1
+  </select>
+
+
+    <!--  获取用户信息 -->
+    <select id="getUserVo" resultMap="AppUserVoMap">
     select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name  as jobTitle,buml.name as memberName  from app_user_login l
     left join  app_user_detail d
     on d.userid = l.id
@@ -54,32 +63,13 @@
     and
     buml.isdel=0
     and
-    bum.is_del=0
-    and
-     d.userid = #{userId}  limit 1
-  </select>
+     d.userid in
 
+     <foreach collection="list" item="userId" index="index" open="(" separator="," close=")" >
+        #{userId}
+    </foreach>
 
-<!--    &lt;!&ndash;  获取用户信息 &ndash;&gt;-->
-<!--    <select id="getUserVo" resultMap="AppUserVoMap">-->
-<!--    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name  as jobTitle,buml.name as memberName  from app_user_login l-->
-<!--    left join  app_user_detail d-->
-<!--    on d.userid = l.id-->
-<!--    left join base_user_member bum-->
-<!--    on bum.user_id=l.id-->
-<!--    left join  base_user_member_level buml-->
-<!--    on bum.member_level = buml.level-->
-<!--    left join   app_user_position  p-->
-<!--    on d.position_id=p.id-->
-<!--    where-->
-<!--    p.is_del=0-->
-<!--    and-->
-<!--    buml.isdel=0-->
-<!--    and-->
-<!--    bum.is_del=0-->
-<!--    and-->
-<!--     d.userid = #{userId}  limit 1-->
-<!--  </select>-->
+  </select>
 
 
     <select id="getUserIdByUsername" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -207,7 +197,7 @@
         </if>
         <if test="citySet != null ">
             and d.city_code in
-            <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")" >
+            <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
@@ -216,8 +206,125 @@
 
     <update id="updateUserMemberStatusByUserId">
     update `app_user_detail` set `is_member`={status}  where `userid`=#{userId}
-</update>
+    </update>
     <update id="updateUserPositionByUserId">
         update  `app_user_detail` set `position_id`=#{positionId} where `userid`=#{userId}
     </update>
+
+    <select id="selectAppUserManage" parameterType="com.github.wxiaoqi.security.admin.dto.AppUserManageDTO"
+            resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
+        select
+        l.id As userid,
+        l.username,
+        d.channel,
+        d.is_member,
+        d.realname,
+        d.source,
+        d.province_code as provinceCode,
+        d.city_code as cityCode,
+        d.sex,
+        d.headimgurl,
+        d.email,
+        m.member_level as memberLevel,
+        m.valid_time as validTime,
+        m.buy_count as buyCount,
+        m.total_number as totalNumber,
+        m.rent_free_days as rentFreeDays,
+        m.crt_time as timeOfMembership,
+        m.recent_recharge as recentRecharge,
+        m.name as memberName,
+        aup.name as `positionName`,
+        p.nameOfSuperior,
+        p.username AS superiorMobileNumber,
+        p.parent_id as parentId
+        from
+        app_user_login l
+        inner join
+        (select * from app_user_detail where 1=1
+        <if test="postionState != null">
+            <choose>
+                <when test="postionState == 6">
+                    and `position_id`=#{postionState}
+                </when>
+                <otherwise>
+                    and <![CDATA[`position_id`<>6]]>
+                </otherwise>
+            </choose>
+        </if>
+        ) d
+        on
+        d.userid = l.id
+        left join
+        app_user_login ul
+        on
+        ul.id=d.inviter_account
+        left join
+        (
+        select
+        b.*,
+        ml.name
+        from
+        base_user_member b
+        left join
+        base_user_member_level ml
+        on
+        ml.level = b.member_level
+        where ml.isdel = 0
+        ) m
+        on
+        l.id = m.user_id
+        left join
+        `app_user_position` as aup
+        on aup.id = d.position_id
+        left join (
+        SELECT
+        r.user_id,
+        r.parent_id,
+        l.username,
+        IFNULL(d.realname,d.nickname) as nameOfSuperior
+        FROM
+        app_user_relation r
+        LEFT JOIN app_user_login l ON r.parent_id = l.id
+        LEFT JOIN app_user_detail d ON l.id = d.userid
+        WHERE
+        l.isdel = 0
+        AND
+        r.is_del = 0
+        ) p
+        on
+        l.id=p.user_id
+        where l.isdel = 0
+        <if test="mobile !=null and mobile !='' ">
+            and l.username like CONCAT('%',#{mobile},'%')
+        </if>
+        <if test="channel !=null ">
+            and d.channel=#{channel}
+        </if>
+        <if test="memberLevel !=null and memberLevel != -1">
+            and m.member_level = #{memberLevel}
+        </if>
+        <if test="memberLevel == -1">
+            and m.member_level in (select level from base_user_member_level)
+        </if>
+
+        <if test="registrationTimeBegin !=null  ">
+            and l.createtime &gt;= #{registrationTimeBegin}
+        </if>
+        <if test="registrationTimeEnd !=null ">
+            and l.createtime &lt;= #{registrationTimeEnd}
+        </if>
+        <if test="source !=null  ">
+            and d.source = #{source}
+        </if>
+        <if test="userId!=null">
+            and  l.id=#{userId}
+        </if>
+        <if test="citySet != null ">
+            and d.city_code in
+            <foreach collection="citySet" item="item" index="index" open="(" separator="," close=")" >
+                #{item}
+            </foreach>
+        </if>
+        order by l.id ASC
+    </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderListVo.java

@@ -51,6 +51,8 @@ public class OrderListVo extends BaseOrder {
 
     private List<OrderItem> items;
 
+    @ApiModelProperty(value = "车辆编号")
+    private Integer vehicleCode;
 
     @ApiModelProperty(value = "用户职位名称")
     private String jobTitle;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -172,7 +172,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
         List<OrderListVo> list = pageDataVO.getData();
         List<Integer> userIds = list.stream().map(OrderListVo::getUserId).distinct().collect(Collectors.toList());
         if (userIds != null && userIds.size() > 0) {
-            ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
+            ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getUsersByUserIds(userIds);
             log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getData());
             Map<Integer, AppUserVo> appvoMap = new HashMap<Integer, AppUserVo>();
             if (objectRestResponse.getData() != null) {
@@ -215,7 +215,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
                         String[] couponIds = orderPageVO.getCouponTickerNos().split(",");
                         List<Coupon> couponList = activityFeign.couponsByTickerNoList(Lists.newArrayList(couponIds));
                         orderPageVO.setCouponList(couponList);
-
                     }
 
                 }
@@ -225,6 +224,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     log.info("获取车辆信息返回消息：{}", restResponse.getData());
                     if (restResponse.getData() != null) {
                         orderPageVO.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
+                        orderPageVO.setVehicleCode(restResponse.getData().getCode());
                     }
                     if (StringUtils.isNotBlank(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds())) {
                         try {