Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -22,13 +22,10 @@ import java.io.Serializable;
 @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/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/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/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/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;
@@ -59,6 +63,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                 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) {
@@ -90,4 +95,24 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
     public void InsertBatch(List<BaseUserMemberExport> baseUserMemberExports) {
         mapper.insertList(baseUserMemberExports);
     }
+
+     public List<BaseUserMemberExportDTO> findUserMemberExportDataByPhoneAndHashEffective(String phone){
+         List<BaseUserMemberExportDTO> baseUserMemberExportDTOS  = new ArrayList<>();
+
+       //  BaseUserMemberExport baseUserMemberExport = new BaseUserMemberExport();
+         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;
+     }
 }

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

@@ -7,10 +7,12 @@ 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);
 }
\ 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/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);
@@ -119,6 +119,7 @@ public class AppUserController extends CommonBaseController {
             throw new Exception();
         }
         Integer id= userVo.getId();
+       Integer positionId=userVo.getPositionId();
         BeanUtils.copyProperties(userDTO,userVo);
         if(userVo.getIsMember()!=null&&userVo.getIsMember()>0){
             //获取用户会员信息
@@ -127,6 +128,10 @@ 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/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/rpc/service/AppPermissionService.java

@@ -8,6 +8,8 @@ import com.github.wxiaoqi.security.admin.biz.AppUserLoginBiz;
 import com.github.wxiaoqi.security.admin.biz.ElementBiz;
 import com.github.wxiaoqi.security.admin.constant.RedisKey;
 import com.github.wxiaoqi.security.admin.constant.enumerate.UserSourceEnum;
+import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
+import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.api.vo.authority.PermissionInfo;
@@ -26,11 +28,13 @@ import com.xxfc.platform.universal.dto.RegionDTO;
 import com.xxfc.platform.universal.feign.RegionFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 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 org.springframework.web.client.RestTemplate;
 import org.springframework.web.context.request.RequestAttributes;
@@ -49,6 +53,7 @@ import java.util.concurrent.TimeUnit;
  * @author keliii
  */
 @Service
+@Transactional
 @Slf4j
 public class AppPermissionService {
 
@@ -84,6 +89,12 @@ public class AppPermissionService {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private BaseUserMemberExportBiz baseUserMemberExportBiz;
+
+    @Autowired
+    private BaseUserMemberBiz baseUserMemberBiz;
+
 
 
 
@@ -238,6 +249,9 @@ public class AppPermissionService {
             appUserLogin.setUpdatetime(now);
             appUserLoginBiz.insertSelective(appUserLogin);
             Integer userid = appUserLogin.getId();
+
+            insertUserMemberByUserIdAndPhone(userid,username);
+
             log.error("注册：新增登陆用户信息： " + userid);
             // 新增用户详情
             AppUserDetail rsUserDetail = new AppUserDetail();
@@ -401,6 +415,7 @@ public class AppPermissionService {
                         userDetail.setCrtHost(getIp());
                         setCreateIPInfo(userDetail);
                         appUserDetailBiz.insertSelective(userDetail);
+
                     } /*else {
                         userDetail.setId(userVo.getId());
                         userDetail.setHeadimgurl(headimgurl);
@@ -748,6 +763,9 @@ public class AppPermissionService {
             appUserLogin.setUpdatetime(now);
             appUserLoginBiz.insertSelective(appUserLogin);
             Integer userid = appUserLogin.getId();
+
+             insertUserMemberByUserIdAndPhone(userid,username);
+
             log.error("注册：新增登陆用户信息： " + userid);
             // 新增用户详情
             AppUserDetail rsUserDetail = new AppUserDetail();
@@ -807,6 +825,7 @@ public class AppPermissionService {
      * @param username
      * @return
      */
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public JSONObject appletRegistry(String username,String headimgurl,String nickname,Integer small_id){
 
         try {
@@ -830,6 +849,28 @@ public class AppPermissionService {
         }
     }
 
+    public void  insertUserMemberByUserIdAndPhone(Integer userId,String phone) throws Exception {
+        List<BaseUserMemberExportDTO> memberExportDTOS = baseUserMemberExportBiz.findUserMemberExportDataByPhoneAndHashEffective(phone);
+        if (CollectionUtils.isNotEmpty(memberExportDTOS)){
+            insertUserMemberByExistUserMemberExportData(userId,memberExportDTOS);
+        }
+
+    }
+
+   public void insertUserMemberByExistUserMemberExportData(Integer userId, List<BaseUserMemberExportDTO> userMemberExportDTOS) throws Exception {
+        UserMemberDTO userMemberDTO;
+       for (BaseUserMemberExportDTO userMemberExportDTO : userMemberExportDTOS) {
+            userMemberDTO = new UserMemberDTO();
+            userMemberDTO.setUserId(userId);
+            userMemberDTO.setRentFreeDays(userMemberExportDTO.getRentFreeDays());
+            userMemberDTO.setMemberLevel(userMemberExportDTO.getMemberLevel());
+            userMemberDTO.setTotalNumber(userMemberExportDTO.getTotalNumber());
+            userMemberDTO.setDiscount(userMemberExportDTO.getDiscount());
+            userMemberDTO.setIsBind(1);
+           baseUserMemberBiz.updUserMemberByUserId(userMemberDTO);
+       }
+   }
+
     /**
      * ip地址 信息解析
      * @param appUserDetail
@@ -838,13 +879,8 @@ public class AppPermissionService {
 
         String crtHost = appUserDetail.getCrtHost();
         String ipAddress = restTemplate.getForObject(String.format("%s%s", IPAddress.BASE_IP_PARSING_URL, crtHost), String.class);
-        log.info("----setCreateIPInfo--crtHost========"+crtHost);
         String data = JSONObject.parseObject(ipAddress).getString(IPAddress.BASE_DATA);
         JSONObject ipJsonObject = JSONObject.parseObject(data);
-//        Integer provinceCode = ipJsonObject.getInteger(IPAddress.PROVINCE_CODE);
-//        Integer cityCode = ipJsonObject.getInteger(IPAddress.CITY_CODE);
-        //appUserLogin.setProvinceCode(provinceCode);
-        //appUserLogin.setCityCode(cityCode);
         String cityName = ipJsonObject.getString(IPAddress.CITY_NAME);
         RegionDTO regionDTO = regionFeign.getRegionByCityName(cityName);
         if (null!=regionDTO){

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

@@ -90,20 +90,37 @@
         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>
 
 

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-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/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;
@@ -97,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);
 
@@ -107,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