会员订单列表

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/bo/UserBo.java

+package com.github.wxiaoqi.security.admin.bo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/30 17:42
+ */
+@Data
+public class UserBo implements Serializable {
+     private static final long serialVersionUID = 1L;
+     @JSONField(serialize = false)
+     private String orderNo;
+     private Integer userId;
+     private String phone;
+     private String name;
+     private String leaderName;
+     private String leaderPhone;
+     private Integer facilitateId;
+     private String facilitateName;
+}

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

 package com.github.wxiaoqi.security.admin.feign;
 
+import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
@@ -129,4 +130,12 @@ public interface UserFeign {
 
     @GetMapping("/app/user/finduserIdsByphones")
     Map<String, Integer> findAppusersByUserNames(@RequestParam(value = "phones") List<String> phones);
+
+    @GetMapping(value = "/app/user/users")
+    List<Integer> findAppUserIds(@RequestParam(value = "phone",required = false) String phone,
+                             @RequestParam(value = "leaderPhone",required = false) String leaderPhone,
+                             @RequestParam(value = "name",required = false) String name);
+
+    @PostMapping(value = "/app/user/users/info")
+    List<UserBo> findUserDetailByUserBo(@RequestBody(required = false) List<UserBo> userBos);
 }

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

@@ -4,8 +4,10 @@ import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
@@ -25,9 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Function;
@@ -54,6 +54,10 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     @Autowired
     AppUserDetailBiz appUserDetailBiz;
 
+    @Autowired
+    private AppUserRelationBiz appUserRelationBiz;
+
+
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     @Override
     public void insertSelective(AppUserLogin entity) {
@@ -321,9 +325,65 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     }
 
     public List<AppUserLogin> getUserByUsernameAndRealName(String username, String realName) {
-       
-        return mapper.getUserByUsernameAndRealName(username,realName);
 
+        return mapper.getUserByUsernameAndRealName(username, realName);
+
+
+    }
+
+    public List<Integer> findAppuser(String phone, String leaderPhone, String name) {
+        List<Integer> memberIds = null;
+        //1.根据leader手机号查询userid
+        List<AppUserLogin> appUserLogins = mapper.selectbyPhones(Arrays.asList(leaderPhone));
+        Integer leaderId = null;
+        if (CollectionUtils.isNotEmpty(appUserLogins)) {
+            leaderId = appUserLogins.get(0).getId();
+        }
+        //2.根据leader userId查询下级 userid
+        if (Objects.nonNull(leaderId)) {
+            List<AppUserRelation> appUserRelationList = appUserRelationBiz.findMemberPageByLeaderId(leaderId);
+            memberIds = appUserRelationList.stream().map(AppUserRelation::getUserId).collect(Collectors.toList());
+        }
+        List<Integer> userIds = mapper.findAppUser(phone, name, memberIds);
+        return  userIds==null?Collections.EMPTY_LIST:userIds;
+    }
+
+    public List<UserBo> findUserDetailInfo(List<UserBo> userBos) {
+        Map<Integer, Integer> userIdAndFacilitateIdMap = userBos.stream().filter(x->Objects.nonNull(x.getFacilitateId())).collect(Collectors.toMap(UserBo::getUserId, UserBo::getFacilitateId));
+        List<Integer> userIdList = userBos.stream().map(UserBo::getUserId).distinct().collect(Collectors.toList());
+
+        //查询上级人
+        List<AppUserRelation> appUserRelationList = appUserRelationBiz.findLeaderByUserIds(userIdList);
+        Map<Integer, Integer> memberIdAndParentMap = appUserRelationList.stream().collect(Collectors.toMap(AppUserRelation::getUserId, AppUserRelation::getParentId));
+
+        List<Integer>  uids = new ArrayList<>();
+        uids.addAll(userIdAndFacilitateIdMap==null?Collections.EMPTY_LIST:userIdList);
+        uids.addAll(userIdAndFacilitateIdMap==null?Collections.EMPTY_LIST:userIdAndFacilitateIdMap.values());
+        uids.addAll(memberIdAndParentMap==null?Collections.EMPTY_LIST:memberIdAndParentMap.values());
+
+        List<UserBo> userBoList = mapper.selectByUserIds(uids);
+        Map<Integer, UserBo> userMap = userBoList==null?Collections.EMPTY_MAP:userBoList.stream().collect(Collectors.toMap(UserBo::getUserId, Function.identity()));
+        if (userMap.isEmpty()){
+            return Collections.EMPTY_LIST;
+        }
 
+        for (UserBo userBo : userBos) {
+            UserBo bo = userMap.get(userBo.getUserId());
+            if (Objects.nonNull(bo)) {
+                userBo.setPhone(bo.getPhone());
+                userBo.setName(bo.getName());
+            }
+            Integer leaderId = memberIdAndParentMap.get(userBo.getUserId());
+            UserBo leader = userMap.get(leaderId);
+            if (Objects.nonNull(leader)) {
+                userBo.setLeaderName(leader.getName());
+                userBo.setLeaderPhone(leader.getPhone());
+            }
+            UserBo facilitate = userMap.get(userBo.getFacilitateId());
+            if (Objects.nonNull(facilitate)) {
+                userBo.setFacilitateName(facilitate.getName());
+            }
+        }
+        return userBos;
     }
 }

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

@@ -335,7 +335,9 @@ public class AppUserRelationBiz extends BaseBiz<AppUserRelationMapper,AppUserRel
     }
 
 
-
-
+    public List<AppUserRelation> findLeaderByUserIds(List<Integer> userIds) {
+          List<AppUserRelation> appUserRelationList = mapper.selectByUserIds(userIds);
+        return appUserRelationList==null?Collections.EMPTY_LIST:appUserRelationList;
     }
+}
 

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

 package com.github.wxiaoqi.security.admin.mapper;
 
+import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import org.apache.ibatis.annotations.Param;
@@ -31,4 +32,8 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList
 
 
     List<AppUserLogin> getUserByUsernameAndRealName(@Param("username") String username, @Param("realName")String realName);
+
+    List<Integer> findAppUser(@Param("phone") String phone,@Param("name") String name,@Param("memberIds") List<Integer> memberIds);
+
+    List<UserBo> selectByUserIds(@Param("userIds") List<Integer> uids);
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 用户关系表
@@ -20,4 +21,6 @@ public interface AppUserRelationMapper extends Mapper<AppUserRelation> {
 
     //获取有效的下级
     public  int countByParentId(@Param("parentId")Integer parentId,@Param("bindTime")Long bindTime);
+
+    List<AppUserRelation> selectByUserIds(@Param("userIds") List<Integer> userIds);
 }

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper">
 
     <select id="selectbyPhones" resultType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
-        select `id`,`username` from `app_user_login` where `username` in
+        select `id`,`username` from `app_user_login` where `isdel`=0,`username` in
         <foreach collection="phones" item="phone" open="(" close=")" separator=",">
             #{phone}
         </foreach>
@@ -27,4 +27,32 @@
             and   d.realname like concat('%',#{realName},'%')
         </if>
     </select>
+
+    <select id="findAppUser" resultType="integer">
+        select `id` from (select `id` from `app_user_login` where aul.isdel=0
+        <if test="phone!=null and phone!=''">
+            and `username`=#{phone}
+        </if>
+        <if test="memberIds!=null and memberIds.size()>0">
+            and  `id` IN
+            <foreach collection="memberIds" item="userId" separator="," open="(" close=")">
+                #{userId}
+            </foreach>
+        </if>
+        ) AS `aul`
+        INNER JOIN
+        `app_user_detail` AS `aud` ON aud.userid=aul.id
+       <if test="name!=null and name!=''">
+         and ( aud.realname like CONCAT('%',#{name},'%') OR aud.nickname like CONCAT('%',#{name},'%'))
+       </if>
+    </select>
+
+    <select id="selectByUserIds" resultType="com.github.wxiaoqi.security.admin.bo.UserBo">
+         select  aul.`id` AS `userId`,aul.username AS `phone`,IFNULL(aud.realname,aud.nickname) AS `name` from ( select `id`,`username` from `app_user_login` where `isdel`=0 and `id` IN
+        <foreach collection="userIds" item="uid" separator="," open="(" close=")">
+            #{uid}
+        </foreach>) AS `aul`
+         INNER JOIN
+         `app_user_detail` AS `aud` ON aud.userid=aul.id
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -14,4 +14,11 @@
              and (is_forever=1 or bind_time>#{bindTime})
          </if>
     </select>
+
+    <select id="selectByUserIds" resultType="com.github.wxiaoqi.security.admin.entity.AppUserRelation">
+        select  `user_id`,`parent_id` from `app_user_relation` where  `is_del`=0 and `user_id` IN
+        <foreach collection="userIds" item="userId" separator="," open="(" close=")">
+           #{userId}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

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

+package com.xxfc.platform.order.pojo.dto;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/30 15:48
+ */
+@Data
+public class MemberOrderBo {
+    private Integer id;
+    private String orderNo;
+    private Date creatTime;
+    private Integer status;
+    private String name;
+    private BigDecimal goodsAmount;
+    private Integer userId;
+    private String userName;
+    private String phone;
+    private String leaderName;
+    private String leaderPhone;
+    private Integer memberLevel;
+    /**
+     * 促成人
+     */
+    @JSONField(serialize = false)
+    private Integer facilitateId;
+    private String facilitateName;
+    private String facilitatePhone;
+    /**
+     * 订单金额
+     */
+    private BigDecimal orderAmount;
+    /**
+     * 优惠金额
+     */
+    private BigDecimal couponAmount;
+    private BigDecimal realAmount;
+    private Long payTime;
+
+}

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

+package com.xxfc.platform.order.pojo.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/30 14:48
+ */
+@Data
+public class MemberOrderFindDTO extends PageParam {
+     private String orderNo;
+     private String name;
+     private String phone;
+     private Integer state;
+     private Integer level;
+     /**
+      * 下单的开始时间
+      */
+     private Date startOrderTime;
+     private Date  endOrderTime;
+     /**
+      * 支付的开始时间
+      */
+     private Long  startPayTime;
+     private Long  endPayTime;
+     private String leaderPhone;
+     /**
+      * 促成人的手机号
+      */
+     private String facilitatePhone;
+     private Boolean isExport;
+}

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

+package com.xxfc.platform.order.pojo.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/30 14:48
+ */
+@Data
+public class MemberOrderStatisticsBo {
+    private Integer orderNum;
+    private BigDecimal totalAmount;
+    /**
+     * 钻石
+     */
+    private Integer diamondOrderNum;
+    private BigDecimal totalDiamondAmount;
+    /**
+     * 黄金
+     */
+    private Integer goldOrderNum;
+    private BigDecimal totalGoldAmount;
+    /**
+     * 普通
+     */
+    private Integer generalOrderNum;
+    private BigDecimal generalAmount;
+}

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

+package com.xxfc.platform.order.pojo.vo;
+
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
+import com.xxfc.platform.order.pojo.dto.MemberOrderStatisticsBo;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/10/30 15:58
+ */
+@Data
+public class MemberOrderPageVo {
+      private MemberOrderStatisticsBo memberOrderStatisticsBo;
+      private PageDataVO<MemberOrderBo>  memberOrderPage;
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -16,6 +16,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
@@ -26,6 +27,8 @@ import com.xxfc.platform.order.mapper.BaseOrderMapper;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
 import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
 import com.xxfc.platform.order.pojo.calculate.InProgressVO;
+import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
+import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
@@ -141,6 +144,17 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return mapper.getTourList(paramMap);
     }
 
+
+     public  PageDataVO<MemberOrderBo> findMemberOrderPage(List<Integer> userIds, MemberOrderFindDTO memberOrderFindDTO){
+        return PageDataVO.pageInfo(memberOrderFindDTO.getPage(),memberOrderFindDTO.getLimit(),()->mapper.findMemberOrders(userIds,memberOrderFindDTO));
+     }
+
+    public List<MemberOrderBo> findMemberOrders(List<Integer> userIds, MemberOrderFindDTO memberOrderFindDTO) {
+        return mapper.findMemberOrders(userIds,memberOrderFindDTO);
+    }
+
+   // public List<MemberOrderBo>
+
     /**
      * 获取订单详情
      *
@@ -691,6 +705,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         }
     }
 
+
+
 //    /**
 //     * 更新（不成功抛异常）
 //     * @param baseOrder
@@ -763,6 +779,8 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return userFeign;
     }
 
+
+
     /**
      * 订单查询类
      */

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
+import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.math.BigDecimal;
@@ -32,4 +35,6 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 
 	public List<OrderPageVO> selectAllTourOrder(Map<String, Object> paramMap);
 
+	List<MemberOrderBo> findMemberOrders(@Param("userIds") List<Integer> userIds, @Param("memberOrder") MemberOrderFindDTO memberOrderFindDTO);
+
 }

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

@@ -9,23 +9,24 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderMemberDetail;
+import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.order.add.AddMemberDTO;
 import com.xxfc.platform.order.pojo.order.MemberBO;
+import com.xxfc.platform.order.pojo.vo.MemberOrderPageVo;
 import com.xxfc.platform.order.service.OrderMemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
 
 @Controller
 @RequestMapping("orderMember")
-@Api(value="会员订单",tags={"会员订单"})
+@Api(value = "会员订单", tags = {"会员订单"})
 @IgnoreClientToken
-public class OrderMemberController extends BaseController<OrderMemberDetailBiz,OrderMemberDetail> {
+public class OrderMemberController extends BaseController<OrderMemberDetailBiz, OrderMemberDetail> {
 
     @Autowired
     OrderMemberService orderMemberService;
@@ -33,10 +34,10 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,O
     @Autowired
     UserFeign userFeign;
 
-    @RequestMapping(value = "add",method = RequestMethod.POST)
+    @RequestMapping(value = "add", method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "确认会员订单")
-    public ObjectRestResponse<BaseOrder> add(@RequestBody AddMemberDTO dto){
+    public ObjectRestResponse<BaseOrder> add(@RequestBody AddMemberDTO dto) {
         MemberBO bo = BeanUtil.toBean(dto, MemberBO.class);
 
         //查询会员等级实体
@@ -52,4 +53,22 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,O
         return ObjectRestResponse.succ(bo.getOrder());
     }
 
+    /**
+     * 会员订单列表
+     *
+     * @param memberOrderFindDTO
+     * @return
+     */
+    @PostMapping("/page")
+    @ResponseBody
+    public ObjectRestResponse<MemberOrderPageVo> listMemberOrderPage(@RequestBody MemberOrderFindDTO memberOrderFindDTO) {
+        MemberOrderPageVo memberOrderPageVo = orderMemberService.listMemberOrderPage(memberOrderFindDTO);
+        return ObjectRestResponse.succ(memberOrderPageVo);
+    }
+
+    @PostMapping("/export")
+    @ResponseBody
+    public void exportMemberOrders(@RequestBody MemberOrderFindDTO memberOrderFindDTO, HttpServletResponse response){
+
+    }
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -125,7 +125,7 @@
             </if>
             <if test="userIds != null and userIds.size() > 0">
                 and b.user_id in
-                <foreach collection="userIds" item="item"  open="("  separator="," close=")">
+                <foreach collection="userIds" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
 
@@ -153,9 +153,10 @@
                 or t.start_time between #{startTime} and #{endTime})
             </if>
             <if test="vehicleIds != null and vehicleIds.size() > 0">
-                AND r.vehicle_id IN <foreach collection="vehicleIds" item="vehicleId" open="(" close=")" separator=",">
-                #{vehicleId}
-            </foreach>
+                AND r.vehicle_id IN
+                <foreach collection="vehicleIds" item="vehicleId" open="(" close=")" separator=",">
+                    #{vehicleId}
+                </foreach>
             </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and (r.start_company_id in
@@ -273,7 +274,7 @@
         </if>
     </select>
 
-    <select id="selectAllTourOrder" parameterType="Map"  resultMap="orderPageMap">
+    <select id="selectAllTourOrder" parameterType="Map" resultMap="orderPageMap">
         select b.*
         from base_order b
         LEFT JOIN order_tour_detail r on r.order_id = b.id
@@ -282,4 +283,62 @@
             and r.start_time between #{startTime} and #{endTime}
         </if>
     </select>
+
+    <select id="findMemberOrders" resultType="com.xxfc.platform.order.pojo.dto.MemberOrderBo">
+        SELECT
+        `id`,
+        `no` AS `orderNo`,
+        `name`,
+        `status`,
+        `goods_amount` AS `goodsAmount`,
+        `real_amount` AS `realAmount`,
+        `order_amount` AS `orderAmount`,
+        `crt_time` AS `creatTime`,
+        `pay_time` AS `payTime`,
+        `coupon_amount` AS `couponAmount`,
+        `user_id` AS `userId`,
+        `member_level` AS `memberLevel`,
+        `facilitate_id` AS `facilitateId`,
+        `facilitate_phone` AS `facilitatePhone`
+        FROM
+        `base_order`
+        WHERE
+        type = 3 and  <![CDATA[`member_level`<>0]]>
+        <if test="memberOrder.orderNo!=null and memberOrder.orderNo!=''">
+            and `no`=#{orderNo}
+        </if>
+        <if test="memberOrder.state!=null">
+            and `status`=#{state}
+        </if>
+        <if test="memberOrder.level !=null">
+            and `member_level`=#{level}
+        </if>
+        <if test="memberOrder.facilitatePhone!=null and memberOrder.facilitatePhone!=''">
+            and `facilitate_phone`=#{facilitatePhone}
+        </if>
+        <if test="memberOrder.startOrderTime!=null and memberOrder.endOrderTime!=null">
+            and `crt_time` between #{startOrderTime} and #{endOrderTime}
+        </if>
+        <if test="memberOrder.startOrderTime!=null and memberOrder.endOrderTime==null">
+            and `crt_time` <![CDATA[>=#{startOrderTime}]]>
+        </if>
+        <if test="memberOrder.endOrderTime!=null and memberOrder.startOrderTime==null">
+            and `crt_time` <![CDATA[<=#{endOrderTime}]]>
+        </if>
+        <if test="memberOrder.startPayTime!=null and memberOrder.endPayTime!=null">
+            and `pay_time` between #{startPayTime} and #{startPayTime}
+        </if>
+        <if test="memberOrder.startPayTime!=null and memberOrder.endPayTime==null">
+            and `pay_time` <![CDATA[>=#{startPayTime}]]>
+        </if>
+        <if test="memberOrder.endPayTime!=null and memberOrder.startPayTime==null">
+            and `pay_time` <![CDATA[<=#{endPayTime}]]>
+        </if>
+        <if test="userIds!=null and userIds.size()>0">
+            and `user_id` IN
+            <foreach collection="userIds" item="userId" separator="," open="(" close=")">
+                #{userId}
+            </foreach>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -225,7 +225,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
         try {
             vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);
 
-            UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+            UserBo userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
             if (userDTO != null) {
                 if (userDTO.getDataAll() == 2) {
                     List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());