Merge branch '2.0.0-develop'

# Conflicts:
#	member-service-impl/src/main/java/com/topdraw/business/module/member/address/domain/MemberAddress.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/profile/domain/MemberProfileBuild.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/profile/service/dto/MemberProfileDTO.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/profile/service/impl/MemberProfileServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/rest/MemberController.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/service/MemberService.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/service/impl/MemberServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/business/module/member/viphistory/service/impl/MemberVipHistoryServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/business/module/user/iptv/domain/UserTv.java
#	member-service-impl/src/main/java/com/topdraw/business/module/user/iptv/service/dto/UserTvDTO.java
#	member-service-impl/src/main/java/com/topdraw/business/module/user/weixin/service/dto/UserWeixinDTO.java
#	member-service-impl/src/main/java/com/topdraw/business/process/domian/TempIptvUser.java
#	member-service-impl/src/main/java/com/topdraw/business/process/rest/MemberOperationController.java
#	member-service-impl/src/main/java/com/topdraw/business/process/rest/UserOperationController.java
#	member-service-impl/src/main/java/com/topdraw/business/process/service/UserOperationService.java
#	member-service-impl/src/main/java/com/topdraw/business/process/service/impl/UserOperationServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/business/process/service/impl/member/MemberOperationServiceImpl.java
#	member-service-impl/src/main/java/com/topdraw/resttemplate/RestTemplateClient.java
#	member-service-impl/src/main/resources/config/application-dev.yml
#	member-service-impl/src/test/java/com/topdraw/test/business/basicdata/member/profile/MemberProfileServiceTest.java
#	member-service-impl/src/test/java/com/topdraw/test/business/basicdata/member/rest/MemberControllerTest.java
#	member-service-impl/src/test/java/com/topdraw/test/business/basicdata/member/rest/MemberProfileControllerTest.java
#	member-service-impl/src/test/java/com/topdraw/test/business/process/rest/UserOperationControllerTest.java

+ALTER TABLE `uc_user_tv`
+MODIFY COLUMN `platform_account` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '运营商平台账号' AFTER `id`,
+MODIFY COLUMN `member_id` bigint(20) NULL DEFAULT NULL COMMENT '会员id' AFTER `platform_account`,
+ADD COLUMN `vis_user_id` bigint(0) UNSIGNED NULL COMMENT 'vis_user表主键' AFTER `member_id`,
+MODIFY COLUMN `priority_member_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主会员编码' AFTER `member_id`,
+MODIFY COLUMN `platform` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '运营商平台' AFTER `image`,
+MODIFY COLUMN `person_id` bigint(20) NULL DEFAULT NULL COMMENT '人ID' AFTER `update_time`,
+ADD UNIQUE INDEX `unique_vis_user_id`(`vis_user_id`) USING BTREE;
\ No newline at end of file

@@ -17,17 +17,18 @@
 
 
     <dependencies>
     <dependencies>
         <!--系统-->
         <!--系统-->
-        <dependency>
+        <!--<dependency>
             <groupId>com.topdraw</groupId>
             <groupId>com.topdraw</groupId>
             <artifactId>cronos-system</artifactId>
             <artifactId>cronos-system</artifactId>
             <version>${cronos.version}</version>
             <version>${cronos.version}</version>
-        </dependency>
+        </dependency>-->
+
         <!--代码生成器-->
         <!--代码生成器-->
-        <dependency>
+        <!--<dependency>
             <groupId>com.topdraw</groupId>
             <groupId>com.topdraw</groupId>
             <artifactId>cronos-generator</artifactId>
             <artifactId>cronos-generator</artifactId>
             <version>${cronos.version}</version>
             <version>${cronos.version}</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
     </dependencies>
 
 
 </project>
 </project>
\ No newline at end of file

@@ -15,16 +15,27 @@
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <maven.compiler.target>8</maven.compiler.target>
         <jjwt.version>0.9.1</jjwt.version>
         <jjwt.version>0.9.1</jjwt.version>
+        <cronos.version>1.1.0</cronos.version>
     </properties>
     </properties>
 
 
 
 
     <dependencies>
     <dependencies>
 
 
-        <!--redisson-->
+        <!--<dependency>
+            <groupId>com.topdraw</groupId>
+            <artifactId>cronos-system</artifactId>
+            <version>${cronos.version}</version>
+        </dependency>-->
+
         <dependency>
         <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>3.16.3</version>
+            <groupId>com.topdraw</groupId>
+            <artifactId>code-generator</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-cache</artifactId>
         </dependency>
         </dependency>
 
 
         <!--api-->
         <!--api-->

@@ -9,6 +9,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.retry.annotation.EnableRetry;
 import org.springframework.retry.annotation.EnableRetry;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -24,6 +25,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableRetry
 @EnableRetry
 @EnableCaching
 @EnableCaching
 @SpringBootApplication(exclude = {SecurityAutoConfiguration.class})
 @SpringBootApplication(exclude = {SecurityAutoConfiguration.class})
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 public class MemberServiceApplication extends SpringBootServletInitializer {
 public class MemberServiceApplication extends SpringBootServletInitializer {
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {

@@ -2,6 +2,8 @@ package com.topdraw.aspect;
 
 
 
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
+import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
 import com.topdraw.mq.domain.TableOperationMsg;
 import com.topdraw.mq.domain.TableOperationMsg;
 import com.topdraw.mq.producer.MessageProducer;
 import com.topdraw.mq.producer.MessageProducer;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

@@ -2,12 +2,8 @@ package com.topdraw.business.module.common.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 
-import javax.persistence.Entity;
-import javax.persistence.EntityListeners;
 import javax.persistence.Transient;
 import javax.persistence.Transient;
-import java.io.Serializable;
 
 
 /**
 /**
  * @author ：
  * @author ：
@@ -20,9 +16,12 @@ import java.io.Serializable;
  */
  */
 @Data
 @Data
 @Accessors(chain = true)
 @Accessors(chain = true)
-public class DefaultAsyncMqModule {
+public class AsyncMqModule {
 
 
     @Transient
     @Transient
     private String memberCode;
     private String memberCode;
 
 
+    /** 运营商平台账号 */
+    @Transient
+    private String platformAccount;
 }
 }

+package com.topdraw.business.module.common.validated;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/3/7 21:20
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/3/7 21:20
+ */
+public interface CreateGroup {
+}

+package com.topdraw.business.module.common.validated;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/3/7 21:20
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/3/7 21:20
+ */
+public interface UpdateGroup {
+}

-package com.topdraw.business.module.points.standingbook.domain;
+package com.topdraw.business.module.contact.vis.domain;
 
 
 import lombok.Data;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.experimental.Accessors;
@@ -14,52 +14,60 @@ import java.io.Serializable;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
- * @date 2021-10-29
+ * @date 2022-04-24
  */
  */
 @Entity
 @Entity
 @Data
 @Data
 @EntityListeners(AuditingEntityListener.class)
 @EntityListeners(AuditingEntityListener.class)
 @Accessors(chain = true)
 @Accessors(chain = true)
-@Table(name="uc_points_standing_book")
-public class PointsStandingBook implements Serializable {
+@Table(name="x_activity_address")
+public class ActivityAddress implements Serializable {
 
 
-    // 主键
+    // id
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
     private Long id;
     private Long id;
 
 
-    // 积分生产
-    @Column(name = "points_produce", nullable = false)
-    private Long pointsProduce;
+    // vis的用户id
+    @Column(name = "user_id", nullable = false)
+    private Long userId;
 
 
-    // 积分消耗
-    @Column(name = "points_consume", nullable = false)
-    private Long pointsConsume;
+    // 大屏账号
+    @Column(name = "platform_account")
+    private String platformAccount;
 
 
-    // 可用总积分
-    @Column(name = "points_available", nullable = false)
-    private Long pointsAvailable;
+    // 活动id
+    @Column(name = "activity_id", nullable = false)
+    private Long activityId;
 
 
-    // 积分过期
-    @Column(name = "points_expire", nullable = false)
-    private Long pointsExpire;
+    // 应用id
+    @Column(name = "app_id")
+    private Long appId;
 
 
-    // 日期
-    @Column(name = "day")
-    private String day;
+    // 收货人名称
+    @Column(name = "name")
+    private String name;
+
+    // 收货人地址
+    @Column(name = "address")
+    private String address;
+
+    // 收获人手机号
+    @Column(name = "cellphone")
+    private String cellphone;
 
 
     // 创建时间
     // 创建时间
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 创建时间
+    // 更新时间
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
     private Timestamp updateTime;
     private Timestamp updateTime;
 
 
-    public void copy(PointsStandingBook source){
+    public void copy(ActivityAddress source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
     }
 }
 }

+package com.topdraw.business.module.contact.vis.repository;
+
+import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author XiangHan
+ * @date 2022-04-24
+ */
+public interface ActivityAddressRepository extends JpaRepository<ActivityAddress, Long>, JpaSpecificationExecutor<ActivityAddress> {
+
+    List<ActivityAddress> findByPlatformAccount(String platformAccount);
+
+    Optional<ActivityAddress> findByPlatformAccountAndActivityId(String platformAccount, Long activityId);
+}

+package com.topdraw.business.module.contact.vis.rest;
+
+import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
+import com.topdraw.common.ResultInfo;
+import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
+import com.topdraw.business.module.contact.vis.service.ActivityAddressService;
+import com.topdraw.exception.BadRequestException;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author XiangHan
+ * @date 2022-04-24
+ */
+@Api(tags = "中奖人联系方式管理")
+@RestController
+@RequestMapping("/uce/activityAddress")
+@Slf4j
+public class ActivityAddressController {
+
+    @Autowired
+    private ActivityAddressService activityAddressService;
+
+    @GetMapping(value = "/findByPlatformAccountAndActivityId")
+    @ApiOperation("查询指定活动事件的中奖人联系方式")
+    @AnonymousAccess
+    public ResultInfo findByPlatformAccountAndActivityId(@RequestParam(value = "platformAccount") String platformAccount,
+                                                         @RequestParam(value = "activityId") Long activityId) {
+        log.info("activityAddress ==>> findByPlatformAccountAndActivityId ==>> platformAccount ==>> {}", platformAccount);
+        log.info("activityAddress ==>> findByPlatformAccountAndActivityId ==>> activityId ==>> {}", activityId);
+        if (StringUtils.isBlank(platformAccount)) {
+            throw new BadRequestException("platformAccount is nul");
+        }
+
+        if (Objects.isNull(activityId)) {
+            throw new BadRequestException("activityId is nul");
+        }
+
+        ActivityAddress activityAddress = new ActivityAddress();
+        activityAddress.setPlatformAccount(platformAccount);
+        activityAddress.setActivityId(activityId);
+        ActivityAddressDTO activityAddressDTO = this.activityAddressService.findByPlatformAccountAndActivityId(activityAddress);
+        return ResultInfo.success(activityAddressDTO);
+    }
+
+    @GetMapping(value = "/findByPlatformAccount")
+    @ApiOperation("查询所有ActivityAddress")
+    @AnonymousAccess
+    public ResultInfo findByPlatformAccount(@RequestParam(value = "platformAccount") String platformAccount) {
+        log.info("activityAddress ==>> findByPlatformAccount ==>> platformAccount ==>> {}", platformAccount);
+        List<ActivityAddressDTO> activityAddressDTO = this.activityAddressService.findByPlatformAccount(platformAccount);
+        return ResultInfo.success(activityAddressDTO);
+    }
+
+    @PostMapping(value = "/createOrUpdateActivityAddress")
+    @ApiOperation("新增ActivityAddress")
+    @AnonymousAccess
+    public ResultInfo createOrUpdateActivityAddress(@Validated @RequestBody ActivityAddress resources) {
+        log.info("activityAddress ==>> createOrUpdateActivityAddress ==>> params ==>> {}", resources);
+        String platformAccount = resources.getPlatformAccount();
+        if (StringUtils.isBlank(platformAccount)) {
+            throw new BadRequestException("platformAccount is null");
+        }
+        Long appId = resources.getAppId();
+        if (Objects.isNull(appId)) {
+            throw new BadRequestException("appId is null");
+        }
+        Long activityId = resources.getActivityId();
+        if (Objects.isNull(activityId)) {
+            throw new BadRequestException("activityId is null");
+        }
+        Long userId = resources.getUserId();
+        if (Objects.isNull(userId)) {
+            throw new BadRequestException("visUserId is null");
+        }
+        String name = resources.getName();
+        if (StringUtils.isBlank(name)) {
+            throw new BadRequestException("name is null");
+        }
+        String cellphone = resources.getCellphone();
+        if (StringUtils.isBlank(cellphone)) {
+            throw new BadRequestException("cellphone is null");
+        }
+        String address = resources.getAddress();
+        if (StringUtils.isBlank(address)) {
+            throw new BadRequestException( "address is null");
+        }
+        ActivityAddressDTO activityAddressDTO = this.activityAddressService.createOrUpdateActivityAddress(resources);
+        return ResultInfo.success(activityAddressDTO);
+    }
+
+//    @Log
+    @PostMapping(value = "/create")
+    @ApiOperation("新增ActivityAddress")
+    @AnonymousAccess
+    public ResultInfo create(@Validated @RequestBody ActivityAddress resources) {
+        this.activityAddressService.create(resources);
+        return ResultInfo.success();
+    }
+
+//    @Log
+    @PutMapping(value = "/update")
+    @ApiOperation("修改ActivityAddress")
+    @AnonymousAccess
+    public ResultInfo update(@Validated @RequestBody ActivityAddress resources) {
+        this.activityAddressService.update(resources);
+        return ResultInfo.success();
+    }
+
+
+//    @Log
+    @DeleteMapping(value = "/{id}")
+    @ApiOperation("删除ActivityAddress")
+    public ResultInfo delete(@PathVariable Long id) {
+        this.activityAddressService.delete(id);
+        return ResultInfo.success();
+    }
+
+}

+package com.topdraw.business.module.contact.vis.service;
+
+import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
+import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
+
+import java.util.List;
+
+/**
+ * @author XiangHan
+ * @date 2022-04-24
+ */
+public interface ActivityAddressService {
+    /**
+     * 根据ID查询
+     * @param id ID
+     * @return ActivityAddressDTO
+     */
+    ActivityAddressDTO findById(Long id);
+
+    /**
+     *
+     * @param resources
+     */
+    ActivityAddressDTO create(ActivityAddress resources);
+
+    /**
+     *
+     * @param resources
+     */
+    ActivityAddressDTO update(ActivityAddress resources);
+
+    /**
+     *
+     * @param id
+     */
+    void delete(Long id);
+
+    /**
+     *
+     * @param platformAccount
+     * @return
+     */
+    List<ActivityAddressDTO> findByPlatformAccount(String platformAccount);
+
+    /**
+     *
+     * @param resources
+     * @return
+     */
+    ActivityAddressDTO createOrUpdateActivityAddress(ActivityAddress resources);
+
+    /**
+     *
+     * @param resources
+     * @return
+     */
+    ActivityAddressDTO findByPlatformAccountAndActivityId(ActivityAddress resources);
+}

+package com.topdraw.business.module.contact.vis.service.dto;
+
+import lombok.Data;
+import java.sql.Timestamp;
+import java.io.Serializable;
+
+
+/**
+ * @author XiangHan
+ * @date 2022-04-24
+ */
+@Data
+public class ActivityAddressDTO implements Serializable {
+
+    // id
+    private Long id;
+
+    // vis的用户id
+    private Long userId;
+
+    // 大屏账号
+    private String platformAccount;
+
+    // 活动id
+    private Long activityId;
+
+    // 应用id
+    private Long appId;
+
+    // 收货人名称
+    private String name;
+
+    // 收货人地址
+    private String address;
+
+    // 收获人手机号
+    private String cellphone;
+
+    // 创建时间
+    private Timestamp createTime;
+
+    // 更新时间
+    private Timestamp updateTime;
+}

+package com.topdraw.business.module.contact.vis.service.impl;
+
+import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
+import com.topdraw.util.TimestampUtil;
+import com.topdraw.utils.ValidationUtil;
+import com.topdraw.business.module.contact.vis.repository.ActivityAddressRepository;
+import com.topdraw.business.module.contact.vis.service.ActivityAddressService;
+import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
+import com.topdraw.business.module.contact.vis.service.mapper.ActivityAddressMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.util.Assert;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author XiangHan
+ * @date 2022-04-24
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class ActivityAddressServiceImpl implements ActivityAddressService {
+
+    @Autowired
+    private ActivityAddressRepository activityAddressRepository;
+
+    @Autowired
+    private ActivityAddressMapper activityAddressMapper;
+
+    @Override
+//    @Cacheable(cacheNames = "uce::activityAddress::platformAccount", key = "#platformAccount")
+    public List<ActivityAddressDTO> findByPlatformAccount(String platformAccount) {
+        List<ActivityAddress> activityAddress = activityAddressRepository.findByPlatformAccount(platformAccount);
+        return this.activityAddressMapper.toDto(activityAddress);
+    }
+
+    @Override
+    public ActivityAddressDTO createOrUpdateActivityAddress(ActivityAddress resources) {
+        ActivityAddressDTO activityAddressDTO = this.findByPlatformAccountAndActivityId(resources);
+        if (Objects.isNull(activityAddressDTO.getId())) {
+            activityAddressDTO = this.create(resources);
+        } else {
+            resources.setId(activityAddressDTO.getId());
+            resources.setUpdateTime(TimestampUtil.now());
+            activityAddressDTO = this.update(resources);
+        }
+        return activityAddressDTO;
+    }
+
+    @Override
+    public ActivityAddressDTO findByPlatformAccountAndActivityId(ActivityAddress resources) {
+        String platformAccount = resources.getPlatformAccount();
+        Long activityId = resources.getActivityId();
+        ActivityAddress activityAddress = activityAddressRepository.findByPlatformAccountAndActivityId(platformAccount, activityId).orElseGet(ActivityAddress::new);
+        return this.activityAddressMapper.toDto(activityAddress);
+    }
+
+    @Override
+    public ActivityAddressDTO findById(Long id) {
+        ActivityAddress ActivityAddress = activityAddressRepository.findById(id).orElseGet(ActivityAddress::new);
+        ValidationUtil.isNull(ActivityAddress.getId(),"ActivityAddress","id",id);
+        return this.activityAddressMapper.toDto(ActivityAddress);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+//    @CachePut(cacheNames = "uce::activityAddress::platformAccount", key = "#resources.platformAccount")
+    public ActivityAddressDTO create(ActivityAddress resources) {
+        ActivityAddress activityAddress = activityAddressRepository.save(resources);
+        return this.activityAddressMapper.toDto(activityAddress);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+//    @CachePut(cacheNames = "uce::activityAddress::platformAccount", key = "#resources.platformAccount")
+    public ActivityAddressDTO update(ActivityAddress resources) {
+        ActivityAddress activityAddress = activityAddressRepository.findById(resources.getId()).orElseGet(ActivityAddress::new);
+        ValidationUtil.isNull( activityAddress.getId(),"ActivityAddress","id",resources.getId());
+        activityAddress.copy(resources);
+        ActivityAddress save = activityAddressRepository.save(activityAddress);
+        return this.activityAddressMapper.toDto(save);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(Long id) {
+        Assert.notNull(id, "The given id must not be null!");
+        ActivityAddress ActivityAddress = activityAddressRepository.findById(id).orElseThrow(
+                () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", ActivityAddress.class, id), 1));
+        activityAddressRepository.delete(ActivityAddress);
+    }
+
+
+
+
+}

-package com.topdraw.business.module.points.standingbook.service.mapper;
+package com.topdraw.business.module.contact.vis.service.mapper;
 
 
 import com.topdraw.base.BaseMapper;
 import com.topdraw.base.BaseMapper;
-import com.topdraw.business.module.points.standingbook.domain.PointsStandingBook;
-import com.topdraw.business.module.points.standingbook.service.dto.PointsStandingBookDTO;
+import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
+import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.ReportingPolicy;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
- * @date 2021-10-29
+ * @date 2022-04-24
  */
  */
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
-public interface PointsStandingBookMapper extends BaseMapper<PointsStandingBookDTO, PointsStandingBook> {
+public interface ActivityAddressMapper extends BaseMapper<ActivityAddressDTO, ActivityAddress> {
 
 
 }
 }

@@ -12,7 +12,6 @@ import java.sql.Timestamp;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -25,94 +24,94 @@ import java.time.LocalDateTime;
 @Table(name="m_coupon")
 @Table(name="m_coupon")
 public class Coupon implements Serializable {
 public class Coupon implements Serializable {
 
 
-    // id
+    /** id */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
     private Long id;
     private Long id;
 
 
-    // 标识
+    /** 标识 */
     @Column(name = "code", nullable = false)
     @Column(name = "code", nullable = false)
     private String code;
     private String code;
 
 
-    // 名称
+    /** 名称 */
     @Column(name = "title", nullable = false)
     @Column(name = "title", nullable = false)
     private String title;
     private String title;
 
 
-    // 图片
+    /** 图片 */
     @Column(name = "images")
     @Column(name = "images")
     private String images;
     private String images;
 
 
-    // 发行量，-1代表不限量
+    /** 发行量，-1代表不限量 */
     @Column(name = "stock")
     @Column(name = "stock")
     private Integer stock;
     private Integer stock;
 
 
-    // 剩余量，-1代表不限量
+    /** 剩余量，-1代表不限量 */
     @Column(name = "remain_stock")
     @Column(name = "remain_stock")
     private Integer remainStock;
     private Integer remainStock;
 
 
-    // 优惠形式：1：现金；2：折扣
+    /** 优惠形式：1：现金；2：折扣 */
     @Column(name = "use_type")
     @Column(name = "use_type")
     private Integer useType;
     private Integer useType;
 
 
-    // 面额
+    /** 面额 */
     @Column(name = "denomination")
     @Column(name = "denomination")
     private BigDecimal denomination;
     private BigDecimal denomination;
 
 
-    // 折扣
+    /** 折扣 */
     @Column(name = "discount")
     @Column(name = "discount")
     private BigDecimal discount;
     private BigDecimal discount;
 
 
-    // 适用用户范围：1：新用户；2：全体用户
+    /** 适用用户范围：1：新用户；2：全体用户 */
     @Column(name = "user_range")
     @Column(name = "user_range")
     private Integer userRange;
     private Integer userRange;
 
 
-    // 限领次数 -1：无限次； >0：具体次数
+    /** 限领次数 -1：无限次； >0：具体次数 */
     @Column(name = "collect_limit")
     @Column(name = "collect_limit")
     private Integer collectLimit;
     private Integer collectLimit;
 
 
-    // 适用门槛：1：无门槛；2：满减形式
+    /** 适用门槛：1：无门槛；2：满减形式 */
     @Column(name = "threshold_type")
     @Column(name = "threshold_type")
     private Integer thresholdType;
     private Integer thresholdType;
 
 
-    // 满减门槛
+    /** 满减门槛 */
     @Column(name = "amount_threshold")
     @Column(name = "amount_threshold")
     private BigDecimal amountThreshold;
     private BigDecimal amountThreshold;
 
 
-    // 产品范围：1：全部商品；2：指定商品
+    /** 产品范围：1：全部商品；2：指定商品 */
     @Column(name = "item_range")
     @Column(name = "item_range")
     private Integer itemRange;
     private Integer itemRange;
 
 
-    // 生效形式：1：固定日期；2：相对日期
+    /** 生效形式：1：固定日期；2：相对日期 */
     @Column(name = "effect_type")
     @Column(name = "effect_type")
     private Integer effectType;
     private Integer effectType;
 
 
-    // 生效时间
+    /** 生效时间 */
     @Column(name = "start_time")
     @Column(name = "start_time")
     private Timestamp startTime;
     private Timestamp startTime;
 
 
-    // 过期时间
+    /** 过期时间 */
     @Column(name = "expire_time")
     @Column(name = "expire_time")
-    private LocalDateTime expireTime;
+    private Timestamp expireTime;
 
 
-    // 自领取当日，几天内有效
+    /** 自领取当日，几天内有效 */
     @Column(name = "valid_days")
     @Column(name = "valid_days")
     private Integer validDays;
     private Integer validDays;
 
 
-    // 使用说明
+    /** 使用说明 */
     @Column(name = "description")
     @Column(name = "description")
     private String description;
     private String description;
 
 
-    // 状态0：未开始，1:启用；2：停用
+    /** 状态0：未开始，1:启用；2：停用 */
     @Column(name = "status")
     @Column(name = "status")
     private Integer status;
     private Integer status;
 
 
-    // 创建时间
+    /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
     private Timestamp updateTime;
     private Timestamp updateTime;

+package com.topdraw.business.module.coupon.domain;
+
+import com.topdraw.business.module.coupon.service.dto.CouponDTO;
+import com.topdraw.util.IdWorker;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * 优惠券
+ */
+public class CouponBuilder {
+
+    public static Coupon build(CouponDTO couponDTO){
+        Coupon coupon = new Coupon();
+        BeanUtils.copyProperties(couponDTO,coupon);
+        return build(coupon.getId(),
+                coupon.getCode(),
+                coupon.getTitle(),coupon.getImages(),coupon.getStock(),coupon.getRemainStock(),coupon.getUseType(),
+                coupon.getDenomination(),coupon.getDiscount(),coupon.getUserRange(),coupon.getCollectLimit(),
+                coupon.getThresholdType(),coupon.getAmountThreshold(),coupon.getItemRange(),coupon.getEffectType(),
+                coupon.getStartTime(),coupon.getExpireTime(),coupon.getValidDays(),coupon.getDescription(),coupon.getStatus());
+    }
+
+    public static Coupon build(Coupon coupon){
+        return build(coupon.getId(),
+                coupon.getCode(),
+                coupon.getTitle(),coupon.getImages(),coupon.getStock(),coupon.getRemainStock(),coupon.getUseType(),
+                coupon.getDenomination(),coupon.getDiscount(),coupon.getUserRange(),coupon.getCollectLimit(),
+                coupon.getThresholdType(),coupon.getAmountThreshold(),coupon.getItemRange(),coupon.getEffectType(),
+                coupon.getStartTime(),coupon.getExpireTime(),coupon.getValidDays(),coupon.getDescription(),coupon.getStatus());
+    }
+
+    public static Coupon build(Long id , String code , String title,
+                               String images,
+                               Integer stock,
+                               Integer remainStock,
+                               Integer useType,
+                               BigDecimal denomination,
+                               BigDecimal discount,
+                               Integer userRange,
+                               Integer collectLimit,
+                               Integer thresholdType,
+                               BigDecimal amountThreshold,
+                               Integer itemRange,
+                               Integer effectType,
+                               Timestamp startTime,
+                               Timestamp expireTime,
+                               Integer validDays,String description , Integer status){
+
+        Coupon coupon = new Coupon();
+        coupon.setId(id);
+        coupon.setCode(StringUtils.isBlank(code)? IdWorker.generatorCode("coupon"):code);
+        coupon.setTitle(StringUtils.isBlank(title)?null:title);
+        coupon.setImages(StringUtils.isBlank(images)?null:images);
+        coupon.setStock(Objects.isNull(stock)?null:stock);
+        coupon.setRemainStock(Objects.isNull(remainStock)?null:remainStock);
+        coupon.setUseType(Objects.isNull(useType)?null:useType);
+        coupon.setDenomination(Objects.isNull(denomination)?null:denomination);
+        coupon.setDiscount(Objects.isNull(discount)?null:discount);
+        coupon.setUserRange(Objects.isNull(userRange)?null:userRange);
+        coupon.setCollectLimit(collectLimit);
+        coupon.setThresholdType(Objects.isNull(thresholdType)?null:thresholdType);
+        coupon.setAmountThreshold(Objects.isNull(amountThreshold)?null:amountThreshold);
+        coupon.setItemRange(Objects.isNull(itemRange)?null:itemRange);
+        coupon.setEffectType(Objects.isNull(effectType)?null:effectType);
+        coupon.setStartTime(Objects.isNull(startTime)?null: startTime);
+        coupon.setExpireTime(Objects.isNull(expireTime)?null:expireTime);
+        coupon.setValidDays(validDays);
+        coupon.setDescription(StringUtils.isBlank(description)?"":description);
+        coupon.setStatus(Objects.nonNull(status)?status:0);
+        return coupon;
+    }
+
+}

@@ -11,7 +11,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -24,57 +23,60 @@ import java.time.LocalDateTime;
 @Table(name="m_coupon_history")
 @Table(name="m_coupon_history")
 public class CouponHistory implements Serializable {
 public class CouponHistory implements Serializable {
 
 
-    // 主键
+    @Transient
+    private String memberCode;
+
+    /** 主键 */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
     private Long id;
     private Long id;
 
 
-    // 优惠券id
+    /** 优惠券id */
     @Column(name = "coupon_id")
     @Column(name = "coupon_id")
     private Long couponId;
     private Long couponId;
 
 
-    // 领券用户id（对应账号）
+    /** 领券用户id（对应账号） */
     @Column(name = "user_id")
     @Column(name = "user_id")
     private Long userId;
     private Long userId;
 
 
-    // 优惠券code
+    /** 优惠券code */
     @Column(name = "coupon_code")
     @Column(name = "coupon_code")
     private String couponCode;
     private String couponCode;
 
 
-    // 领取人昵称
+    /** 领取人昵称 */
     @Column(name = "user_nickname")
     @Column(name = "user_nickname")
     private String userNickname;
     private String userNickname;
 
 
-    // 领取时间
+    /** 领取时间 */
     @Column(name = "receive_time")
     @Column(name = "receive_time")
-    private LocalDateTime receiveTime;
+    private Timestamp receiveTime;
 
 
-    // 失效时间
+    /** 失效时间 */
     @Column(name = "expire_time")
     @Column(name = "expire_time")
-    private LocalDateTime expireTime;
+    private Timestamp expireTime;
 
 
-    // 使用状态 0：未使用；1：已使用；-1：已过期
+    /** 使用状态 0：未使用；1：已使用；-1：已过期 */
     @Column(name = "use_status")
     @Column(name = "use_status")
     private Integer useStatus;
     private Integer useStatus;
 
 
-    // 使用时间
+    /** 使用时间 */
     @Column(name = "use_time")
     @Column(name = "use_time")
-    private LocalDateTime useTime;
+    private Timestamp useTime;
 
 
-    // 订单详情id
+    /** 订单详情id */
     @Column(name = "order_detail_id")
     @Column(name = "order_detail_id")
     private Long orderDetailId;
     private Long orderDetailId;
 
 
-    // 创建时间
+    /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
-    private LocalDateTime createTime;
+    private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
-    private LocalDateTime updateTime;
+    private Timestamp updateTime;
 
 
     public void copy(CouponHistory source){
     public void copy(CouponHistory source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

+package com.topdraw.business.module.coupon.history.domain;
+
+import com.topdraw.business.module.coupon.domain.Coupon;
+import com.topdraw.util.TimestampUtil;
+import org.apache.commons.lang3.StringUtils;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * 优惠券
+ */
+public class CouponHistoryBuilder {
+
+    public static CouponHistory build(CouponHistory couponHistory){
+        return build(couponHistory.getId(),
+                couponHistory.getCouponId(),
+                couponHistory.getUserId(),
+                couponHistory.getCouponCode(),
+                couponHistory.getUserNickname(),
+                couponHistory.getReceiveTime(),
+                couponHistory.getExpireTime(),
+                couponHistory.getUseStatus(),
+                couponHistory.getUseTime(),
+                couponHistory.getOrderDetailId());
+    }
+
+    public static CouponHistory build(Coupon coupon,Long userId,String userNickname){
+        return build(coupon,userId,userNickname,null);
+    }
+
+    public static CouponHistory build(Coupon coupon,Long userId,String userNickname,Long orderDetailId){
+        return build(null,
+                coupon.getId(),userId,coupon.getCode(),userNickname, TimestampUtil.now(),
+                coupon.getExpireTime(),coupon.getStatus(),null,orderDetailId);
+    }
+
+    public static CouponHistory build(Long id , Long couponId , Long userId, String couponCode, String userNickname, Timestamp receiveTime,
+                                      Timestamp expireTime, Integer useStatus, Timestamp useTime,
+                                      Long orderDetailId) {
+        CouponHistory couponHistory = new CouponHistory();
+        couponHistory.setId(id);
+        couponHistory.setCouponId(Objects.isNull(couponId)?null:couponId);
+        couponHistory.setUserId(Objects.isNull(userId)?null:userId);
+        couponHistory.setCouponCode(StringUtils.isBlank(couponCode)?null:couponCode);
+        couponHistory.setUserNickname(StringUtils.isBlank(userNickname)?null:userNickname);
+        couponHistory.setReceiveTime(Objects.isNull(receiveTime)?null:receiveTime);
+        couponHistory.setExpireTime(Objects.isNull(expireTime)?null:expireTime);
+        couponHistory.setUseStatus(Objects.isNull(useStatus)?0:useStatus);
+        couponHistory.setUseTime(Objects.isNull(useTime)?null:useTime);
+        couponHistory.setOrderDetailId(Objects.isNull(orderDetailId)?null:orderDetailId);
+        return couponHistory;
+    }
+
+}

-package com.topdraw.business.module.coupon.history.rest;
-
-import com.topdraw.common.ResultInfo;
-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.data.domain.Pageable;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-
-/**
- * @author XiangHan
- * @date 2021-10-23
- */
-@Api(tags = "CouponHistory管理")
-@RestController
-@RequestMapping("/api/CouponHistory")
-public class CouponHistoryController {
-
-    @Autowired
-    private CouponHistoryService CouponHistoryService;
-
-    @GetMapping
-    @ApiOperation("查询CouponHistory")
-    public ResultInfo getCouponHistorys(CouponHistoryQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(CouponHistoryService.queryAll(criteria,pageable));
-    }
-
-    @GetMapping(value = "/all")
-    @ApiOperation("查询所有CouponHistory")
-    public ResultInfo getCouponHistorys(CouponHistoryQueryCriteria criteria) {
-        return ResultInfo.success(CouponHistoryService.queryAll(criteria));
-    }
-
-    @PostMapping(value = "/create")
-    @ApiOperation("新增CouponHistory")
-    public ResultInfo create(@Validated @RequestBody CouponHistory resources) {
-        CouponHistoryService.create(resources);
-        return ResultInfo.success();
-    }
-
-    @PutMapping(value = "/update")
-    @ApiOperation("修改CouponHistory")
-    public ResultInfo update(@Validated @RequestBody CouponHistory resources) {
-        CouponHistoryService.update(resources);
-        return ResultInfo.success();
-    }
-
-
-    @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation("删除CouponHistory")
-    public ResultInfo delete(@PathVariable Long id) {
-        CouponHistoryService.delete(id);
-        return ResultInfo.success();
-    }
-
-}

@@ -2,13 +2,8 @@ package com.topdraw.business.module.coupon.history.service;
 
 
 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
 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.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.time.LocalDateTime;
-import java.util.Map;
-import java.util.List;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -16,20 +11,6 @@ import java.util.List;
  */
  */
 public interface CouponHistoryService {
 public interface CouponHistoryService {
 
 
-    /**
-    * 查询数据分页
-    * @param criteria 条件参数
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(CouponHistoryQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<CouponHistoryDTO>
-    */
-    List<CouponHistoryDTO> queryAll(CouponHistoryQueryCriteria criteria);
 
 
     /**
     /**
      * 根据ID查询
      * 根据ID查询
@@ -38,15 +19,33 @@ public interface CouponHistoryService {
      */
      */
     CouponHistoryDTO findById(Long id);
     CouponHistoryDTO findById(Long id);
 
 
+    /**
+     *
+     * @param resources
+     */
     void create(CouponHistory resources);
     void create(CouponHistory resources);
 
 
-    void update(CouponHistory resources);
-
-    void delete(Long id);
-
+    /**
+     *
+     * @param userId
+     * @return
+     */
     Long countByUserId(Long userId);
     Long countByUserId(Long userId);
 
 
+    /**
+     *
+     * @param userId
+     * @param now
+     * @return
+     */
     Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now);
     Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now);
 
 
+    /**
+     *
+     * @param userId
+     * @param now
+     * @param expireTime
+     * @return
+     */
     Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime);
     Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime);
 }
 }

@@ -2,7 +2,7 @@ package com.topdraw.business.module.coupon.history.service.dto;
 
 
 import lombok.Data;
 import lombok.Data;
 import java.io.Serializable;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.sql.Timestamp;
 
 
 
 
 /**
 /**
@@ -12,39 +12,39 @@ import java.time.LocalDateTime;
 @Data
 @Data
 public class CouponHistoryDTO implements Serializable {
 public class CouponHistoryDTO implements Serializable {
 
 
-    // 主键
+    /** 主键  */
     private Long id;
     private Long id;
 
 
-    // 优惠券id
+    /** 优惠券id */
     private Long couponId;
     private Long couponId;
 
 
-    // 领券用户id（对应账号）
+    /** 领券用户id（对应账号） */
     private Long userId;
     private Long userId;
 
 
-    // 优惠券code
+    /** 优惠券code */
     private String couponCode;
     private String couponCode;
 
 
-    // 领取人昵称
+    /** 领取人昵称 */
     private String userNickname;
     private String userNickname;
 
 
-    // 领取时间
-    private LocalDateTime receiveTime;
+    /** 领取时间 */
+    private Timestamp receiveTime;
 
 
-    // 失效时间
-    private LocalDateTime expireTime;
+    /** 失效时间 */
+    private Timestamp expireTime;
 
 
-    // 使用状态 0：未使用；1：已使用；-1：已过期
+    /** 使用状态 0：未使用；1：已使用；-1：已过期 */
     private Integer useStatus;
     private Integer useStatus;
 
 
-    // 使用时间
-    private LocalDateTime useTime;
+    /** 使用时间 */
+    private Timestamp useTime;
 
 
-    // 订单详情id
+    /** 订单详情id */
     private Long orderDetailId;
     private Long orderDetailId;
 
 
-    // 创建时间
-    private LocalDateTime createTime;
+    /** 创建时间 */
+    private Timestamp createTime;
 
 
-    // 更新时间
-    private LocalDateTime updateTime;
+    /** 更新时间 */
+    private Timestamp updateTime;
 }
 }

-package com.topdraw.business.module.coupon.history.service.dto;
-
-import lombok.Data;
-
-/**
- * @author XiangHan
- * @date 2021-10-23
- */
-@Data
-public class CouponHistoryQueryCriteria{
-}

 package com.topdraw.business.module.coupon.history.service.impl;
 package com.topdraw.business.module.coupon.history.service.impl;
 
 
-import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
+import com.topdraw.business.module.coupon.history.domain.CouponHistoryBuilder;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.coupon.history.repository.CouponHistoryRepository;
 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.CouponHistoryService;
 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryDTO;
 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.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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.util.Assert;
-import com.topdraw.utils.PageUtil;
-import com.topdraw.utils.QueryHelp;
 
 
-import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -33,69 +23,38 @@ import java.util.Map;
 public class CouponHistoryServiceImpl implements CouponHistoryService {
 public class CouponHistoryServiceImpl implements CouponHistoryService {
 
 
     @Autowired
     @Autowired
-    private CouponHistoryRepository CouponHistoryRepository;
-
+    private CouponHistoryMapper couponHistoryMapper;
     @Autowired
     @Autowired
-    private CouponHistoryMapper CouponHistoryMapper;
-
-    @Override
-    public Map<String, Object> queryAll(CouponHistoryQueryCriteria criteria, Pageable pageable) {
-        Page<CouponHistory> page = CouponHistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(CouponHistoryMapper::toDto));
-    }
+    private CouponHistoryRepository couponHistoryRepository;
 
 
-    @Override
-    public List<CouponHistoryDTO> queryAll(CouponHistoryQueryCriteria criteria) {
-        return CouponHistoryMapper.toDto(CouponHistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
 
 
     @Override
     @Override
     public CouponHistoryDTO findById(Long id) {
     public CouponHistoryDTO findById(Long id) {
-        CouponHistory CouponHistory = CouponHistoryRepository.findById(id).orElseGet(CouponHistory::new);
-        ValidationUtil.isNull(CouponHistory.getId(),"CouponHistory","id",id);
-        return CouponHistoryMapper.toDto(CouponHistory);
+        CouponHistory couponHistory = this.couponHistoryRepository.findById(id).orElseGet(CouponHistory::new);
+        ValidationUtil.isNull(couponHistory.getId(),"CouponHistory","id",id);
+        return this.couponHistoryMapper.toDto(couponHistory);
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public void create(CouponHistory resources) {
     public void create(CouponHistory resources) {
-        CouponHistoryRepository.save(resources);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void update(CouponHistory resources) {
-        CouponHistory CouponHistory = CouponHistoryRepository.findById(resources.getId()).orElseGet(CouponHistory::new);
-        ValidationUtil.isNull( CouponHistory.getId(),"CouponHistory","id",resources.getId());
-        CouponHistory.copy(resources);
-        CouponHistoryRepository.save(CouponHistory);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(Long id) {
-        Assert.notNull(id, "The given id must not be null!");
-        CouponHistory CouponHistory = CouponHistoryRepository.findById(id).orElseThrow(
-                () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", CouponHistory.class, id), 1));
-        CouponHistoryRepository.delete(CouponHistory);
+        CouponHistory couponHistory = CouponHistoryBuilder.build(resources);
+        this.couponHistoryRepository.save(couponHistory);
     }
     }
 
 
     @Override
     @Override
     public Long countByUserId(Long userId) {
     public Long countByUserId(Long userId) {
-        return this.CouponHistoryRepository.countByUserId(userId);
+        return this.couponHistoryRepository.countByUserId(userId);
     }
     }
 
 
     @Override
     @Override
     public Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now) {
     public Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now) {
-        return this.CouponHistoryRepository.countByUserIdAndExpireTimeBefore(userId,now);
+        return this.couponHistoryRepository.countByUserIdAndExpireTimeBefore(userId,now);
     }
     }
 
 
     @Override
     @Override
     public Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime) {
     public Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime) {
-        return this.CouponHistoryRepository.countByUserIdAndExpireTimeBetween(userId,now,expireTime);
+        return this.couponHistoryRepository.countByUserIdAndExpireTimeBetween(userId,now,expireTime);
     }
     }
 
 
-
 }
 }

 package com.topdraw.business.module.coupon.repository;
 package com.topdraw.business.module.coupon.repository;
 
 
 import com.topdraw.business.module.coupon.domain.Coupon;
 import com.topdraw.business.module.coupon.domain.Coupon;
+import com.topdraw.business.module.coupon.service.dto.CouponDTO;
 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.List;
 import java.util.Optional;
 import java.util.Optional;
 
 
 /**
 /**
@@ -13,4 +15,5 @@ import java.util.Optional;
 public interface CouponRepository extends JpaRepository<Coupon, Long>, JpaSpecificationExecutor<Coupon> {
 public interface CouponRepository extends JpaRepository<Coupon, Long>, JpaSpecificationExecutor<Coupon> {
 
 
     Optional<Coupon> findFirstByCode(String code);
     Optional<Coupon> findFirstByCode(String code);
+
 }
 }

-package com.topdraw.business.module.coupon.rest;
-
-import com.topdraw.common.ResultInfo;
-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.data.domain.Pageable;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Api(tags = "Coupon管理")
-@RestController
-@RequestMapping("/api/Coupon")
-public class CouponController {
-
-    @Autowired
-    private CouponService CouponService;
-
-    @GetMapping
-    @ApiOperation("查询Coupon")
-    public ResultInfo getCoupons(CouponQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(CouponService.queryAll(criteria,pageable));
-    }
-
-    @GetMapping(value = "/all")
-    @ApiOperation("查询所有Coupon")
-    public ResultInfo getCoupons(CouponQueryCriteria criteria) {
-        return ResultInfo.success(CouponService.queryAll(criteria));
-    }
-
-    @PostMapping(value = "/create")
-    @ApiOperation("新增Coupon")
-    public ResultInfo create(@Validated @RequestBody Coupon resources) {
-        CouponService.create(resources);
-        return ResultInfo.success();
-    }
-
-    @PutMapping(value = "/update")
-    @ApiOperation("修改Coupon")
-    public ResultInfo update(@Validated @RequestBody Coupon resources) {
-        CouponService.update(resources);
-        return ResultInfo.success();
-    }
-
-    @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation("删除Coupon")
-    public ResultInfo delete(@PathVariable Long id) {
-        CouponService.delete(id);
-        return ResultInfo.success();
-    }
-
-    @GetMapping(value = "/getByCode/{code}")
-    @ApiOperation(value = "根据标识查询")
-    public ResultInfo getByCode(@PathVariable String code) {
-        return ResultInfo.success(CouponService.getByCode(code));
-    }
-}

 package com.topdraw.business.module.coupon.service;
 package com.topdraw.business.module.coupon.service;
 
 
-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.CouponDTO;
-import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -14,37 +9,18 @@ import java.util.List;
 public interface CouponService {
 public interface CouponService {
 
 
     /**
     /**
-    * 查询数据分页
-    * @param criteria 条件参数
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(CouponQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<CouponDTO>
-    */
-    List<CouponDTO> queryAll(CouponQueryCriteria criteria);
-
-    /**
      * 根据ID查询
      * 根据ID查询
      * @param id ID
      * @param id ID
      * @return CouponDTO
      * @return CouponDTO
      */
      */
     CouponDTO findById(Long id);
     CouponDTO findById(Long id);
 
 
-    void create(Coupon resources);
-
-    void update(Coupon resources);
-
-    void delete(Long id);
-
     /**
     /**
     * Code校验
     * Code校验
     * @param code
     * @param code
     * @return CouponDTO
     * @return CouponDTO
     */
     */
     CouponDTO getByCode(String code);
     CouponDTO getByCode(String code);
+
+
 }
 }

@@ -4,7 +4,6 @@ import lombok.Data;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.io.Serializable;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 
 
 
 /**
 /**
@@ -14,69 +13,69 @@ import java.time.LocalDateTime;
 @Data
 @Data
 public class CouponDTO implements Serializable {
 public class CouponDTO implements Serializable {
 
 
-    // id
+    /** id */
     private Long id;
     private Long id;
 
 
-    // 标识
+    /** 标识 */
     private String code;
     private String code;
 
 
-    // 名称
+    /** 名称 */
     private String title;
     private String title;
 
 
-    // 图片
+    /** 图片 */
     private String images;
     private String images;
 
 
-    // 发行量，-1代表不限量
+    /** 发行量，-1代表不限量 */
     private Integer stock;
     private Integer stock;
 
 
-    // 剩余量，-1代表不限量
+    /** 剩余量，-1代表不限量 */
     private Integer remainStock;
     private Integer remainStock;
 
 
-    // 优惠形式：1：现金；2：折扣
+    /** 优惠形式：1：现金；2：折扣 */
     private Integer useType;
     private Integer useType;
 
 
-    // 面额
+    /** 面额 */
     private BigDecimal denomination;
     private BigDecimal denomination;
 
 
-    // 折扣
+    /** 折扣 */
     private BigDecimal discount;
     private BigDecimal discount;
 
 
-    // 适用用户范围：1：新用户；2：全体用户
+    /** 适用用户范围：1：新用户；2：全体用户 */
     private Integer userRange;
     private Integer userRange;
 
 
-    // 限领次数 -1：无限次； >0：具体次数
+    /** 限领次数 -1：无限次； >0：具体次数 */
     private Integer collectLimit;
     private Integer collectLimit;
 
 
-    // 适用门槛：1：无门槛；2：满减形式
+    /** 适用门槛：1：无门槛；2：满减形式 */
     private Integer thresholdType;
     private Integer thresholdType;
 
 
-    // 满减门槛
+    /** 满减门槛 */
     private BigDecimal amountThreshold;
     private BigDecimal amountThreshold;
 
 
-    // 产品范围：1：全部商品；2：指定商品
+    /** 产品范围：1：全部商品；2：指定商品 */
     private Integer itemRange;
     private Integer itemRange;
 
 
-    // 生效形式：1：固定日期；2：相对日期
+    /** 生效形式：1：固定日期；2：相对日期 */
     private Integer effectType;
     private Integer effectType;
 
 
-    // 生效时间
+    /** 生效时间 */
     private Timestamp startTime;
     private Timestamp startTime;
 
 
-    // 过期时间
-    private LocalDateTime expireTime;
+    /** 过期时间 */
+    private Timestamp expireTime;
 
 
-    // 自领取当日，几天内有效
+    /** 自领取当日，几天内有效 */
     private Integer validDays;
     private Integer validDays;
 
 
-    // 使用说明
+    /** 使用说明 */
     private String description;
     private String description;
 
 
-    // 状态0：未开始，1:启用；2：停用
+    /** 状态0：未开始，1:启用；2：停用 */
     private Integer status;
     private Integer status;
 
 
-    // 创建时间
+    /** 创建时间 */
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     private Timestamp updateTime;
     private Timestamp updateTime;
 }
 }

-package com.topdraw.business.module.coupon.service.dto;
-
-import lombok.Data;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Data
-public class CouponQueryCriteria{
-}

 package com.topdraw.business.module.coupon.service.impl;
 package com.topdraw.business.module.coupon.service.impl;
 
 
-import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.coupon.domain.Coupon;
 import com.topdraw.business.module.coupon.domain.Coupon;
-import com.topdraw.util.RedissonUtil;
+import com.topdraw.exception.GlobeExceptionMsg;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.coupon.repository.CouponRepository;
 import com.topdraw.business.module.coupon.repository.CouponRepository;
 import com.topdraw.business.module.coupon.service.CouponService;
 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.CouponDTO;
-import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
 import com.topdraw.business.module.coupon.service.mapper.CouponMapper;
 import com.topdraw.business.module.coupon.service.mapper.CouponMapper;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
 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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.domain.Page;
-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.QueryHelp;
 import com.topdraw.utils.StringUtils;
 import com.topdraw.utils.StringUtils;
 
 
-import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -34,73 +23,24 @@ import java.util.Map;
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
 public class CouponServiceImpl implements CouponService {
 public class CouponServiceImpl implements CouponService {
 
 
-    @Autowired
-    private CouponRepository CouponRepository;
 
 
     @Autowired
     @Autowired
-    private CouponMapper CouponMapper;
-
+    private CouponMapper couponMapper;
     @Autowired
     @Autowired
-    private RedissonClient redissonClient;
-
-    @Override
-    public Map<String, Object> queryAll(CouponQueryCriteria criteria, Pageable pageable) {
-        Page<Coupon> page = CouponRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(CouponMapper::toDto));
-    }
-
-    @Override
-    public List<CouponDTO> queryAll(CouponQueryCriteria criteria) {
-        return CouponMapper.toDto(CouponRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
+    private CouponRepository couponRepository;
 
 
     @Override
     @Override
     public CouponDTO findById(Long id) {
     public CouponDTO findById(Long id) {
-        Coupon Coupon = CouponRepository.findById(id).orElseGet(Coupon::new);
-        ValidationUtil.isNull(Coupon.getId(),"Coupon","id",id);
-        return CouponMapper.toDto(Coupon);
-    }
+        Assert.notNull(id, GlobeExceptionMsg.COUPON_ID_IS_NULL);
 
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void create(Coupon resources) {
-        CouponRepository.save(resources);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void update(Coupon resources) {
-        RLock rLock = this.redissonClient.getLock(resources.getId().toString());
-        try {
-            RedissonUtil.lock(rLock);
-            Coupon Coupon = CouponRepository.findById(resources.getId()).orElseGet(Coupon::new);
-            ValidationUtil.isNull( Coupon.getId(),"Coupon","id",resources.getId());
-            Coupon.copy(resources);
-            CouponRepository.save(Coupon);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw e;
-        } finally {
-            RedissonUtil.unlock(rLock);
-        }
+        Coupon coupon = this.couponRepository.findById(id).orElseGet(Coupon::new);
+        ValidationUtil.isNull(coupon.getId(),"Coupon","id",id);
+        return this.couponMapper.toDto(coupon);
     }
     }
 
 
     @Override
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void delete(Long id) {
-        Assert.notNull(id, "The given id must not be null!");
-        Coupon Coupon = CouponRepository.findById(id).orElseThrow(
-                () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", Coupon.class, id), 1));
-        CouponRepository.delete(Coupon);
-    }
-
-
-    @Override
     public CouponDTO getByCode(String code) {
     public CouponDTO getByCode(String code) {
-        return StringUtils.isNotEmpty(code) ? CouponMapper.toDto(CouponRepository.findFirstByCode(code).orElseGet(Coupon::new))
+        return StringUtils.isNotEmpty(code) ? this.couponMapper.toDto(this.couponRepository.findFirstByCode(code).orElseGet(Coupon::new))
         : new CouponDTO();
         : new CouponDTO();
     }
     }
 }
 }

@@ -23,70 +23,73 @@ import java.io.Serializable;
 @Table(name="uc_exp_detail")
 @Table(name="uc_exp_detail")
 public class ExpDetail implements Serializable {
 public class ExpDetail implements Serializable {
 
 
-    // 主键
+    @Transient
+    private String memberCode;
+
+    /** 主键 */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
     private Long id;
     private Long id;
 
 
-    // 标识
+    /** 标识 */
     @Column(name = "code", nullable = false)
     @Column(name = "code", nullable = false)
     private String code;
     private String code;
 
 
-    // 应用code
+    /** 应用code */
     @Column(name = "app_code")
     @Column(name = "app_code")
     private String appCode;
     private String appCode;
 
 
-    // 会员id
+    /** 会员id */
     @Column(name = "member_id", nullable = false)
     @Column(name = "member_id", nullable = false)
     private Long memberId;
     private Long memberId;
 
 
-    // 账号id
+    /** 账号id */
     @Column(name = "account_id")
     @Column(name = "account_id")
     private Long accountId;
     private Long accountId;
 
 
-    // 原始成长值
+    /** 原始成长值 */
     @Column(name = "original_exp", nullable = false)
     @Column(name = "original_exp", nullable = false)
     private Long originalExp;
     private Long originalExp;
 
 
-    // 结果成长值
+    /** 结果成长值 */
     @Column(name = "result_exp", nullable = false)
     @Column(name = "result_exp", nullable = false)
     private Long resultExp;
     private Long resultExp;
 
 
-    // 成长值变化，一般为正数
+    /** 成长值变化，一般为正数 */
     @Column(name = "exp", nullable = false)
     @Column(name = "exp", nullable = false)
     private Long exp;
     private Long exp;
 
 
-    // 设备类型 1：大屏；2：小屏（微信）3.小屏（xx）
+    /** 设备类型 1：大屏；2：小屏（微信）3.小屏（xx） */
     @Column(name = "device_type", nullable = false)
     @Column(name = "device_type", nullable = false)
     private Integer deviceType;
     private Integer deviceType;
 
 
-    // 行为事件类型 1：登录；2：观影；3：参与活动；4：订购；10：跨屏绑定；98：系统操作；99：其他
+    /** 行为事件类型 1：登录；2：观影；3：参与活动；4：订购；10：跨屏绑定；98：系统操作；99：其他 */
     @Column(name = "evt_type", nullable = false)
     @Column(name = "evt_type", nullable = false)
     private Integer evtType;
     private Integer evtType;
 
 
-    // 订单id（针对订购操作）
+    /** 订单id（针对订购操作） */
     @Column(name = "order_id")
     @Column(name = "order_id")
     private Long orderId;
     private Long orderId;
 
 
-    // 节目id（针对观影操作）
+    /** 节目id（针对观影操作） */
     @Column(name = "media_id")
     @Column(name = "media_id")
     private Long mediaId;
     private Long mediaId;
 
 
-    // 活动id（针对参与活动）
+    /** 活动id（针对参与活动） */
     @Column(name = "activity_id")
     @Column(name = "activity_id")
     private Long activityId;
     private Long activityId;
 
 
-    // 成长值变化描述，用于管理侧显示
+    /** 成长值变化描述，用于管理侧显示 */
     @Column(name = "description", nullable = false)
     @Column(name = "description", nullable = false)
     private String description;
     private String description;
 
 
-    // 创建时间
+    /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
     private Timestamp updateTime;
     private Timestamp updateTime;

+package com.topdraw.business.module.exp.detail.domain;
+
+import com.topdraw.exception.GlobeExceptionMsg;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.Assert;
+
+import java.util.Objects;
+
+public class ExpDetailBuilder {
+
+    public static ExpDetail build(Long memberId, Long originalExp, Long resultExp,
+                                  Integer deviceType, Integer evtType){
+        ExpDetail expDetail = new ExpDetail();
+        expDetail.setMemberId(memberId);
+        expDetail.setOriginalExp(originalExp);
+        expDetail.setResultExp(resultExp);
+        expDetail.setDeviceType(deviceType);
+        expDetail.setEvtType(evtType);
+        return build(expDetail);
+    }
+
+    public static ExpDetail build(ExpDetail expDetail){
+        return build(expDetail.getId(),
+                expDetail.getCode(),
+                expDetail.getAppCode(),
+                expDetail.getMemberId(),
+                expDetail.getAccountId(),
+                expDetail.getOriginalExp(),expDetail.getResultExp(),
+                expDetail.getExp(),expDetail.getDeviceType(),
+                expDetail.getEvtType(), expDetail.getOrderId(), expDetail.getMediaId(),
+                expDetail.getActivityId(),expDetail.getDescription());
+    }
+
+    public static ExpDetail build(Long id, String code,
+                                  String appCode, Long memberId, Long accountId,
+                                  Long originalExp, Long resultExp, Long exp,
+                                  Integer deviceType, Integer evtType, Long orderId,
+                                  Long mediaId, Long activityId, String description){
+        Assert.notNull(memberId, GlobeExceptionMsg.MEMBER_ID_IS_NULL);
+
+        ExpDetail expDetail = new ExpDetail();
+        expDetail.setId(Objects.isNull(id)?null:id);
+        expDetail.setCode(StringUtils.isBlank(code)?null:code);
+        expDetail.setAppCode(StringUtils.isBlank(appCode)?null:appCode);
+        expDetail.setMemberId(Objects.isNull(memberId)?null:memberId);
+        expDetail.setAccountId(Objects.isNull(accountId)?null:accountId);
+        expDetail.setOriginalExp(Objects.isNull(originalExp)?0:originalExp);
+        expDetail.setResultExp(Objects.isNull(resultExp)?0:resultExp);
+        expDetail.setExp(Objects.isNull(exp)?0:exp);
+        expDetail.setDeviceType(Objects.isNull(deviceType)?null:deviceType);
+        expDetail.setEvtType(Objects.isNull(evtType)?null:evtType);
+        expDetail.setOrderId(Objects.isNull(orderId)?null:orderId);
+        expDetail.setMediaId(Objects.isNull(mediaId)?null:mediaId);
+        expDetail.setActivityId(Objects.isNull(activityId)?null:activityId);
+        expDetail.setDescription(StringUtils.isBlank(description)?null:description);
+        return expDetail;
+    }
+
+}

-package com.topdraw.business.module.exp.detail.rest;
-
-import com.topdraw.common.ResultInfo;
-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.data.domain.Pageable;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Api(tags = "ExpDetail管理")
-@RestController
-@RequestMapping("/api/ExpDetail")
-public class ExpDetailController {
-
-    @Autowired
-    private ExpDetailService ExpDetailService;
-
-    @GetMapping
-    @ApiOperation("查询ExpDetail")
-    public ResultInfo getExpDetails(ExpDetailQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(ExpDetailService.queryAll(criteria,pageable));
-    }
-
-    @GetMapping(value = "/all")
-    @ApiOperation("查询所有ExpDetail")
-    public ResultInfo getExpDetails(ExpDetailQueryCriteria criteria) {
-        return ResultInfo.success(ExpDetailService.queryAll(criteria));
-    }
-
-    @PostMapping(value = "/create")
-    @ApiOperation("新增ExpDetail")
-    public ResultInfo create(@Validated @RequestBody ExpDetail resources) {
-        ExpDetailService.create(resources);
-        return ResultInfo.success();
-    }
-
-    @PutMapping(value = "/update")
-    @ApiOperation("修改ExpDetail")
-    public ResultInfo update(@Validated @RequestBody ExpDetail resources) {
-        ExpDetailService.update(resources);
-        return ResultInfo.success();
-    }
-
-    @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation("删除ExpDetail")
-    public ResultInfo delete(@PathVariable Long id) {
-        ExpDetailService.delete(id);
-        return ResultInfo.success();
-    }
-
-    @GetMapping(value = "/getByCode/{code}")
-    @ApiOperation(value = "根据标识查询")
-    public ResultInfo getByCode(@PathVariable String code) {
-        return ResultInfo.success(ExpDetailService.getByCode(code));
-    }
-}

@@ -2,10 +2,6 @@ package com.topdraw.business.module.exp.detail.service;
 
 
 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
 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.ExpDetailDTO;
-import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -14,31 +10,28 @@ import java.util.List;
 public interface ExpDetailService {
 public interface ExpDetailService {
 
 
     /**
     /**
-    * 查询数据分页
-    * @param criteria 条件参数
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(ExpDetailQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<ExpDetailDTO>
-    */
-    List<ExpDetailDTO> queryAll(ExpDetailQueryCriteria criteria);
-
-    /**
      * 根据ID查询
      * 根据ID查询
      * @param id ID
      * @param id ID
      * @return ExpDetailDTO
      * @return ExpDetailDTO
      */
      */
     ExpDetailDTO findById(Long id);
     ExpDetailDTO findById(Long id);
 
 
+    /**
+     *
+     * @param resources
+     */
     void create(ExpDetail resources);
     void create(ExpDetail resources);
 
 
+    /**
+     *
+     * @param resources
+     */
     void update(ExpDetail resources);
     void update(ExpDetail resources);
 
 
+    /**
+     *
+     * @param id
+     */
     void delete(Long id);
     void delete(Long id);
 
 
     /**
     /**

@@ -12,51 +12,51 @@ import java.io.Serializable;
 @Data
 @Data
 public class ExpDetailDTO implements Serializable {
 public class ExpDetailDTO implements Serializable {
 
 
-    // 主键
+    /** 主键 */
     private Long id;
     private Long id;
 
 
-    // 标识
+    /** 标识 */
     private String code;
     private String code;
 
 
-    // 应用code
+    /** 应用code */
     private String appCode;
     private String appCode;
 
 
-    // 会员id
+    /** 会员id */
     private Long memberId;
     private Long memberId;
 
 
-    // 账号id
+    /** 账号id */
     private Long accountId;
     private Long accountId;
 
 
-    // 原始成长值
+    /** 原始成长值 */
     private Long originalExp;
     private Long originalExp;
 
 
-    // 结果成长值
+    /** 结果成长值 */
     private Long resultExp;
     private Long resultExp;
 
 
-    // 成长值变化，一般为正数
+    /** 成长值变化，一般为正数 */
     private Long exp;
     private Long exp;
 
 
-    // 设备类型 1：大屏；2：小屏（微信）3.小屏（xx）
+    /** 设备类型 1：大屏；2：小屏（微信）3.小屏（xx） */
     private Integer deviceType;
     private Integer deviceType;
 
 
-    // 行为事件类型 1：登录；2：观影；3：参与活动；4：订购；10：跨屏绑定；98：系统操作；99：其他
+    /** 行为事件类型 1：登录；2：观影；3：参与活动；4：订购；10：跨屏绑定；98：系统操作；99：其他 */
     private Integer evtType;
     private Integer evtType;
 
 
-    // 订单id（针对订购操作）
+    /** 订单id（针对订购操作） */
     private Long orderId;
     private Long orderId;
 
 
-    // 节目id（针对观影操作）
+    /** 节目id（针对观影操作） */
     private Long mediaId;
     private Long mediaId;
 
 
-    // 活动id（针对参与活动）
+    /** 活动id（针对参与活动） */
     private Long activityId;
     private Long activityId;
 
 
-    // 成长值变化描述，用于管理侧显示
+    /** 成长值变化描述，用于管理侧显示 */
     private String description;
     private String description;
 
 
-    // 创建时间
+    /** 创建时间 */
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     private Timestamp updateTime;
     private Timestamp updateTime;
 }
 }

-package com.topdraw.business.module.exp.detail.service.dto;
-
-import lombok.Data;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Data
-public class ExpDetailQueryCriteria{
-}

 package com.topdraw.business.module.exp.detail.service.impl;
 package com.topdraw.business.module.exp.detail.service.impl;
 
 
-import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
+import com.topdraw.business.module.exp.detail.domain.ExpDetailBuilder;
+import com.topdraw.utils.RedisUtils;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.exp.detail.repository.ExpDetailRepository;
 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.ExpDetailService;
 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailDTO;
 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.business.module.exp.detail.service.mapper.ExpDetailMapper;
-import org.redisson.api.RLock;
-import org.redisson.api.RedissonClient;
 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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.domain.Page;
-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.QueryHelp;
 import com.topdraw.utils.StringUtils;
 import com.topdraw.utils.StringUtils;
 
 
-import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -34,71 +26,56 @@ import java.util.Map;
 public class ExpDetailServiceImpl implements ExpDetailService {
 public class ExpDetailServiceImpl implements ExpDetailService {
 
 
     @Autowired
     @Autowired
-    private ExpDetailRepository ExpDetailRepository;
-
+    private ExpDetailRepository expDetailRepository;
     @Autowired
     @Autowired
-    private ExpDetailMapper ExpDetailMapper;
+    private ExpDetailMapper expDetailMapper;
 
 
     @Autowired
     @Autowired
-    private RedissonClient redissonClient;
-
-    @Override
-    public Map<String, Object> queryAll(ExpDetailQueryCriteria criteria, Pageable pageable) {
-        Page<ExpDetail> page = ExpDetailRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(ExpDetailMapper::toDto));
-    }
-
-    @Override
-    public List<ExpDetailDTO> queryAll(ExpDetailQueryCriteria criteria) {
-        return ExpDetailMapper.toDto(ExpDetailRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
+    private RedisUtils redisUtils;
 
 
     @Override
     @Override
     public ExpDetailDTO findById(Long id) {
     public ExpDetailDTO findById(Long id) {
-        ExpDetail ExpDetail = ExpDetailRepository.findById(id).orElseGet(ExpDetail::new);
+        ExpDetail ExpDetail = this.expDetailRepository.findById(id).orElseGet(ExpDetail::new);
         ValidationUtil.isNull(ExpDetail.getId(),"ExpDetail","id",id);
         ValidationUtil.isNull(ExpDetail.getId(),"ExpDetail","id",id);
-        return ExpDetailMapper.toDto(ExpDetail);
+        return this.expDetailMapper.toDto(ExpDetail);
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public void create(ExpDetail resources) {
     public void create(ExpDetail resources) {
-        ExpDetailRepository.save(resources);
+        ExpDetail expDetail = ExpDetailBuilder.build(resources);
+        this.expDetailRepository.save(expDetail);
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public void update(ExpDetail resources) {
     public void update(ExpDetail resources) {
-        RLock rLock = this.redissonClient.getLock(resources.getId().toString());
+        this.redisUtils.doLock("expDetail::memberId::" + resources.getMemberId());
         try {
         try {
-            ExpDetail ExpDetail = ExpDetailRepository.findById(resources.getId()).orElseGet(ExpDetail::new);
+            ExpDetail ExpDetail = this.expDetailRepository.findById(resources.getId()).orElseGet(ExpDetail::new);
             ValidationUtil.isNull( ExpDetail.getId(),"ExpDetail","id",resources.getId());
             ValidationUtil.isNull( ExpDetail.getId(),"ExpDetail","id",resources.getId());
             ExpDetail.copy(resources);
             ExpDetail.copy(resources);
-            ExpDetailRepository.save(ExpDetail);
+            this.expDetailRepository.save(ExpDetail);
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
             throw e;
             throw e;
         } finally {
         } finally {
-            rLock.unlock();
+            this.redisUtils.doUnLock("expDetail::memberId::" + resources.getMemberId());
         }
         }
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public void delete(Long id) {
     public void delete(Long id) {
         Assert.notNull(id, "The given id must not be null!");
         Assert.notNull(id, "The given id must not be null!");
-        ExpDetail ExpDetail = ExpDetailRepository.findById(id).orElseThrow(
+        ExpDetail ExpDetail = this.expDetailRepository.findById(id).orElseThrow(
                 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", ExpDetail.class, id), 1));
                 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", ExpDetail.class, id), 1));
-        ExpDetailRepository.delete(ExpDetail);
+        this.expDetailRepository.delete(ExpDetail);
     }
     }
 
 
-
     @Override
     @Override
     public ExpDetailDTO getByCode(String code) {
     public ExpDetailDTO getByCode(String code) {
-        return StringUtils.isNotEmpty(code) ? ExpDetailMapper.toDto(ExpDetailRepository.findFirstByCode(code).orElseGet(ExpDetail::new))
+        return StringUtils.isNotEmpty(code) ? this.expDetailMapper.toDto(this.expDetailRepository.findFirstByCode(code).orElseGet(ExpDetail::new))
         : new ExpDetailDTO();
         : new ExpDetailDTO();
     }
     }
 }
 }

+package com.topdraw.business.module.exp.history.domain;
+
+import com.topdraw.exception.GlobeExceptionMsg;
+import com.topdraw.util.IdWorker;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.Assert;
+
+import java.util.Objects;
+
+public class ExpHistoryBuilder {
+
+    public ExpHistory build(Long memberId, Long originalExp, Long resultExp, Long exp,Integer deviceType , Integer evtType) {
+        ExpHistory expHistory = new ExpHistory();
+        expHistory.setMemberId(memberId);
+        expHistory.setOriginalExp(originalExp);
+        expHistory.setResultExp(resultExp);
+        expHistory.setDeviceType(deviceType);
+        expHistory.setEvtType(evtType);
+        expHistory.setExp(exp);
+        return build(expHistory);
+    }
+
+    public ExpHistory build(ExpHistory expHistory) {
+        return build(expHistory.getId(),expHistory.getCode(),
+                expHistory.getMemberId(),expHistory.getAccountId(),
+                expHistory.getOriginalExp(),expHistory.getResultExp(),expHistory.getExp(),
+                expHistory.getDeviceType(),expHistory.getEvtType(),expHistory.getOrderId(),
+                expHistory.getMediaId(),expHistory.getActivityId(),expHistory.getDescription());
+    }
+
+    public ExpHistory build(Long id,String code,Long memberId,Long accountId,
+                            Long originalExp,Long resultExp,Long exp,
+                            Integer deviceType,Integer evtType,Long orderId,
+                            Long mediaId,Long activityId,String description) {
+
+        Assert.notNull(memberId, GlobeExceptionMsg.MEMBER_ID_IS_NULL);
+
+        ExpHistory expHistory = new ExpHistory();
+        expHistory.setId(Objects.isNull(id)?null:id);
+        expHistory.setCode(StringUtils.isBlank(code)? IdWorker.generatorCode("exp") :code);
+        expHistory.setMemberId(memberId);
+        expHistory.setAccountId(Objects.isNull(accountId)?null:accountId);
+        expHistory.setOriginalExp(Objects.isNull(originalExp)?0L:originalExp);
+        expHistory.setResultExp(Objects.isNull(resultExp)?0L:resultExp);
+        expHistory.setExp(Objects.isNull(exp)?0L:exp);
+        expHistory.setDeviceType(Objects.isNull(deviceType)?4:deviceType);
+        expHistory.setEvtType(Objects.isNull(evtType)?98:evtType);
+        expHistory.setOrderId(Objects.isNull(orderId)?null:orderId);
+        expHistory.setMediaId(Objects.isNull(mediaId)?null:mediaId);
+        expHistory.setActivityId(Objects.isNull(activityId)?null:activityId);
+        expHistory.setDescription(StringUtils.isBlank(description)?null:description);
+        return expHistory;
+    }
+
+
+}

-package com.topdraw.business.module.exp.history.rest;
-
-import com.topdraw.common.ResultInfo;
-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.data.domain.Pageable;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Api(tags = "ExpHistory管理")
-@RestController
-@RequestMapping("/api/ExpHistory")
-public class ExpHistoryController {
-
-    @Autowired
-    private ExpHistoryService ExpHistoryService;
-
-    @GetMapping
-    @ApiOperation("查询ExpHistory")
-    public ResultInfo getExpHistorys(ExpHistoryQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(ExpHistoryService.queryAll(criteria,pageable));
-    }
-
-    @GetMapping(value = "/all")
-    @ApiOperation("查询所有ExpHistory")
-    public ResultInfo getExpHistorys(ExpHistoryQueryCriteria criteria) {
-        return ResultInfo.success(ExpHistoryService.queryAll(criteria));
-    }
-
-    @GetMapping(value = "/getByCode/{code}")
-    @ApiOperation(value = "根据标识查询")
-    public ResultInfo getByCode(@PathVariable String code) {
-        return ResultInfo.success(ExpHistoryService.getByCode(code));
-    }
-}

@@ -2,10 +2,6 @@ package com.topdraw.business.module.exp.history.service;
 
 
 import com.topdraw.business.module.exp.history.domain.ExpHistory;
 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.ExpHistoryDTO;
-import com.topdraw.business.module.exp.history.service.dto.ExpHistoryQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -14,33 +10,18 @@ import java.util.List;
 public interface ExpHistoryService {
 public interface ExpHistoryService {
 
 
     /**
     /**
-    * 查询数据分页
-    * @param criteria 条件参数
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(ExpHistoryQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<ExpHistoryDTO>
-    */
-    List<ExpHistoryDTO> queryAll(ExpHistoryQueryCriteria criteria);
-
-    /**
      * 根据ID查询
      * 根据ID查询
      * @param id ID
      * @param id ID
      * @return ExpHistoryDTO
      * @return ExpHistoryDTO
      */
      */
     ExpHistoryDTO findById(Long id);
     ExpHistoryDTO findById(Long id);
 
 
+    /**
+     *
+     * @param resources
+     */
     void create(ExpHistory resources);
     void create(ExpHistory resources);
 
 
-    void update(ExpHistory resources);
-
-    void delete(Long id);
-
     /**
     /**
     * Code校验
     * Code校验
     * @param code
     * @param code

-package com.topdraw.business.module.exp.history.service.dto;
-
-import lombok.Data;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Data
-public class ExpHistoryQueryCriteria{
-}

 package com.topdraw.business.module.exp.history.service.impl;
 package com.topdraw.business.module.exp.history.service.impl;
 
 
-import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.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.module.exp.history.repository.ExpHistoryRepository;
 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.ExpHistoryService;
 import com.topdraw.business.module.exp.history.service.dto.ExpHistoryDTO;
 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.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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.util.Assert;
-import com.topdraw.utils.PageUtil;
-import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;
 import com.topdraw.utils.StringUtils;
 
 
-import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -32,60 +22,28 @@ import java.util.Map;
 public class ExpHistoryServiceImpl implements ExpHistoryService {
 public class ExpHistoryServiceImpl implements ExpHistoryService {
 
 
     @Autowired
     @Autowired
-    private ExpHistoryRepository ExpHistoryRepository;
-
+    private ExpHistoryMapper expHistoryMapper;
     @Autowired
     @Autowired
-    private ExpHistoryMapper ExpHistoryMapper;
+    private ExpHistoryRepository expHistoryRepository;
 
 
-    @Override
-    public Map<String, Object> queryAll(ExpHistoryQueryCriteria criteria, Pageable pageable) {
-        Page<ExpHistory> page = ExpHistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(ExpHistoryMapper::toDto));
-    }
-
-    @Override
-    public List<ExpHistoryDTO> queryAll(ExpHistoryQueryCriteria criteria) {
-        return ExpHistoryMapper.toDto(ExpHistoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
 
 
     @Override
     @Override
     public ExpHistoryDTO findById(Long id) {
     public ExpHistoryDTO findById(Long id) {
-        ExpHistory ExpHistory = ExpHistoryRepository.findById(id).orElseGet(ExpHistory::new);
+        ExpHistory ExpHistory = this.expHistoryRepository.findById(id).orElseGet(ExpHistory::new);
         ValidationUtil.isNull(ExpHistory.getId(),"ExpHistory","id",id);
         ValidationUtil.isNull(ExpHistory.getId(),"ExpHistory","id",id);
-        return ExpHistoryMapper.toDto(ExpHistory);
+        return this.expHistoryMapper.toDto(ExpHistory);
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public void create(ExpHistory resources) {
     public void create(ExpHistory resources) {
-        ExpHistoryRepository.save(resources);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void update(ExpHistory resources) {
-        ExpHistory ExpHistory = ExpHistoryRepository.findById(resources.getId()).orElseGet(ExpHistory::new);
-        ValidationUtil.isNull( ExpHistory.getId(),"ExpHistory","id",resources.getId());
-        ExpHistory.copy(resources);
-        ExpHistoryRepository.save(ExpHistory);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void delete(Long id) {
-        Assert.notNull(id, "The given id must not be null!");
-        ExpHistory ExpHistory = ExpHistoryRepository.findById(id).orElseThrow(
-                () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", ExpHistory.class, id), 1));
-        ExpHistoryRepository.delete(ExpHistory);
+        this.expHistoryRepository.save(resources);
     }
     }
 
 
 
 
     @Override
     @Override
     public ExpHistoryDTO getByCode(String code) {
     public ExpHistoryDTO getByCode(String code) {
-        return StringUtils.isNotEmpty(code) ? ExpHistoryMapper.toDto(ExpHistoryRepository.findFirstByCode(code).orElseGet(ExpHistory::new))
+        return StringUtils.isNotEmpty(code) ? this.expHistoryMapper.toDto(this.expHistoryRepository.findFirstByCode(code).orElseGet(ExpHistory::new))
         : new ExpHistoryDTO();
         : new ExpHistoryDTO();
     }
     }
 }
 }

 package com.topdraw.business.module.member.address.domain;
 package com.topdraw.business.module.member.address.domain;
 
 
+import com.topdraw.business.module.common.domain.AsyncMqModule;
 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;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
 import javax.persistence.*;
+
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 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.io.Serializable;
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.sql.Timestamp;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -22,81 +23,79 @@ import java.time.LocalDateTime;
 @EntityListeners(AuditingEntityListener.class)
 @EntityListeners(AuditingEntityListener.class)
 @Accessors(chain = true)
 @Accessors(chain = true)
 @Table(name="uc_member_address")
 @Table(name="uc_member_address")
-public class MemberAddress implements Serializable {
+public class MemberAddress extends AsyncMqModule implements Serializable {
 
 
     @Transient
     @Transient
     private String platformAccount;
     private String platformAccount;
 
 
     // 主键
     // 主键
+    /** 主键 */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
     private Long id;
     private Long id;
 
 
-    // 会员id
+    /** 会员id */
     @Column(name = "member_id", nullable = false)
     @Column(name = "member_id", nullable = false)
     private Long memberId;
     private Long memberId;
 
 
-    @Transient
-    private String memberCode;
-
-    // 类型 1：家；2：公司；3：学校
+    /** 类型 1：家；2：公司；3：学校 */
     @Column(name = "type", nullable = false)
     @Column(name = "type", nullable = false)
     private Integer type;
     private Integer type;
 
 
-    // 是否默认地址
+    /** 是否默认地址 */
     @Column(name = "is_default", nullable = false)
     @Column(name = "is_default", nullable = false)
     private Integer isDefault;
     private Integer isDefault;
 
 
-    // 显示顺序
+    /** 显示顺序 */
     @Column(name = "sequence")
     @Column(name = "sequence")
     private Integer sequence;
     private Integer sequence;
 
 
-    // 状态 0：不可用；1-可用
+    /** 状态 0：不可用；1-可用 */
     @Column(name = "status", nullable = false)
     @Column(name = "status", nullable = false)
     private Integer status;
     private Integer status;
 
 
-    // 联系人姓名
+    /** 联系人姓名 */
     @Column(name = "contactor", nullable = false)
     @Column(name = "contactor", nullable = false)
     private String contactor;
     private String contactor;
 
 
-    // 联系人电话
+    /** 联系人电话 */
     @Column(name = "cellphone", nullable = false)
     @Column(name = "cellphone", nullable = false)
     private String cellphone;
     private String cellphone;
 
 
-    // 国家
+    /** 国家 */
     @Column(name = "country", nullable = false)
     @Column(name = "country", nullable = false)
     private String country;
     private String country;
 
 
-    // 省份
+    /** 省份 */
     @Column(name = "province", nullable = false)
     @Column(name = "province", nullable = false)
     private String province;
     private String province;
 
 
-    // 城市
+    /** 城市 */
     @Column(name = "city", nullable = false)
     @Column(name = "city", nullable = false)
     private String city;
     private String city;
 
 
-    // 区县
+    /** 区县 */
     @Column(name = "district", nullable = false)
     @Column(name = "district", nullable = false)
     private String district;
     private String district;
 
 
-    // 地址
+    /** 地址 */
     @Column(name = "address", nullable = false)
     @Column(name = "address", nullable = false)
     private String address;
     private String address;
 
 
-    // 邮编
+    /** 邮编 */
     @Column(name = "zip_code")
     @Column(name = "zip_code")
     private String zipCode;
     private String zipCode;
 
 
-    // 创建时间
+    /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
-    private LocalDateTime createTime;
+    private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
-    private LocalDateTime updateTime;
+    private Timestamp updateTime;
 
 
     public void copy(MemberAddress source){
     public void copy(MemberAddress source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

+package com.topdraw.business.module.member.address.domain;
+
+import com.topdraw.business.module.member.domain.Member;
+import com.topdraw.exception.GlobeExceptionMsg;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.Assert;
+
+import java.util.Objects;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/3/11 11:08
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/3/11 11:08
+ */
+public class MemberAddressBuilder {
+
+    private static final Integer DEFAULT_VALUE_0 = 0;
+    private static final Integer DEFAULT_VALUE_1 = 1;
+
+    public static MemberAddress build(MemberAddress memberAddress, Long memberId,String memberCode){
+        Long id = memberAddress.getId();
+        Integer type = memberAddress.getType();
+        Integer isDefault = memberAddress.getIsDefault();
+        Integer sequence = memberAddress.getSequence();
+        Integer status= memberAddress.getStatus();
+        String contactor = memberAddress.getContactor();
+        String cellphone = memberAddress.getCellphone();
+        String country = memberAddress.getCountry();
+        String province = memberAddress.getProvince();
+        String city = memberAddress.getCity();
+        String district = memberAddress.getDistrict();
+        String address = memberAddress.getAddress();
+        String zipCode = memberAddress.getZipCode();
+        return build(id,memberId,memberCode,type,isDefault,sequence,status,
+                contactor,cellphone,country,province,city,district,address,zipCode);
+    }
+
+    public static MemberAddress build(MemberAddress memberAddress, Member member){
+        Long id = memberAddress.getId();
+        Long memberId = member.getId();
+        String memberCode = member.getCode();
+        Integer type = memberAddress.getType();
+        Integer isDefault = memberAddress.getIsDefault();
+        Integer sequence = memberAddress.getSequence();
+        Integer status= memberAddress.getStatus();
+        String contactor = memberAddress.getContactor();
+        String cellphone = memberAddress.getCellphone();
+        String country = memberAddress.getCountry();
+        String province = memberAddress.getProvince();
+        String city = memberAddress.getCity();
+        String district = memberAddress.getDistrict();
+        String address = memberAddress.getAddress();
+        String zipCode = memberAddress.getZipCode();
+        return build(id, memberId, memberCode, type, isDefault, sequence, status,
+                contactor, cellphone, country, province, city, district, address, zipCode);
+    }
+
+    public static MemberAddress build(MemberAddress memberAddress){
+        Long id = memberAddress.getId();
+        Long memberId = memberAddress.getMemberId();
+        String memberCode = memberAddress.getMemberCode();
+        Integer type = memberAddress.getType();
+        Integer isDefault = memberAddress.getIsDefault();
+        Integer sequence = memberAddress.getSequence();
+        Integer status= memberAddress.getStatus();
+        String contactor = memberAddress.getContactor();
+        String cellphone = memberAddress.getCellphone();
+        String country = memberAddress.getCountry();
+        String province = memberAddress.getProvince();
+        String city = memberAddress.getCity();
+        String district = memberAddress.getDistrict();
+        String address = memberAddress.getAddress();
+        String zipCode = memberAddress.getZipCode();
+        return build(id, memberId, memberCode, type, isDefault, sequence, status,
+                contactor, cellphone, country, province, city, district, address, zipCode);
+    }
+
+
+    public static MemberAddress build(Long id , Long memberId,String memberCode,
+                                      Integer type ,Integer isDefault, Integer sequence, Integer status,
+                                      String contactor, String cellphone,
+                                      String country, String province, String city,
+                                      String district, String address, String zipCode){
+        Assert.notNull(memberId, GlobeExceptionMsg.MEMBER_ID_IS_NULL);
+
+        MemberAddress memberAddress = new MemberAddress();
+        memberAddress.setId(Objects.isNull(id)?null:id);
+        memberAddress.setMemberId(Objects.isNull(memberId)?null:memberId);
+        memberAddress.setMemberCode(stringIsNull(memberCode));
+
+        memberAddress.setSequence(Objects.isNull(sequence)?DEFAULT_VALUE_1:sequence);
+        memberAddress.setType(Objects.isNull(type)?DEFAULT_VALUE_0:type);
+        memberAddress.setIsDefault(Objects.isNull(isDefault)?DEFAULT_VALUE_0:isDefault);
+        memberAddress.setStatus(Objects.isNull(status)?DEFAULT_VALUE_1:status);
+
+        memberAddress.setContactor(stringIsNull(contactor));
+        memberAddress.setCellphone(stringIsNull(cellphone));
+
+        memberAddress.setCountry(stringIsNull(country));
+        memberAddress.setProvince(stringIsNull(province));
+        memberAddress.setCity(stringIsNull(city));
+        memberAddress.setDistrict(stringIsNull(district));
+        memberAddress.setAddress(stringIsNull(address));
+        memberAddress.setZipCode(stringIsNull(zipCode));
+
+        return memberAddress;
+
+    }
+
+    private static String stringIsNull(String s){
+        return StringUtils.isBlank(s)?"":s;
+    }
+
+}

@@ -3,6 +3,7 @@ package com.topdraw.business.module.member.address.repository;
 import com.topdraw.business.module.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;
+import org.springframework.data.jpa.repository.Query;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -10,4 +11,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  */
  */
 public interface MemberAddressRepository extends JpaRepository<MemberAddress, Long>, JpaSpecificationExecutor<MemberAddress> {
 public interface MemberAddressRepository extends JpaRepository<MemberAddress, Long>, JpaSpecificationExecutor<MemberAddress> {
 
 
+    @Query(value = "select IFNULL(max(sequence),0) from uc_member_address where member_id = ?1" , nativeQuery = true)
+    int findMaxSequenceByMemberId(Long memberId);
+
 }
 }

 package com.topdraw.business.module.member.address.rest;
 package com.topdraw.business.module.member.address.rest;
 
 
 import com.topdraw.annotation.AnonymousAccess;
 import com.topdraw.annotation.AnonymousAccess;
-import com.topdraw.business.module.member.service.MemberService;
-import com.topdraw.business.module.member.service.dto.MemberDTO;
+import com.topdraw.business.module.common.validated.CreateGroup;
+import com.topdraw.business.module.common.validated.UpdateGroup;
+import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO;
+import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
+import com.topdraw.business.process.service.member.MemberAddressOperationService;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 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 lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 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.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.util.Objects;
-
 /**
 /**
  * @author XiangHan
  * @author XiangHan
  * @date 2021-10-22
  * @date 2021-10-22
  */
  */
-@Api(tags = "MemberAddress管理")
+@Api(tags = "会员地址管理")
 @RestController
 @RestController
-@RequestMapping("/ucEngine/api/memberAddress")
+@RequestMapping("/uce/memberAddress")
 @CrossOrigin
 @CrossOrigin
 @Slf4j
 @Slf4j
 public class MemberAddressController {
 public class MemberAddressController {
 
 
     @Autowired
     @Autowired
-    private MemberAddressService MemberAddressService;
-    @Autowired
-    private MemberService memberService;
-
-    @GetMapping(value = "/pageMemberAddress")
-    @ApiOperation("查询MemberAddress")
-    public ResultInfo pageMemberAddress(MemberAddressQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(MemberAddressService.queryAll(criteria,pageable));
-    }
-
-    @GetMapping(value = "/findById/{id}")
-    @ApiOperation("查询指定MemberAddress")
-    public ResultInfo findById(@PathVariable(value = "id") Long id) {
-        return ResultInfo.success(MemberAddressService.findById(id));
-    }
+    private MemberAddressOperationService memberAddressOperationService;
 
 
-    @PostMapping(value = "/create")
-    @ApiOperation("新增MemberAddress")
+    @RequestMapping(value = "/create")
+    @ApiOperation("新增会员地址")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultInfo create(@Validated @RequestBody MemberAddress resources) {
-        log.info("MemberAddressController ==>> create ===>>[{}]",resources);
-
-        Long memberId = resources.getMemberId();
-        MemberDTO memberDTO = this.memberService.findById(memberId);
-        String code = memberDTO.getCode();
-        resources.setMemberCode(code);
-        MemberAddressService.create(resources);
-        return ResultInfo.success();
+    public ResultInfo create(@Validated(value = {CreateGroup.class}) @RequestBody MemberAddress resources) {
+        log.info("memberAddress ==>> create ==> param  ==>> [{}]",resources);
+        BasicMemberAddressDTO memberAddressDTO = this.memberAddressOperationService.create(resources);
+        log.info("memberAddress ==>> create ==> result  ==>> [{}]",resources);
+        return ResultInfo.success(memberAddressDTO);
     }
     }
 
 
-    @PutMapping(value = "/update")
-    @ApiOperation("修改MemberAddress")
+    @RequestMapping(value = "/update")
+    @ApiOperation("修改会员地址")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultInfo update(@Validated @RequestBody MemberAddress resources) {
-
-        log.info("MemberAddressController ==>> update ===>>[{}]",resources);
-
-        Long memberId = resources.getMemberId();
-        Integer sequence = resources.getSequence();
-        Assert.notNull(memberId,"memberId can't be null");
-        Assert.notNull(sequence,"sequence can't be null");
-        MemberDTO memberDTO = this.memberService.findById(memberId);
-        if (Objects.nonNull(memberDTO)) {
-            String code = memberDTO.getCode();
-            Assert.notNull(code,"code can't be null");
-            resources.setMemberCode(code);
-            MemberAddressService.update(resources);
-        }
-        return ResultInfo.success();
+    public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberAddress resources) {
+        log.info("memberAddress ==>> update ==> param  ==>> [{}]",resources);
+        BasicMemberAddressDTO memberAddressDTO = this.memberAddressOperationService.update(resources);
+        log.info("memberAddress ==>> update ==> result  ==>> [{}]",resources);
+        return ResultInfo.success(memberAddressDTO);
     }
     }
 
 
-    @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation("删除MemberAddress")
+    @RequestMapping(value = "/delete")
+    @ApiOperation("删除会员地址")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultInfo delete(@PathVariable Long id) {
-        MemberAddressService.delete(id);
+    public ResultInfo delete(@RequestParam(value = "id") Long resources) {
+        log.info("memberAddress ==>> delete ==> param  ==>> [{}]",resources);
+        this.memberAddressOperationService.delete(resources);
         return ResultInfo.success();
         return ResultInfo.success();
     }
     }
 
 

@@ -2,10 +2,6 @@ package com.topdraw.business.module.member.address.service;
 
 
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 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.MemberAddressDTO;
-import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -14,30 +10,34 @@ import java.util.List;
 public interface MemberAddressService {
 public interface MemberAddressService {
 
 
     /**
     /**
-    * 查询数据分页
-    * @param criteria 条件参数
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(MemberAddressQueryCriteria criteria, Pageable pageable);
+     * 根据ID查询
+     * @param resources ID
+     * @return MemberAddressDTO
+     */
+    MemberAddressDTO findById(Long resources);
 
 
     /**
     /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<MemberAddressDTO>
-    */
-    List<MemberAddressDTO> queryAll(MemberAddressQueryCriteria criteria);
+     * 保存会员地址
+     * @param resources
+     */
+    MemberAddressDTO create(MemberAddress resources);
 
 
     /**
     /**
-     * 根据ID查询
-     * @param id ID
-     * @return MemberAddressDTO
+     * 修改会员地址
+     * @param resources
      */
      */
-    MemberAddressDTO findById(Long id);
+    MemberAddressDTO update(MemberAddress resources);
 
 
-    void create(MemberAddress resources);
-
-    void update(MemberAddress resources);
+    /**
+     * 通过id删除
+     * @param resources
+     */
+    void delete(Long resources);
 
 
-    void delete(Long id);
+    /**
+     * 地址最大序列号
+     * @param memberId
+     * @return
+     */
+    int findMaxSequenceByMemberId(Long memberId);
 }
 }

+package com.topdraw.business.module.member.address.service.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * @author XiangHan
+ * @date 2021-10-22
+ */
+@Data
+public class BasicMemberAddressDTO implements Serializable {
+
+    /** 主键 */
+    private Long id;
+
+    /** 会员id */
+    private Long memberId;
+
+    /** 类型 1：家；2：公司；3：学校 */
+    private Integer type;
+
+    /** 是否默认地址 */
+    private Integer isDefault;
+
+    /** 显示顺序 */
+    private Integer sequence;
+
+    /** 状态 0：不可用；1-可用 */
+    private Integer status;
+
+    /** 联系人姓名 */
+    private String contactor;
+
+    /** 联系人电话 */
+    private String cellphone;
+
+    /** 国家 */
+    private String country;
+
+    /** 省份 */
+    private String province;
+
+    /** 城市 */
+    private String city;
+
+    /** 区县 */
+    private String district;
+
+    /** 地址 */
+    private String address;
+
+    /** 邮编 */
+    private String zipCode;
+}

 package com.topdraw.business.module.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.io.Serializable;
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 
 
@@ -13,51 +13,54 @@ import java.time.LocalDateTime;
 @Data
 @Data
 public class MemberAddressDTO implements Serializable {
 public class MemberAddressDTO implements Serializable {
 
 
-    // 主键
+    /** 会员code */
+    private String memberCode;
+
+    /** 主键 */
     private Long id;
     private Long id;
 
 
-    // 会员id
+    /** 会员id */
     private Long memberId;
     private Long memberId;
 
 
-    // 类型 1：家；2：公司；3：学校
+    /** 类型 1：家；2：公司；3：学校 */
     private Integer type;
     private Integer type;
 
 
-    // 是否默认地址
+    /** 是否默认地址 */
     private Integer isDefault;
     private Integer isDefault;
 
 
-    // 显示顺序
+    /** 显示顺序 */
     private Integer sequence;
     private Integer sequence;
 
 
-    // 状态 0：不可用；1-可用
+    /** 状态 0：不可用；1-可用 */
     private Integer status;
     private Integer status;
 
 
-    // 联系人姓名
+    /** 联系人姓名 */
     private String contactor;
     private String contactor;
 
 
-    // 联系人电话
+    /** 联系人电话 */
     private String cellphone;
     private String cellphone;
 
 
-    // 国家
+    /** 国家 */
     private String country;
     private String country;
 
 
-    // 省份
+    /** 省份 */
     private String province;
     private String province;
 
 
-    // 城市
+    /** 城市 */
     private String city;
     private String city;
 
 
-    // 区县
+    /** 区县 */
     private String district;
     private String district;
 
 
-    // 地址
+    /** 地址 */
     private String address;
     private String address;
 
 
-    // 邮编
+    /** 邮编 */
     private String zipCode;
     private String zipCode;
 
 
-    // 创建时间
-    private LocalDateTime createTime;
+    /** 创建时间 */
+    private Timestamp createTime;
 
 
-    // 更新时间
-    private LocalDateTime updateTime;
+    /** 更新时间 */
+    private Timestamp updateTime;
 }
 }

-package com.topdraw.business.module.member.address.service.dto;
-
-import com.topdraw.annotation.Query;
-import lombok.Data;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Data
-public class MemberAddressQueryCriteria{
-
-    @Query
-    private Long memberId;
-
-}

 package com.topdraw.business.module.member.address.service.impl;
 package com.topdraw.business.module.member.address.service.impl;
 
 
-import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
 import com.topdraw.business.module.member.address.domain.MemberAddress;
+import com.topdraw.business.module.member.address.domain.MemberAddressBuilder;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.MemberService;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
+import com.topdraw.utils.RedisUtils;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.member.address.repository.MemberAddressRepository;
 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.MemberAddressService;
 import com.topdraw.business.module.member.address.service.dto.MemberAddressDTO;
 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.address.service.mapper.MemberAddressMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.domain.Page;
-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.QueryHelp;
-
-import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -29,58 +25,105 @@ import java.util.Map;
  */
  */
 @Service
 @Service
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+@Slf4j
 public class MemberAddressServiceImpl implements MemberAddressService {
 public class MemberAddressServiceImpl implements MemberAddressService {
 
 
     @Autowired
     @Autowired
-    private MemberAddressRepository MemberAddressRepository;
-
+    private MemberService memberService;
     @Autowired
     @Autowired
-    private MemberAddressMapper MemberAddressMapper;
-
-    @Override
-    public Map<String, Object> queryAll(MemberAddressQueryCriteria criteria, Pageable pageable) {
-        Page<MemberAddress> page = MemberAddressRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(MemberAddressMapper::toDto));
-    }
-
-    @Override
-    public List<MemberAddressDTO> queryAll(MemberAddressQueryCriteria criteria) {
-        return MemberAddressMapper.toDto(MemberAddressRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
+    private MemberAddressMapper memberAddressMapper;
+    @Autowired
+    private MemberAddressRepository memberAddressRepository;
 
 
+    @Autowired
+    private RedisUtils redisUtils;
+    
     @Override
     @Override
     public MemberAddressDTO findById(Long id) {
     public MemberAddressDTO findById(Long id) {
-        MemberAddress MemberAddress = MemberAddressRepository.findById(id).orElseGet(MemberAddress::new);
+        Assert.notNull(id,"id can't be null");
+        MemberAddress MemberAddress = this.memberAddressRepository.findById(id).orElseGet(MemberAddress::new);
         ValidationUtil.isNull(MemberAddress.getId(),"MemberAddress","id",id);
         ValidationUtil.isNull(MemberAddress.getId(),"MemberAddress","id",id);
-        return MemberAddressMapper.toDto(MemberAddress);
+        return this.memberAddressMapper.toDto(MemberAddress);
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void create(MemberAddress resources) {
-        MemberAddressRepository.save(resources);
+    public MemberAddressDTO create(MemberAddress resources) {
+        log.info("MemberAddressServiceImpl ==>> create ==>> param ==>> [{}]",resources);
+        MemberDTO memberDTO = this.checkMember(resources);
+
+        MemberAddress _memberAddress = MemberAddressBuilder.build(resources, memberDTO.getId(), memberDTO.getCode());
+        MemberAddress memberAddress = this.memberAddressRepository.save(_memberAddress);
+
+        log.info("MemberAddressServiceImpl ==>> create ==>> result ==>> [{}]",resources);
+        MemberAddressDTO memberAddressDTO = new MemberAddressDTO();
+        BeanUtils.copyProperties(memberAddress, memberAddressDTO);
+        return memberAddressDTO;
+
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void update(MemberAddress resources) {
-        MemberAddress MemberAddress = MemberAddressRepository.findById(resources.getId()).orElseGet(MemberAddress::new);
-        ValidationUtil.isNull( MemberAddress.getId(),"MemberAddress","id",resources.getId());
-        MemberAddress.copy(resources);
-        MemberAddressRepository.save(MemberAddress);
+    public MemberAddressDTO update(MemberAddress resources) {
+        log.info("MemberAddressServiceImpl ==>> update ==>> param ==>> [{}]",resources);
+        Assert.notNull(resources.getId(),"id can't be null");
+        try {
+            this.redisUtils.doLock("memberAddress::memberId::" + resources.getMemberId());
+
+            MemberAddress _memberAddress = this.memberAddressRepository.findById(resources.getId()).orElseGet(MemberAddress::new);
+            ValidationUtil.isNull( _memberAddress.getId(),"MemberAddress","id",resources.getId());
+
+            resources.setMemberId(_memberAddress.getMemberId());
+            MemberDTO memberDTO = this.checkMember(resources);
+            resources.setMemberCode(memberDTO.getCode());
+
+            _memberAddress.copy(resources);
+            MemberAddress memberAddress = this.memberAddressRepository.save(_memberAddress);
+
+            MemberAddressDTO memberAddressDTO = new MemberAddressDTO();
+            BeanUtils.copyProperties(memberAddress, memberAddressDTO);
+            return memberAddressDTO;
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        } finally {
+            this.redisUtils.doUnLock("memberAddress::memberId::" + resources.getMemberId());
+        }
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public void delete(Long id) {
     public void delete(Long id) {
         Assert.notNull(id, "The given id must not be null!");
         Assert.notNull(id, "The given id must not be null!");
-        MemberAddress MemberAddress = MemberAddressRepository.findById(id).orElseThrow(
+        MemberAddress MemberAddress = this.memberAddressRepository.findById(id).orElseThrow(
                 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberAddress.class, id), 1));
                 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberAddress.class, id), 1));
-        MemberAddressRepository.delete(MemberAddress);
+        this.memberAddressRepository.delete(MemberAddress);
     }
     }
 
 
+    @Override
+    public int findMaxSequenceByMemberId(Long memberId) {
+        return this.memberAddressRepository.findMaxSequenceByMemberId(memberId);
+    }
+
+    /**
+     * 检查会员
+     * @param memberAddress
+     * @return
+     */
+    private MemberDTO checkMember(MemberAddress memberAddress){
+        Long memberId = memberAddress.getMemberId();
+        String memberCode = memberAddress.getMemberCode();
+        return this.checkMember(memberId,memberCode);
+    }
+
+    /**
+     * 检查会员
+     * @param memberId 会员id
+     * @param memberCode 会员code
+     * @return
+     */
+    private MemberDTO checkMember(Long memberId, String memberCode) {
+        return this.memberService.checkMember(memberId, memberCode);
+    }
 
 
 }
 }

@@ -2,6 +2,7 @@ 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.module.common.validated.UpdateGroup;
 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;
@@ -9,9 +10,9 @@ import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 
 import javax.persistence.*;
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
-import java.time.LocalDateTime;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -30,12 +31,13 @@ public class Member implements Serializable {
 
 
     /** 会员过期时间 */
     /** 会员过期时间 */
     @Column(name = "vip_expire_time", nullable = false)
     @Column(name = "vip_expire_time", nullable = false)
-    private LocalDateTime vipExpireTime;
+    private Timestamp vipExpireTime;
 
 
     /** 主键 */
     /** 主键 */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
+    @NotNull(message = "id can't be null!!",groups = {UpdateGroup.class})
     private Long id;
     private Long id;
 
 
     /** 标识 */
     /** 标识 */
@@ -116,17 +118,17 @@ public class Member implements Serializable {
 
 
     /** iptv账号绑定时间 */
     /** iptv账号绑定时间 */
     @Column(name = "bind_iptv_time")
     @Column(name = "bind_iptv_time")
-    private LocalDateTime bindIptvTime;
+    private Timestamp bindIptvTime;
 
 
     /** 创建时间 */
     /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
-    private LocalDateTime createTime;
+    private Timestamp createTime;
 
 
     /** 更新时间 */
     /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
-    private LocalDateTime updateTime;
+    private Timestamp updateTime;
 
 
     /** 是否在黑名单 1：是；0否 */
     /** 是否在黑名单 1：是；0否 */
     @Column(name = "black_status")
     @Column(name = "black_status")

 package com.topdraw.business.module.member.domain;
 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 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 org.apache.commons.lang3.StringUtils;
 
 
-import javax.persistence.*;
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
+import java.util.Objects;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -20,22 +11,63 @@ import java.time.LocalDateTime;
  */
  */
 public class MemberBuilder {
 public class MemberBuilder {
 
 
-    public static Member build(Integer type,String avatarUrl,String nickname,Integer vip){
+    private static final Long DEFAULT_VALUE = 0L;
+    private static final Integer DEFAULT_VALUE_1 = 1;
+    private static final Integer DEFAULT_VALUE_ = -1;
+
+    public static Member build(Member member){
+        Member _member = checkMemberData(member);
+        return _member;
+    }
+
+    private static Member checkMemberData(Member member) {
+        String code = member.getCode();
+        member.setCode(StringUtils.isEmpty(code)?String.valueOf(IdWorker.generator()):code);
+        Integer gender = member.getGender();
+        member.setGender(Objects.nonNull(gender) ? gender : DEFAULT_VALUE_);
+        Integer type = member.getType();
+        member.setType(Objects.nonNull(type) ? type:DEFAULT_VALUE_);
+        Integer status = member.getStatus();
+        member.setStatus(Objects.nonNull(status) ? status:DEFAULT_VALUE_1);
+        Integer vip = member.getVip();
+        member.setVip(Objects.nonNull(vip) ? vip:0);
+        Integer level = member.getLevel();
+        member.setLevel(Objects.nonNull(level) ? level:DEFAULT_VALUE_1);
+        member.setExp(DEFAULT_VALUE);
+        member.setPoints(DEFAULT_VALUE);
+        member.setDuePoints(DEFAULT_VALUE);
+        member.setCouponAmount(DEFAULT_VALUE);
+        member.setDueCouponAmount(DEFAULT_VALUE);
+        member.setBlackStatus(DEFAULT_VALUE);
+        member.setBirthday(StringUtils.isBlank(member.getBirthday())?"1900-01-01":member.getBirthday());
+        /*String nickname = member.getNickname();
+        if (StringUtils.isNotEmpty(nickname)) {
+            String base64Nickname = new String(Base64.getEncoder().encode(nickname.getBytes(StandardCharsets.UTF_8)));
+            member.setNickname(base64Nickname);
+        }*/
+        return member;
+    }
+
+   public static Member build(Integer type, String avatarUrl, String nickname, int vip){
+        // todo 原型模式
+       Member member = new Member();
+       member.setType(type);
+       member.setAvatarUrl(avatarUrl);
+       member.setNickname(nickname);
+       member.setVip(vip);
+       Member _member = checkMemberData(member);
+       return _member;
+    }
+
+    public static Member build(Integer type, String avatarUrl, String nickname, int vip, Integer sex){
+        // todo 原型模式
         Member member = new Member();
         Member member = new Member();
         member.setType(type);
         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.setAvatarUrl(avatarUrl);
-        member.setCode(IdWorker.generator() + "");
         member.setNickname(nickname);
         member.setNickname(nickname);
-        return member;
+        member.setVip(vip);
+        member.setGender(Objects.isNull(sex) == true ? -1:sex);
+        Member _member = checkMemberData(member);
+        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.module.member.group.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.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+* @author luerlong
+* @date 2021-09-27
+*/
+@Entity
+@Data
+@EntityListeners(AuditingEntityListener.class)
+@Accessors(chain = true)
+@Table(name="uc_group")
+public class Group implements Serializable {
+
+    /** ID */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    /** CODE */
+    @Column(name = "code")
+    private String code;
+
+    /** 名称 */
+    @Column(name = "name")
+    private String name;
+
+    /** 状态 0-下线 1-上线 */
+    @Column(name = "status")
+    private Integer status;
+
+    /** 权限 0-测试分组 1-鉴权通过（白名单） 2-不允许精准（黑名单）3-可以精准（金名单） */
+    @Column(name = "permission_type")
+    private Integer permissionType;
+
+    public void copy(Group source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

@@ -23,58 +23,58 @@ import java.io.Serializable;
 @Table(name="uc_member_group")
 @Table(name="uc_member_group")
 public class MemberGroup implements Serializable {
 public class MemberGroup implements Serializable {
 
 
-    // ID ID
+    /** ID */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
     private Long id;
     private Long id;
 
 
-    // 分组ID
+    /** 分组ID */
     @Column(name = "group_id")
     @Column(name = "group_id")
     private Long groupId;
     private Long groupId;
 
 
-    // 会员ID
+    /** 会员ID */
     @Column(name = "member_id")
     @Column(name = "member_id")
     private Long memberId;
     private Long memberId;
 
 
-    // 运营商平台账号
+    /** 运营商平台账号 */
     @Column(name = "platform_account")
     @Column(name = "platform_account")
     private String platformAccount;
     private String platformAccount;
 
 
-    // 手机号
+    /** 手机号 */
     @Column(name = "cellphone")
     @Column(name = "cellphone")
     private String cellphone;
     private String cellphone;
 
 
-    // 设备
+    /** 设备 */
     @Column(name = "stb_id")
     @Column(name = "stb_id")
     private String stbId;
     private String stbId;
 
 
-    // 有线MAC地址
+    /** 有线MAC地址 */
     @Column(name = "eth_mac")
     @Column(name = "eth_mac")
     private String ethMac;
     private String ethMac;
 
 
-    // 无线MAC地址
+    /** 无线MAC地址 */
     @Column(name = "wifi_mac")
     @Column(name = "wifi_mac")
     private String wifiMac;
     private String wifiMac;
 
 
-    // 描述
+    /** 描述 */
     @Column(name = "description")
     @Column(name = "description")
     private String description;
     private String description;
 
 
-    // 创建者
+    /** 创建者 */
     @Column(name = "create_by")
     @Column(name = "create_by")
     private String createBy;
     private String createBy;
 
 
-    // 创建时间
+    /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新者
+    /** 更新者 */
     @Column(name = "update_by")
     @Column(name = "update_by")
     private String updateBy;
     private String updateBy;
 
 
-    // 更新时间
+    /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
     private Timestamp updateTime;
     private Timestamp updateTime;

+package com.topdraw.business.module.member.group.repository;
+
+import com.topdraw.business.module.member.group.domain.Group;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+* @author luerlong
+* @date 2021-09-27
+*/
+public interface GroupRepository extends JpaRepository<Group, Long>, JpaSpecificationExecutor<Group> {
+
+    Optional<Group> findFirstByCode(String code);
+
+    List<Group> findByName(String name);
+
+    @Query(value = "select t1.id from uc_group t1  left join uc_user__group t2 on t1.id = t2.group_id where t2.user_id = ?1 and t1.permission_type = ?2  ", nativeQuery = true)
+    List<Map<String, Object>> findByUserIdAndPermissionType(Long userId, Integer type);
+}

 package com.topdraw.business.module.member.group.repository;
 package com.topdraw.business.module.member.group.repository;
 
 
 import com.topdraw.business.module.member.group.domain.MemberGroup;
 import com.topdraw.business.module.member.group.domain.MemberGroup;
+import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
 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.List;
+
 /**
 /**
  * @author XiangHan
  * @author XiangHan
  * @date 2021-11-17
  * @date 2021-11-17
  */
  */
 public interface MemberGroupRepository extends JpaRepository<MemberGroup, Long>, JpaSpecificationExecutor<MemberGroup> {
 public interface MemberGroupRepository extends JpaRepository<MemberGroup, Long>, JpaSpecificationExecutor<MemberGroup> {
 
 
+    List<MemberGroupDTO> findByMemberId(Long memberId);
 }
 }

-package com.topdraw.business.module.member.group.rest;
-
-import com.topdraw.common.ResultInfo;
-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.data.domain.Pageable;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-
-/**
- * @author XiangHan
- * @date 2021-11-17
- */
-@Api(tags = "MemberGroup管理")
-@RestController
-@RequestMapping("/api/MemberGroup")
-public class MemberGroupController {
-
-    @Autowired
-    private MemberGroupService MemberGroupService;
-
-    @GetMapping
-    @ApiOperation("查询MemberGroup")
-    public ResultInfo getMemberGroups(MemberGroupQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(MemberGroupService.queryAll(criteria,pageable));
-    }
-
-    @GetMapping(value = "/all")
-    @ApiOperation("查询所有MemberGroup")
-    public ResultInfo getMemberGroups(MemberGroupQueryCriteria criteria) {
-        return ResultInfo.success(MemberGroupService.queryAll(criteria));
-    }
-
-    @PostMapping
-    @ApiOperation("新增MemberGroup")
-    public ResultInfo create(@Validated @RequestBody MemberGroup resources) {
-        MemberGroupService.create(resources);
-        return ResultInfo.success();
-    }
-
-    @PutMapping
-    @ApiOperation("修改MemberGroup")
-    public ResultInfo update(@Validated @RequestBody MemberGroup resources) {
-        MemberGroupService.update(resources);
-        return ResultInfo.success();
-    }
-
-    @DeleteMapping(value = "/{id}")
-    @ApiOperation("删除MemberGroup")
-    public ResultInfo delete(@PathVariable Long id) {
-        MemberGroupService.delete(id);
-        return ResultInfo.success();
-    }
-
-}

+package com.topdraw.business.module.member.group.service;
+
+import com.topdraw.business.module.member.group.service.dto.GroupDTO;
+
+
+/**
+* @author luerlong
+* @date 2021-09-27
+*/
+public interface GroupService {
+
+
+    /**
+     * 根据ID查询
+     * @param id ID
+     * @return GroupDTO
+     */
+    GroupDTO findById(Long id);
+
+    /**
+    * Code校验
+    * @param code
+    * @return GroupDTO
+    */
+    GroupDTO getByCode(String code);
+}

@@ -2,9 +2,7 @@ package com.topdraw.business.module.member.group.service;
 
 
 import com.topdraw.business.module.member.group.domain.MemberGroup;
 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.MemberGroupDTO;
-import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
+
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -14,19 +12,11 @@ import java.util.List;
 public interface MemberGroupService {
 public interface MemberGroupService {
 
 
     /**
     /**
-    * 查询数据分页
-    * @param criteria 条件参数
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(MemberGroupQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<MemberGroupDTO>
-    */
-    List<MemberGroupDTO> queryAll(MemberGroupQueryCriteria criteria);
+     * 通过会员id获取会员分组列表
+     * @param memberId
+     * @return
+     */
+    List<MemberGroupDTO> findByMemberId(Long memberId);
 
 
     /**
     /**
      * 根据ID查询
      * 根据ID查询
@@ -35,10 +25,4 @@ public interface MemberGroupService {
      */
      */
     MemberGroupDTO findById(Long id);
     MemberGroupDTO findById(Long id);
 
 
-    void create(MemberGroup resources);
-
-    void update(MemberGroup resources);
-
-    void delete(Long id);
-
 }
 }

+package com.topdraw.business.module.member.group.service.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+* @author luerlong
+* @date 2021-09-27
+*/
+@Data
+public class GroupDTO implements Serializable {
+
+    /** ID  */
+    private Long id;
+
+    /** CODE */
+    private String code;
+
+    /** 名称 */
+    private String name;
+
+    /** 状态 0-下线 1-上线 */
+    private Integer status;
+
+    /** 权限 0-测试分组 1-鉴权通过（白名单） 2-不允许精准（黑名单）3-可以精准（金名单） */
+    private Integer permissionType;
+
+}

@@ -12,42 +12,43 @@ import java.io.Serializable;
 @Data
 @Data
 public class MemberGroupDTO implements Serializable {
 public class MemberGroupDTO implements Serializable {
 
 
-    // ID ID
+    /** ID */
     private Long id;
     private Long id;
 
 
-    // 分组ID
+    /** 分组ID */
     private Long groupId;
     private Long groupId;
 
 
-    // 会员ID
+    /** 会员ID */
     private Long memberId;
     private Long memberId;
 
 
-    // 运营商平台账号
+    /** 运营商平台账号 */
     private String platformAccount;
     private String platformAccount;
 
 
-    // 手机号
+    /** 手机号 */
     private String cellphone;
     private String cellphone;
 
 
-    // 设备
+    /** 设备 */
     private String stbId;
     private String stbId;
 
 
-    // 有线MAC地址
+    /** 有线MAC地址 */
     private String ethMac;
     private String ethMac;
 
 
-    // 无线MAC地址
+    /** 无线MAC地址 */
     private String wifiMac;
     private String wifiMac;
 
 
-    // 描述
+    /** 描述 */
     private String description;
     private String description;
 
 
-    // 创建者
+    /** 创建者 */
     private String createBy;
     private String createBy;
 
 
-    // 创建时间
+    /** 创建时间 */
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新者
+    /** 更新者 */
     private String updateBy;
     private String updateBy;
 
 
-    // 更新时间
+    /** 更新时间 */
     private Timestamp updateTime;
     private Timestamp updateTime;
+
 }
 }

-package com.topdraw.business.module.member.group.service.dto;
-
-import lombok.Data;
-import com.topdraw.annotation.Query;
-
-/**
- * @author XiangHan
- * @date 2021-11-17
- */
-@Data
-public class MemberGroupQueryCriteria{
-
-    @Query(type = Query.Type.EQUAL)
-    private Long memberId;
-}

+package com.topdraw.business.module.member.group.service.impl;
+
+import com.topdraw.business.module.member.group.domain.Group;
+import com.topdraw.business.module.member.group.repository.GroupRepository;
+import com.topdraw.business.module.member.group.service.GroupService;
+import com.topdraw.business.module.member.group.service.dto.GroupDTO;
+import com.topdraw.business.module.member.group.service.mapper.GroupMapper;
+import com.topdraw.utils.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author luerlong
+ * @date 2021-09-27
+ */
+@Service
+@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
+public class GroupServiceImpl implements GroupService {
+
+    @Autowired
+    private GroupRepository groupRepository;
+
+    @Autowired
+    private GroupMapper groupMapper;
+
+    @Override
+    public GroupDTO findById(Long id) {
+        Group group = groupRepository.findById(id).orElseGet(Group::new);
+        ValidationUtil.isNull(group.getId(),"Group","id",id);
+        return groupMapper.toDto(group);
+    }
+
+    @Override
+    public GroupDTO getByCode(String code) {
+        return StringUtils.isNotEmpty(code) ? groupMapper.toDto(groupRepository.findFirstByCode(code).orElseGet(Group::new))
+        : new GroupDTO();
+    }
+}

@@ -5,21 +5,13 @@ import com.topdraw.utils.ValidationUtil;
 import com.topdraw.business.module.member.group.repository.MemberGroupRepository;
 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.MemberGroupService;
 import com.topdraw.business.module.member.group.service.dto.MemberGroupDTO;
 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 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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.util.Assert;
-import com.topdraw.utils.PageUtil;
-import com.topdraw.utils.QueryHelp;
 
 
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -30,52 +22,20 @@ import java.util.Map;
 public class MemberGroupServiceImpl implements MemberGroupService {
 public class MemberGroupServiceImpl implements MemberGroupService {
 
 
     @Autowired
     @Autowired
-    private MemberGroupRepository MemberGroupRepository;
-
+    private MemberGroupRepository memberGroupRepository;
     @Autowired
     @Autowired
-    private MemberGroupMapper MemberGroupMapper;
-
-    @Override
-    public Map<String, Object> queryAll(MemberGroupQueryCriteria criteria, Pageable pageable) {
-        Page<MemberGroup> page = MemberGroupRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(MemberGroupMapper::toDto));
-    }
+    private MemberGroupMapper memberGroupMapper;
 
 
     @Override
     @Override
-    public List<MemberGroupDTO> queryAll(MemberGroupQueryCriteria criteria) {
-        return MemberGroupMapper.toDto(MemberGroupRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+    public List<MemberGroupDTO> findByMemberId(Long memberId) {
+        return this.memberGroupRepository.findByMemberId(memberId);
     }
     }
 
 
     @Override
     @Override
     public MemberGroupDTO findById(Long id) {
     public MemberGroupDTO findById(Long id) {
-        MemberGroup MemberGroup = MemberGroupRepository.findById(id).orElseGet(MemberGroup::new);
-        ValidationUtil.isNull(MemberGroup.getId(),"MemberGroup","id",id);
-        return MemberGroupMapper.toDto(MemberGroup);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void create(MemberGroup resources) {
-        MemberGroupRepository.save(resources);
+        MemberGroup memberGroup = this.memberGroupRepository.findById(id).orElseGet(MemberGroup::new);
+        ValidationUtil.isNull(memberGroup.getId(),"MemberGroup","id",id);
+        return this.memberGroupMapper.toDto(memberGroup);
     }
     }
 
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(MemberGroup resources) {
-        MemberGroup MemberGroup = MemberGroupRepository.findById(resources.getId()).orElseGet(MemberGroup::new);
-        ValidationUtil.isNull( MemberGroup.getId(),"MemberGroup","id",resources.getId());
-        MemberGroup.copy(resources);
-        MemberGroupRepository.save(MemberGroup);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(Long id) {
-        Assert.notNull(id, "The given id must not be null!");
-        MemberGroup MemberGroup = MemberGroupRepository.findById(id).orElseThrow(
-                () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberGroup.class, id), 1));
-        MemberGroupRepository.delete(MemberGroup);
-    }
-
-
 }
 }

+package com.topdraw.business.module.member.group.service.mapper;
+
+import com.topdraw.base.BaseMapper;
+import com.topdraw.business.module.member.group.domain.Group;
+import com.topdraw.business.module.member.group.service.dto.GroupDTO;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+/**
+* @author luerlong
+* @date 2021-09-27
+*/
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface GroupMapper extends BaseMapper<GroupDTO, Group> {
+
+}

 package com.topdraw.business.module.member.level.domain;
 package com.topdraw.business.module.member.level.domain;
 
 
+import com.topdraw.business.module.common.validated.CreateGroup;
+import com.topdraw.business.module.common.validated.UpdateGroup;
 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;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.bean.copier.CopyOptions;
 import javax.persistence.*;
 import javax.persistence.*;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
@@ -23,50 +28,53 @@ import java.io.Serializable;
 @Table(name="uc_member_level")
 @Table(name="uc_member_level")
 public class MemberLevel implements Serializable {
 public class MemberLevel implements Serializable {
 
 
-    // 主键
+    /** 主键 */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
+    @NotNull(message = "id can't be null !!" , groups = {UpdateGroup.class})
     private Long id;
     private Long id;
 
 
-    // 标识
+    /** 标识 */
     @Column(name = "code", nullable = false)
     @Column(name = "code", nullable = false)
     private String code;
     private String code;
 
 
-    // 名称
+    /** 名称 */
     @Column(name = "name", nullable = false)
     @Column(name = "name", nullable = false)
     private String name;
     private String name;
 
 
-    // 状态 0：未启用；1：启用
+    /** 状态 0：未启用；1：启用 */
     @Column(name = "status", nullable = false)
     @Column(name = "status", nullable = false)
     private Integer status;
     private Integer status;
 
 
-    // 对应成长值
+    /** 对应成长值 */
     @Column(name = "exp_value", nullable = false)
     @Column(name = "exp_value", nullable = false)
     private Long expValue;
     private Long expValue;
 
 
-    // 等级（不可重复，数字越大等级越高）
+    /** 等级（不可重复，数字越大等级越高） */
     @Column(name = "level", nullable = false)
     @Column(name = "level", nullable = false)
+    @Min(message = "level can't less then 1" , value = 1)
+    @NotNull(message = "level can't be null" , groups = {CreateGroup.class,UpdateGroup.class})
     private Integer level;
     private Integer level;
 
 
-    // 会员徽标
+    /** 会员徽标 */
     @Column(name = "icon_url")
     @Column(name = "icon_url")
     private String iconUrl;
     private String iconUrl;
 
 
-    // 描述
+    /** 描述 */
     @Column(name = "description")
     @Column(name = "description")
     private String description;
     private String description;
 
 
-    // 对应任务id，通过此字段可获得该等级所对应的权益
+    /** 对应任务id，通过此字段可获得该等级所对应的权益 */
     @Column(name = "task_id")
     @Column(name = "task_id")
     private Long taskId;
     private Long taskId;
 
 
-    // 创建时间
+    /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
     private Timestamp updateTime;
     private Timestamp updateTime;

-package com.topdraw.business.module.member.level.rest;
-
-import com.topdraw.common.ResultInfo;
-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.data.domain.Pageable;
-import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Api(tags = "MemberLevel管理")
-@RestController
-@RequestMapping("/api/MemberLevel")
-public class MemberLevelController {
-
-    @Autowired
-    private MemberLevelService MemberLevelService;
-
-    @GetMapping
-    @ApiOperation("查询MemberLevel")
-    public ResultInfo getMemberLevels(MemberLevelQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(MemberLevelService.queryAll(criteria,pageable));
-    }
-
-    @GetMapping(value = "/all")
-    @ApiOperation("查询所有MemberLevel")
-    public ResultInfo getMemberLevels(MemberLevelQueryCriteria criteria) {
-        return ResultInfo.success(MemberLevelService.queryAll(criteria));
-    }
-
-    /*@Log
-    @PostMapping(value = "/create")
-    @ApiOperation("新增MemberLevel")
-    public ResultInfo create(@Validated @RequestBody MemberLevel resources) {
-        MemberLevelService.create(resources);
-        return ResultInfo.success();
-    }
-
-    @Log
-    @PutMapping(value = "/update")
-    @ApiOperation("修改MemberLevel")
-    public ResultInfo update(@Validated @RequestBody MemberLevel resources) {
-        MemberLevelService.update(resources);
-        return ResultInfo.success();
-    }
-
-
-    @Log
-    @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation("删除MemberLevel")
-    public ResultInfo delete(@PathVariable Long id) {
-        MemberLevelService.delete(id);
-        return ResultInfo.success();
-    }*/
-
-    @GetMapping(value = "/getByCode/{code}")
-    @ApiOperation(value = "根据标识查询")
-    public ResultInfo getByCode(@PathVariable String code) {
-        return ResultInfo.success(MemberLevelService.getByCode(code));
-    }
-}

 package com.topdraw.business.module.member.level.service;
 package com.topdraw.business.module.member.level.service;
 
 
-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.MemberLevelDTO;
-import com.topdraw.business.module.member.level.service.dto.MemberLevelQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
+
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -14,33 +11,12 @@ import java.util.List;
 public interface MemberLevelService {
 public interface MemberLevelService {
 
 
     /**
     /**
-    * 查询数据分页
-    * @param criteria 条件参数
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(MemberLevelQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<MemberLevelDTO>
-    */
-    List<MemberLevelDTO> queryAll(MemberLevelQueryCriteria criteria);
-
-    /**
      * 根据ID查询
      * 根据ID查询
      * @param id ID
      * @param id ID
      * @return MemberLevelDTO
      * @return MemberLevelDTO
      */
      */
     MemberLevelDTO findById(Long id);
     MemberLevelDTO findById(Long id);
 
 
-    void create(MemberLevel resources);
-
-    void update(MemberLevel resources);
-
-    void delete(Long id);
-
     /**
     /**
     * Code校验
     * Code校验
     * @param code
     * @param code
@@ -48,5 +24,13 @@ public interface MemberLevelService {
     */
     */
     MemberLevelDTO getByCode(String code);
     MemberLevelDTO getByCode(String code);
 
 
+    /**
+     * 通过等级和状态检索
+     * @param i
+     * @param status
+     * @return
+     */
     List<MemberLevelDTO> findLevelAndStatus(Integer i, Integer status);
     List<MemberLevelDTO> findLevelAndStatus(Integer i, Integer status);
+
+    
 }
 }

@@ -12,36 +12,36 @@ import java.io.Serializable;
 @Data
 @Data
 public class MemberLevelDTO implements Serializable {
 public class MemberLevelDTO implements Serializable {
 
 
-    // 主键
+    /** 主键 */
     private Long id;
     private Long id;
 
 
-    // 标识
+    /** 标识 */
     private String code;
     private String code;
 
 
-    // 名称
+    /** 名称 */
     private String name;
     private String name;
 
 
-    // 状态 0：未启用；1：启用
+    /** 状态 0：未启用；1：启用 */
     private Integer status;
     private Integer status;
 
 
-    // 对应成长值
+    /** 对应成长值 */
     private Long expValue;
     private Long expValue;
 
 
-    // 等级（不可重复，数字越大等级越高）
+    /** 等级（不可重复，数字越大等级越高） */
     private Integer level;
     private Integer level;
 
 
-    // 会员徽标
+    /** 会员徽标 */
     private String iconUrl;
     private String iconUrl;
 
 
-    // 描述
+    /** 描述 */
     private String description;
     private String description;
 
 
-    // 对应任务id，通过此字段可获得该等级所对应的权益
+    /** 对应任务id，通过此字段可获得该等级所对应的权益 */
     private Long taskId;
     private Long taskId;
 
 
-    // 创建时间
+    /** 创建时间 */
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     private Timestamp updateTime;
     private Timestamp updateTime;
 }
 }

-package com.topdraw.business.module.member.level.service.dto;
-
-import lombok.Data;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Data
-public class MemberLevelQueryCriteria{
-}

 package com.topdraw.business.module.member.level.service.impl;
 package com.topdraw.business.module.member.level.service.impl;
 
 
-import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.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.module.member.level.repository.MemberLevelRepository;
 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.MemberLevelService;
 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
 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.business.module.member.level.service.mapper.MemberLevelMapper;
 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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.util.Assert;
-import com.topdraw.utils.PageUtil;
-import com.topdraw.utils.QueryHelp;
 import com.topdraw.utils.StringUtils;
 import com.topdraw.utils.StringUtils;
 
 
 import java.util.List;
 import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -32,65 +23,27 @@ import java.util.Map;
 public class MemberLevelServiceImpl implements MemberLevelService {
 public class MemberLevelServiceImpl implements MemberLevelService {
 
 
     @Autowired
     @Autowired
-    private MemberLevelRepository MemberLevelRepository;
+    private MemberLevelRepository memberLevelRepository;
 
 
     @Autowired
     @Autowired
-    private MemberLevelMapper MemberLevelMapper;
-
-    @Override
-    public Map<String, Object> queryAll(MemberLevelQueryCriteria criteria, Pageable pageable) {
-        Page<MemberLevel> page = MemberLevelRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(MemberLevelMapper::toDto));
-    }
-
-    @Override
-    public List<MemberLevelDTO> queryAll(MemberLevelQueryCriteria criteria) {
-        return MemberLevelMapper.toDto(MemberLevelRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
-    }
+    private MemberLevelMapper memberLevelMapper;
 
 
     @Override
     @Override
     public MemberLevelDTO findById(Long id) {
     public MemberLevelDTO findById(Long id) {
-        MemberLevel MemberLevel = MemberLevelRepository.findById(id).orElseGet(MemberLevel::new);
+        MemberLevel MemberLevel = this.memberLevelRepository.findById(id).orElseGet(MemberLevel::new);
         ValidationUtil.isNull(MemberLevel.getId(),"MemberLevel","id",id);
         ValidationUtil.isNull(MemberLevel.getId(),"MemberLevel","id",id);
-        return MemberLevelMapper.toDto(MemberLevel);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void create(MemberLevel resources) {
-        MemberLevelRepository.save(resources);
+        return this.memberLevelMapper.toDto(MemberLevel);
     }
     }
 
 
     @Override
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void update(MemberLevel resources) {
-        MemberLevel MemberLevel = MemberLevelRepository.findById(resources.getId()).orElseGet(MemberLevel::new);
-        ValidationUtil.isNull( MemberLevel.getId(),"MemberLevel","id",resources.getId());
-        MemberLevel.copy(resources);
-        MemberLevelRepository.save(MemberLevel);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
-    public void delete(Long id) {
-        Assert.notNull(id, "The given id must not be null!");
-        MemberLevel MemberLevel = MemberLevelRepository.findById(id).orElseThrow(
-                () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", MemberLevel.class, id), 1));
-        MemberLevelRepository.delete(MemberLevel);
-    }
-
-
-    @Override
     public MemberLevelDTO getByCode(String code) {
     public MemberLevelDTO getByCode(String code) {
-        return StringUtils.isNotEmpty(code) ? MemberLevelMapper.toDto(MemberLevelRepository.findFirstByCode(code).orElseGet(MemberLevel::new))
+        return StringUtils.isNotEmpty(code) ? this.memberLevelMapper.toDto(this.memberLevelRepository.findFirstByCode(code).orElseGet(MemberLevel::new))
         : new MemberLevelDTO();
         : new MemberLevelDTO();
     }
     }
 
 
     @Override
     @Override
     public List<MemberLevelDTO> findLevelAndStatus(Integer level, Integer status) {
     public List<MemberLevelDTO> findLevelAndStatus(Integer level, Integer status) {
-        return MemberLevelMapper.toDto(MemberLevelRepository.findByLevelAndStatus(level,status));
+        return this.memberLevelMapper.toDto(this.memberLevelRepository.findByLevelAndStatus(level,status));
     }
     }
+
 }
 }

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

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

 package com.topdraw.business.module.member.profile.domain;
 package com.topdraw.business.module.member.profile.domain;
 
 
-import com.topdraw.business.module.member.profile.DoSaveMemberProfileGroup;
-import com.topdraw.business.module.member.profile.DoUpdateMemberProfileGroup;
+import com.topdraw.business.module.common.validated.CreateGroup;
+import com.topdraw.business.module.common.validated.UpdateGroup;
 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;
@@ -27,82 +27,81 @@ import java.io.Serializable;
 @Table(name="uc_member_profile")
 @Table(name="uc_member_profile")
 public class MemberProfile implements Serializable {
 public class MemberProfile implements Serializable {
 
 
+    /** 会员code */
     @Transient
     @Transient
+//    @NotNull(message = "memberCode not be null!!" , groups = {CreateGroup.class,UpdateGroup.class})
     private String memberCode;
     private String memberCode;
 
 
-    // 主键
+    /** 头像 */
+    @Transient
+    private String avatarUrl;
+
+    /** 主键 */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
-    @NotNull(message = "【id】 not be null!!" , groups = DoUpdateMemberProfileGroup.class)
+    @NotNull(message = "id not be null!!" , groups = UpdateGroup.class)
     private Long id;
     private Long id;
 
 
-    // 会员id
-    @NotNull(message = "【memberId】 not be null!!" , groups = DoSaveMemberProfileGroup.class)
+    /** 会员id */
     @Column(name = "member_id", nullable = false)
     @Column(name = "member_id", nullable = false)
+    @NotNull(message = "memberId not be null!!" , groups = {CreateGroup.class})
     private Long memberId;
     private Long memberId;
 
 
-    // 姓名
+    /** 姓名 */
     @Column(name = "realname")
     @Column(name = "realname")
     private String realname;
     private String realname;
 
 
-    // 性别 0：女； 1：男 -1：未知
+    /** 性别 0：女； 1：男 -1：未知 */
     @Column(name = "gender", nullable = false)
     @Column(name = "gender", nullable = false)
-    @NotNull(message = "【gender】 not be null!!" , groups = {DoSaveMemberProfileGroup.class})
     private Integer gender;
     private Integer gender;
 
 
-    // 生日
-    @NotNull(message = "【memberId】 not be null!!" , groups = DoSaveMemberProfileGroup.class)
+    /** 生日 */
     @Column(name = "birthday", nullable = false)
     @Column(name = "birthday", nullable = false)
     private String birthday;
     private String birthday;
 
 
-    // 手机号
+    /** 手机号 */
     @Column(name = "phone")
     @Column(name = "phone")
     private String phone;
     private String phone;
 
 
-    // 星座
+    /** 星座 */
     @Column(name = "constellation")
     @Column(name = "constellation")
     private String constellation;
     private String constellation;
 
 
-    // 身份证
-    @NotNull(message = "【idCard】 not be null!!" , groups = DoSaveMemberProfileGroup.class)
+    /** 身份证 */
     @Column(name = "id_card", nullable = false)
     @Column(name = "id_card", nullable = false)
     private String idCard;
     private String idCard;
 
 
-    // 电子邮件
+    /** 电子邮件 */
     @Column(name = "email")
     @Column(name = "email")
     private String email;
     private String email;
 
 
-    // 国家
+    /** 国家 */
     @Column(name = "country")
     @Column(name = "country")
     private String country;
     private String country;
 
 
-    // 省份
+    /** 省份 */
     @Column(name = "province")
     @Column(name = "province")
     private String province;
     private String province;
 
 
-    // 城市
+    /** 城市 */
     @Column(name = "city")
     @Column(name = "city")
     private String city;
     private String city;
 
 
-    // 区县
+    /** 区县 */
     @Column(name = "district")
     @Column(name = "district")
     private String district;
     private String district;
 
 
-    //头像
-    @Transient
-    private String avatarUrl;
-
-    // 描述
+    /** 描述 */
     @Column(name = "description")
     @Column(name = "description")
     private String description;
     private String description;
 
 
-    // 创建时间
+    /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
     private Timestamp updateTime;
     private Timestamp updateTime;

-package com.topdraw.business.module.member.profile.domain;
-
-
-import com.topdraw.utils.StringUtils;
-
-import java.sql.Timestamp;
-import java.util.Objects;
-
-public class MemberProfileBuild {
-
-    public static MemberProfile build(Long memberId , String realname , Integer gender, String birthday){
-        MemberProfile memberProfile = build(memberId,realname,gender,"","","","","","",
-                "","","",birthday);
-        return memberProfile;
-    }
-
-    public static MemberProfile build(){
-        MemberProfile memberProfile = build(null,"",null,"","","","","","",
-                "","","",null);
-        return memberProfile;
-    }
-
-    public static MemberProfile build(Long memberId, String realName, Integer sex,
-                                      String contry, String district, String city, String idCard, String province,
-                                      String email, String description, String phone, String constellation,
-                                      String timestamp) {
-
-        if (memberId == null)
-            throw new NullPointerException("memberId is null");
-
-        MemberProfile memberProfile = new MemberProfile();
-        memberProfile.setMemberId(memberId);
-        memberProfile.setRealname(stringIsNull(realName));
-        memberProfile.setGender(sex == null ? 0 : sex);
-        memberProfile.setCountry(stringIsNull(contry));
-        memberProfile.setDistrict(stringIsNull(district));
-        memberProfile.setCity(stringIsNull(city));
-        memberProfile.setIdCard(stringIsNull(idCard));
-        memberProfile.setProvince(stringIsNull(province));
-        memberProfile.setEmail(stringIsNull(email));
-        memberProfile.setDescription(stringIsNull(description));
-        memberProfile.setPhone(stringIsNull(phone));
-        memberProfile.setConstellation(stringIsNull(constellation));
-        memberProfile.setBirthday(StringUtils.isNotBlank(timestamp) ? timestamp : "1900-01-01");
-
-        return memberProfile;
-    }
-
-    private static String stringIsNull(String s){
-        return StringUtils.isBlank(s)?"":s;
-    }
-
-    private static Object objectIsNull(Object s){
-        return Objects.nonNull(s)?null:s;
-    }
-
-}

+package com.topdraw.business.module.member.profile.domain;
+
+import com.topdraw.business.module.member.domain.Member;
+import com.topdraw.exception.GlobeExceptionMsg;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.Assert;
+
+import java.util.Objects;
+
+public class MemberProfileBuilder {
+
+    public static MemberProfile build(Member member){
+        MemberProfile memberProfile = build(member.getId(),member.getCode(),member.getNickname(),member.getGender(),"","","","","","",
+                "","","",member.getBirthday());
+        return memberProfile;
+    }
+
+    public static MemberProfile build(Long memberId){
+        MemberProfile memberProfile = build(memberId,"","",-1,"","","","","","",
+                "","","","");
+        return memberProfile;
+    }
+
+    public static MemberProfile build(Long memberId ,String memberCode, String realname , Integer gender, String birthday){
+        MemberProfile memberProfile = build(memberId,memberCode,realname,gender,"","","","","","",
+                "","","",birthday);
+        return memberProfile;
+    }
+
+    public static MemberProfile build(Long memberId,String memberCode, String realName, Integer sex,
+                                      String country, String district, String city, String idCard, String province,
+                                      String email, String description, String phone, String constellation,
+                                      String birthday) {
+
+        Assert.notNull(memberId, GlobeExceptionMsg.MEMBER_ID_IS_NULL);
+
+        MemberProfile memberProfile = new MemberProfile();
+        memberProfile.setMemberId(memberId);
+        memberProfile.setMemberCode(memberCode);
+        memberProfile.setRealname(stringIsNull(realName));
+        memberProfile.setGender(sex == null ? 0 : sex);
+        memberProfile.setCountry(StringUtils.isBlank(country)?"中国":birthday);
+        memberProfile.setDistrict(stringIsNull(district));
+        memberProfile.setCity(stringIsNull(city));
+        memberProfile.setIdCard(StringUtils.isBlank(idCard)?"000000000000000000":idCard);
+        memberProfile.setProvince(stringIsNull(province));
+        memberProfile.setEmail(stringIsNull(email));
+        memberProfile.setDescription(stringIsNull(description));
+        memberProfile.setPhone(stringIsNull(phone));
+        memberProfile.setConstellation(stringIsNull(constellation));
+        memberProfile.setBirthday(StringUtils.isBlank(birthday)?"1900-01-01":birthday);
+
+        return memberProfile;
+    }
+
+    private static String stringIsNull(String s){
+        return StringUtils.isBlank(s)?"":s;
+    }
+
+    public static MemberProfile build(MemberProfile resources) {
+        if (resources.getMemberId() == null)
+            throw new NullPointerException("memberId is null");
+
+        MemberProfile memberProfile = new MemberProfile();
+        memberProfile.setId(resources.getId());
+        memberProfile.setMemberId(resources.getMemberId());
+        memberProfile.setRealname(stringIsNull(resources.getRealname()));
+        memberProfile.setGender(resources.getGender() == null ? -1 : resources.getGender());
+        memberProfile.setCountry(stringIsNull(resources.getCountry()));
+        memberProfile.setDistrict(stringIsNull(resources.getDistrict()));
+        memberProfile.setCity(stringIsNull(resources.getCity()));
+        memberProfile.setIdCard(StringUtils.isBlank(resources.getIdCard()) ? "000000000000000000":resources.getIdCard());
+        memberProfile.setProvince(stringIsNull(resources.getProvince()));
+        memberProfile.setEmail(stringIsNull(resources.getEmail()));
+        memberProfile.setDescription(stringIsNull(resources.getDescription()));
+        memberProfile.setPhone(stringIsNull(resources.getPhone()));
+        memberProfile.setConstellation(stringIsNull(resources.getConstellation()));
+        memberProfile.setBirthday(Objects.isNull(resources.getBirthday()) ? "1900-01-01" : resources.getBirthday());
+        return memberProfile;
+    }
+}

 package com.topdraw.business.module.member.profile.rest;
 package com.topdraw.business.module.member.profile.rest;
 
 
 import com.topdraw.annotation.AnonymousAccess;
 import com.topdraw.annotation.AnonymousAccess;
+import com.topdraw.business.module.common.validated.CreateGroup;
+import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 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.business.process.service.member.MemberProfileOperationService;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 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.MemberProfileService;
-import com.topdraw.util.Base64Util;
-import com.topdraw.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-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.*;
 import io.swagger.annotations.*;
 import io.swagger.annotations.*;
 
 
-import java.util.Objects;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
  * @date 2021-10-22
  * @date 2021-10-22
  */
  */
-@Api(tags = "MemberProfile管理")
+@Api(tags = "会员属性管理")
 @RestController
 @RestController
-@RequestMapping("/ucEngine/api/memberProfile")
+@RequestMapping("/uce/memberProfile")
 @CrossOrigin
 @CrossOrigin
 @Slf4j
 @Slf4j
 public class MemberProfileController {
 public class MemberProfileController {
 
 
     @Autowired
     @Autowired
-    private MemberProfileService MemberProfileService;
-    @Autowired
-    private MemberService memberService;
-
-    /*@GetMapping
-    @ApiOperation("查询MemberProfile")
-    public ResultInfo getMemberProfiles(MemberProfileQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(MemberProfileService.queryAll(criteria,pageable));
-    }
+    private MemberProfileOperationService memberProfileOperationService;
 
 
-    @GetMapping(value = "/all")
-    @ApiOperation("查询所有MemberProfile")
-    public ResultInfo getMemberProfiles(MemberProfileQueryCriteria criteria) {
-        return ResultInfo.success(MemberProfileService.queryAll(criteria));
-    }*/
-
-    @PostMapping(value = "/create")
-    @ApiOperation("新增MemberProfile")
+    @RequestMapping(value = "/update")
+    @ApiOperation("修改会员属性")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultInfo create(@Validated @RequestBody MemberProfile resources) {
-        log.info("MemberProfileServiceImpl ==>> create ==>> resources ===>> [{}]",resources);
-        String realname = resources.getRealname();
-        MemberProfileService.create(resources);
-        return ResultInfo.success();
+    @Deprecated
+    public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberProfile resources) {
+
+        log.info("memberProfile ==>> update ==>> resources ===>> [{}]",resources);
+        MemberProfileDTO memberProfileDTO = this.memberProfileOperationService.updateMemberProfileAndMember(resources);
+        return ResultInfo.success(memberProfileDTO);
     }
     }
 
 
-    @PutMapping(value = "/update")
-    @ApiOperation("修改MemberProfile")
+    @PutMapping(value = "/updateMemberProfileAndMember")
+    @ApiOperation("修改会员属性并同步会员信息")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultInfo update(@Validated @RequestBody MemberProfile resources) {
-
+    public ResultInfo updateMemberProfileAndMember(@Validated @RequestBody MemberProfile resources) {
         log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
         log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
 
 
-        Long memberId = resources.getMemberId();
-        Assert.notNull(memberId,"memberId can't be null");
-        MemberDTO memberDTO = this.memberService.findById(memberId);
-        if (Objects.nonNull(memberDTO)) {
-            String code = memberDTO.getCode();
-            if (StringUtils.isNotEmpty(code)) {
-                resources.setMemberCode(code);
-                MemberProfileDTO memberProfile = this.MemberProfileService.findByMemberId(memberId);
-                if (Objects.nonNull(memberProfile)) {
-                    resources.setId(memberProfile.getId());
-                    MemberProfileService.update(resources);
-                } else {
-                    resources.setId(null);
-                    this.create(resources);
-                }
-            }
-        }
-        return ResultInfo.success();
+        MemberProfileDTO memberProfileDTO = this.memberProfileOperationService.updateMemberProfileAndMember(resources);
+        return ResultInfo.success(memberProfileDTO);
     }
     }
 
 
-    @PutMapping
-    @ApiOperation("修改MemberProfile")
+    @RequestMapping(value = "/create")
+    @ApiOperation("新增会员属性")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultInfo updateMemberProfileAndMember(@Validated @RequestBody MemberProfile resources) {
-        log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources);
-        this.MemberProfileService.updateMemberProfileAndMember(resources);
-        return ResultInfo.success();
-    }
+    @Deprecated
+    public ResultInfo create(@Validated(value = {CreateGroup.class}) @RequestBody MemberProfile resources) {
 
 
-    @DeleteMapping(value = "/delete/{id}")
-    @ApiOperation("删除MemberProfile")
-    public ResultInfo delete(@PathVariable Long id) {
-        MemberProfileService.delete(id);
-        return ResultInfo.success();
-    }
+        log.info("memberProfile ==>> update ==>> resources ===>> [{}]",resources);
 
 
+        MemberProfileDTO memberProfileDTO = this.memberProfileOperationService.createMemberProfileAndSyncMember(resources);
+        return ResultInfo.success(memberProfileDTO);
+    }
 }
 }

 package com.topdraw.business.module.member.profile.service;
 package com.topdraw.business.module.member.profile.service;
 
 
+import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 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.MemberProfileDTO;
-import com.topdraw.business.module.member.profile.service.dto.MemberProfileQueryCriteria;
-import org.springframework.data.domain.Pageable;
-import java.util.Map;
-import java.util.List;
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -14,36 +12,69 @@ import java.util.List;
 public interface MemberProfileService {
 public interface MemberProfileService {
 
 
     /**
     /**
-    * 查询数据分页
-    * @param criteria 条件参数
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
-    Map<String,Object> queryAll(MemberProfileQueryCriteria criteria, Pageable pageable);
-
-    /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<MemberProfileDTO>
-    */
-    List<MemberProfileDTO> queryAll(MemberProfileQueryCriteria criteria);
-
-    /**
      * 根据ID查询
      * 根据ID查询
      * @param id ID
      * @param id ID
      * @return MemberProfileDTO
      * @return MemberProfileDTO
      */
      */
     MemberProfileDTO findById(Long id);
     MemberProfileDTO findById(Long id);
 
 
-    MemberProfile create(MemberProfile resources);
+    /**
+     * 保存
+     * @param resources 会员基本信息
+     * @return
+     */
+    MemberProfileDTO create(MemberProfile resources);
 
 
-    MemberProfile createDefault(MemberProfile resources);
+    /**
+     * 默认属性
+     * @param resources
+     * @return
+     */
+    MemberProfileDTO createDefault(MemberProfile resources);
+
+    /**
+     * 通过会员创建默认属性
+     * @param resources
+     * @return
+     */
+    MemberProfileDTO createDefault(Member resources);
 
 
-    void update(MemberProfile resources);
+    /**
+     * 通过会员id创建默认属性
+     * @param resources
+     * @return
+     */
+    MemberProfileDTO createDefaultByMemberId(Long resources);
 
 
+    /**
+     * 修改
+     * @param resources
+     */
+    MemberProfileDTO update(MemberProfile resources);
+
+    /**
+     * 删除
+     * @param id
+     */
     void delete(Long id);
     void delete(Long id);
 
 
+    /**
+     * 通过会员id查询
+     * @param memberId
+     * @return
+     */
     MemberProfileDTO findByMemberId(Long memberId);
     MemberProfileDTO findByMemberId(Long memberId);
 
 
-    void updateMemberProfileAndMember(MemberProfile resources);
+    /**
+     * 通过会员code查询
+     * @param memberCode
+     * @return
+     */
+    MemberProfileDTO findByMemberCode(String memberCode);
+
+    /**
+     * 修改会员属性并同步会员信息
+     * @param resources
+     */
+    MemberProfileDTO updateMemberProfileAndMember(MemberProfile resources, MemberDTO memberDTO);
 }
 }

@@ -12,63 +12,63 @@ import java.io.Serializable;
 @Data
 @Data
 public class MemberProfileDTO implements Serializable {
 public class MemberProfileDTO implements Serializable {
 
 
-    // 主键
+    /** 会员code */
+    private String memberCode;
+
+    /** 主键 */
     private Long id;
     private Long id;
 
 
-    // 会员id
+    /** 会员id */
     private Long memberId;
     private Long memberId;
 
 
-    // 姓名
+    /** 姓名 */
     private String realname;
     private String realname;
 
 
-    private String nickname;
-
-    // 性别 0：女； 1：男 -1：未知
+    /** 性别 0：女； 1：男 -1：未知 */
     private Integer gender;
     private Integer gender;
 
 
-    // 生日
+    /** 生日 */
     private String birthday;
     private String birthday;
 
 
-    // 生日字符串
-    private String birthdayStr;
-
-    // vip
-    private Integer vip;
+    /** 电话 */
+    private String phone;
 
 
-    // 星座
+    /** 星座 */
     private String constellation;
     private String constellation;
 
 
-    private Long vipExpireTime;
-
-    private String phone;
-
-    // 身份证
+    /** 身份证 */
     private String idCard;
     private String idCard;
 
 
-    // 电子邮件
+    /** 电子邮件 */
     private String email;
     private String email;
 
 
-    // 国家
+    /** 国家 */
     private String country;
     private String country;
 
 
-    // 省份
+    /** 省份 */
     private String province;
     private String province;
 
 
-    // 城市
+    /** 城市 */
     private String city;
     private String city;
 
 
-    // 头像
-    private String avatarUrl;
-
-    // 区县
+    /** 区县 */
     private String district;
     private String district;
 
 
-    // 描述
+    /** 描述 */
     private String description;
     private String description;
 
 
-    // 创建时间
+    /** 创建时间 */
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     private Timestamp updateTime;
     private Timestamp updateTime;
+
+    /** vip */
+    private Integer vip;
+
+    /** vip过期时间 */
+    private Long vipExpireTime;
+
+    /** 头像 */
+    private String avatarUrl;
 }
 }

-package com.topdraw.business.module.member.profile.service.dto;
-
-import lombok.Data;
-
-/**
- * @author XiangHan
- * @date 2021-10-22
- */
-@Data
-public class MemberProfileQueryCriteria{
-}

 package com.topdraw.business.module.member.relatedinfo.domain;
 package com.topdraw.business.module.member.relatedinfo.domain;
 
 
+import com.topdraw.business.module.common.validated.UpdateGroup;
+import com.topdraw.business.module.common.domain.AsyncMqModule;
 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;
@@ -13,7 +15,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
-import java.time.LocalDate;
 
 
 /**
 /**
  * @author XiangHan
  * @author XiangHan
@@ -24,56 +25,53 @@ import java.time.LocalDate;
 @EntityListeners(AuditingEntityListener.class)
 @EntityListeners(AuditingEntityListener.class)
 @Accessors(chain = true)
 @Accessors(chain = true)
 @Table(name="uc_member_related_info")
 @Table(name="uc_member_related_info")
-public class MemberRelatedInfo implements Serializable {
+public class MemberRelatedInfo extends AsyncMqModule implements Serializable {
 
 
-    // ID
+    /** ID */
     @Id
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id")
     @Column(name = "id")
-    @NotNull(groups = {UpdateGroup.class})
+    @NotNull(message = "id can't be null" , groups = {UpdateGroup.class})
     private Long id;
     private Long id;
 
 
-    // 会员id
+    /** 会员id */
     @Column(name = "member_id", nullable = false)
     @Column(name = "member_id", nullable = false)
     private Long memberId;
     private Long memberId;
 
 
-    @Transient
-    private String memberCode;
-
-    // 人物关系 0：子女；1：父母
+    /** 人物关系 0：子女；1：父母 */
     @Column(name = "type")
     @Column(name = "type")
     private Integer type;
     private Integer type;
 
 
-    // 手机号
+    /** 手机号 */
     @Column(name = "cellphone")
     @Column(name = "cellphone")
     private String cellphone;
     private String cellphone;
 
 
-    // 身份证号
+    /** 身份证号 */
     @Column(name = "id_card")
     @Column(name = "id_card")
     private String idCard;
     private String idCard;
 
 
-    // 姓名
+    /** 姓名 */
     @Column(name = "name")
     @Column(name = "name")
     private String name;
     private String name;
 
 
-    // 性别 0：女；1：男；-1：未知
+    /** 性别 0：女；1：男；-1：未知 */
     @Column(name = "sex")
     @Column(name = "sex")
     private Integer sex;
     private Integer sex;
 
 
-    // 生日
+    /** 生日 */
     @Column(name = "birthday")
     @Column(name = "birthday")
-    private LocalDate birthday;
+    private String birthday;
 
 
-    // 头像地址
+    /** 头像地址 */
     @Column(name = "avatar_url")
     @Column(name = "avatar_url")
     private String avatarUrl;
     private String avatarUrl;
 
 
-    // 创建时间
+    /** 创建时间 */
     @CreatedDate
     @CreatedDate
     @Column(name = "create_time")
     @Column(name = "create_time")
     private Timestamp createTime;
     private Timestamp createTime;
 
 
-    // 更新时间
+    /** 更新时间 */
     @LastModifiedDate
     @LastModifiedDate
     @Column(name = "update_time")
     @Column(name = "update_time")
     private Timestamp updateTime;
     private Timestamp updateTime;