1.优化部分程序，清理警告信息

-package com.topdraw.business.module.member.viphistory.rest;
-
-import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
-import com.topdraw.business.process.service.member.MemberOperationService;
-import com.topdraw.common.ResultInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author luerlong
- * @date 2021-12-10
- */
-@Api(tags = "会员vip历史管理")
-@RestController
-@RequestMapping("/uce/memberVipHistory")
-public class MemberVipHistoryController {
-
-    @Autowired
-    private MemberOperationService memberOperationService;
-
-    @PostMapping
-    @ApiOperation("新增MemberVipHistory")
-    public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) {
-        this.memberOperationService.createVipHistory(resources);
-        return ResultInfo.success();
-    }
-
-}

@@ -24,7 +24,7 @@ public interface MemberVipHistoryService {
      *
      * @param resources
      */
-    void create(MemberVipHistory resources);
+    MemberVipHistoryDTO create(MemberVipHistory resources);
 
     /**
      *

@@ -52,15 +52,14 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend
-    public void create(MemberVipHistory resources) {
+    public MemberVipHistoryDTO create(MemberVipHistory resources) {
         log.info("MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]",resources);
         MemberDTO memberDTO = this.checkMember(resources);
 
         MemberVipHistory memberVipHistory = MemberVipHistoryBuilder.build(resources);
         MemberVipHistory vipHistory = this.memberVipHistoryRepository.save(memberVipHistory);
         vipHistory.setMemberCode(memberDTO.getCode());
-
+        return this.memberVipHistoryMapper.toDto(vipHistory);
     }
 
     @Override

+package com.topdraw.business.module.rights.constant;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/6/18 16:06
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/6/18 16:06
+ */
+public interface RightTypeConstants {
+
+    // 优惠券
+    int DISCOUNT_COUPON = 1;
+    // 观影券
+    int VIEW_COUPON= 2;
+    // 参加活动
+    int JOIN_ACTIVITY = 3;
+    // 积分商品
+    int POINTS_GOODS = 4;
+    // IPTV产品包
+    int IPTV_PRODUCT = 5;
+    // IPTV观影权益
+    int IPTV_VIEW = 6;
+
+}

+package com.topdraw.business.module.task.template.constant;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/6/18 14:30
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/6/18 14:30
+ */
+public interface TaskEventType {
+    //类型 1：登录；2：观影；3：参加活动；4：订购；5：优享会员；6：签到；7：完成设置；
+    // 8：播放记录；10：跨屏绑定；11：积分转移；30：积分兑换商品；98：系统操作；99：其他
+    int LOGIN = 1;
+    int VIEW = 2;
+    int ACTIVITY = 3;
+    int ORDER = 4;
+    int MEMBER_PRIORITY = 5;
+    int SIGN = 6;
+    int COMPLETE_INFO = 7;
+    int PLAY = 8;
+    int BINDING = 10;
+    int POINTS_TRANS = 11;
+    int POINTS_EXCHANGE_GOODS = 30;
+    int SYSTEM_OPERATE = 98;
+    int OHHER = 99;
+
+}

@@ -2,25 +2,20 @@ package com.topdraw.business.process.rest;
 
 import com.topdraw.annotation.AnonymousAccess;
 import com.topdraw.business.module.common.validated.UpdateGroup;
-import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.process.domian.member.MemberOperationBean;
-import com.topdraw.business.process.domian.weixin.BuyVipBean;
 import com.topdraw.business.process.service.member.MemberOperationService;
 import com.topdraw.common.IResultInfo;
 import com.topdraw.common.ResultInfo;
-import com.topdraw.exception.BadRequestException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.sql.Timestamp;
 import java.util.Objects;
 
 @Api("会员处理")
@@ -38,21 +33,11 @@ public class MemberOperationController {
     @AnonymousAccess
     public ResultInfo updateVipByMemberId(@Validated(value = {UpdateGroup.class}) @RequestBody MemberOperationBean resources) {
         log.info("member ==>> doUpdateVipByCode ==>> param ==>> [{}]",resources);
-        Integer vip = resources.getVip();
-        Timestamp vipExpireTime = resources.getVipExpireTime();
         Long memberId = resources.getMemberId();
         MemberDTO memberDTO = this.memberOperationService.findById(memberId);
+        resources.setMemberCode(memberDTO.getCode());
 
-        Member member = new Member();
-        BeanUtils.copyProperties(memberDTO, member);
-        if (Objects.nonNull(vip)) {
-            member.setVip(vip);
-        }
-        if (Objects.nonNull(vipExpireTime)) {
-            member.setVipExpireTime(vipExpireTime);
-        }
-        this.memberOperationService.doUpdateMemberVipAndVipExpireTime(member);
-        return ResultInfo.success();
+        return this.updateVipByMemberCode(resources);
     }
 
     @RequestMapping(value = "/updateVipByMemberCode")
@@ -71,28 +56,9 @@ public class MemberOperationController {
             log.error("参数错误，vip为空或者小于0 , vip ==>> {}", vip);
             return ResultInfo.failure("参数错误，vip为空或者小于0");
         }
-        Timestamp vipExpireTime = resources.getVipExpireTime();
-
-
-        Member member = new Member();
-        member.setCode(memberCode);
-        member.setVip(vip);
-        member.setVipExpireTime(vipExpireTime);
-
-        MemberDTO memberDTO = this.memberOperationService.doUpdateMemberVipAndVipExpireTime(member);
-        this.createVipHistory(memberDTO.getId(), memberDTO.getCode(), vip, vipExpireTime);
-
-        return ResultInfo.success();
-    }
 
-
-    private void createVipHistory(Long memberId, String code, Integer vip , Timestamp vipExpireTime){
-        BuyVipBean buyVipBean = new BuyVipBean();
-        buyVipBean.setMemberId(memberId);
-        buyVipBean.setMemberCode(code);
-        buyVipBean.setVip(vip);
-        buyVipBean.setVipExpireTime(vipExpireTime);
-        this.memberOperationService.buyVipByMemberId(buyVipBean);
+        MemberDTO memberDTO = this.memberOperationService.doUpdateVipByMemberCode(resources);
+        return ResultInfo.success(memberDTO);
     }
 
 
@@ -104,27 +70,6 @@ public class MemberOperationController {
         MemberProfileDTO memberProfileDTO = this.memberOperationService.getMemberProfileAndCheckVip(memberId, appId);
         return ResultInfo.success(memberProfileDTO);
     }
-
-    @PutMapping("/buyVip")
-    @ApiOperation("购买vip")
-    @AnonymousAccess
-    @Deprecated
-    public ResultInfo buyVip(@RequestBody BuyVipBean buyVipBean) {
-
-      /*  // 小程序账户id
-        Long id = buyVipBean.getId();
-        if (Objects.isNull(id))
-            throw new BadRequestException("参数异常: id is null !");
-
-        // vip等级
-        Integer vip = buyVipBean.getVip();
-        if (Objects.isNull(vip) || vip <= 0)
-            throw new BadRequestException("vip 等级有误");
-
-        MemberDTO memberDTO = this.memberOperationService.buyVip(buyVipBean);
-        return ResultInfo.success(memberDTO);*/
-      return null;
-    }
 }
 
 

@@ -61,23 +61,26 @@ public class PointsOperationController {
     @AnonymousAccess
     public ResultInfo addPoints(@Validated @RequestBody TempPoints tempPoints) {
         log.info("手动发放积分,参数 ==>>{} ", tempPoints);
+
         Long memberId = tempPoints.getMemberId();
         if (Objects.isNull(memberId)) {
             log.error("积分发放失败,参数错误,会员id 不存在");
             return ResultInfo.failure("积分发放失败，参数错误");
         }
+
         Long points = tempPoints.getPoints();
         if (Objects.isNull(points) || points <= 0L) {
             log.error("积分发放失败,参数错误,积分不存在或者积分小于0");
             return ResultInfo.failure("积分发放失败，参数错误");
         }
+
         MemberDTO memberDTO = this.memberService.findById(memberId);
-        if (Objects.nonNull(memberDTO)) {
-            String code = memberDTO.getCode();
-            tempPoints.setMemberCode(code);
+        if (Objects.nonNull(memberDTO.getId())) {
             tempPoints.setMemberId(memberDTO.getId());
+            tempPoints.setMemberCode(memberDTO.getCode());
             this.pointsOperationService.grantPointsByManualByTempPoints(tempPoints);
         }
+
         return ResultInfo.success();
     }
 

@@ -14,6 +14,7 @@ import com.topdraw.business.module.user.iptv.domain.UserTv;
 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
+import com.topdraw.business.process.domian.member.MemberOperationBean;
 import com.topdraw.business.process.domian.weixin.*;
 import com.topdraw.business.process.service.UserOperationService;
 import com.topdraw.business.process.service.member.MemberOperationService;
@@ -89,30 +90,14 @@ public class UserOperationController {
         Long memberId = userWeixinDTO.getMemberId();
         MemberDTO memberDTO = this.memberService.findById(memberId);
 
-        Member member = new Member();
-        member.setId(memberDTO.getId());
-        member.setCode(memberDTO.getCode());
-        if (Objects.nonNull(vip)) {
-            member.setVip(vip);
-        }
-        if (Objects.nonNull(vipExpireTime)) {
-            member.setVipExpireTime(vipExpireTime);
-        }
-
-        this.memberOperationService.doUpdateMemberVipAndVipExpireTime(member);
-
-        this.createVipHistory(userId, vip, vipExpireTime);
-
-        return ResultInfo.success();
-    }
+        MemberOperationBean memberOperationBean = new MemberOperationBean();
+        memberOperationBean.setMemberCode(memberDTO.getCode());
+        memberOperationBean.setVip(vip);
+        memberOperationBean.setVipExpireTime(vipExpireTime);
 
+        MemberDTO memberDTO1 = this.memberOperationService.doUpdateVipByMemberCode(memberOperationBean);
 
-    private void createVipHistory(Long weixinUserId, Integer vip , Timestamp vipExpireTime){
-        BuyVipBean buyVipBean = new BuyVipBean();
-        buyVipBean.setId(weixinUserId);
-        buyVipBean.setVip(vip);
-        buyVipBean.setVipExpireTime(vipExpireTime);
-        this.memberOperationService.buyVipByUserId(buyVipBean);
+        return ResultInfo.success(memberDTO1);
     }
 
     @PostMapping(value = "/createWeixinUserAndCreateMember")

@@ -160,10 +160,4 @@ public interface UserOperationService {
      */
     UserTvDTO updateUserTv(UserTv resources);
 
-    /**
-     * 修改大屏账号vis_user_id
-     * @param resources
-     * @return
-     */
-    UserTvDTO updateUserTvVisUserId(UserTv resources);
 }

@@ -90,6 +90,7 @@ public class PointsOperationServiceImpl implements PointsOperationService {
         if (Objects.isNull(expireTime)){
             tempPoints.setExpireTime(TimestampUtil.localDateTime2Timestamp(DateUtil.getLastDateTimeSecondYear()));
         }
+
         this.refresh(tempPoints);
     }
 

@@ -11,13 +11,11 @@ import com.topdraw.business.process.service.dto.MemberProfileAndMemberDTO;
 import com.topdraw.business.process.service.member.MemberProfileOperationService;
 import com.topdraw.exception.EntityExistException;
 import com.topdraw.exception.EntityNotFoundException;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotNull;
 import java.util.Objects;
 
 
@@ -39,25 +37,16 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
     private MemberService memberService;
 
     @AsyncMqSend
-    public void asyncMemberProfile(MemberProfileDTO memberProfileDTO){}
+    public void asyncUpdateMemberProfileAndSyncMember(MemberProfileAndMemberDTO memberProfileAndMemberDTO){}
     @AsyncMqSend
-    public void asyncMemberProfileAndMember(MemberProfileAndMemberDTO memberProfileAndMemberDTO){}
-    @AsyncMqSend
-    public void asyncCreateMemberProfile(MemberProfileDTO memberProfileDTO) {}
-
-    @Override
-    public MemberProfileDTO update(MemberProfile resources) {
-        MemberProfileDTO memberProfileDTO = this.memberProfileService.update(resources);
-        memberProfileDTO.setMemberCode(resources.getMemberCode());
-        ((MemberProfileOperationServiceImpl) AopContext.currentProxy()).asyncMemberProfile(memberProfileDTO);
-        return memberProfileDTO;
-    }
+    public void asyncCreateMemberProfileAndSyncMember(MemberProfileDTO memberProfileDTO) {}
 
     @Override
     public MemberProfileDTO updateMemberProfileAndMember(MemberProfile resources) {
         Long id = resources.getId();
-        MemberProfileDTO _memberProfile = this.memberProfileService.findById(id);
-        Long memberId = _memberProfile.getMemberId();
+        MemberProfileDTO memberProfile = this.memberProfileService.findById(id);
+
+        Long memberId = memberProfile.getMemberId();
         resources.setMemberId(memberId);
 
         MemberDTO memberDTO = this.memberService.checkMember(resources.getMemberId(), resources.getMemberCode());
@@ -68,7 +57,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
         memberProfileDTO.setMemberCode(memberDTO.getCode());
 
         ((MemberProfileOperationServiceImpl)AopContext.currentProxy())
-                .asyncMemberProfileAndMember(new MemberProfileAndMemberDTO(memberProfileDTO, memberDTO));
+                .asyncUpdateMemberProfileAndSyncMember(new MemberProfileAndMemberDTO(memberProfileDTO, memberDTO));
 
         return memberProfileDTO;
     }
@@ -88,7 +77,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
 
             this.createMemberProfileAndSyncMember(memberProfileDTO, memberDTO);
 
-            ((MemberProfileOperationServiceImpl) AopContext.currentProxy()).asyncCreateMemberProfile(memberProfileDTO);
+            ((MemberProfileOperationServiceImpl) AopContext.currentProxy()).asyncCreateMemberProfileAndSyncMember(memberProfileDTO);
 
         } else {
 
@@ -112,13 +101,11 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
 
     private void syncMember(MemberProfileDTO memberProfileDTO, MemberDTO memberDTO) {
         Member member = new Member();
-
         member.setId(memberDTO.getId());
         member.setCode(memberDTO.getCode());
         member.setAvatarUrl(memberProfileDTO.getAvatarUrl());
         member.setNickname(memberProfileDTO.getRealname());
         member.setGender(memberProfileDTO.getGender());
-//        this.memberService.update(member);
         this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member);
     }
 

@@ -4,6 +4,7 @@ import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
+import com.topdraw.business.process.domian.member.MemberOperationBean;
 import com.topdraw.business.process.domian.weixin.BuyVipBean;
 
 public interface MemberOperationService {
@@ -31,26 +32,6 @@ public interface MemberOperationService {
     MemberProfileDTO getMemberProfileAndCheckVip(Long memberId, String appid);
 
     /**
-     *
-     * @param resources
-     * @return
-     */
-    MemberDTO buyVipByUserId(BuyVipBean resources);
-
-    /**
-     *
-     * @param resources
-     * @return
-     */
-    MemberDTO buyVipByMemberId(BuyVipBean resources);
-
-    /**
-     *
-     * @param memberVipHistory
-     */
-    void createVipHistory(MemberVipHistory memberVipHistory);
-
-    /**
      * 修改会员
      * @param resources
      */
@@ -60,12 +41,6 @@ public interface MemberOperationService {
      *
      * @param resources
      */
-    MemberDTO doUpdateMember(Member resources);
-
-    /**
-     *
-     * @param resources
-     */
     MemberDTO doInsertMember(Member resources);
 
     /**
@@ -91,4 +66,10 @@ public interface MemberOperationService {
      * @param member
      */
     MemberDTO doUpdateMemberVipAndVipExpireTime(Member member);
+
+    /**
+     *
+     * @param resources
+     */
+    MemberDTO doUpdateVipByMemberCode(MemberOperationBean resources);
 }

@@ -6,12 +6,6 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 public interface MemberProfileOperationService {
 
     /**
-     * 修改
-     * @param resources
-     */
-    MemberProfileDTO update(MemberProfile resources);
-
-    /**
      * 修改会员属性并同步会员信息
      * @param resources
      */

+package com.topdraw.config;
+
+/**
+ * @author ：
+ * @description：\
+ * @function :
+ * @date ：Created in 2022/6/18 13:25
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/6/18 13:25
+ */
+public interface RedisKeyConstants {
+
+    String cacheMemberById = "uce::member::id";
+    String updateCacheMemberById = "uce::updateMember::id";
+
+    String updateCachePointsByMemberId = "uce::updatePoints::memberId";
+    String updateCacheExpByMemberId = "uce::updateExp::memberId";
+    String updateCacheCouponByMemberId = "uce::updateCoupon::memberId";
+
+    String cacheUserTvByPlatformAccount = "uce::userTv::platformAccount";
+    String cacheTaskProcessByMemberId = "uce::taskProcess::memberId";
+    String cacheTaskByTaskTemplateId = "uce::task::taskTemplateId";
+}

+package com.topdraw.config;
+
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CachingConfigurerSupport;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+
+import java.time.Duration;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author ：
+ * @description：
+ * @function :
+ * @date ：Created in 2022/6/19 16:30
+ * @version: ：
+ * @modified By：
+ * @since : modified in 2022/6/19 16:30
+ */
+@Slf4j
+@Configuration
+public class UceRedisConfig {
+
+    @Autowired
+    private RedisConfig redisConfig;
+    @Autowired
+    private RedisConnectionFactory redisConnectionFactory;
+
+    @Bean(value = "uceRedisTemplate")
+    public RedisTemplate<Object, Object> uceRedisTemplate() {
+        return redisConfig.redisTemplate(redisConnectionFactory);
+    }
+    /**
+     * 自定义缓存管理器
+     */
+    @Bean(value = "uceCacheManagemer")
+    @Primary
+    public RedisCacheManager cacheManager(RedisConnectionFactory factory) {
+        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig();
+        Set<String> cacheNames = new HashSet<>();
+//        cacheNames.add("car");
+//        cacheNames.add(RedisKeyConstants.cacheTaskByEvent);
+        cacheNames.add(RedisKeyConstants.cacheTaskProcessByMemberId);
+        ConcurrentHashMap<String, RedisCacheConfiguration> configMap = new ConcurrentHashMap<>();
+//        configMap.put("car", config.entryTtl(Duration.ofMinutes(6L)));
+        configMap.put(RedisKeyConstants.cacheTaskProcessByMemberId, config.entryTtl(Duration.ofDays(1)));
+//        configMap.put(RedisKeyConstants.cacheTaskByEvent, config);
+
+        //需要先初始化缓存名称，再初始化其它的配置。
+        RedisCacheManager cacheManager = RedisCacheManager.builder(factory).
+                initialCacheNames(cacheNames).withInitialCacheConfigurations(configMap).build();
+        return cacheManager;
+    }
+}

@@ -23,35 +23,6 @@ public class MemberOperationServiceTest extends BaseTest {
     }
 
     @Test
-    public void doUpdateMemberInfo() {
-        Member member = new Member();
-        member.setId(2L);
-        member.setCode(String.valueOf(IdWorker.generator()));
-        member.setType(1);
-        member.setStatus(1);
-        member.setNickname("nickname");
-        member.setDescription("description");
-        member.setGender(1);
-        member.setBirthday("birthday");
-        member.setAvatarUrl("avatarUrl");
-        member.setGroups("groups");
-        member.setTags("tags");
-        member.setVip(1);
-        member.setLevel(1);
-        member.setExp(10L);
-        member.setPoints(5L);
-        member.setDuePoints(0L);
-        member.setCouponAmount(1L);
-        member.setDueCouponAmount(0L);
-        member.setUserIptvId(1L);
-        member.setBindIptvPlatformType(0);
-        member.setUpdateTime(TimestampUtil.now());
-        String s = JSONObject.toJSONString(member);
-
-        this.memberOperationService.doUpdateMember(member);
-    }
-
-    @Test
     public void doInsertMember() {
         Member member = new Member();
         member.setCode(String.valueOf(IdWorker.generator()));