修改会员信息和用户管理

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

@@ -68,6 +68,13 @@ public class BaseUserMemberVO implements Serializable {
     @ApiModelProperty(value = "有效期;0代表永久")
     private Long validTime;
 
+    /**
+     * 会员等级名称
+     */
+    @Column(name = "name")
+    private String name;
+
+
 
 
 

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

@@ -71,7 +71,7 @@ public class AppUserDetail {
 	@Column(name = "code")
 	private  String code;
 
-	@ApiModelProperty(value = "邀请人id:")
+	@ApiModelProperty(value = "邀请人账号:")
 	@Column(name = "inviter_account")
 	private  String inviterAccount;
 }

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

+package com.github.wxiaoqi.security.admin.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+
+@Data
+public class UserMemberLevel {
+
+    /**
+     * 会员id
+     */
+    @Column(name = "id")
+    private String id;
+    /**
+     * 会员等级名称
+     */
+    @Column(name = "name")
+    private String name;
+    /**
+     * 图标
+     */
+    @Column(name = "icon")
+    private String icon;
+    /**
+     * 等级
+     */
+    @Column(name = "level")
+    private String level;
+    /**
+     * describes
+     */
+    @Column(name = "describes")
+    private String describes;
+    /**
+     * 有效数；-1是永久有效
+     */
+    @Column(name = "end_date")
+    private String end_date;
+    /**
+     * 折扣
+     */
+    @Column(name = "discount")
+    private String discount;
+    /**
+     * 是否删除；0-正常；1-删除
+     */
+    @Column(name = "isdel")
+    private String isdel;
+    /**
+     * 购买会员价格
+     */
+    @Column(name = "price")
+    private String price;
+    /**
+     * 权益
+     */
+    @Column(name = "rights")
+    private String rights;
+    /**
+     * 赠送免费天数
+     */
+    @Column(name = "number")
+    private String number;
+}

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

@@ -55,7 +55,7 @@ public class AppUserManageVo {
      * 邀请人id
      */
     @Column(name = "inviter_account")
-    private Integer inviterAccount;
+    private String inviterAccount;
     /**
      * 省代码
      */
@@ -90,7 +90,7 @@ public class AppUserManageVo {
      * 实名认证状态:0-未认证，1-已认证
      */
     @Column(name = "certification_status")
-    private String certification_status;
+    private String certificationStatus;
 
     /**
      * 身份证号
@@ -156,4 +156,8 @@ public class AppUserManageVo {
      */
     private String memberName;
 
+    /**
+     * 头像
+     */
+    private String headimgurl;
 }

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

@@ -4,6 +4,8 @@ import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -44,6 +46,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
     @Autowired
     private TaskExecutor taskExecutor;
 
+    @Autowired
+    private UserMemberLevelBiz userMemberLevelBiz;
+
    //获取用户会员信息
    @Cache(key = "user:member{1}")
     public UserMemberVo getMemberInfoByUserId(Integer userId){
@@ -175,16 +180,13 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
      * @param userId
      * @return
      */
-    public BaseUserMember findOneByUserId(Integer userId) {
-        Example exa = new Example(BaseUserMember.class);
-        Example.Criteria criteria = exa.createCriteria();
-        criteria.andEqualTo("userId",userId);
-        List<BaseUserMember> baseUserMembers = mapper.selectByExample(exa);
-
-        if (baseUserMembers.size()>1) {
-            throw new BaseException("Member purchase repeat!");
+    public BaseUserMemberVO findOneByUserId(Integer userId) {
+        BaseUserMemberVO baseUserMemberVO=  mapper.getBaseUserMemberVOByUserId(userId);
+        if (baseUserMemberVO!=null) {
+            return baseUserMemberVO;
         }
-        return baseUserMembers!=null&&baseUserMembers.size()!=0 ? baseUserMembers.get(0): null;
+        return new BaseUserMemberVO();
+
     }
 
 

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

 package com.github.wxiaoqi.security.admin.mapper;
 
+import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import org.apache.ibatis.annotations.Param;
@@ -16,5 +17,6 @@ public interface BaseUserMemberMapper extends Mapper<BaseUserMember> {
 
     //获取用户会员信息
     public UserMemberVo getInfoByUserId(@Param("userId")Integer userId);
-	
+
+    BaseUserMemberVO getBaseUserMemberVOByUserId(@Param("userId") Integer userId);
 }

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

@@ -24,12 +24,9 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
      * @return
      */
     @RequestMapping("/findOne/{userId}")
-    public ObjectRestResponse<AppUserManage> findOneByUserId(@PathVariable Integer userId){
-        BaseUserMember oneByUserId = baseBiz.findOneByUserId(userId);
-        if (oneByUserId==null) {
-            return ObjectRestResponse.succ();
-        }
-        return  ObjectRestResponse.succ(oneByUserId);
+    public ObjectRestResponse<BaseUserMemberVO> findOneByUserId(@PathVariable Integer userId){
+
+        return  ObjectRestResponse.succ(baseBiz.findOneByUserId(userId));
     }
 
 

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

@@ -46,28 +46,29 @@
         select
         l.id As userid,
         l.username,
-        l.certification_status,
-        l.id_number,
+        l.certification_status as certificationStatus,
+        l.id_number as idNumber,
         l.createtime,
-        l.last_time,
+        l.last_time as lastTime,
         d.channel,
         d.is_member,
         d.realname,
         d.isdel,
         d.nickname,
         d.source,
-        d.Inviter_account,
-        d.province_code,
-        d.city_code,
+        d.Inviter_account as inviterAccount,
+        d.province_code as provinceCode,
+        d.city_code as cityCode,
         d.sex,
+        d.headimgurl,
         d.email,
-        m.member_level,
-        m.valid_time,
-        m.buy_count,
-        m.total_number,
-        m.rent_free_days,
-        m.crt_time AS timeOfMembership,
-        m.recent_recharge,
+        m.member_level as memberLevel,
+        m.valid_time as validTime,
+        m.buy_count as buyCount,
+        m.total_number as totalNumber,
+        m.rent_free_days as rentFreeDays,
+        m.crt_time as timeOfMembership,
+        m.recent_recharge as  recentRecharge,
         m.name as memberName
         from
         app_user_login l
@@ -84,29 +85,12 @@
         left join
         base_user_member_level ml
         on
-        ml.id = b.member_level
+        ml.level = b.member_level
         ) m
         on
         l.id = m.user_id
         where 1=1
 
-<!--        <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>

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

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper">
 
-	<!-- 可根据自己的需求，是否要使用 -->
+    <!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.github.wxiaoqi.security.admin.vo.UserMemberVo" id="baseUserMemberMap">
         <result property="id" column="id"/>
         <result property="userId" column="user_id"/>
@@ -25,4 +25,28 @@
           select  * from  base_user_member where  user_id=#{userId} and is_del=0 limit 1
     </select>
 
+
+    <select id="getBaseUserMemberVOByUserId" parameterType="Integer"
+            resultType="com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO">
+        select
+        m.id as id,
+        m.user_id as userId,
+        m.rent_free_days as rentFreeDays,
+        m.member_level as memberLevel,
+        m.total_number as totalNumber,
+        m.buy_count as buyCount,
+        m.valid_time as validTime,
+        ml.name as name
+        from
+        base_user_member m
+        left join
+        base_user_member_level ml
+        on
+        m.member_level =ml.level
+        where
+         m.user_id=#{userId}
+         and
+         m.is_del=0
+    </select>
+
 </mapper>
\ No newline at end of file

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

+package com.xxfc.platform.order.pojo.order;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+     * 订单查询类
+     */
+    @Data
+    public class QueryOrderDTO extends PageParam {
+        @ApiModelProperty(hidden = false)
+        private Integer crtUser;
+
+        @ApiModelProperty(hidden = false)
+        private Integer crtCompanyId;
+
+        @ApiModelProperty(value = "订单状态\n" +
+                "0--删除\n" +
+                "1--创建订单\n" +
+                "2--取消\n" +
+                "3--待付款\n" +
+                "4--待出行\n" +
+                "5--出行中（进行中）\n" +
+                "6--已完成")
+        private Integer status;
+
+        private String multiStatus;
+
+        @ApiModelProperty(value = "是否有使用会员权益")
+        private Integer hasMemberRight;
+
+        @ApiModelProperty(value = "订单类型 1--租车；2--旅游; 3--会员订单")
+        private Integer type;
+    }
\ No newline at end of file

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

@@ -24,10 +24,7 @@ import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
-import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
-import com.xxfc.platform.order.pojo.order.OrderListVo;
-import com.xxfc.platform.order.pojo.order.OrderPageVO;
-import com.xxfc.platform.order.pojo.order.OrderAboutParamDTO;
+import com.xxfc.platform.order.pojo.order.*;
 import com.xxfc.platform.order.pojo.pay.RentVehicleOrderPayVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
@@ -379,35 +376,7 @@ public class BaseOrderController extends CommonBaseController {
         return ObjectRestResponse.succ();
     }
 
-    /**
-     * 订单查询类
-     */
-    @Data
-    public class QueryOrderDTO extends PageParam {
-        @ApiModelProperty(hidden = false)
-        private Integer crtUser;
-
-        @ApiModelProperty(hidden = false)
-        private Integer crtCompanyId;
 
-        @ApiModelProperty(value = "订单状态\n" +
-                "0--删除\n" +
-                "1--创建订单\n" +
-                "2--取消\n" +
-                "3--待付款\n" +
-                "4--待出行\n" +
-                "5--出行中（进行中）\n" +
-                "6--已完成")
-        private Integer status;
-
-        private String multiStatus;
-
-        @ApiModelProperty(value = "是否有使用会员权益")
-        private Integer hasMemberRight;
-
-        @ApiModelProperty(value = "订单类型 1--租车；2--旅游; 3--会员订单")
-        private Integer type;
-    }
 
     /**
      * 订单查询类