V1.1.0-future-UserCenter接口转移

@@ -12,15 +12,21 @@
     <artifactId>member-service-api</artifactId>
     <artifactId>member-service-api</artifactId>
 
 
     <properties>
     <properties>
-
+        <cronos.version>1.1.0</cronos.version>
     </properties>
     </properties>
 
 
     <dependencies>
     <dependencies>
+        <!--系统-->
+        <dependency>
+            <groupId>com.topdraw</groupId>
+            <artifactId>cronos-system</artifactId>
+            <version>${cronos.version}</version>
+        </dependency>
         <!--代码生成器-->
         <!--代码生成器-->
         <dependency>
         <dependency>
             <groupId>com.topdraw</groupId>
             <groupId>com.topdraw</groupId>
-            <artifactId>code-generator</artifactId>
-            <version>3.1.0</version>
+            <artifactId>cronos-generator</artifactId>
+            <version>${cronos.version}</version>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
 
 

@@ -25,6 +25,8 @@ public class DataSyncMsg implements Serializable {
     // 其他属性
     // 其他属性
     private String extraData;
     private String extraData;
 
 
+    /** 模板参数 */
+    private TaskTemplateParam param;
 
 
     /**
     /**
      *  消息体
      *  消息体
@@ -47,6 +49,18 @@ public class DataSyncMsg implements Serializable {
         private Long activityId;
         private Long activityId;
         private Long mediaId;
         private Long mediaId;
         private Long itemId;
         private Long itemId;
+
+
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class TaskTemplateParam {
+        /** 类别 */
+        private String category;
+        /** 编码 */
+        private String code;
     }
     }
 
 
 }
 }

-package com.topdraw.business.basicdata.coupon.domain;
+package com.topdraw.business.module.coupon.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;

-package com.topdraw.business.basicdata.coupon.history.domain;
+package com.topdraw.business.module.coupon.history.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;

-package com.topdraw.business.basicdata.coupon.history.repository;
+package com.topdraw.business.module.coupon.history.repository;
 
 
-import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory;
+import com.topdraw.business.module.coupon.history.domain.CouponHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
-import java.util.Optional;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan

-package com.topdraw.business.basicdata.coupon.history.rest;
+package com.topdraw.business.module.coupon.history.rest;
 
 
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.annotation.Log;
 import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory;
-import com.topdraw.business.basicdata.coupon.history.service.CouponHistoryService;
-import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryQueryCriteria;
+import com.topdraw.business.module.coupon.history.domain.CouponHistory;
+import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
+import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan

-package com.topdraw.business.basicdata.coupon.history.service;
+package com.topdraw.business.module.coupon.history.service;
 
 
-import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory;
-import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryDTO;
-import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryQueryCriteria;
+import com.topdraw.business.module.coupon.history.domain.CouponHistory;
+import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
+import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 
 
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan

-package com.topdraw.business.basicdata.coupon.history.service.dto;
+package com.topdraw.business.module.coupon.history.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;

-package com.topdraw.business.basicdata.coupon.history.service.dto;
+package com.topdraw.business.module.coupon.history.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
-import com.topdraw.annotation.Query;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan

-package com.topdraw.business.basicdata.coupon.history.service.impl;
+package com.topdraw.business.module.coupon.history.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory;
+import com.topdraw.business.module.coupon.history.domain.CouponHistory;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.business.basicdata.coupon.history.repository.CouponHistoryRepository;
-import com.topdraw.business.basicdata.coupon.history.service.CouponHistoryService;
-import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryDTO;
-import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryQueryCriteria;
-import com.topdraw.business.basicdata.coupon.history.service.mapper.CouponHistoryMapper;
+import com.topdraw.business.module.coupon.history.repository.CouponHistoryRepository;
+import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
+import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
+import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQueryCriteria;
+import com.topdraw.business.module.coupon.history.service.mapper.CouponHistoryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;

-package com.topdraw.business.basicdata.coupon.history.service.mapper;
+package com.topdraw.business.module.coupon.history.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory;
-import com.topdraw.business.basicdata.coupon.history.service.dto.CouponHistoryDTO;
+import com.topdraw.business.module.coupon.history.domain.CouponHistory;
+import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.coupon.repository;
+package com.topdraw.business.module.coupon.repository;
 
 
-import com.topdraw.business.basicdata.coupon.domain.Coupon;
+import com.topdraw.business.module.coupon.domain.Coupon;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 

-package com.topdraw.business.basicdata.coupon.rest;
+package com.topdraw.business.module.coupon.rest;
 
 
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.annotation.Log;
 import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.coupon.domain.Coupon;
-import com.topdraw.business.basicdata.coupon.service.CouponService;
-import com.topdraw.business.basicdata.coupon.service.dto.CouponQueryCriteria;
+import com.topdraw.business.module.coupon.domain.Coupon;
+import com.topdraw.business.module.coupon.service.CouponService;
+import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;

-package com.topdraw.business.basicdata.coupon.service;
+package com.topdraw.business.module.coupon.service;
 
 
-import com.topdraw.business.basicdata.coupon.domain.Coupon;
-import com.topdraw.business.basicdata.coupon.service.dto.CouponDTO;
-import com.topdraw.business.basicdata.coupon.service.dto.CouponQueryCriteria;
+import com.topdraw.business.module.coupon.domain.Coupon;
+import com.topdraw.business.module.coupon.service.dto.CouponDTO;
+import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;

-package com.topdraw.business.basicdata.coupon.service.dto;
+package com.topdraw.business.module.coupon.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;

-package com.topdraw.business.basicdata.coupon.service.dto;
+package com.topdraw.business.module.coupon.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

-package com.topdraw.business.basicdata.coupon.service.impl;
+package com.topdraw.business.module.coupon.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.coupon.domain.Coupon;
+import com.topdraw.business.module.coupon.domain.Coupon;
 import com.topdraw.util.RedissonUtil;
 import com.topdraw.util.RedissonUtil;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.business.basicdata.coupon.repository.CouponRepository;
-import com.topdraw.business.basicdata.coupon.service.CouponService;
-import com.topdraw.business.basicdata.coupon.service.dto.CouponDTO;
-import com.topdraw.business.basicdata.coupon.service.dto.CouponQueryCriteria;
-import com.topdraw.business.basicdata.coupon.service.mapper.CouponMapper;
+import com.topdraw.business.module.coupon.repository.CouponRepository;
+import com.topdraw.business.module.coupon.service.CouponService;
+import com.topdraw.business.module.coupon.service.dto.CouponDTO;
+import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
+import com.topdraw.business.module.coupon.service.mapper.CouponMapper;
 import org.redisson.api.RLock;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

-package com.topdraw.business.basicdata.coupon.service.mapper;
+package com.topdraw.business.module.coupon.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.coupon.domain.Coupon;
-import com.topdraw.business.basicdata.coupon.service.dto.CouponDTO;
+import com.topdraw.business.module.coupon.domain.Coupon;
+import com.topdraw.business.module.coupon.service.dto.CouponDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.exp.detail.domain;
+package com.topdraw.business.module.exp.detail.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;

-package com.topdraw.business.basicdata.exp.detail.repository;
+package com.topdraw.business.module.exp.detail.repository;
 
 
-import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail;
+import com.topdraw.business.module.exp.detail.domain.ExpDetail;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 

-package com.topdraw.business.basicdata.exp.detail.rest;
+package com.topdraw.business.module.exp.detail.rest;
 
 
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.annotation.Log;
 import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail;
-import com.topdraw.business.basicdata.exp.detail.service.ExpDetailService;
-import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailQueryCriteria;
+import com.topdraw.business.module.exp.detail.domain.ExpDetail;
+import com.topdraw.business.module.exp.detail.service.ExpDetailService;
+import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;

-package com.topdraw.business.basicdata.exp.detail.service;
+package com.topdraw.business.module.exp.detail.service;
 
 
-import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail;
-import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailDTO;
-import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailQueryCriteria;
+import com.topdraw.business.module.exp.detail.domain.ExpDetail;
+import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
+import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;

-package com.topdraw.business.basicdata.exp.detail.service.dto;
+package com.topdraw.business.module.exp.detail.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;

-package com.topdraw.business.basicdata.exp.detail.service.dto;
+package com.topdraw.business.module.exp.detail.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

-package com.topdraw.business.basicdata.exp.detail.service.impl;
+package com.topdraw.business.module.exp.detail.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail;
+import com.topdraw.business.module.exp.detail.domain.ExpDetail;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.business.basicdata.exp.detail.repository.ExpDetailRepository;
-import com.topdraw.business.basicdata.exp.detail.service.ExpDetailService;
-import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailDTO;
-import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailQueryCriteria;
-import com.topdraw.business.basicdata.exp.detail.service.mapper.ExpDetailMapper;
+import com.topdraw.business.module.exp.detail.repository.ExpDetailRepository;
+import com.topdraw.business.module.exp.detail.service.ExpDetailService;
+import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
+import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria;
+import com.topdraw.business.module.exp.detail.service.mapper.ExpDetailMapper;
 import org.redisson.api.RLock;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

-package com.topdraw.business.basicdata.exp.detail.service.mapper;
+package com.topdraw.business.module.exp.detail.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail;
-import com.topdraw.business.basicdata.exp.detail.service.dto.ExpDetailDTO;
+import com.topdraw.business.module.exp.detail.domain.ExpDetail;
+import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.exp.history.domain;
+package com.topdraw.business.module.exp.history.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;

-package com.topdraw.business.basicdata.exp.history.repository;
+package com.topdraw.business.module.exp.history.repository;
 
 
-import com.topdraw.business.basicdata.exp.history.domain.ExpHistory;
+import com.topdraw.business.module.exp.history.domain.ExpHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 

-package com.topdraw.business.basicdata.exp.history.rest;
+package com.topdraw.business.module.exp.history.rest;
 
 
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
-import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.exp.history.domain.ExpHistory;
-import com.topdraw.business.basicdata.exp.history.service.ExpHistoryService;
-import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryQueryCriteria;
+import com.topdraw.business.module.exp.history.service.ExpHistoryService;
+import com.topdraw.business.module.exp.history.service.dto.ExpHistoryQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import io.swagger.annotations.*;
 
 

-package com.topdraw.business.basicdata.exp.history.service;
+package com.topdraw.business.module.exp.history.service;
 
 
-import com.topdraw.business.basicdata.exp.history.domain.ExpHistory;
-import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryDTO;
-import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryQueryCriteria;
+import com.topdraw.business.module.exp.history.domain.ExpHistory;
+import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
+import com.topdraw.business.module.exp.history.service.dto.ExpHistoryQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;

-package com.topdraw.business.basicdata.exp.history.service.dto;
+package com.topdraw.business.module.exp.history.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;

-package com.topdraw.business.basicdata.exp.history.service.dto;
+package com.topdraw.business.module.exp.history.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

-package com.topdraw.business.basicdata.exp.history.service.impl;
+package com.topdraw.business.module.exp.history.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.exp.history.domain.ExpHistory;
+import com.topdraw.business.module.exp.history.domain.ExpHistory;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.business.basicdata.exp.history.repository.ExpHistoryRepository;
-import com.topdraw.business.basicdata.exp.history.service.ExpHistoryService;
-import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryDTO;
-import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryQueryCriteria;
-import com.topdraw.business.basicdata.exp.history.service.mapper.ExpHistoryMapper;
+import com.topdraw.business.module.exp.history.repository.ExpHistoryRepository;
+import com.topdraw.business.module.exp.history.service.ExpHistoryService;
+import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
+import com.topdraw.business.module.exp.history.service.dto.ExpHistoryQueryCriteria;
+import com.topdraw.business.module.exp.history.service.mapper.ExpHistoryMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;

-package com.topdraw.business.basicdata.exp.history.service.mapper;
+package com.topdraw.business.module.exp.history.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.exp.history.domain.ExpHistory;
-import com.topdraw.business.basicdata.exp.history.service.dto.ExpHistoryDTO;
+import com.topdraw.business.module.exp.history.domain.ExpHistory;
+import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.member.address.domain;
+package com.topdraw.business.module.member.address.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;

-package com.topdraw.business.basicdata.member.address.repository;
+package com.topdraw.business.module.member.address.repository;
 
 
-import com.topdraw.business.basicdata.member.address.domain.MemberAddress;
+import com.topdraw.business.module.member.address.domain.MemberAddress;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 

-package com.topdraw.business.basicdata.member.address.rest;
+package com.topdraw.business.module.member.address.rest;
 
 
-import com.topdraw.business.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.annotation.Log;
 import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.member.address.domain.MemberAddress;
-import com.topdraw.business.basicdata.member.address.service.MemberAddressService;
-import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressQueryCriteria;
+import com.topdraw.business.module.member.address.domain.MemberAddress;
+import com.topdraw.business.module.member.address.service.MemberAddressService;
+import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.Assert;
 import org.springframework.util.Assert;

-package com.topdraw.business.basicdata.member.address.service;
+package com.topdraw.business.module.member.address.service;
 
 
-import com.topdraw.business.basicdata.member.address.domain.MemberAddress;
-import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressDTO;
-import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressQueryCriteria;
+import com.topdraw.business.module.member.address.domain.MemberAddress;
+import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
+import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;

-package com.topdraw.business.basicdata.member.address.service.dto;
+package com.topdraw.business.module.member.address.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;

-package com.topdraw.business.basicdata.member.address.service.dto;
+package com.topdraw.business.module.member.address.service.dto;
 
 
 import com.topdraw.annotation.Query;
 import com.topdraw.annotation.Query;
 import lombok.Data;
 import lombok.Data;

-package com.topdraw.business.basicdata.member.address.service.impl;
+package com.topdraw.business.module.member.address.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.member.address.domain.MemberAddress;
+import com.topdraw.business.module.member.address.domain.MemberAddress;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.business.basicdata.member.address.repository.MemberAddressRepository;
-import com.topdraw.business.basicdata.member.address.service.MemberAddressService;
-import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressDTO;
-import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressQueryCriteria;
-import com.topdraw.business.basicdata.member.address.service.mapper.MemberAddressMapper;
+import com.topdraw.business.module.member.address.repository.MemberAddressRepository;
+import com.topdraw.business.module.member.address.service.MemberAddressService;
+import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
+import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
+import com.topdraw.business.module.member.address.service.mapper.MemberAddressMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;

-package com.topdraw.business.basicdata.member.address.service.mapper;
+package com.topdraw.business.module.member.address.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.member.address.domain.MemberAddress;
-import com.topdraw.business.basicdata.member.address.service.dto.MemberAddressDTO;
+import com.topdraw.business.module.member.address.domain.MemberAddress;
+import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.member.domain;
+package com.topdraw.business.module.member.domain;
 
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.bean.copier.CopyOptions;
-import com.topdraw.business.basicdata.member.profile.domain.MemberProfile;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.CreatedDate;
@@ -135,6 +133,6 @@ public class Member implements Serializable {
     private Long blackStatus;
     private Long blackStatus;
 
 
     public void copy(Member source){
     public void copy(Member source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));
     }
     }
 }
 }

+package com.topdraw.business.module.member.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.topdraw.util.IdWorker;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+/**
+ * @author XiangHan
+ * @date 2021-10-22
+ */
+public class MemberBuilder {
+
+    public static Member build(Integer type,String avatarUrl,String nickname,Integer vip){
+        Member member = new Member();
+        member.setType(type);
+        member.setBlackStatus(0L);
+        member.setGender(-1);
+        member.setVip(vip==null?0:vip);
+        member.setLevel(1);
+        member.setStatus(1);
+        member.setPoints(0L);
+        member.setDuePoints(0L);
+        member.setExp(0L);
+        member.setCouponAmount(0L);
+        member.setDueCouponAmount(0L);
+        member.setAvatarUrl(avatarUrl);
+        member.setCode(IdWorker.generator() + "");
+        member.setNickname(nickname);
+        return member;
+    }
+}

+package com.topdraw.business.module.member.domain;
+
+public interface MemberConstant {
+
+    // vip等级
+    Integer vip[] = new Integer[]{0,1,2,3,4,5,6,7,8};
+
+}

-package com.topdraw.business.basicdata.member.group.domain;
+package com.topdraw.business.module.member.group.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;

-package com.topdraw.business.basicdata.member.group.repository;
+package com.topdraw.business.module.member.group.repository;
 
 
-import com.topdraw.business.basicdata.member.group.domain.MemberGroup;
+import com.topdraw.business.module.member.group.domain.MemberGroup;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 
-import java.util.Optional;
-
 /**
 /**
  * @author XiangHan
  * @author XiangHan
  * @date 2021-11-17
  * @date 2021-11-17

-package com.topdraw.business.basicdata.member.group.rest;
+package com.topdraw.business.module.member.group.rest;
 
 
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.annotation.Log;
 import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.member.group.domain.MemberGroup;
-import com.topdraw.business.basicdata.member.group.service.MemberGroupService;
-import com.topdraw.business.basicdata.member.group.service.dto.MemberGroupQueryCriteria;
+import com.topdraw.business.module.member.group.domain.MemberGroup;
+import com.topdraw.business.module.member.group.service.MemberGroupService;
+import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan

-package com.topdraw.business.basicdata.member.group.service;
+package com.topdraw.business.module.member.group.service;
 
 
-import com.topdraw.business.basicdata.member.group.domain.MemberGroup;
-import com.topdraw.business.basicdata.member.group.service.dto.MemberGroupDTO;
-import com.topdraw.business.basicdata.member.group.service.dto.MemberGroupQueryCriteria;
+import com.topdraw.business.module.member.group.domain.MemberGroup;
+import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
+import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan

-package com.topdraw.business.basicdata.member.group.service.dto;
+package com.topdraw.business.module.member.group.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;

-package com.topdraw.business.basicdata.member.group.service.dto;
+package com.topdraw.business.module.member.group.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import com.topdraw.annotation.Query;
 import com.topdraw.annotation.Query;

-package com.topdraw.business.basicdata.member.group.service.impl;
+package com.topdraw.business.module.member.group.service.impl;
 
 
-import com.topdraw.business.basicdata.member.group.domain.MemberGroup;
+import com.topdraw.business.module.member.group.domain.MemberGroup;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.utils.FileUtil;
-import com.topdraw.business.basicdata.member.group.repository.MemberGroupRepository;
-import com.topdraw.business.basicdata.member.group.service.MemberGroupService;
-import com.topdraw.business.basicdata.member.group.service.dto.MemberGroupDTO;
-import com.topdraw.business.basicdata.member.group.service.dto.MemberGroupQueryCriteria;
-import com.topdraw.business.basicdata.member.group.service.mapper.MemberGroupMapper;
+import com.topdraw.business.module.member.group.repository.MemberGroupRepository;
+import com.topdraw.business.module.member.group.service.MemberGroupService;
+import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
+import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria;
+import com.topdraw.business.module.member.group.service.mapper.MemberGroupMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;
@@ -18,14 +17,9 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.util.Assert;
 import org.springframework.util.Assert;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.QueryHelp;
-import com.topdraw.utils.StringUtils;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan

-package com.topdraw.business.basicdata.member.group.service.mapper;
+package com.topdraw.business.module.member.group.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.member.group.domain.MemberGroup;
-import com.topdraw.business.basicdata.member.group.service.dto.MemberGroupDTO;
+import com.topdraw.business.module.member.group.domain.MemberGroup;
+import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.member.level.domain;
+package com.topdraw.business.module.member.level.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;

-package com.topdraw.business.basicdata.member.level.repository;
+package com.topdraw.business.module.member.level.repository;
 
 
-import com.topdraw.business.basicdata.member.level.domain.MemberLevel;
+import com.topdraw.business.module.member.level.domain.MemberLevel;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 

-package com.topdraw.business.basicdata.member.level.rest;
+package com.topdraw.business.module.member.level.rest;
 
 
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
-import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.member.level.domain.MemberLevel;
-import com.topdraw.business.basicdata.member.level.service.MemberLevelService;
-import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelQueryCriteria;
+import com.topdraw.business.module.member.level.service.MemberLevelService;
+import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.*;
 import io.swagger.annotations.*;
 
 

-package com.topdraw.business.basicdata.member.level.service;
+package com.topdraw.business.module.member.level.service;
 
 
-import com.topdraw.business.basicdata.member.level.domain.MemberLevel;
-import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelDTO;
-import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelQueryCriteria;
+import com.topdraw.business.module.member.level.domain.MemberLevel;
+import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
+import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;

-package com.topdraw.business.basicdata.member.level.service.dto;
+package com.topdraw.business.module.member.level.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;

-package com.topdraw.business.basicdata.member.level.service.dto;
+package com.topdraw.business.module.member.level.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

-package com.topdraw.business.basicdata.member.level.service.impl;
+package com.topdraw.business.module.member.level.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.member.level.domain.MemberLevel;
+import com.topdraw.business.module.member.level.domain.MemberLevel;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.business.basicdata.member.level.repository.MemberLevelRepository;
-import com.topdraw.business.basicdata.member.level.service.MemberLevelService;
-import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelDTO;
-import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelQueryCriteria;
-import com.topdraw.business.basicdata.member.level.service.mapper.MemberLevelMapper;
+import com.topdraw.business.module.member.level.repository.MemberLevelRepository;
+import com.topdraw.business.module.member.level.service.MemberLevelService;
+import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
+import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria;
+import com.topdraw.business.module.member.level.service.mapper.MemberLevelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;

-package com.topdraw.business.basicdata.member.level.service.mapper;
+package com.topdraw.business.module.member.level.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.member.level.domain.MemberLevel;
-import com.topdraw.business.basicdata.member.level.service.dto.MemberLevelDTO;
+import com.topdraw.business.module.member.level.domain.MemberLevel;
+import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.member.profile;
+package com.topdraw.business.module.member.profile;
 
 
 public interface DoSaveMemberProfileGroup {
 public interface DoSaveMemberProfileGroup {
 }
 }

-package com.topdraw.business.basicdata.member.profile;
+package com.topdraw.business.module.member.profile;
 
 
 public interface DoUpdateMemberProfileGroup {
 public interface DoUpdateMemberProfileGroup {
 }
 }

-package com.topdraw.business.basicdata.member.profile.domain;
+package com.topdraw.business.module.member.profile.domain;
 
 
-import com.topdraw.business.basicdata.member.profile.DoSaveMemberProfileGroup;
-import com.topdraw.business.basicdata.member.profile.DoUpdateMemberProfileGroup;
+import com.topdraw.business.module.member.profile.DoSaveMemberProfileGroup;
+import com.topdraw.business.module.member.profile.DoUpdateMemberProfileGroup;
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;

-package com.topdraw.business.basicdata.member.profile.repository;
+package com.topdraw.business.module.member.profile.repository;
 
 
-import com.topdraw.business.basicdata.member.profile.domain.MemberProfile;
+import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 

-package com.topdraw.business.basicdata.member.profile.rest;
+package com.topdraw.business.module.member.profile.rest;
 
 
-import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDTO;
-import com.topdraw.business.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
+import com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.annotation.Log;
 import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.member.profile.domain.MemberProfile;
-import com.topdraw.business.basicdata.member.profile.service.MemberProfileService;
-import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileQueryCriteria;
+import com.topdraw.business.module.member.profile.domain.MemberProfile;
+import com.topdraw.business.module.member.profile.service.MemberProfileService;
 import com.topdraw.utils.StringUtils;
 import com.topdraw.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
 import org.springframework.util.Assert;
 import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;

-package com.topdraw.business.basicdata.member.profile.service;
+package com.topdraw.business.module.member.profile.service;
 
 
-import com.topdraw.business.basicdata.member.profile.domain.MemberProfile;
-import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDTO;
-import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileQueryCriteria;
+import com.topdraw.business.module.member.profile.domain.MemberProfile;
+import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
+import com.topdraw.business.module.member.profile.service.dto.MemberProfileQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;
@@ -35,7 +35,7 @@ public interface MemberProfileService {
      */
      */
     MemberProfileDTO findById(Long id);
     MemberProfileDTO findById(Long id);
 
 
-    void create(MemberProfile resources);
+    MemberProfile create(MemberProfile resources);
 
 
     void update(MemberProfile resources);
     void update(MemberProfile resources);
 
 

-package com.topdraw.business.basicdata.member.profile.service.dto;
+package com.topdraw.business.module.member.profile.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
@@ -21,21 +21,30 @@ public class MemberProfileDTO implements Serializable {
     // 姓名
     // 姓名
     private String realname;
     private String realname;
 
 
+    private String nickname;
+
     // 性别 0：女； 1：男 -1：未知
     // 性别 0：女； 1：男 -1：未知
     private Integer gender;
     private Integer gender;
 
 
     // 生日
     // 生日
     private Timestamp birthday;
     private Timestamp birthday;
 
 
+    // 生日字符串
+    private String birthdayStr;
+
+    // vip
+    private Integer vip;
+
     // 星座
     // 星座
     private String constellation;
     private String constellation;
 
 
-    // 身份证
-    private String idCard;
+    private Long vipExpireTime;
 
 
-    // 电话
     private String phone;
     private String phone;
 
 
+    // 身份证
+    private String idCard;
+
     // 电子邮件
     // 电子邮件
     private String email;
     private String email;
 
 
@@ -48,6 +57,9 @@ public class MemberProfileDTO implements Serializable {
     // 城市
     // 城市
     private String city;
     private String city;
 
 
+    // 头像
+    private String avatarUrl;
+
     // 区县
     // 区县
     private String district;
     private String district;
 
 

-package com.topdraw.business.basicdata.member.profile.service.dto;
+package com.topdraw.business.module.member.profile.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

-package com.topdraw.business.basicdata.member.profile.service.impl;
+package com.topdraw.business.module.member.profile.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.member.profile.domain.MemberProfile;
-import com.topdraw.business.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.business.basicdata.member.profile.repository.MemberProfileRepository;
-import com.topdraw.business.basicdata.member.profile.service.MemberProfileService;
-import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDTO;
-import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileQueryCriteria;
-import com.topdraw.business.basicdata.member.profile.service.mapper.MemberProfileMapper;
+import com.topdraw.business.module.member.profile.repository.MemberProfileRepository;
+import com.topdraw.business.module.member.profile.service.MemberProfileService;
+import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
+import com.topdraw.business.module.member.profile.service.dto.MemberProfileQueryCriteria;
+import com.topdraw.business.module.member.profile.service.mapper.MemberProfileMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;
@@ -61,8 +59,9 @@ public class MemberProfileServiceImpl implements MemberProfileService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @AsyncMqSend()
     @AsyncMqSend()
-    public void create(MemberProfile resources) {
+    public MemberProfile create(MemberProfile resources) {
         MemberProfileRepository.save(resources);
         MemberProfileRepository.save(resources);
+        return resources;
     }
     }
 
 
     @Override
     @Override

-package com.topdraw.business.basicdata.member.profile.service.mapper;
+package com.topdraw.business.module.member.profile.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.member.profile.domain.MemberProfile;
-import com.topdraw.business.basicdata.member.profile.service.dto.MemberProfileDTO;
+import com.topdraw.business.module.member.profile.domain.MemberProfile;
+import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.member.relatedinfo.domain;
+package com.topdraw.business.module.member.relatedinfo.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;

-package com.topdraw.business.basicdata.member.relatedinfo.repository;
+package com.topdraw.business.module.member.relatedinfo.repository;
 
 
-import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo;
+import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 

-package com.topdraw.business.basicdata.member.relatedinfo.rest;
+package com.topdraw.business.module.member.relatedinfo.rest;
 
 
-import com.topdraw.business.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.annotation.Log;
 import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo;
-import com.topdraw.business.basicdata.member.relatedinfo.service.MemberRelatedInfoService;
-import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
+import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
+import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
+import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.util.Assert;
 import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;

-package com.topdraw.business.basicdata.member.relatedinfo.service;
+package com.topdraw.business.module.member.relatedinfo.service;
 
 
-import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo;
-import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
-import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
+import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
+import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
+import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;

-package com.topdraw.business.basicdata.member.relatedinfo.service.dto;
+package com.topdraw.business.module.member.relatedinfo.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.persistence.Column;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDate;

-package com.topdraw.business.basicdata.member.relatedinfo.service.dto;
+package com.topdraw.business.module.member.relatedinfo.service.dto;
 
 
 import com.topdraw.annotation.Query;
 import com.topdraw.annotation.Query;
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.validation.constraints.NotNull;
-
 /**
 /**
  * @author XiangHan
  * @author XiangHan
  * @date 2021-10-22
  * @date 2021-10-22

-package com.topdraw.business.basicdata.member.relatedinfo.service.impl;
+package com.topdraw.business.module.member.relatedinfo.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo;
+import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
-import com.topdraw.business.basicdata.member.relatedinfo.repository.MemberRelatedInfoRepository;
-import com.topdraw.business.basicdata.member.relatedinfo.service.MemberRelatedInfoService;
-import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
-import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
-import com.topdraw.business.basicdata.member.relatedinfo.service.mapper.MemberRelatedInfoMapper;
+import com.topdraw.business.module.member.relatedinfo.repository.MemberRelatedInfoRepository;
+import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
+import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
+import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
+import com.topdraw.business.module.member.relatedinfo.service.mapper.MemberRelatedInfoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;

-package com.topdraw.business.basicdata.member.relatedinfo.service.mapper;
+package com.topdraw.business.module.member.relatedinfo.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo;
-import com.topdraw.business.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
+import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
+import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

-package com.topdraw.business.basicdata.member.repository;
+package com.topdraw.business.module.member.repository;
 
 
-import com.topdraw.business.basicdata.member.domain.Member;
+import com.topdraw.business.module.member.domain.Member;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 

-package com.topdraw.business.basicdata.member.rest;
+package com.topdraw.business.module.member.rest;
 
 
 import com.topdraw.annotation.Log;
 import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.member.domain.Member;
-import com.topdraw.business.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
-import com.topdraw.business.basicdata.user.iptv.domain.UserTv;
-import com.topdraw.business.process.service.UserTvOperationService;
+import com.topdraw.business.module.member.domain.Member;
+import com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
+import com.topdraw.business.module.user.iptv.domain.UserTv;
+import com.topdraw.business.process.service.UserOperationService;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.util.Base64Util;
 import com.topdraw.util.Base64Util;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -33,7 +33,7 @@ public class MemberController {
     private MemberService memberService;
     private MemberService memberService;
 
 
     @Autowired
     @Autowired
-    private UserTvOperationService userTvOperationService;
+    private UserOperationService userTvOperationService;
 
 
     @Log
     @Log
     @GetMapping(value = "/findById/{id}")
     @GetMapping(value = "/findById/{id}")

-package com.topdraw.business.basicdata.member.service;
+package com.topdraw.business.module.member.service;
 
 
-import com.topdraw.business.basicdata.member.domain.Member;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
-import com.topdraw.business.basicdata.member.service.dto.MemberQueryCriteria;
-import com.topdraw.business.basicdata.user.iptv.domain.UserTv;
+import com.topdraw.business.module.member.domain.Member;
+import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.service.dto.MemberQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 
 
 import java.util.List;
 import java.util.List;
@@ -37,10 +37,23 @@ public interface MemberService {
      */
      */
     MemberDTO findById(Long id);
     MemberDTO findById(Long id);
 
 
+    /**
+     *
+     * @param resources
+     * @return
+     */
     Long create(Member resources);
     Long create(Member resources);
 
 
+    /**
+     *
+     * @param resources
+     */
     void update(Member resources);
     void update(Member resources);
 
 
+    /**
+     *
+     * @param id
+     */
     void delete(Long id);
     void delete(Long id);
 
 
     /**
     /**
@@ -50,5 +63,9 @@ public interface MemberService {
     */
     */
     MemberDTO getByCode(String code);
     MemberDTO getByCode(String code);
 
 
+    /**
+     *
+     * @param member
+     */
     void doUpdateMemberPoints(Member member);
     void doUpdateMemberPoints(Member member);
 }
 }

-package com.topdraw.business.basicdata.member.service.dto;
+package com.topdraw.business.module.member.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

-package com.topdraw.business.basicdata.member.service.dto;
+package com.topdraw.business.module.member.service.dto;
 
 
 import com.topdraw.annotation.Query;
 import com.topdraw.annotation.Query;
 import lombok.Data;
 import lombok.Data;

-package com.topdraw.business.basicdata.member.service.impl;
+package com.topdraw.business.module.member.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
-import com.topdraw.business.basicdata.member.domain.Member;
-import com.topdraw.business.basicdata.member.repository.MemberRepository;
-import com.topdraw.business.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
-import com.topdraw.business.basicdata.member.service.dto.MemberQueryCriteria;
-import com.topdraw.business.basicdata.member.service.mapper.MemberMapper;
-import com.topdraw.business.basicdata.user.iptv.domain.UserTv;
-import com.topdraw.business.basicdata.user.iptv.service.UserTvService;
-import com.topdraw.business.basicdata.user.iptv.service.dto.UserTvDTO;
-import com.topdraw.common.ResultInfo;
-import com.topdraw.config.LocalConstants;
-import com.topdraw.mq.config.RabbitMqConfig;
+import com.topdraw.business.module.member.domain.Member;
+import com.topdraw.business.module.member.repository.MemberRepository;
+import com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.service.dto.MemberQueryCriteria;
+import com.topdraw.business.module.member.service.mapper.MemberMapper;
 import com.topdraw.util.IdWorker;
 import com.topdraw.util.IdWorker;
 import com.topdraw.util.RedissonUtil;
 import com.topdraw.util.RedissonUtil;
-import com.topdraw.util.TimestampUtil;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;
 import com.topdraw.utils.StringUtils;
@@ -23,21 +16,15 @@ import com.topdraw.utils.ValidationUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.redisson.api.RedissonClient;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheConfig;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.util.Assert;
 import org.springframework.util.Assert;
 
 
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.StandardCharsets;
@@ -65,7 +52,7 @@ public class MemberServiceImpl implements MemberService {
     PlatformTransactionManager platformTransactionManager;
     PlatformTransactionManager platformTransactionManager;
 
 
     @Autowired
     @Autowired
-    private com.topdraw.business.basicdata.user.iptv.service.UserTvService UserTvService;
+    private com.topdraw.business.module.user.iptv.service.UserTvService UserTvService;
 
 
     @Override
     @Override
     public Map<String, Object> queryAll(MemberQueryCriteria criteria, Pageable pageable) {
     public Map<String, Object> queryAll(MemberQueryCriteria criteria, Pageable pageable) {
@@ -80,7 +67,6 @@ public class MemberServiceImpl implements MemberService {
     }
     }
 
 
     @Override
     @Override
-//    @Cacheable(value = "member::memberId",key = "#p0")
     public MemberDTO findById(Long id) {
     public MemberDTO findById(Long id) {
         Member member = memberRepository.findById(id).orElseGet(Member::new);
         Member member = memberRepository.findById(id).orElseGet(Member::new);
         ValidationUtil.isNull(member.getId(),"Member","id",id);
         ValidationUtil.isNull(member.getId(),"Member","id",id);
@@ -130,7 +116,6 @@ public class MemberServiceImpl implements MemberService {
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @AsyncMqSend()
     @AsyncMqSend()
-    @CacheEvict(value = "member::memberId",key = "#p0.id")
     public void update(Member resources) {
     public void update(Member resources) {
         RLock rLock = this.redissonClient.getLock("member::update::id" + resources.getId().toString());
         RLock rLock = this.redissonClient.getLock("member::update::id" + resources.getId().toString());
         try {
         try {

-package com.topdraw.business.basicdata.member.service.mapper;
+package com.topdraw.business.module.member.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.member.domain.Member;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.domain.Member;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 

+package com.topdraw.business.module.member.viphistory.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+/**
+ * @author luerlong
+ * @date 2021-12-10
+ */
+@Entity
+@Data
+@EntityListeners(AuditingEntityListener.class)
+@Accessors(chain = true)
+@Table(name="uc_member_vip_history")
+public class MemberVipHistory implements Serializable {
+
+    // 主键
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    // 会员id
+    @Column(name = "member_id")
+    private Long memberId;
+
+    // 会员vip等级
+    @Column(name = "vip")
+    private Integer vip;
+
+    // 修改之前vip等级  
+    @Column(name = "before_vip")
+    private Integer beforeVip;
+
+    // vip失效时间
+    @Column(name = "vip_expire_time")
+    private LocalDateTime vipExpireTime;
+
+    // 状态 1正常  0已过期
+    @Column(name = "status")
+    private Integer status;
+
+    // 创建时间
+    @CreatedDate
+    @Column(name = "create_time")
+    private Timestamp createTime;
+
+    // 修改时间
+    @LastModifiedDate
+    @Column(name = "update_time")
+    private Timestamp updateTime;
+
+    public void copy(MemberVipHistory source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

+package com.topdraw.business.module.member.viphistory.repository;
+
+import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+
+/**
+ * @author luerlong
+ * @date 2021-12-10
+ */
+public interface MemberVipHistoryRepository extends JpaRepository<MemberVipHistory, Long>, JpaSpecificationExecutor<MemberVipHistory> {
+
+    @Query(value = "SELECT * FROM uc_member_vip_history " +
+            " WHERE vip_expire_time >= ?2 AND member_id = ?1 order by create_time desc limit 1 ", nativeQuery = true)
+    Optional<MemberVipHistory> findByTime(Long memberId, LocalDateTime nowTime);
+}

+package com.topdraw.business.module.member.viphistory.rest;
+
+import com.topdraw.annotation.Log;
+import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
+import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
+import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria;
+import com.topdraw.common.ResultInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author luerlong
+ * @date 2021-12-10
+ */
+@Api(tags = "MemberVipHistory管理")
+@RestController
+@RequestMapping("/api/memberVipHistory")
+public class MemberVipHistoryController {
+
+    @Autowired
+    private MemberVipHistoryService memberVipHistoryService;
+
+    @GetMapping
+    @ApiOperation("查询MemberVipHistory")
+    public ResultInfo getMemberVipHistorys(MemberVipHistoryQueryCriteria criteria, Pageable pageable) {
+        return ResultInfo.successPage(memberVipHistoryService.queryAll(criteria,pageable));
+    }
+
+    @GetMapping(value = "/all")
+    @ApiOperation("查询所有MemberVipHistory")
+    public ResultInfo getMemberVipHistorys(MemberVipHistoryQueryCriteria criteria) {
+        return ResultInfo.success(memberVipHistoryService.queryAll(criteria));
+    }
+
+    @Log
+    @PostMapping
+    @ApiOperation("新增MemberVipHistory")
+    public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) {
+        memberVipHistoryService.create(resources);
+        return ResultInfo.success();
+    }
+
+    @Log
+    @PutMapping
+    @ApiOperation("修改MemberVipHistory")
+    public ResultInfo update(@Validated @RequestBody MemberVipHistory resources) {
+        memberVipHistoryService.update(resources);
+        return ResultInfo.success();
+    }
+
+
+    @Log
+    @DeleteMapping(value = "/{id}")
+    @ApiOperation("删除MemberVipHistory")
+    public ResultInfo delete(@PathVariable Long id) {
+        memberVipHistoryService.delete(id);
+        return ResultInfo.success();
+    }
+
+}

+package com.topdraw.business.module.member.viphistory.service;
+
+import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
+import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
+import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria;
+import org.springframework.data.domain.Pageable;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * @author luerlong
+ * @date 2021-12-10
+ */
+public interface MemberVipHistoryService {
+
+    /**
+    * 查询数据分页
+    * @param criteria 条件参数
+    * @param pageable 分页参数
+    * @return Map<String,Object>
+    */
+    Map<String,Object> queryAll(MemberVipHistoryQueryCriteria criteria, Pageable pageable);
+
+    /**
+    * 查询所有数据不分页
+    * @param criteria 条件参数
+    * @return List<MemberVipHistoryDTO>
+    */
+    List<MemberVipHistoryDTO> queryAll(MemberVipHistoryQueryCriteria criteria);
+
+    /**
+     * 根据ID查询
+     * @param id ID
+     * @return MemberVipHistoryDTO
+     */
+    MemberVipHistoryDTO findById(Long id);
+
+    void create(MemberVipHistory resources);
+
+    void update(MemberVipHistory resources);
+
+    void delete(Long id);
+
+    MemberVipHistory findByTime(Long id, LocalDateTime nowTime);
+}

+package com.topdraw.business.module.member.viphistory.service.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+
+/**
+ * @author luerlong
+ * @date 2021-12-10
+ */
+@Data
+public class MemberVipHistoryDTO implements Serializable {
+
+    // 主键
+    private Long id;
+
+    // 会员id
+    private Long memberId;
+
+    // 会员vip等级
+    private Integer vip;
+
+    // 修改之前vip等级  
+    private Integer beforeVip;
+
+    // vip失效时间
+    private LocalDateTime vipExpireTime;
+
+    // 状态 1正常  0已过期
+    private Integer status;
+
+    // 创建时间
+    private Timestamp createTime;
+
+    // 修改时间
+    private Timestamp updateTime;
+}

+package com.topdraw.business.module.member.viphistory.service.dto;
+
+import lombok.Data;
+
+/**
+ * @author luerlong
+ * @date 2021-12-10
+ */
+@Data
+public class MemberVipHistoryQueryCriteria {
+}

+package com.topdraw.business.module.member.viphistory.service.impl;
+
+
+import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
+import com.topdraw.business.module.member.viphistory.repository.MemberVipHistoryRepository;
+import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
+import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
+import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria;
+import com.topdraw.business.module.member.viphistory.service.mapper.MemberVipHistoryMapper;
+import com.topdraw.utils.PageUtil;
+import com.topdraw.utils.QueryHelp;
+import com.topdraw.utils.ValidationUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * @author luerlong
+ * @date 2021-12-10
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
+
+    @Autowired
+    private MemberVipHistoryRepository memberVipHistoryRepository;
+
+    @Autowired
+    private MemberVipHistoryMapper memberVipHistoryMapper;
+
+    @Override
+    public Map<String, Object> queryAll(MemberVipHistoryQueryCriteria criteria, Pageable pageable) {
+        Page<MemberVipHistory> page = memberVipHistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
+        return PageUtil.toPage(page.map(memberVipHistoryMapper::toDto));
+    }
+
+    @Override
+    public List<MemberVipHistoryDTO> queryAll(MemberVipHistoryQueryCriteria criteria) {
+        return memberVipHistoryMapper.toDto(memberVipHistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+    }
+
+    @Override
+    public MemberVipHistoryDTO findById(Long id) {
+        MemberVipHistory memberVipHistory = memberVipHistoryRepository.findById(id).orElseGet(MemberVipHistory::new);
+        ValidationUtil.isNull(memberVipHistory.getId(),"MemberVipHistory","id",id);
+        return memberVipHistoryMapper.toDto(memberVipHistory);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void create(MemberVipHistory resources) {
+        memberVipHistoryRepository.save(resources);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(MemberVipHistory resources) {
+        MemberVipHistory memberVipHistory = memberVipHistoryRepository.findById(resources.getId()).orElseGet(MemberVipHistory::new);
+        ValidationUtil.isNull( memberVipHistory.getId(),"MemberVipHistory","id",resources.getId());
+        memberVipHistory.copy(resources);
+        memberVipHistoryRepository.save(memberVipHistory);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long id) {
+        Assert.notNull(id, "The given id must not be null!");
+        MemberVipHistory memberVipHistory = memberVipHistoryRepository.findById(id).orElseThrow(
+                () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberVipHistory.class, id), 1));
+        memberVipHistoryRepository.delete(memberVipHistory);
+    }
+
+    @Override
+    public MemberVipHistory findByTime(Long memberId, LocalDateTime nowTime) {
+        MemberVipHistory memberVipHistory = this.memberVipHistoryRepository.findByTime(memberId, nowTime).orElseGet(MemberVipHistory::new);
+        return memberVipHistory;
+    }
+
+
+}

+package com.topdraw.business.module.member.viphistory.service.mapper;
+
+import com.topdraw.base.BaseMapper;
+import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
+import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+/**
+ * @author luerlong
+ * @date 2021-12-10
+ */
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface MemberVipHistoryMapper extends BaseMapper<MemberVipHistoryDTO, MemberVipHistory> {
+
+}

-package com.topdraw.business.basicdata.points.available.domain;
+package com.topdraw.business.module.points.available.domain;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
@@ -11,7 +10,6 @@ import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.UUID;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 
 

-package com.topdraw.business.basicdata.points.available.repository;
+package com.topdraw.business.module.points.available.repository;
 
 
-import com.topdraw.business.basicdata.points.available.domain.PointsAvailable;
-import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableDTO;
-import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria;
+import com.topdraw.business.module.points.available.domain.PointsAvailable;
+import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
+import com.topdraw.business.module.points.available.service.dto.PointsAvailableQueryCriteria;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Modifying;

-package com.topdraw.business.basicdata.points.available.rest;
-
-import com.topdraw.common.ResultInfo;
-import com.topdraw.annotation.Log;
-import com.topdraw.business.basicdata.points.available.domain.PointsAvailable;
-import com.topdraw.business.basicdata.points.available.service.PointsAvailableService;
-import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
+package com.topdraw.business.module.points.available.rest;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan

-package com.topdraw.business.basicdata.points.available.service;
+package com.topdraw.business.module.points.available.service;
 
 
-import com.topdraw.business.basicdata.points.available.domain.PointsAvailable;
-import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableDTO;
-import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria;
+import com.topdraw.business.module.points.available.domain.PointsAvailable;
+import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
+import com.topdraw.business.module.points.available.service.dto.PointsAvailableQueryCriteria;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.Map;
 import java.util.Map;
 import java.util.List;
 import java.util.List;
 
 

-package com.topdraw.business.basicdata.points.available.service.dto;
+package com.topdraw.business.module.points.available.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;

-package com.topdraw.business.basicdata.points.available.service.dto;
+package com.topdraw.business.module.points.available.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import com.topdraw.annotation.Query;
 import com.topdraw.annotation.Query;