1.update

@@ -33,8 +33,8 @@
         <!--代码生成器-->
         <dependency>
             <groupId>com.topdraw</groupId>
-            <artifactId>code-generator</artifactId>
-            <version>3.1.0</version>
+            <artifactId>cronos-system</artifactId>
+            <version>1.1.0</version>
         </dependency>
 
         <!-- Spring boot 热部署 : 此热部署会遇到 java.lang.ClassCastException 异常 -->

+package com.topdraw.business.module.common.domain;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.persistence.Transient;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/2/10 10:12
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/2/10 10:12
+ */
+@Data
+@Accessors(chain = true)
+public class DefaultAsyncMqModule {
+
+    @Transient
+    private String memberCode;
+
+}

-package com.topdraw.business.basicdata.coupon.domain;
+package com.topdraw.business.module.coupon.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

-package com.topdraw.business.basicdata.coupon.history.domain;
+package com.topdraw.business.module.coupon.history.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
@@ -11,6 +11,7 @@ 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
@@ -47,11 +48,11 @@ public class CouponHistory implements Serializable {
 
     // 领取时间
     @Column(name = "receive_time")
-    private Timestamp receiveTime;
+    private LocalDateTime receiveTime;
 
     // 失效时间
     @Column(name = "expire_time")
-    private Timestamp expireTime;
+    private LocalDateTime expireTime;
 
     // 使用状态 0：未使用；1：已使用；-1：已过期
     @Column(name = "use_status")
@@ -59,7 +60,7 @@ public class CouponHistory implements Serializable {
 
     // 使用时间
     @Column(name = "use_time")
-    private Timestamp useTime;
+    private LocalDateTime useTime;
 
     // 订单详情id
     @Column(name = "order_detail_id")
@@ -68,12 +69,12 @@ public class CouponHistory implements Serializable {
     // 创建时间
     @CreatedDate
     @Column(name = "create_time")
-    private Timestamp createTime;
+    private LocalDateTime createTime;
 
     // 更新时间
     @LastModifiedDate
     @Column(name = "update_time")
-    private Timestamp updateTime;
+    private LocalDateTime updateTime;
 
     public void copy(CouponHistory source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

-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.JpaSpecificationExecutor;
 
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 /**
  * @author XiangHan
@@ -14,7 +15,7 @@ public interface CouponHistoryRepository extends JpaRepository<CouponHistory, Lo
 
     Long countByUserId(Long userId);
 
-    Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now);
+    Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now);
 
-    Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime);
+    Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime);
 }

-package com.topdraw.business.basicdata.coupon.history.rest;
+package com.topdraw.business.module.coupon.history.rest;
 
-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 com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +35,6 @@ public class CouponHistoryController {
         return ResultInfo.success(CouponHistoryService.queryAll(criteria));
     }
 
-    @Log
     @PostMapping
     @ApiOperation("新增CouponHistory")
     public ResultInfo create(@Validated @RequestBody CouponHistory resources) {
@@ -44,7 +42,6 @@ public class CouponHistoryController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping
     @ApiOperation("修改CouponHistory")
     public ResultInfo update(@Validated @RequestBody CouponHistory resources) {
@@ -53,7 +50,6 @@ public class CouponHistoryController {
     }
 
 
-    @Log
     @DeleteMapping(value = "/{id}")
     @ApiOperation("删除CouponHistory")
     public ResultInfo delete(@PathVariable Long id) {

-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 java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -45,7 +46,7 @@ public interface CouponHistoryService {
 
     Long countByUserId(Long userId);
 
-    Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now);
+    Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now);
 
-    Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime);
+    Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime);
 }

-package com.topdraw.business.basicdata.coupon.history.service.dto;
+package com.topdraw.business.module.coupon.history.service.dto;
 
 import lombok.Data;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 
 /**
@@ -29,23 +30,23 @@ public class CouponHistoryDTO implements Serializable {
     private String userNickname;
 
     // 领取时间
-    private Timestamp receiveTime;
+    private LocalDateTime receiveTime;
 
     // 失效时间
-    private Timestamp expireTime;
+    private LocalDateTime expireTime;
 
     // 使用状态 0：未使用；1：已使用；-1：已过期
     private Integer useStatus;
 
     // 使用时间
-    private Timestamp useTime;
+    private LocalDateTime useTime;
 
     // 订单详情id
     private Long orderDetailId;
 
     // 创建时间
-    private Timestamp createTime;
+    private LocalDateTime createTime;
 
     // 更新时间
-    private Timestamp updateTime;
+    private LocalDateTime updateTime;
 }

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

-package com.topdraw.business.basicdata.coupon.history.service.impl;
-
-import com.topdraw.business.basicdata.coupon.history.domain.CouponHistory;
-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;
+package com.topdraw.business.module.coupon.history.service.impl;
+
+import com.topdraw.business.module.coupon.history.domain.CouponHistory;
+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 com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.ValidationUtil;
@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -84,12 +85,12 @@ public class CouponHistoryServiceImpl implements CouponHistoryService {
     }
 
     @Override
-    public Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now) {
+    public Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now) {
         return this.CouponHistoryRepository.countByUserIdAndExpireTimeBefore(userId,now);
     }
 
     @Override
-    public Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime) {
+    public Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime) {
         return this.CouponHistoryRepository.countByUserIdAndExpireTimeBetween(userId,now,expireTime);
     }
 

-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.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.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.JpaSpecificationExecutor;
 

-package com.topdraw.business.basicdata.coupon.rest;
+package com.topdraw.business.module.coupon.rest;
 
-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 com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +35,6 @@ public class CouponController {
         return ResultInfo.success(CouponService.queryAll(criteria));
     }
 
-    @Log
     @PostMapping
     @ApiOperation("新增Coupon")
     public ResultInfo create(@Validated @RequestBody Coupon resources) {
@@ -44,7 +42,6 @@ public class CouponController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping
     @ApiOperation("修改Coupon")
     public ResultInfo update(@Validated @RequestBody Coupon resources) {
@@ -52,8 +49,6 @@ public class CouponController {
         return ResultInfo.success();
     }
 
-
-    @Log
     @DeleteMapping(value = "/{id}")
     @ApiOperation("删除Coupon")
     public ResultInfo delete(@PathVariable Long id) {

-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 java.util.List;

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

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

-package com.topdraw.business.basicdata.coupon.service.impl;
+package com.topdraw.business.module.coupon.service.impl;
 
-import com.topdraw.business.basicdata.coupon.domain.Coupon;
-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.domain.Coupon;
+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 com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;

-package com.topdraw.business.basicdata.coupon.service.mapper;
+package com.topdraw.business.module.coupon.service.mapper;
 
 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.ReportingPolicy;
 

-package com.topdraw.business.basicdata.exp.detail.domain;
+package com.topdraw.business.module.exp.detail.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

-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.JpaSpecificationExecutor;
 

-package com.topdraw.business.basicdata.exp.detail.rest;
+package com.topdraw.business.module.exp.detail.rest;
 
-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 com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +35,6 @@ public class ExpDetailController {
         return ResultInfo.success(ExpDetailService.queryAll(criteria));
     }
 
-    @Log
     @PostMapping
     @ApiOperation("新增ExpDetail")
     public ResultInfo create(@Validated @RequestBody ExpDetail resources) {
@@ -44,7 +42,6 @@ public class ExpDetailController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping
     @ApiOperation("修改ExpDetail")
     public ResultInfo update(@Validated @RequestBody ExpDetail resources) {
@@ -52,8 +49,6 @@ public class ExpDetailController {
         return ResultInfo.success();
     }
 
-
-    @Log
     @DeleteMapping(value = "/{id}")
     @ApiOperation("删除ExpDetail")
     public ResultInfo delete(@PathVariable Long id) {

-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 java.util.List;

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

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

-package com.topdraw.business.basicdata.exp.detail.service.impl;
+package com.topdraw.business.module.exp.detail.service.impl;
 
-import com.topdraw.business.basicdata.exp.detail.domain.ExpDetail;
-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.domain.ExpDetail;
+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 com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;

-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.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.ReportingPolicy;
 

-package com.topdraw.business.basicdata.exp.history.domain;
+package com.topdraw.business.module.exp.history.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

-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.JpaSpecificationExecutor;
 

-package com.topdraw.business.basicdata.exp.history.rest;
+package com.topdraw.business.module.exp.history.rest;
 
-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.domain.ExpHistory;
+import com.topdraw.business.module.exp.history.service.ExpHistoryService;
+import com.topdraw.business.module.exp.history.service.dto.ExpHistoryQueryCriteria;
 import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +35,6 @@ public class ExpHistoryController {
         return ResultInfo.success(ExpHistoryService.queryAll(criteria));
     }
 
-    @Log
     @PostMapping
     @ApiOperation("新增ExpHistory")
     public ResultInfo create(@Validated @RequestBody ExpHistory resources) {
@@ -44,7 +42,6 @@ public class ExpHistoryController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping
     @ApiOperation("修改ExpHistory")
     public ResultInfo update(@Validated @RequestBody ExpHistory resources) {
@@ -52,8 +49,6 @@ public class ExpHistoryController {
         return ResultInfo.success();
     }
 
-
-    @Log
     @DeleteMapping(value = "/{id}")
     @ApiOperation("删除ExpHistory")
     public ResultInfo delete(@PathVariable Long id) {

-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 java.util.List;

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

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

-package com.topdraw.business.basicdata.exp.history.service.impl;
+package com.topdraw.business.module.exp.history.service.impl;
 
-import com.topdraw.business.basicdata.exp.history.domain.ExpHistory;
-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.domain.ExpHistory;
+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 com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;

-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.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.ReportingPolicy;
 

-package com.topdraw.business.basicdata.member.address.domain;
+package com.topdraw.business.module.member.address.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

-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.JpaSpecificationExecutor;
 

-package com.topdraw.business.basicdata.member.address.rest;
+package com.topdraw.business.module.member.address.rest;
 
-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 com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +35,6 @@ public class MemberAddressController {
         return ResultInfo.success(MemberAddressService.findById(id));
     }
 
-    @Log
     @PostMapping(value = "/create")
     @ApiOperation("新增MemberAddress")
     public ResultInfo create(@Validated @RequestBody MemberAddress resources) {
@@ -44,7 +42,6 @@ public class MemberAddressController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping(value = "/update")
     @ApiOperation("修改MemberAddress")
     public ResultInfo update(@Validated @RequestBody MemberAddress resources) {
@@ -52,7 +49,6 @@ public class MemberAddressController {
         return ResultInfo.success();
     }
 
-    @Log
     @DeleteMapping(value = "/delete/{id}")
     @ApiOperation("删除MemberAddress")
     public ResultInfo delete(@PathVariable Long id) {

-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 java.util.List;

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

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

-package com.topdraw.business.basicdata.member.address.service.impl;
+package com.topdraw.business.module.member.address.service.impl;
 
-import com.topdraw.business.basicdata.member.address.domain.MemberAddress;
-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.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.address.domain.MemberAddress;
+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 com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.ValidationUtil;
@@ -63,6 +63,9 @@ public class MemberAddressServiceImpl implements MemberAddressService {
     @Transactional(rollbackFor = Exception.class)
     public void create(MemberAddress resources) {
         String memberCode = resources.getMemberCode();
+        MemberDTO memberDTO = this.memberService.getByCode(memberCode);
+        Long id = memberDTO.getId();
+        resources.setMemberId(id);
         MemberAddressRepository.save(resources);
     }
 

-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.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.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.copier.CopyOptions;
@@ -116,17 +116,17 @@ public class Member implements Serializable {
 
     // iptv账号绑定时间
     @Column(name = "bind_iptv_time")
-    private Timestamp bindIptvTime;
+    private LocalDateTime bindIptvTime;
 
     // 创建时间
     @CreatedDate
     @Column(name = "create_time")
-    private Timestamp createTime;
+    private LocalDateTime createTime;
 
     // 更新时间
     @LastModifiedDate
     @Column(name = "update_time")
-    private Timestamp updateTime;
+    private LocalDateTime updateTime;
 
     // 是否在黑名单   1：是；0否
     @Column(name = "black_status")

-package com.topdraw.business.basicdata.member.level.domain;
+package com.topdraw.business.module.member.level.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

-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.JpaSpecificationExecutor;
 

-package com.topdraw.business.basicdata.member.level.rest;
+package com.topdraw.business.module.member.level.rest;
 
-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.domain.MemberLevel;
+import com.topdraw.business.module.member.level.service.MemberLevelService;
+import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria;
 import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +35,6 @@ public class MemberLevelController {
         return ResultInfo.success(MemberLevelService.queryAll(criteria));
     }
 
-    @Log
     @PostMapping
     @ApiOperation("新增MemberLevel")
     public ResultInfo create(@Validated @RequestBody MemberLevel resources) {
@@ -44,7 +42,6 @@ public class MemberLevelController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping
     @ApiOperation("修改MemberLevel")
     public ResultInfo update(@Validated @RequestBody MemberLevel resources) {
@@ -52,8 +49,6 @@ public class MemberLevelController {
         return ResultInfo.success();
     }
 
-
-    @Log
     @DeleteMapping(value = "/{id}")
     @ApiOperation("删除MemberLevel")
     public ResultInfo delete(@PathVariable Long id) {

-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 java.util.List;

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

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

-package com.topdraw.business.basicdata.member.level.service.impl;
+package com.topdraw.business.module.member.level.service.impl;
 
-import com.topdraw.business.basicdata.member.level.domain.MemberLevel;
-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.domain.MemberLevel;
+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 com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;

-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.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.ReportingPolicy;
 

-package com.topdraw.business.basicdata.member.profile.domain;
+package com.topdraw.business.module.member.profile.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

-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.JpaSpecificationExecutor;
 
+import java.util.Optional;
+
 /**
  * @author XiangHan
  * @date 2021-10-22

-package com.topdraw.business.basicdata.member.profile.rest;
+package com.topdraw.business.module.member.profile.rest;
 
-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.business.module.member.profile.service.dto.MemberProfileQueryCriteria;
 import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +35,6 @@ public class MemberProfileController {
         return ResultInfo.success(MemberProfileService.queryAll(criteria));
     }
 
-    @Log
     @PostMapping
     @ApiOperation("新增MemberProfile")
     public ResultInfo create(@Validated @RequestBody MemberProfile resources) {
@@ -44,7 +42,6 @@ public class MemberProfileController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping
     @ApiOperation("修改MemberProfile")
     public ResultInfo update(@Validated @RequestBody MemberProfile resources) {
@@ -52,8 +49,6 @@ public class MemberProfileController {
         return ResultInfo.success();
     }
 
-
-    @Log
     @DeleteMapping(value = "/{id}")
     @ApiOperation("删除MemberProfile")
     public ResultInfo delete(@PathVariable Long id) {

-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 java.util.List;
@@ -36,7 +36,7 @@ public interface MemberProfileService {
      */
     MemberProfileDTO findById(Long id);
 
-    void create(MemberProfile resources);
+    MemberProfile create(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 javax.persistence.Column;
 import java.io.Serializable;
 import java.sql.Timestamp;
 

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

-package com.topdraw.business.basicdata.member.profile.service.impl;
-
-import com.topdraw.business.basicdata.member.profile.domain.MemberProfile;
-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.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
+package com.topdraw.business.module.member.profile.service.impl;
+
+import com.topdraw.business.module.member.profile.domain.MemberProfile;
+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 com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;
@@ -61,7 +61,7 @@ public class MemberProfileServiceImpl implements MemberProfileService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void create(MemberProfile resources) {
+    public MemberProfile create(MemberProfile resources) {
         String memberCode = resources.getMemberCode();
         MemberDTO memberDTO = this.memberService.getByCode(memberCode);
         if (Objects.nonNull(memberDTO)) {
@@ -73,6 +73,8 @@ public class MemberProfileServiceImpl implements MemberProfileService {
                 MemberProfileRepository.save(resources);
             }
         }
+
+        return resources;
     }
 
     @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.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.ReportingPolicy;
 

-package com.topdraw.business.basicdata.member.relatedinfo.domain;
+package com.topdraw.business.module.member.relatedinfo.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

-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.basicdata.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
+import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 import java.util.List;
-import java.util.Optional;
 
 /**
  * @author XiangHan

-package com.topdraw.business.basicdata.member.relatedinfo.rest;
+package com.topdraw.business.module.member.relatedinfo.rest;
 
-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 com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +29,6 @@ public class MemberRelatedInfoController {
         return ResultInfo.successPage(MemberRelatedInfoService.queryAll(criteria,pageable));
     }
 
-    @Log
     @PostMapping(value = "/create")
     @ApiOperation("新增MemberRelatedInfo")
     public ResultInfo create(@Validated @RequestBody MemberRelatedInfo resources) {
@@ -38,7 +36,6 @@ public class MemberRelatedInfoController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping(value = "/update")
     @ApiOperation("修改MemberRelatedInfo")
     public ResultInfo update(@Validated @RequestBody MemberRelatedInfo resources) {
@@ -52,7 +49,6 @@ public class MemberRelatedInfoController {
         return ResultInfo.success(MemberRelatedInfoService.findById(id));
     }
 
-    @Log
     @DeleteMapping(value = "/delete//{id}")
     @ApiOperation("删除MemberRelatedInfo")
     public ResultInfo delete(@PathVariable Long id) {

-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 java.util.List;

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

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

-package com.topdraw.business.basicdata.member.relatedinfo.service.impl;
+package com.topdraw.business.module.member.relatedinfo.service.impl;
 
-import com.topdraw.business.basicdata.member.relatedinfo.domain.MemberRelatedInfo;
-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.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
+import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
+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 com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.ValidationUtil;
@@ -24,7 +24,6 @@ import org.springframework.util.CollectionUtils;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 /**
  * @author XiangHan

-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.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.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.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

-package com.topdraw.business.basicdata.member.rest;
+package com.topdraw.business.module.member.rest;
 
-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.MemberQueryCriteria;
+import com.topdraw.business.module.member.domain.Member;
+import com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberQueryCriteria;
 import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,7 +35,6 @@ public class MemberController {
         return ResultInfo.success(memberService.findById(id));
     }
 
-    @Log
     @PostMapping(value = "/create")
     @ApiOperation("新增Member")
     public ResultInfo create(@Validated @RequestBody Member resources) {
@@ -44,7 +42,6 @@ public class MemberController {
         return ResultInfo.success();
     }
 
-    @Log
     @PutMapping(value = "/update")
     @ApiOperation("修改Member")
     public ResultInfo update(@Validated @RequestBody Member resources) {

-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.service.dto.MemberDTO;
+import com.topdraw.business.module.member.service.dto.MemberQueryCriteria;
+import com.topdraw.business.module.user.iptv.domain.UserTv;
 import org.springframework.data.domain.Pageable;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
@@ -39,6 +40,8 @@ public interface MemberService {
 
     Long create(Member resources);
 
+    void unbind(Member resources);
+
     void update(Member resources);
 
     void delete(Long id);
@@ -53,4 +56,6 @@ public interface MemberService {
     boolean createMemberByUserTv(UserTv resources);
 
     void doUpdateMemberPoints(Member member);
+
+    Member createAndReturnMember(Member resources);
 }

-package com.topdraw.business.basicdata.member.service.dto;
+package com.topdraw.business.module.member.service.dto;
 
 import lombok.Data;
 
@@ -78,13 +78,13 @@ public class MemberDTO implements Serializable {
     private Integer bindIptvPlatformType;
 
     // iptv账号绑定时间
-    private Timestamp bindIptvTime;
+    private LocalDateTime bindIptvTime;
 
     // 创建时间
-    private Timestamp createTime;
+    private LocalDateTime createTime;
 
     // 更新时间
-    private Timestamp updateTime;
+    private LocalDateTime updateTime;
 
     // 是否在黑名单   1：是；0否
 //    private Integer blackStatus;

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

-package com.topdraw.business.basicdata.member.service.impl;
-
-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;
+package com.topdraw.business.module.member.service.impl;
+
+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.business.module.user.iptv.domain.UserTv;
+import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
 import com.topdraw.config.LocalConstants;
 import com.topdraw.util.IdWorker;
 import com.topdraw.util.RedissonUtil;
@@ -22,6 +21,7 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -30,6 +30,7 @@ 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.Objects;
@@ -50,7 +51,7 @@ public class MemberServiceImpl implements MemberService {
     private MemberMapper memberMapper;
 
     @Autowired
-    private com.topdraw.business.basicdata.user.iptv.service.UserTvService UserTvService;
+    private com.topdraw.business.module.user.iptv.service.UserTvService UserTvService;
 
     @Autowired
     private RedissonClient redissonClient;
@@ -105,14 +106,31 @@ public class MemberServiceImpl implements MemberService {
         return member;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void unbind(Member resources) {
+        try {
+            String code = resources.getCode();
+            MemberDTO memberDTO = this.getByCode(code);
+//            Member member = memberRepository.findById(resources.getId()).orElseGet(Member::new);
+            ValidationUtil.isNull(memberDTO.getId(), "Member", "id", resources.getId());
+            Member member = new Member();
+            BeanUtils.copyProperties(memberDTO,member);
 
+            member.setUserIptvId(null);
+            member.setBindIptvTime(null);
+            member.setBindIptvPlatformType(null);
+            this.save(member);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(Member resources) {
-        RLock rLock = this.redissonClient.getLock("Member::update::code" + resources.getCode());
         try {
-            RedissonUtil.lock(rLock);
             Member member = memberRepository.findByCode(resources.getCode()).orElseGet(Member::new);
             ValidationUtil.isNull( member.getId(),"Member","id",member.getId());
             if (Objects.nonNull(member)) {
@@ -121,21 +139,24 @@ public class MemberServiceImpl implements MemberService {
 
                 String platformAccount = resources.getPlatformAccount();
                 if (StringUtils.isNotEmpty(platformAccount)) {
+                    resources.setUserIptvId(null);
+
                     UserTvDTO userTvDTO = this.UserTvService.findByPlatformAccount(platformAccount);
                     if (Objects.nonNull(userTvDTO)) {
                         Long userIptvId = userTvDTO.getId();
                         resources.setUserIptvId(userIptvId);
+                        resources.setBindIptvPlatformType(1);
+                        resources.setBindIptvTime(LocalDateTime.now());
                     }
                 }
             }
 
             member.copy(resources);
+            log.info("memberService ==>> update ==>> [{}]",member);
             memberRepository.save(member);
         } catch (Exception e) {
             e.printStackTrace();
             throw e;
-        } finally {
-            RedissonUtil.unlock(rLock);
         }
     }
 
@@ -186,7 +207,7 @@ public class MemberServiceImpl implements MemberService {
                 if (Objects.nonNull(userIptvId)) {
                     member.setId(memberId);
                     member.setUserIptvId(userIptvId);
-                    member.setBindIptvTime(TimestampUtil.now());
+                    member.setBindIptvTime(LocalDateTime.now());
                     this.bindIptvId(member);
                 }
             }
@@ -216,10 +237,17 @@ public class MemberServiceImpl implements MemberService {
         }
     }
 
-    private void save(Member member){
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Member createAndReturnMember(Member resources) {
+        Member member = this.checkMemberData(resources);
         memberRepository.save(member);
+        return resources;
     }
 
+    private void save(Member member){
+        memberRepository.save(member);
+    }
 
     public void bindIptvId(Member resources) {
         RLock rLock = this.redissonClient.getLock("Member::update::code::" + resources.getCode());

-package com.topdraw.business.basicdata.member.service.mapper;
+package com.topdraw.business.module.member.service.mapper;
 
 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.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.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));
+    }
+
+    @PostMapping
+    @ApiOperation("新增MemberVipHistory")
+    public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) {
+        memberVipHistoryService.create(resources);
+        return ResultInfo.success();
+    }
+
+    @PutMapping
+    @ApiOperation("修改MemberVipHistory")
+    public ResultInfo update(@Validated @RequestBody MemberVipHistory resources) {
+        memberVipHistoryService.update(resources);
+        return ResultInfo.success();
+    }
+
+    @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;
+
+/**
+ * @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;
+
+/**
+ * @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 cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

-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.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

-package com.topdraw.business.basicdata.points.available.rest;
+package com.topdraw.business.module.points.available.rest;
 
 /**
  * @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 java.time.LocalDateTime;

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

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

-package com.topdraw.business.basicdata.points.available.service.dto;
+package com.topdraw.business.module.points.available.service.dto;
 
 public enum PointsAvailableQueryType {
 

-package com.topdraw.business.basicdata.points.available.service.impl;
-
-import com.topdraw.business.basicdata.member.service.MemberService;
-import com.topdraw.business.basicdata.member.service.dto.MemberDTO;
-import com.topdraw.business.basicdata.points.available.domain.PointsAvailable;
-import com.topdraw.business.basicdata.points.available.repository.PointsAvailableRepository;
-import com.topdraw.business.basicdata.points.available.service.PointsAvailableService;
-import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableDTO;
-import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableQueryCriteria;
-import com.topdraw.business.basicdata.points.available.service.mapper.PointsAvailableMapper;
+package com.topdraw.business.module.points.available.service.impl;
+
+import com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
+import com.topdraw.business.module.points.available.domain.PointsAvailable;
+import com.topdraw.business.module.points.available.repository.PointsAvailableRepository;
+import com.topdraw.business.module.points.available.service.PointsAvailableService;
+import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
+import com.topdraw.business.module.points.available.service.dto.PointsAvailableQueryCriteria;
+import com.topdraw.business.module.points.available.service.mapper.PointsAvailableMapper;
 import com.topdraw.util.RedissonUtil;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;

-package com.topdraw.business.basicdata.points.available.service.mapper;
+package com.topdraw.business.module.points.available.service.mapper;
 
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.points.available.domain.PointsAvailable;
-import com.topdraw.business.basicdata.points.available.service.dto.PointsAvailableDTO;
+import com.topdraw.business.module.points.available.domain.PointsAvailable;
+import com.topdraw.business.module.points.available.service.dto.PointsAvailableDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

-package com.topdraw.business.basicdata.points.detail.detailhistory.domain;
+package com.topdraw.business.module.points.detail.detailhistory.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;

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

-package com.topdraw.business.basicdata.points.detail.detailhistory.rest;
+package com.topdraw.business.module.points.detail.detailhistory.rest;
 
 import io.swagger.annotations.Api;
 

-package com.topdraw.business.basicdata.points.detail.detailhistory.service;
+package com.topdraw.business.module.points.detail.detailhistory.service;
 
-import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory;
-import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
-import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria;
+import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
+import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
+import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
 import java.util.List;

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

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

-package com.topdraw.business.basicdata.points.detail.detailhistory.service.impl;
+package com.topdraw.business.module.points.detail.detailhistory.service.impl;
 
-import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory;
-import com.topdraw.business.basicdata.points.detail.detailhistory.repository.PointsDetailHistoryRepository;
-import com.topdraw.business.basicdata.points.detail.detailhistory.service.PointsDetailHistoryService;
-import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
-import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria;
-import com.topdraw.business.basicdata.points.detail.detailhistory.service.mapper.PointsDetailHistoryMapper;
+import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
+import com.topdraw.business.module.points.detail.detailhistory.repository.PointsDetailHistoryRepository;
+import com.topdraw.business.module.points.detail.detailhistory.service.PointsDetailHistoryService;
+import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
+import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryQueryCriteria;
+import com.topdraw.business.module.points.detail.detailhistory.service.mapper.PointsDetailHistoryMapper;
 import com.topdraw.utils.PageUtil;
 import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;

-package com.topdraw.business.basicdata.points.detail.detailhistory.service.mapper;
+package com.topdraw.business.module.points.detail.detailhistory.service.mapper;
 
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.basicdata.points.detail.detailhistory.domain.PointsDetailHistory;
-import com.topdraw.business.basicdata.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
+import com.topdraw.business.module.points.detail.detailhistory.domain.PointsDetailHistory;
+import com.topdraw.business.module.points.detail.detailhistory.service.dto.PointsDetailHistoryDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 

-package com.topdraw.business.basicdata.points.detail.domain;
+package com.topdraw.business.module.points.detail.domain;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;