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

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/UUIDUtils.java

 package com.github.wxiaoqi.security.common.util;
 
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Created by ace on 2017/9/27.
@@ -35,13 +35,40 @@ public class UUIDUtils {
     public static String genCodes(int length) {
         StringBuffer shortBuffer = new StringBuffer();
         String uuid = UUID.randomUUID().toString().replace("-", "");
+        //System.out.println(uuid);
         for (int i = 0; i < length; i++) {
             String str = uuid.substring(i * 4, i * 4 + 4);
             int x = Integer.parseInt(str, 16);
-            shortBuffer.append(chars1[x % 0x3E]);
+//            chars1[x % 0x3B]chars[x % 0x3E]
+            shortBuffer.append(chars1[x % 0x3B]);
         }
         return shortBuffer.toString();
     }
 
 
+    public static void main(String[] args) {
+        Map<String, Integer> map = new HashMap<String, Integer>();
+        for(int i = 0; i < 100000000; i++) {
+            //System.out.println(UUIDUtils.genCodes(6));
+            String key = UUIDUtils.genCodes(8);
+            if(null == map.get(key)) {
+                map.put(key, 1);
+            }else {
+                System.out.println("重复"+ key+ ":"+ i);
+                map.put(key, map.get(key) + 1);
+            }
+        }
+
+        int flag = 0;
+        Set<Map.Entry<String, Integer>> list = map.entrySet();
+        for(Map.Entry<String, Integer> e : list) {
+            if(e.getValue() > 1) {
+                flag++;
+                System.out.println(e.getKey()+ ":"+ e.getValue());
+            }
+        }
+        System.out.println("flag : "+ flag);
+    }
+
+
 }

ace-common/src/main/resources/properties/systemconfig.properties

@@ -18,8 +18,7 @@ ACCESSKEYSECRET=OCKDEiwKGjePCZgPeWMEUFGwGbKYLA
 TEMPLATECODE=SMS_170070101
 SIGNNAME=滴房车
 #微信支付配置
-WINXIN_AppID=wxcc2c9b7c87439a6d
-WINXIN_AppSecret=279796e8c2963c8a5ddc8270ef642b29
+WINXIN_AppID=wx425608b69a34736f
 WINXIN_PARTNER_KEY=xxfcXXDfangche74upyuns3AD4334533
 WINXIN_PARTNER=1539689201
 #ios

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

@@ -39,23 +39,12 @@ public class AppUserManageDTO {
     /**
      * 注册时间(开始)
      */
-    @JsonFormat(pattern = "yyyy-MM-DD HH:mm", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-DD HH:mm")
-    private Date registrationTimeBegin;
+    private Long registrationTimeBegin;
 
     /**
      * 注册时间(结束)
      */
-    @JsonFormat(pattern = "yyyy-MM-DD HH:mm", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-DD HH:mm")
-    private Date registrationTimeEnd;
 
-    public Long getRegistrationTimeBegin() {
-        return registrationTimeBegin.getTime();
-    }
+    private Long registrationTimeEnd;
 
-
-    public Long getRegistrationTimeEnd() {
-        return registrationTimeEnd.getTime();
-    }
 }

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 String username;
+    private Integer memberLevel;
+    private Integer totalNumber;
+    private Integer rentFreeDays;
+    private Integer discount;
+    private Integer status;
+}

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

+package com.github.wxiaoqi.security.admin.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 用户身份职位表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+@Data
+@Table(name = "app_user_position")
+public class AppUserPosition implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键id
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+	    /**
+     *  角色名称
+     */
+    @Column(name = "name")
+	@ApiModelProperty(value = "角色名称")
+    private String name;
+	
+	    /**
+     *  等级
+     */
+    @Column(name = "level")
+	@ApiModelProperty(value = "等级")
+    private Integer level;
+	
+	    /**
+     *  每年赠送的天数
+     */
+    @Column(name = "number")
+	@ApiModelProperty(value = "每年赠送的天数")
+    private Integer number;
+	
+	    /**
+     *  提成比例
+     */
+    @Column(name = "extract")
+	@ApiModelProperty(value = "提成比例")
+    private Integer extract;
+	
+	    /**
+     *  状态：0-正常；1-禁用
+     */
+    @Column(name = "status")
+	@ApiModelProperty(value = "状态：0-正常；1-禁用")
+    private Integer status;
+	
+	    /**
+     *  创建时间
+     */
+    @Column(name = "crt_time")
+	@ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+	
+	    /**
+     *  更新时间
+     */
+    @Column(name = "upd_time")
+	@ApiModelProperty(value = "更新时间", hidden = true )
+    private Long updTime;
+	
+	    /**
+     *  是否删除：0-正常；1-删除
+     */
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    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-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -46,6 +46,9 @@ public class AppUserDTO {
 	@ApiModelProperty(value = "用户职位")
 	private  Integer positionId;
 
+	@ApiModelProperty(value = "用户职位名称")
+	private  String positionName;
+
 	@ApiModelProperty(value = "用户来源:0-自来,1-用户邀请")
 	private  Integer source;
 
@@ -59,7 +62,7 @@ public class AppUserDTO {
 	private String wxOpenid;
 	private String unionid;
 	private String openid;
-	private String status;
+	private Integer status;
 	private String idNumber;
 	private Integer certificationStatus;
 	private Integer rentFreeDays;

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

@@ -46,7 +46,7 @@ public class AppUserManageVo {
     private String nickName;
 
     /**
-     * 用户来源:0-自来,1-公司人员推荐,2-用户推荐
+     * 用户来源:0-自来,1-用户邀请
      */
     @Column(name = "source")
     private Integer source;
@@ -57,13 +57,17 @@ public class AppUserManageVo {
     @Column(name = "inviter_account")
     private Integer inviterAccount;
     /**
-     * 上
+     * 省代码
      */
     @Column(name = "province_code")
     private String provinceCode;
 
+    /**
+     * 市代码
+     */
     @Column(name = "city_code")
     private String cityCode;
+
     /**
      * 用户性别
      */

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

@@ -77,10 +77,4 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 
     }
 
-
-
-
-
-
-
 }

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

@@ -2,27 +2,23 @@ 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.Propagation;
 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}
@@ -35,6 +31,7 @@ import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.
 public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
 
 
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     @Override
     public void insertSelective(AppUserLogin entity) {
         String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword());
@@ -43,12 +40,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 +55,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 +99,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 +109,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,8 +137,8 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         boolean flag = true;
         if (null != userLogin) {
             Integer userid = userLogin.getId();
-             userLogin= mapper.selectByPrimaryKey(userid);
-                if (userLogin==null) {
+            userLogin = mapper.selectByPrimaryKey(userid);
+            if (userLogin == null) {
                 flag = false;
             }
         }
@@ -147,16 +146,26 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
     }
 
     //获取用户信息
-    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/AppUserManageBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.mapper.*;
@@ -13,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.List;
 
 
 /**
@@ -35,8 +39,11 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      * @param appUserManageDTO 查询条件
      * @return
      */
-    public AppUserManageVo findAllByQuery(AppUserManageDTO appUserManageDTO) {
-        return mapper.selectAppUserManage(appUserManageDTO);
+    public List<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) {
+        Page<AppUserManageVo> page = PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
+
+        return PageInfo.of(appUserManageVos).getList();
     }
 
     /**

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

+package com.github.wxiaoqi.security.admin.biz;
+
+import org.springframework.stereotype.Service;
+
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.mapper.AppUserPositionMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 用户身份职位表
+ *
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+@Service
+public class AppUserPositionBiz extends BaseBiz<AppUserPositionMapper,AppUserPosition> {
+}
\ No newline at end of file

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.BaseUserMemberExportDTO;
+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.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+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 tk.mybatis.mapper.entity.Example;
+
+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
+@Transactional
+@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));
+                userMemberDTO.setIsBind(1);
+                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,propagation = Propagation.REQUIRED)
+    public void InsertBatch(List<BaseUserMemberExport> baseUserMemberExports) {
+        mapper.insertList(baseUserMemberExports);
+    }
+
+     public List<BaseUserMemberExportDTO> findUserMemberExportDataByPhoneAndHashEffective(String phone){
+         List<BaseUserMemberExportDTO> baseUserMemberExportDTOS  = new ArrayList<>();
+
+         Example example = new Example(BaseUserMemberExport.class);
+         Example.Criteria criteria = example.createCriteria();
+         criteria.andEqualTo("username",phone);
+         criteria.andEqualTo("status",0);
+         List<BaseUserMemberExport> baseUserMemberExports = mapper.selectByExample(example);
+
+         if (CollectionUtils.isNotEmpty(baseUserMemberExports)){
+                  BaseUserMemberExportDTO baseUserMemberExportDTO;
+             for (BaseUserMemberExport userMemberExport : baseUserMemberExports) {
+                 baseUserMemberExportDTO = new BaseUserMemberExportDTO();
+                 BeanUtils.copyProperties(userMemberExport,baseUserMemberExportDTO);
+                 baseUserMemberExportDTOS.add(baseUserMemberExportDTO);
+             }
+         }
+         return baseUserMemberExportDTOS;
+     }
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
+     public void updateUserMemberExportDataToLoseEfficacyByPhone(String phone){
+        mapper.updateUserMemberExportDataToLoseEfficacyByPhone(phone);
+     }
+}

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/AppUserDetailMapper.java

@@ -7,10 +7,14 @@ import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
 
     //查询用户信息
     public AppUserVo getUserInfo(@Param("userId") Integer userId);
 
-    AppUserManageVo selectAppUserManage(AppUserManageDTO appUserManageDTO);
+    List<AppUserManageVo> selectAppUserManage(AppUserManageDTO appUserManageDTO);
+
+    void updateUserMemberStatusByUserId(@Param("userId") Integer userId,@Param("status") Integer status);
 }
\ No newline at end of file

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/AppUserPositionMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 用户身份职位表
+ * 
+ * @author libin
+ * @email 18178966185@163.com
+ * @date 2019-07-09 10:00:42
+ */
+public interface AppUserPositionMapper extends Mapper<AppUserPosition> {
+	
+}

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 org.apache.ibatis.annotations.Param;
+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> {
+
+
+    void updateUserMemberExportDataToLoseEfficacyByPhone(@Param("phone") String phone);
+}

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;
+
 /**
  * 会员等级表
  * 
@@ -11,4 +15,5 @@ import tk.mybatis.mapper.common.Mapper;
  */
 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/AppUserController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.ace.cache.annotation.Cache;
-import com.github.wxiaoqi.security.admin.biz.AppUserBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
-import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
-import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
+import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
@@ -50,6 +47,9 @@ public class AppUserController extends CommonBaseController {
     @Autowired
     private BaseUserMemberBiz userMemberBiz;
 
+    @Autowired
+    AppUserPositionBiz positionBiz;
+
     @GetMapping("page")
     public TableResultResponse list(@RequestParam Map<String, Object> params) {
         Query query = new Query(params);
@@ -118,6 +118,8 @@ public class AppUserController extends CommonBaseController {
         if (userVo == null) {
             throw new Exception();
         }
+        Integer id= userVo.getId();
+       Integer positionId=userVo.getPositionId();
         BeanUtils.copyProperties(userDTO,userVo);
         if(userVo.getIsMember()!=null&&userVo.getIsMember()>0){
             //获取用户会员信息
@@ -126,6 +128,11 @@ public class AppUserController extends CommonBaseController {
                 BeanUtils.copyProperties(userDTO,memberVo);
             }
         }
+        AppUserPosition userPosition=positionBiz.selectById(positionId);
+        if (userPosition!=null){
+            userDTO.setPositionName(userPosition.getName());
+        }
+        userDTO.setId(id);
         return ObjectRestResponse.succ(userDTO);
     }
 

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

 package com.github.wxiaoqi.security.admin.rest;
 
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.biz.AppUserManageBiz;
 import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
@@ -10,6 +11,8 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * app用户管理类
  * @author Administrator
@@ -22,8 +25,8 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
      * 查询所有
      * @return
      */
-    @GetMapping("/findAll")
-    public ObjectRestResponse<AppUserManageVo> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO){
+    @PostMapping("/findAll")
+    public ObjectRestResponse<List<AppUserManageVo>> findAllByQuery(@RequestBody AppUserManageDTO appUserManageDTO){
         return ObjectRestResponse.succ(baseBiz.findAllByQuery(appUserManageDTO));
     }
 

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/PublicController.java

 package com.github.wxiaoqi.security.admin.rest;
 
-import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
-import com.github.wxiaoqi.security.admin.biz.BaseUserMemberBiz;
-import com.github.wxiaoqi.security.admin.biz.MenuBiz;
-import com.github.wxiaoqi.security.admin.biz.UserBiz;
-import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
-import com.github.wxiaoqi.security.admin.entity.Group;
-import com.github.wxiaoqi.security.admin.entity.Menu;
-import com.github.wxiaoqi.security.admin.entity.User;
+import com.github.wxiaoqi.security.admin.biz.*;
+import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
@@ -54,6 +48,9 @@ public class PublicController {
     @Autowired
     private UserAuthUtil userAuthUtil;
 
+    @Autowired
+    AppUserPositionBiz positionBiz;
+
     @RequestMapping(value = "/userinfo-by-token", method = RequestMethod.GET)
     public @ResponseBody
     ObjectRestResponse userinfoByToken(String token) throws Exception {
@@ -82,6 +79,8 @@ public class PublicController {
         if (userVo == null) {
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         }
+        Integer id= userVo.getId();
+        Integer positionId=userVo.getPositionId();
         BeanUtils.copyProperties(userDTO,userVo);
         if(userVo.getIsMember()!=null&&userVo.getIsMember()>0){
             //获取用户会员信息
@@ -90,6 +89,11 @@ public class PublicController {
                 BeanUtils.copyProperties(userDTO,memberVo);
             }
         }
+        AppUserPosition userPosition=positionBiz.selectById(positionId);
+        if (userPosition!=null){
+            userDTO.setPositionName(userPosition.getName());
+        }
+        userDTO.setId(id);
         return new ObjectRestResponse<AppUserDetail>().rel(true).data(userDTO);
     }
 

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,8 +27,12 @@ public class UserMemberController {
     @Autowired
     private BaseUserMemberBiz memberBiz;
 
+    @Autowired
+    private BaseUserMemberExportBiz baseUserMemberExportBiz;
+
     /**
      * 购买会员
+     *
      * @param userMemberDTO
      * @return
      * @throws Exception
@@ -36,6 +45,7 @@ public class UserMemberController {
 
     /**
      * 订单更改会员
+     *
      * @param userId
      * @param days
      * @param type   1-用户锁定下单；2-购买下单;3-取消订单
@@ -44,11 +54,26 @@ public class UserMemberController {
      */
     @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
+            @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);
+        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/AppUserDetailMapper.xml

@@ -90,24 +90,43 @@
         l.id = m.user_id
         where 1=1
 
-        <if test="mobile !=null || mobile ! = ''">
+<!--        <if test="mobile !=null or mobile != ''">-->
+<!--            and l.username=#{mobile}-->
+<!--        </if>-->
+<!--        <if test="channel !=null or channel != ''">-->
+<!--            and d.channel=#{channel}-->
+<!--        </if>-->
+<!--        <if test="memberLevel !=null or memberLevel  != ''">-->
+<!--            and m.member_level = #{memberLevel}-->
+<!--        </if>-->
+<!--        <if test="registrationTimeBegin !=null or registrationTimeBegin  != ''">-->
+<!--            and l.createtime &gt;= #{registrationTimeBegin}-->
+<!--        </if>-->
+<!--        <if test="registrationTimeEnd!=null or registrationTimeEnd != ''">-->
+<!--            and l.createtime &lt;= #{registrationTimeEnd}-->
+<!--        </if>-->
+
+
+        <if test="mobile !=null">
             and l.username=#{mobile}
         </if>
-        <if test="channel !=null || channel != ''">
+        <if test="channel !=null">
             and d.channel=#{channel}
         </if>
-        <if test="memberLevel !=null || memberLevel  != ''">
+        <if test="memberLevel !=null">
             and m.member_level = #{memberLevel}
         </if>
-        <if test="registrationTimeBegin !=null || registrationTimeBegin  != ''">
+        <if test="registrationTimeBegin !=null">
             and l.createtime &gt;= #{registrationTimeBegin}
         </if>
-        <if test="registrationTimeEnd!=null || registrationTimeEnd != ''">
-            and l.createtime &lt;= #{registrationTimeEn}
+        <if test="registrationTimeEnd !=null">
+            and l.createtime &lt;= #{registrationTimeEnd}
         </if>
 
 
     </select>
 
-
+<update id="updateUserMemberStatusByUserId">
+    update `app_user_detail` set `is_member`={status}  where `userid`=#{userId}
+</update>
 </mapper>
\ No newline at end of file

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>
+
+    <update id="updateUserMemberExportDataToLoseEfficacyByPhone">
+        update `base_user_member_export` set `status`=1 where `username`=#{phone}
+    </update>
+</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-common/xx-common-platform-component/pom.xml

@@ -15,12 +15,25 @@
           <swagger.version>2.9.2</swagger.version>
       </properties>
      <dependencies>
+
+         <dependency>
+             <groupId>com.github.wxiaoqi</groupId>
+             <artifactId>ace-admin-api</artifactId>
+             <version>2.0-SNAPSHOT</version>
+         </dependency>
+
          <dependency>
              <groupId>org.springframework.cloud</groupId>
              <artifactId>spring-cloud-starter-openfeign</artifactId>
              <scope>provided</scope>
          </dependency>
 
+         <dependency>
+             <groupId>org.springframework.boot</groupId>
+             <artifactId>spring-boot-starter-data-redis</artifactId>
+             <scope>provided</scope>
+         </dependency>
+
          <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-configuration-processor -->
          <dependency>
              <groupId>org.springframework.boot</groupId>

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

@@ -214,4 +214,18 @@ public class BaseOrder implements Serializable {
     @ApiModelProperty(value = "乐观锁,修改版本号")
     @Version
     private Integer version;
+
+	/**
+	 * 下单来源 1--app；2--小程序
+	 */
+	@ApiModelProperty(value = "下单来源 1--app；2--小程序")
+	@Column(name = "order_origin")
+	private Integer orderOrigin;
+
+	/**
+	 * 支付来源 1--app；2--小程序
+	 */
+	@ApiModelProperty(value = "支付来源 1--app；2--小程序")
+	@Column(name = "pay_origin")
+	private Integer payOrigin;
 }

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

@@ -15,4 +15,8 @@ public interface OrderDetail {
     BaseOrder getOrder();
 
     void setOrder(BaseOrder order);
+
+    Integer getOrderOrigin();
+
+    void setOrderOrigin(Integer orderOrigin);
 }

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

@@ -94,6 +94,12 @@ public class AddRentVehicleDTO{
     @ApiModelProperty(value = "是否使用出租免费天数")
     private Integer rentFreeDay;
 
+    /**
+     *
+     */
+    @ApiModelProperty(value = "下单来源，1--app；2--小程序")
+    private Integer orderOrigin;
+
 
     /**
      * 优惠券ids

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

@@ -18,6 +18,10 @@ import java.util.List;
 public class MemberBO extends OrderMemberDetail implements OrderDetail {
     private BaseOrder order;
     private BaseUserMemberLevel baseUserMemberLevel;
+    /**
+     * 下单来源，1--app；2--小程序
+     */
+    private Integer orderOrigin;
     /**
      * 优惠券*
      */

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

@@ -7,6 +7,7 @@ import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
@@ -22,6 +23,11 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
     private Integer rentFreeDay;
     private AppUserDTO appUserDTO;
 
+    /**
+     * 下单来源，1--app；2--小程序
+     */
+    private Integer orderOrigin;
+
     /**
      * 优惠券*
      */

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

@@ -21,6 +21,10 @@ public class TourBO extends OrderTourDetail implements OrderDetail {
     List<TourUser> tourUsers;
     AppUserDTO appUserDTO;
 
+    /**
+     * 下单来源，1--app；2--小程序
+     */
+    private Integer orderOrigin;
     /**
      * 优惠券*
      */

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/pay/RentVehicleOrderPayVO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/pay/OrderPayDTO.java

@@ -12,7 +12,7 @@ import lombok.Data;
  * @date 2019-05-28 16:17:42
  */
 @Data
-public class RentVehicleOrderPayVO {
+public class OrderPayDTO {
     //订单号
     @ApiModelProperty(value = "订单号")
     private String orderNo;
@@ -24,4 +24,8 @@ public class RentVehicleOrderPayVO {
     //来源:1-app;2-小程序
     @ApiModelProperty(value = "来源:1-app;2-小程序")
     private Integer type;
+
+    //买家第三方付款账号
+    @ApiModelProperty(value = "买家第三方付款账号(如：openId)")
+    private String buyerAccount;
 }

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

@@ -366,7 +366,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
      * @param orderNo
      * @param tradeNo
      */
-    public void payNotifyHandle(String orderNo, String tradeNo) {
+    public void payNotifyHandle(String orderNo, String tradeNo, Integer type) {
         BaseOrder baseOrder = this.selectOne(new BaseOrder() {{
             setNo(orderNo);
         }});
@@ -377,6 +377,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 setOutTradeNo(tradeNo);
                 setHasPay(SYS_TRUE);
                 setPayTime(System.currentTimeMillis());
+                setPayOrigin(type);
                 setVersion(baseOrder.getVersion());
             }};
 

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

@@ -3,7 +3,6 @@ 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;
@@ -28,7 +27,7 @@ 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;
+import com.xxfc.platform.order.pojo.pay.OrderPayDTO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -306,16 +305,16 @@ public class BaseOrderController extends CommonBaseController {
     @ResponseBody
     @ApiOperation(value = "订单支付")
     @IgnoreClientToken
-    public ObjectRestResponse pay(@RequestBody RentVehicleOrderPayVO vo) {
+    public ObjectRestResponse pay(@RequestBody OrderPayDTO dto) {
         //查询列表数据
         if (StringUtils.isBlank(BaseContextHandler.getUserID())) {
             throw new BaseException(ResultCode.AJAX_WECHAT_NOTEXIST_CODE);
         }
 
-        OrderPayVo orderPayVo = BeanUtil.toBean(vo, OrderPayVo.class);
+        OrderPayVo orderPayVo = BeanUtil.toBean(dto, OrderPayVo.class);
 
         BaseOrder baseOrder = baseOrderBiz.selectOne(new BaseOrder() {{
-            setNo(vo.getOrderNo());
+            setNo(dto.getOrderNo());
         }});
 
         if (null == baseOrder || !OrderStatusEnum.ORDER_UNPAY.getCode().equals(baseOrder.getStatus())) {
@@ -362,7 +361,7 @@ public class BaseOrderController extends CommonBaseController {
     public ObjectRestResponse notifyUrl(NotifyUrlDTO dto) {
         //判断是否成功，并且订单是未支付状态，则添加支付编号和修改状态
         if (StrUtil.isNotBlank(dto.getOrderNo())) {
-            baseOrderBiz.payNotifyHandle(dto.getOrderNo(), dto.getTradeNo());
+            baseOrderBiz.payNotifyHandle(dto.getOrderNo(), dto.getTradeNo(), dto.getType());
         }else{
             log.error(" exception notifyUrl : " + JSONUtil.toJsonStr(dto));
         }
@@ -449,5 +448,9 @@ public class BaseOrderController extends CommonBaseController {
         //订单号
         @ApiModelProperty(value = "支付订单（流水）号")
         private String tradeNo;
+
+        //支付类型
+        @ApiModelProperty(value = "支付类型")
+        private Integer type;
     }
-    }
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -42,8 +42,12 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
      * 创建基础订单
      * @return
      */
-    public BaseOrder createBaseOrder() {
+    public BaseOrder createBaseOrder(Integer orderOrigin) {
         BaseOrder baseOrder = new BaseOrder();
+
+        //设置下单来源
+        baseOrder.setOrderOrigin(orderOrigin);
+
         //设置订单号
         baseOrder.setNo(OrderUtil.GetOrderNumber("", OrderUtil.APP_MID));
         //设置订单类型
@@ -64,7 +68,7 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
     }
 
     public void initDetail(Detail detail) {
-        BaseOrder order = createBaseOrder();
+        BaseOrder order = createBaseOrder(detail.getOrderOrigin());
         detail.setOrder(order);
     }
 

xx-order/xx-order-server/src/test/java/com/xxfc/platform/order/InvitationTest.java

+package com.xxfc.platform.order;
+
+import com.xxfc.platform.order.biz.BaseOrderBiz;
+import com.xxfc.platform.order.entity.BaseOrder;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@Slf4j
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes={OrderApplication.class})
+public class InvitationTest {
+
+
+    @Autowired
+    BaseOrderBiz baseOrderBiz;
+
+    @Test
+    public void test() {
+
+        BaseOrder baseOrder =baseOrderBiz.selectById(93);
+        baseOrder.setRefundTime(System.currentTimeMillis());
+        baseOrder.setVersion(baseOrder.getVersion() - 1);
+        baseOrderBiz.updateSelectiveById(baseOrder);
+
+        log.info("success");
+    }
+}

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXPay.java

@@ -34,7 +34,7 @@ import com.alibaba.fastjson.JSONObject;
 @Slf4j
 public class WXPay {
 	/**
-	 * 公众号支付
+	 * JSAPI支付
 	 * @param total_fee
 	 * @param body
 	 * @param notify_url

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/weixin/api/WXPrepay.java

@@ -228,7 +228,7 @@ public class WXPrepay {
 		treeMap.put("total_fee", this.total_fee);
 		treeMap.put("spbill_create_ip", this.spbill_create_ip);
 		treeMap.put("trade_type", this.trade_type);
-		treeMap.put("sub_openid", this.openid);
+		treeMap.put("openid", this.openid);
 		treeMap.put("notify_url", this.notify_url);
 		
 		StringBuilder sb = new StringBuilder();

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -85,8 +85,14 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
         if(amount <= 0) {
             amount = 1;
         }
-
-        String jsParam = WXPay.apppay(amount+"",orderPayVo.getBody(),"https://"+ SystemConfig.weixinHost+"/api/universal/pay/app/unauth/notify" ,trade_no,orderPayVo.getBuyerIp(),0);
+        Integer type=orderPayVo.getType();
+        String jsParam="";
+        String  notify_url="https://"+ SystemConfig.weixinHost+"/api/universal/pay/app/unauth/notify";
+        if(type!=null&&type==2){
+            jsParam=WXPay.webPay( amount+"",orderPayVo.getBody(),notify_url,trade_no,orderPayVo.getBuyerIp(), orderPayVo.getBuyerAccount());
+        }else {
+            jsParam = WXPay.apppay(amount+"",orderPayVo.getBody(),notify_url ,trade_no,orderPayVo.getBuyerIp(),0);
+        }
         log.info("报名费回调路径jsParam:"+jsParam);
         if(!StringUtils.isBlank(jsParam))
         {
@@ -130,7 +136,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
             OrderPay pay= list.get(0);
             if(StringUtils.isNotBlank(pay.getNotifyUrl())){
                 String url=pay.getNotifyUrl();
-                url+="&tradeNo="+orderNo;
+                Integer type=pay.getType()==null?1:pay.getType();
+                url+="&tradeNo="+orderNo+"&type="+type;
                 log.error("---支付回调处理---orderNo======="+orderNo+"----notifyUrl===="+url);
                 String result="";
                 if(url.contains("https")||url.contains("HTTPS")){

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

@@ -17,16 +17,16 @@ import java.util.List;
 @FeignClient(name = "vehicle")
 public interface VehicleFeign {
     @GetMapping(value = "/vehicleModel/{id}")
-    public ObjectRestResponse<VehicleModel> get(@PathVariable("id") int id);
+    public ObjectRestResponse<VehicleModel> get(@PathVariable(value = "id") int id);
 
     @GetMapping(value = "/vehicleInfo/{id}")
-    public ObjectRestResponse<Vehicle> get(@PathVariable("id") String id);
+    public ObjectRestResponse<Vehicle> get(@PathVariable(value = "id") String id);
 
     @RequestMapping(value = "/vehicleInfo/findById", method = RequestMethod.GET)
-    public RestResponse<Vehicle> findById(@RequestParam("id")String id);
+    public RestResponse<Vehicle> findById(@RequestParam(value = "id")String id);
 
     @RequestMapping(value = "/vehicleInfo/getByIds", method = RequestMethod.GET)
-    public RestResponse< List<Vehicle>> getByIds(@RequestParam("ids") List<String> id);
+    public RestResponse< List<Vehicle>> getByIds(@RequestParam(value = "ids") List<String> id);
 
     //修改评分
     @RequestMapping(value = "/vehicleModel/app/addScore", method = RequestMethod.GET)
@@ -36,19 +36,19 @@ public interface VehicleFeign {
     public ObjectRestResponse<VehicleBookRecord> rentApplyVehicle(@RequestBody RentVehicleBookDTO rentVehicleBookDTO);
 
     @RequestMapping(value ="/branchCompany/app/unauth/detail/{id}",method = RequestMethod.GET)
-    public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable Integer id);
+    public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable(value = "id") Integer id);
 
     //租车拒绝预约
     @RequestMapping(value = "/vehicleInfo/rent/book/reject/{bookRecordId}", method = RequestMethod.PUT)
-    public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable Long bookRecordId);
+    public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //取消预约
     @RequestMapping(value = "/vehicleInfo/unbook/4employee/{bookRecordId}", method = RequestMethod.DELETE)
-    public RestResponse<Integer> unbookVehicle(@PathVariable Long bookRecordId);
+    public RestResponse<Integer> unbookVehicle(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //通过预约
     @RequestMapping(value = "/vehicleInfo/book/4employee/prove/{bookRecordId}", method = RequestMethod.PUT)
-    public RestResponse<Integer> proveVehicleBooking(@PathVariable Long bookRecordId);
+    public RestResponse<Integer> proveVehicleBooking(@PathVariable(value = "bookRecordId") Long bookRecordId);
 
     //获取分公司列表
     @GetMapping("/branchCompany/all")

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelQueryCondition.java

 package com.xxfc.platform.vehicle.pojo;
 
+import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -23,5 +26,8 @@ public class VehicleModelQueryCondition {
     private String  takeALieTheNumber;
     @ApiModelProperty(value = "是否删除")
     private Integer isDel;
-
+    @ApiModelProperty("分类逗号分割")
+    String catasStr;
+    @ApiModelProperty(value = "分类列表", hidden = true)
+    Map<Integer, List<VehiclePlatCata>> catas;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

@@ -142,7 +142,7 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 
 	@Column(name = "rent_discount_price")
 	@ApiModelProperty(value = "租车优惠价格")
-	private  String RentDiscountPrice;
+	private  String rentDiscountPrice;
 
 	@Column(name = "buy_price")
 	@ApiModelProperty(value = "购买价格")

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

@@ -10,6 +10,7 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
@@ -20,6 +21,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -51,9 +53,6 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
      */
     public ObjectRestResponse findVehicleModelPage(VehicleModelQueryCondition vmqc) {
 
-
-
-
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                     vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));
@@ -100,7 +99,8 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
      * @return
      */
     public List<GoodDataVO> goodList(Integer page, Integer limit) {
-        List<GoodDataVO> goodDataVOS = Arrays.asList();
+        List<GoodDataVO> goodDataVOS = new ArrayList<>();
+
         /*设置分页*/
         Page<VehicleModel> pages = PageHelper.startPage(page, limit);
 
@@ -110,20 +110,26 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
                                 .andEqualTo(VehicleModel::getIsdel, 0)
                                 .andEqualTo(VehicleModel::getHotSign,1)
                 ).orderByDesc("id").build();
-        selectByExample(example);
+        List<VehicleModel> vehicleModels = selectByExample(example);
+        if (CollectionUtils.isEmpty(vehicleModels)) {
+            return null;
+        }
 
-        PageInfo<VehicleModel> pageInfo= PageInfo.of(pages.getResult());
+        PageInfo<VehicleModel> pageInfo= PageInfo.of(vehicleModels);
         List<VehicleModel> vehicleModelList = pageInfo.getList();
         /*遍历车型列表设置List<GoodDataVO>*/
-        for (VehicleModel vm : vehicleModelList) {
+        vehicleModelList.forEach(vm ->{
             GoodDataVO goodDataVO = new GoodDataVO();
             goodDataVO.setId(vm.getId());
             goodDataVO.setImgUrl(vm.getPicture());
             goodDataVO.setName(vm.getName());
             goodDataVO.setName1(vm.getKeyword());
             goodDataVO.setPrice(String.valueOf(vm.getBuyPrice()));
-            goodDataVOS.add(goodDataVO);
-        }
+            System.out.println("++++++++++++++++++++++++++++++++++++++"+goodDataVO+"++++++++++++++++++++++++++++++++++++++");
+            goodDataVOS.add(goodDataVO);});
+//        for (VehicleModel vm : vehicleModelList) {
+//
+//        }
         return goodDataVOS;
     }
 }
\ No newline at end of file

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

@@ -33,7 +33,10 @@ import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 
@@ -480,4 +483,20 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         updateSelectiveById(vehiclePlatCata);
         return ObjectRestResponse.succ();
     }
+
+    public Map<Integer, List<VehiclePlatCata>> groupCatasByParent(String catasStr) {
+        List<Integer> catasIds = Pattern.compile(",").splitAsStream(catasStr).map((s) -> Integer.parseInt(s)).collect(Collectors.toList());
+        List<VehiclePlatCata> catas = selectByExample(new Example.Builder(VehiclePlatCata.class)
+                .where(WeekendSqls.<VehiclePlatCata>custom().andIn(VehiclePlatCata::getId, catasIds)).build());
+        Map<Integer, List<VehiclePlatCata>> vpcMap = new HashMap<Integer, List<VehiclePlatCata>>();
+        for (VehiclePlatCata vpc : catas) {
+            List<VehiclePlatCata> vpcs = vpcMap.get(vpc.getParentId());
+            if (null == vpcs) {
+                vpcs = new ArrayList<VehiclePlatCata>();
+            }
+            vpcs.add(vpc);
+            vpcMap.put(vpc.getParentId(), vpcs);
+        }
+        return vpcMap;
+    }
 }

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

@@ -363,23 +363,11 @@ public class VehicleController extends BaseController<VehicleBiz> {
         //根据时间 获得 可用车辆
         //结合车型
         if (StringUtils.isNotBlank(dto.getCatasStr())) {
-            List<Integer> catasIds = Pattern.compile(",").splitAsStream(dto.getCatasStr()).map((s) -> Integer.parseInt(s)).collect(Collectors.toList());
-            List<VehiclePlatCata> catas = vehiclePlatCataBiz.selectByExample(new Example.Builder(VehiclePlatCata.class)
-                    .where(WeekendSqls.<VehiclePlatCata>custom().andIn(VehiclePlatCata::getId, catasIds)).build());
-            Map<Integer, List<VehiclePlatCata>> vpcMap = new HashMap<Integer, List<VehiclePlatCata>>();
-            for (VehiclePlatCata vpc : catas) {
-                List<VehiclePlatCata> vpcs = vpcMap.get(vpc.getParentId());
-                if (null == vpcs) {
-                    vpcs = new ArrayList<VehiclePlatCata>();
-                }
-                vpcs.add(vpc);
-                vpcMap.put(vpc.getParentId(), vpcs);
-            }
-            dto.setCatas(vpcMap);
+            dto.setCatas(vehiclePlatCataBiz.groupCatasByParent(dto.getCatasStr()));
         }
         //设置显示是否有车
         dto.setYearNo4Where(Boolean.TRUE);
-        return new ObjectRestResponse<>().data(vehicleBiz.searchUsableModel(dto)).rel(true);
+        return ObjectRestResponse.succ(vehicleBiz.searchUsableModel(dto));
     }
 
     /**

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

@@ -107,6 +107,12 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
             return ObjectRestResponse.createDefaultFail();
         }
+
+        //结合车型
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(vmqc.getCatasStr())) {
+            vmqc.setCatas(vehiclePlatCataBiz.groupCatasByParent(vmqc.getCatasStr()));
+        }
+
         return vehicleModelBiz.findVehicleModelPage(vmqc);
     }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleModelMapper.xml

@@ -28,6 +28,21 @@
       <if test="takeALieTheNumber!=null and takeALieTheNumber!=''">
         AND  EXISTS(SELECT vc2.vehicle_model_id FROM vehicle_cata vc2 WHERE vc2.cata_id=#{takeALieTheNumber} AND vmqc.id=vc2.vehicle_model_id)
       </if>
+
+      <if test="catas != null">
+          AND ( 1
+          <foreach collection="catas" index="key" item="cataList">
+              &amp; (
+              <foreach collection="cataList" index="cIndex" item="cata">
+                  <if test=" cIndex != 0">
+                      |
+                  </if>
+                  (case when FIND_IN_SET(#{cata.id},vmqc.config) > 0 then 1 else 0 end)
+              </foreach>
+              )
+          </foreach>
+          ) > 0
+      </if>
       ORDER BY	vmqc.id ASC
   </select>