Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/BaseUserMemberExportDTO.java

+package com.github.wxiaoqi.security.admin.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/8 16:08
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "base_user_member_export")
+public class BaseUserMemberExportDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Integer id;
+    private String username;
+    private Integer memberLevel;
+    private Integer totalNumber;
+    private Integer rentFreeDays;
+    private Integer discount;
+    private Integer status;
+    private Integer isDel;
+
+}

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

+package com.github.wxiaoqi.security.admin.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/8 16:08
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "base_user_member_export")
+public class BaseUserMemberExport  implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private Integer id;
+    private String username;
+    @Column(name = "member_level")
+    private Integer memberLevel;
+    @Column(name = "total_number")
+    private Integer totalNumber;
+    @Column(name = "rent_free_days")
+    private Integer rentFreeDays;
+    private Integer discount;
+    private Integer status;
+    @Column(name = "is_del")
+    private Integer isDel;
+
+}

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

@@ -2,27 +2,22 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.constant.UserConstant;
-import com.github.wxiaoqi.security.common.msg.TableResultResponse;
-import com.github.wxiaoqi.security.common.util.Query;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
-import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_TRUE;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 /**
  * ${DESCRIPTION}
@@ -43,12 +38,12 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     }
 
     @Override
-    @CacheClear(pre="user{1.username}")
+    @CacheClear(pre = "user{1.username}")
     public void updateSelectiveById(AppUserLogin entity) {
         super.updateSelectiveById(entity);
     }
 
-    @CacheClear(pre="user{1.username}")
+    @CacheClear(pre = "user{1.username}")
     public void updatePasswordById(AppUserLogin entity) {
         String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword());
         entity.setPassword(password);
@@ -58,11 +53,12 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     /**
      * 根据用户名获取用户信息
+     *
      * @param username
      * @return
      */
-    @Cache(key="user{1}")
-    public AppUserLogin getUserByUsername(String username){
+    @Cache(key = "user{1}")
+    public AppUserLogin getUserByUsername(String username) {
         AppUserLogin user = new AppUserLogin();
         user.setUsername(username);
         return mapper.selectOne(user);
@@ -101,7 +97,7 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     public AppUserLogin checkeUserLogin(String username) {
         Example example = new Example(AppUserLogin.class);
-        example.createCriteria().andEqualTo("username", username).andEqualTo("isdel", 0).andEqualTo("status",0);
+        example.createCriteria().andEqualTo("username", username).andEqualTo("isdel", 0).andEqualTo("status", 0);
         List<AppUserLogin> userLoginList = mapper.selectByExample(example);
         if (userLoginList != null && userLoginList.size() != 0) {
             return userLoginList.get(0);
@@ -111,14 +107,15 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
     /**
      * 根据微信号判断是否存在用户
+     *
      * @param openid
      * @return
      */
-    public AppUserLogin getUserByOpenid(String openid,Integer isQQ) {
+    public AppUserLogin getUserByOpenid(String openid, Integer isQQ) {
         Example example = new Example(AppUserLogin.class);
-        if(isQQ==1){
+        if (isQQ == 1) {
             example.createCriteria().andEqualTo("openid", openid).andEqualTo("isdel", 0);
-        }else {
+        } else {
             example.createCriteria().andEqualTo("wxOpenid", openid).andEqualTo("isdel", 0);
         }
         List<AppUserLogin> userLoginList = mapper.selectByExample(example);
@@ -138,25 +135,35 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         boolean flag = true;
         if (null != userLogin) {
             Integer userid = userLogin.getId();
-             userLogin= mapper.selectByPrimaryKey(userid);
-                if (userLogin==null) {
-                    flag = false;
+            userLogin = mapper.selectByPrimaryKey(userid);
+            if (userLogin == null) {
+                flag = false;
             }
         }
         return flag;
     }
 
     //获取用户信息
-    public AppUserLogin getUserById(Integer userId){
+    public AppUserLogin getUserById(Integer userId) {
         return mapper.selectByPrimaryKey(userId);
     }
 
     /**
      * 登录信息更改
+     *
      * @param userId
      * @param ip
      */
-    public void updateLoginInfo(Integer userId,String ip){
-        mapper.updateLoginUserInfoById(userId,ip, Instant.now().toEpochMilli());
+    public void updateLoginInfo(Integer userId, String ip) {
+        mapper.updateLoginUserInfoById(userId, ip, Instant.now().toEpochMilli());
+    }
+
+    public Map<String, Integer> findPhoneAndUserIdMapByPhones(List<String> phones) {
+        List<AppUserLogin> appUserLogins = mapper.selectbyPhones(phones);
+        Map<String, Integer> phoneAndUserIdMap = null;
+        if (CollectionUtils.isNotEmpty(appUserLogins)) {
+            phoneAndUserIdMap = appUserLogins.stream().collect(Collectors.toMap(AppUserLogin::getUsername, AppUserLogin::getId));
+        }
+        return phoneAndUserIdMap;
     }
 }

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
@@ -56,6 +57,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
 
 
     //用户购买会员信息更新
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public  void  updUserMemberByUserId(UserMemberDTO userMemberDTO)throws  Exception{
         if(userMemberDTO==null){
             log.error("updUserMemberByUserId----参数为空");

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

+package com.github.wxiaoqi.security.admin.biz;
+
+import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
+import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberExportMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/8 16:19
+ */
+@Service
+@Slf4j
+public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper, BaseUserMemberExport> {
+
+     @Autowired
+     private UserMemberLevelBiz userMemberLevelBiz;
+
+     @Autowired
+     private BaseUserMemberBiz baseUserMemberBiz;
+
+     @Autowired
+     private  AppUserLoginBiz appUserLoginBiz;
+
+
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
+    public void importUserMember(List<String[]> userMemberData){
+        List<BaseUserMemberExport> baseUserMemberExports = new ArrayList<>();
+
+        List<Integer> levels = userMemberData.stream().map(x -> x[1]).map(Integer::valueOf).collect(Collectors.toList());
+        Map<Integer, Integer> levelAndDisCountMap= userMemberLevelBiz.getUserMemberLevelAndDisCountMapByLevels(levels);
+        List<String> phones = userMemberData.stream().map(x -> x[0]).collect(Collectors.toList());
+        Map<String,Integer> phoneAndUserIdMap = appUserLoginBiz.findPhoneAndUserIdMapByPhones(phones);
+
+        for (String[] data : userMemberData) {
+
+            String phone = data[0];
+            String memberLevel = data[1];
+            String totalNumber = data[2];
+            String rentFreeDays = data[3];
+
+            if (phoneAndUserIdMap!=null && phoneAndUserIdMap.get(phone)!=null){
+                UserMemberDTO userMemberDTO = new UserMemberDTO();
+                userMemberDTO.setUserId(phoneAndUserIdMap.get(phone));
+                userMemberDTO.setMemberLevel(Integer.valueOf(memberLevel));
+                userMemberDTO.setDiscount(levelAndDisCountMap==null?0:(levelAndDisCountMap.get(Integer.valueOf(memberLevel))==null?0:levelAndDisCountMap.get(Integer.valueOf(memberLevel))));
+                userMemberDTO.setTotalNumber(Integer.valueOf(totalNumber));
+                userMemberDTO.setRentFreeDays(Integer.valueOf(rentFreeDays));
+                try {
+                    baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
+                } catch (Exception e) {
+                    log.error("会员更新错误：【{}】",e.getMessage());
+                    throw new BaseException(e);
+                }
+            }
+
+            BaseUserMemberExport memberExport = BaseUserMemberExport
+                    .builder()
+                    .username(phone)
+                    .memberLevel(Integer.valueOf(memberLevel))
+                    .totalNumber(Integer.valueOf(totalNumber))
+                    .rentFreeDays(Integer.valueOf(rentFreeDays))
+                    .discount(levelAndDisCountMap==null?0:(levelAndDisCountMap.get(Integer.valueOf(memberLevel))==null?0:levelAndDisCountMap.get(Integer.valueOf(memberLevel))))
+                    .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(phone) == null ? 0 : 1))
+                    .isDel(0)
+                    .build();
+             if (log.isDebugEnabled()){
+                 log.debug("当前组装的数据：【{}】",memberExport);
+             }
+            baseUserMemberExports.add(memberExport);
+        }
+
+        InsertBatch(baseUserMemberExports);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void InsertBatch(List<BaseUserMemberExport> baseUserMemberExports) {
+        mapper.insertList(baseUserMemberExports);
+    }
+}

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

@@ -4,11 +4,15 @@ import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author keliii
@@ -26,5 +30,13 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs
         return  mapper.selectByExample(example);
     }
 
-
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
+    public Map<Integer,Integer> getUserMemberLevelAndDisCountMapByLevels(List<Integer> levels){
+       List<BaseUserMemberLevel> baseUserMemberLevels = mapper.selectUserMembersLevelByLevels(levels);
+        Map<Integer,Integer> levelAndDiscountMap = null;
+       if (CollectionUtils.isNotEmpty(baseUserMemberLevels)){
+           levelAndDiscountMap = baseUserMemberLevels.stream().collect(Collectors.toMap(BaseUserMemberLevel::getLevel,BaseUserMemberLevel::getDiscount));
+       }
+       return levelAndDiscountMap;
+    }
 }

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

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface AppUserLoginMapper extends Mapper<AppUserLogin> {
 
 
@@ -17,4 +19,6 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin> {
      */
     @Update("update `app_user_login` set `last_host`=#{ip},`last_time`=#{lastTime} where `id`=#{userId}")
     void updateLoginUserInfoById(@Param("userId") Integer userId,@Param("ip") String ip, @Param("lastTime") long lastTime);
+
+    List<AppUserLogin> selectbyPhones(@Param("phones") List<String> phones);
 }
\ No newline at end of file

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

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.common.special.InsertListMapper;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/8 16:21
+ */
+public interface BaseUserMemberExportMapper extends Mapper<BaseUserMemberExport>, InsertListMapper<BaseUserMemberExport> {
+
+}

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

 package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 会员等级表
  * 
@@ -10,5 +14,6 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2019-06-11 11:06:45
  */
 public interface BaseUserMemberLevelMapper extends Mapper<BaseUserMemberLevel> {
-	
+
+    List<BaseUserMemberLevel> selectUserMembersLevelByLevels(@Param("levels") List<Integer> levels);
 }

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

@@ -17,6 +17,12 @@ import java.lang.reflect.InvocationTargetException;
 @RestController
 @RequestMapping("baseUserMember")
 public class BaseUserMemberController extends BaseController<BaseUserMemberBiz, BaseUserMember> {
+
+    /**
+     * 获取用户会员
+     * @param userId
+     * @return
+     */
     @RequestMapping("/findOne/{userId}")
     public ObjectRestResponse<AppUserManage> findOneByUserId(@PathVariable Integer userId){
         BaseUserMember oneByUserId = baseBiz.findOneByUserId(userId);

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

+package com.github.wxiaoqi.security.admin.rest;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/8 16:20
+ */
+public class BaseUserMemberExportController {
+}

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

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
+import com.github.wxiaoqi.security.admin.biz.BaseUserMemberExportBiz;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
+import com.xxfc.platform.vehicle.common.RestResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -22,33 +27,53 @@ public class UserMemberController {
     @Autowired
     private BaseUserMemberBiz memberBiz;
 
+    @Autowired
+    private BaseUserMemberExportBiz baseUserMemberExportBiz;
+
     /**
      * 购买会员
+     *
      * @param userMemberDTO
      * @return
      * @throws Exception
      */
     @RequestMapping(value = "/user/buyMember", method = RequestMethod.POST)
     public ObjectRestResponse buyMember(@RequestBody UserMemberDTO userMemberDTO) throws Exception {
-          memberBiz.updUserMemberByUserId(userMemberDTO);
+        memberBiz.updUserMemberByUserId(userMemberDTO);
         return ObjectRestResponse.succ();
     }
 
     /**
      * 订单更改会员
+     *
      * @param userId
      * @param days
-     * @param type 1-用户锁定下单；2-购买下单;3-取消订单
+     * @param type   1-用户锁定下单；2-购买下单;3-取消订单
      * @return
      * @throws Exception
      */
     @RequestMapping(value = "/user/memberDays", method = RequestMethod.POST)
     public int memberDays(
-            @RequestParam(value = "userId",defaultValue = "0")Integer userId,
-            @RequestParam(value = "days",defaultValue = "0")Integer days,
-            @RequestParam(value = "type",defaultValue = "1")Integer type
-     ) throws Exception {
-        return memberBiz.upMemberDays(userId,days,type);
+            @RequestParam(value = "userId", defaultValue = "0") Integer userId,
+            @RequestParam(value = "days", defaultValue = "0") Integer days,
+            @RequestParam(value = "type", defaultValue = "1") Integer type
+    ) throws Exception {
+        return memberBiz.upMemberDays(userId, days, type);
     }
 
+    @PostMapping("/user/export")
+    public ObjectRestResponse importUserMember(MultipartFile userMemberExcel) {
+        List<String[]> userMemberData = ExcelImport.getExcelData(userMemberExcel);
+        if (userMemberData.size() < 1) {
+            return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
+        }
+        for (String[] userMemberDatum : userMemberData) {
+            if (userMemberDatum.length!=4){
+                return ObjectRestResponse.createFailedResult(1002, "数据不完整！！！");
+            }
+        }
+        userMemberData.remove(0);
+        baseUserMemberExportBiz.importUserMember(userMemberData);
+        return  ObjectRestResponse.succ();
+    }
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<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
+        <foreach collection="phones" item="phone" open="(" close=")" separator=",">
+          #{phone}
+        </foreach>
+    </select>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.wxiaoqi.security.admin.mapper.BaseUserMemberExportMapper">
+    <resultMap type="com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport" id="baseUserMemberExportMap">
+        <id property="id" column="id"/>
+        <result property="discount" column="discount"/>
+        <result property="memberLevel" column="member_level"/>
+        <result property="rentFreeDays" column="rent_free_days"/>
+        <result property="totalNumber" column="total_number"/>
+        <result property="username" column="username"/>
+        <result property="isDel" column="is_del"/>
+        <result property="status" column="status"/>
+    </resultMap>
+</mapper>
\ No newline at end of file

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper">
+
+    <select id="selectUserMembersLevelByLevels" resultType="com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel">
+        select `level`,`discount` from `base_user_member_level` where `level` in
+        <foreach collection="levels" item="level" separator="," open="(" close=")">
+            #{level}
+        </foreach>
+    </select>
+</mapper>
\ No newline at end of file

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/admin/CampsiteShopAdminController.java

@@ -56,8 +56,9 @@ public class CampsiteShopAdminController extends BaseController<CampsiteShopBiz,
     @ApiOperation("营地上下架")
     @PutMapping("/saleStatus")
     public ObjectRestResponse<Void> updateSaleStatus(@RequestParam("id") Integer id,@RequestParam("status") Integer status){
-        int effectRows = getBaseBiz().updateCampsiteSaleStatus(id,status);
+        int effectRows = getBaseBiz().upperOrLowerShelves(id,status);
         if (effectRows>0){
+
             return ObjectRestResponse.succ();
         }
         return  ObjectRestResponse.createDefaultFail();
@@ -66,14 +67,14 @@ public class CampsiteShopAdminController extends BaseController<CampsiteShopBiz,
     @ApiOperation("检验营地名称")
     @GetMapping("/exist")
     public ObjectRestResponse<Boolean> checkCampsiteNameExist(@RequestParam(value = "id",required = false) Integer id,@RequestParam("name") String name){
-        Boolean exist =  getBaseBiz().chekcCampsiteNameExist(id,name==null?"":name.trim());
+        Boolean exist =  getBaseBiz().checkCampsiteNameExist(id,name==null?"":name.trim());
         return ObjectRestResponse.succ(exist);
     }
 
     @ApiOperation("营地编辑查询")
     @GetMapping("/campsite/{id}")
     public ObjectRestResponse<CampsiteShopAdminVO> findByCampsiteId(@PathVariable(value = "id") Integer id){
-          CampsiteShopAdminVO campsiteShopAdminVO = getBaseBiz().findByCampsiteId(id);
+          CampsiteShopAdminVO campsiteShopAdminVO = getBaseBiz().findCampsiteById(id);
           return ObjectRestResponse.succ(campsiteShopAdminVO);
     }
 }
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java

@@ -57,16 +57,6 @@ public class BaseOrder implements Serializable {
 	@ApiModelProperty(value = "订单详情id")
     private Integer detailId;
 
-	    /**
-     *  订单状态
-0--删除
-1--创建订单
-2--取消
-3--待付款
-4--待出行
-5--出行中（进行中）
-6--已完成
-     */
     @Column(name = "status")
 	@ApiModelProperty(value = "订单状态"
 +"0--删除"

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

+package com.xxfc.platform.order.pojo.order;
+
+import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderMemberDetail;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.OrderTourDetail;
+import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OrderListVo extends BaseOrder {
+
+    OrderRentVehicleDetail orderRentVehicleDetail;
+
+    OrderTourDetail orderTourDetail;
+
+    OrderMemberDetail orderMemberDetail;
+
+    List<VehicleUserLicense> vehicleUserLicenses;
+
+    private String username;
+
+    private String vehicleNumberPlat;
+
+    private String telephone;
+
+    private OrderVehicleCrosstownDto orderVehicleCrosstownDto;
+
+    private String startCompanyName;
+
+    private String endCompanyName;
+
+}

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -15,6 +16,7 @@ import com.xxfc.platform.order.contant.enumerate.RefundStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.RefundTypeEnum;
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
+import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
 import com.xxfc.platform.tour.feign.TourFeign;
@@ -81,7 +83,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
     public List<OrderPageVO> pageByParm(Map<String, Object> paramMap){
         return mapper.pageByParm(paramMap);
     }
-    public List<OrderPageVO> listOrder(Map<String, Object> paramMap){
+
+    public List<OrderListVo> listOrder(Map<String, Object> paramMap){
+
         return mapper.listOrder(paramMap);
     }
     public List<OrderPageVO> getRentVehicle (Map<String, Object> paramMap) {

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.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -18,7 +19,7 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 
 	public List<OrderPageVO> pageByParm(Map<String, Object> paramMap);
 
-	public List<OrderPageVO> listOrder(Map<String, Object> paramMap);
+	public List<OrderListVo> listOrder(Map<String, Object> paramMap);
 
 	public List<OrderPageVO> getRentVehicle(Map<String, Object> paramMap);
 

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

@@ -3,6 +3,8 @@ package com.xxfc.platform.order.rest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.entity.AppUser;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
@@ -23,6 +25,7 @@ import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
 import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
+import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderAboutParamDTO;
 import com.xxfc.platform.order.pojo.pay.RentVehicleOrderPayVO;
@@ -33,6 +36,7 @@ import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -135,33 +139,63 @@ public class BaseOrderController extends CommonBaseController {
     @ApiOperation(value = "获取后台订单列表")
     @IgnoreClientToken
     @CrossOrigin
-    public ObjectRestResponse<PageDataVO<OrderPageVO>> selectByUser(QueryOrderList dto) {
+    public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(QueryOrderList dto) {
         if (dto.getStartTime() != null) {
             if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
             }
         }
+        if(StringUtils.isNotBlank(dto.getPhone())) {
+            AppUserLogin appUserLogin = userFeign.one(dto.getPhone());
+            if(appUserLogin != null) {
+                dto.setUserId(appUserLogin.getId());
+            }
+        }
         Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
-        List<OrderPageVO> list = pageDataVO.getData();
-        List<Integer> userIds = list.stream().map(OrderPageVO::getUserId).distinct().collect(Collectors.toList());
-        ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
-        for (OrderPageVO orderPageVO : list) {
-            if (objectRestResponse.getData() != null && objectRestResponse.getData().size() > 0) {
-                for (AppUserVo appUserVo : objectRestResponse.getData()) {
-                    if (appUserVo != null && appUserVo.getUserid() == orderPageVO.getUserId()) {
-                        orderPageVO.setUsername(appUserVo.getNickname());
+        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);
+           for (OrderListVo orderPageVO : list) {
+               if (objectRestResponse.getData() != null && objectRestResponse.getData().size() > 0) {
+                   for (AppUserVo appUserVo : objectRestResponse.getData()) {
+                       if (appUserVo != null && appUserVo.getUserid() == orderPageVO.getUserId()) {
+                           orderPageVO.setUsername(appUserVo.getNickname());
+//                           ObjectRestResponse<AppUser> restResponse = userFeign.get(appUserVo.getUserid());
+//                           if(restResponse.isRel()) {
+//                               orderPageVO.setTelephone( restResponse.getData().getUsername());
+//                           }
+
+                       }
+                   }
+               }
+               if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
+                   RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
+                   log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
+                   if (restResponse.getData() != null) {
+                       orderPageVO.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
+                   }
+               }
+               if(orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getStartCompanyId()!= null && orderPageVO.getOrderRentVehicleDetail().getEndCompanyId() != null) {
+                   ObjectRestResponse<CompanyDetail> startResponse =  vehicleFeign.getCompanyDetail(orderPageVO.getOrderRentVehicleDetail().getStartCompanyId());
+                    if(startResponse.getData() != null) {
+                        orderPageVO.setStartCompanyName(startResponse.getData().getName());
                     }
-                }
-            }
-            if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
-                RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());
-                log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
-                if (restResponse.getData() != null) {
-                    orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
-                }
-            }
-        }
+                   ObjectRestResponse<CompanyDetail> restResponse =  vehicleFeign.getCompanyDetail(orderPageVO.getOrderRentVehicleDetail().getEndCompanyId());
+                   if(restResponse.getData() != null) {
+                       orderPageVO.setEndCompanyName(restResponse.getData().getName());
+                   }
+               }
+
+               if(orderPageVO.getOrderTourDetail() != null && orderPageVO.getOrderTourDetail().getStartCompanyId()!= null) {
+                   ObjectRestResponse<CompanyDetail> startResponse =  vehicleFeign.getCompanyDetail(orderPageVO.getOrderTourDetail().getStartCompanyId());
+                   if(startResponse.getData() != null) {
+                       orderPageVO.setStartCompanyName(startResponse.getData().getName());
+                   }
+               }
+           }
+       }
 
         return new ObjectRestResponse<>().data(pageDataVO);
     }
@@ -171,6 +205,7 @@ public class BaseOrderController extends CommonBaseController {
     @ApiOperation(value = "交还车租车订单列表")
     @IgnoreClientToken
     public ObjectRestResponse<List<OrderPageVO>> getVehicleList(QueryOrderList dto) {
+        log.info("请求参数：dto = {}", dto);
         if (dto.getStartTime() != null) {
             if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
@@ -396,6 +431,13 @@ public class BaseOrderController extends CommonBaseController {
         private Integer userId;
 
         private Integer type;
+
+        private String phone;
+
+        @ApiModelProperty("当前页码")
+        Integer page;
+        @ApiModelProperty("每页限制")
+        Integer limit;
     }
 
     @Data

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

@@ -39,7 +39,23 @@
             </case>
         </discriminator>
     </resultMap>
-    
+
+
+    <resultMap type="com.xxfc.platform.order.pojo.order.OrderListVo" id="orderListMap">
+        <result javaType="Integer" column="type" property="type"></result>
+        <discriminator javaType="Integer" column="type">
+            <case value="1" resultType="com.xxfc.platform.order.pojo.order.OrderListVo">
+                <association column="{id=detail_id}" property="orderRentVehicleDetail" select="com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper.pageByParm" javaType="com.xxfc.platform.order.entity.OrderRentVehicleDetail"></association>
+            </case>
+            <case value="2" resultType="com.xxfc.platform.order.pojo.order.OrderListVo">
+                <association column="detail_id" property="orderTourDetail" select="com.xxfc.platform.order.mapper.OrderTourDetailMapper.selectByPrimaryKey" javaType="com.xxfc.platform.order.entity.OrderTourDetail"></association>
+            </case>
+            <case value="3" resultType="com.xxfc.platform.order.pojo.order.OrderListVo">
+                <association column="detail_id" property="orderMemberDetail" select="com.xxfc.platform.order.mapper.OrderMemberDetailMapper.selectByPrimaryKey" javaType="com.xxfc.platform.order.entity.OrderMemberDetail"></association>
+            </case>
+        </discriminator>
+    </resultMap>
+
     <select id="pageByParm" parameterType="Map" resultMap="orderPageMap">
         select *
             from base_order
@@ -74,7 +90,7 @@
         order by crt_time desc
     </select>
 
-    <select id="listOrder" parameterType="Map" resultMap="orderPageMap">
+    <select id="listOrder" parameterType="Map" resultMap="orderListMap">
         select b.*
         from base_order b
         LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
@@ -83,6 +99,9 @@
             <if test="crtUser != null">
                 and b.crt_user = #{crtUser}
             </if>
+            <if test="userId != null">
+                and b.user_id = #{userId}
+            </if>
             <if test="status != null">
                 and b.status = #{status}
             </if>
@@ -92,6 +111,9 @@
             <if test="no != null">
                 and no like CONCAT ("%", #{no}, "%")
             </if>
+            <if test="name != null">
+                and b.name like CONCAT ("%", #{name}, "%")
+            </if>
             <if test="startTime != null">
                 and r.start_time between  #{startTime}  and  #{endTime}
                 or t.start_time between  #{startTime}  and  #{endTime}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -78,13 +78,16 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
      */
     public CompanyDetail getDetailById(Integer id) {
         BranchCompany branchCompany = this.getById(id);
-        List<SysRegion> sysRegions = sysRegionBiz.getRegionsByCodes(new ArrayList<Long>(){{
-            add(Long.valueOf(branchCompany.getAddrProvince()));
-            add(Long.valueOf(branchCompany.getAddrCity()));
-            add(Long.valueOf(branchCompany.getAddrTown()));
-        }});
-        CompanyDetail detail = BeanUtil.toBean(branchCompany, CompanyDetail.class);
-        detail.setSysRegions(sysRegions);
+        CompanyDetail detail = null;
+        if(branchCompany != null) {
+            List<SysRegion> sysRegions = sysRegionBiz.getRegionsByCodes(new ArrayList<Long>(){{
+                add(Long.valueOf(branchCompany.getAddrProvince()));
+                add(Long.valueOf(branchCompany.getAddrCity()));
+                add(Long.valueOf(branchCompany.getAddrTown()));
+            }});
+            detail = BeanUtil.toBean(branchCompany, CompanyDetail.class);
+            detail.setSysRegions(sysRegions);
+        }
         return detail;
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

@@ -105,7 +105,11 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         Page<VehicleModel> pages = PageHelper.startPage(page, limit);
 
         Example example = Example.builder(VehicleModel.class)
-                .where(WeekendSqls.<VehicleModel>custom().andEqualTo(VehicleModel::getIsdel, 0)).orderByDesc("hot_sign").build();
+                .where(
+                        WeekendSqls.<VehicleModel>custom()
+                                .andEqualTo(VehicleModel::getIsdel, 0)
+                                .andEqualTo(VehicleModel::getHotSign,1)
+                ).orderByDesc("id").build();
         selectByExample(example);
 
         PageInfo<VehicleModel> pageInfo= PageInfo.of(pages.getResult());

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

@@ -104,7 +104,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return RestResponse.data(vehicle);
     }
 
-    @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
+    @RequestMapping(value = "/getByIds", method = RequestMethod.GET)
     public RestResponse< List<Vehicle>> getByIds(@RequestParam("ids") List<String> ids){
         if(ids == null) {
             return RestResponse.codeAndMessage(500, "参数为空！");

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

@@ -96,7 +96,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
      * @return
      */
     @ApiOperation("车型列表")
-    @PostMapping(value = "/app/unauthfind/findVehicleModelPage")
+    @PostMapping(value = "/app/unauth/findVehicleModelPage")
     public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(
             @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc ,HttpServletRequest request) {
 
@@ -281,7 +281,12 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
     }
 
-
+    /**
+     * 优质车型
+     * @param page
+     * @param limit
+     * @return
+     */
     @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
     public List<GoodDataVO> goodList(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit){