修改车型rent_discount_price

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/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/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/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/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-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 = "购买价格")