Merge branch 'release/1.0.5'

@@ -73,7 +73,9 @@ public class AsyncMqProducer {
         boolean async = asyncMqSend.async();
         if (async) {
             // 异步
-            this.threadPoolTaskExecutor.execute(()->this.sendMqMessage(tableOperationMsg));
+            log.info("send message success");
+            this.sendMqMessage(tableOperationMsg);
+            log.info("send message end");
         } else {
             // 同步
             this.sendMqMessage(tableOperationMsg);

@@ -25,18 +25,6 @@ public class MemberController {
     @Autowired
     private MemberService memberService;
 
-   /* @GetMapping(value = "/pageMembers")
-    @ApiOperation("查询Member")
-    public ResultInfo pageMembers(MemberQueryCriteria criteria, Pageable pageable) {
-        return ResultInfo.successPage(memberService.queryAll(criteria,pageable));
-    }
-
-    @GetMapping(value = "/findById/{id}")
-    @ApiOperation("查询指定Member")
-    public ResultInfo findById(@PathVariable("id") Long id) {
-        return ResultInfo.success(memberService.findById(id));
-    }
-*/
     @Log
     @PostMapping(value = "/create")
     @ApiOperation("新增Member")
@@ -46,14 +34,9 @@ public class MemberController {
     }
 
     @Log
-    @PutMapping(value = "/doUpdateVip")
+    @PostMapping(value = "/doUpdateVip")
     @ApiOperation("修改Member等级")
-    public ResultInfo doUpdateVip(Long memberId , Integer vip) {
-        Assert.isNull(memberId,"MemberController -->> doUpdateVip -->>【memberId】 not be null!!");
-        Assert.isNull(vip,"MemberController -->> doUpdateVip -->>【vip】 not be null!!");
-        Member member = new Member();
-        member.setId(memberId);
-        member.setVip(vip);
+    public ResultInfo doUpdateVip(@RequestBody Member member) {
         memberService.update(member);
         return ResultInfo.success();
     }

@@ -26,8 +26,8 @@ public class CouponOperationController {
     @Log
     @PostMapping(value = "/grantCouponByManual")
     @ApiOperation("手动发放优惠券")
-    public ResultInfo grantCouponByManual(Long memberId , Long userId , List<TempCoupon> tempCouponList) {
-        this.couponOperationService.grantCouponByManual(memberId,userId,tempCouponList);
+    public ResultInfo grantCouponByManual(List<TempCoupon> tempCouponList) {
+        this.couponOperationService.grantCouponByManual(tempCouponList);
         return ResultInfo.success();
     }
 

@@ -89,7 +89,7 @@ public class PointsOperationController {
     }
 
     @Log
-    @PostMapping(value = "/customPoints")
+    @PostMapping(value = "/consumePoints")
     @ApiOperation("积分消耗")
     public ResultInfo customPoints(@Validated @RequestBody TempPoints tempPoints) {
         this.pointsOperationService.customPoints(tempPoints);

@@ -22,9 +22,7 @@ public interface CouponOperationService {
 
     /**
      * 系统手动发放优惠券
-     * @param memberId
-     * @param userId
      * @param tempCouponList
      */
-    void grantCouponByManual(Long memberId,Long userId ,List<TempCoupon> tempCouponList);
+    void grantCouponByManual(List<TempCoupon> tempCouponList);
 }

 package com.topdraw.business.process.service;
 
+import com.topdraw.common.ResultInfo;
 import com.topdraw.module.mq.DataSyncMsg;
 
 /**
@@ -14,7 +15,7 @@ public interface TaskOperationService {
      *
      * @param content 任务对象
      */
-    void dealTask(String content);
+    ResultInfo dealTask(String content);
 
 
 }

@@ -61,16 +61,12 @@ public class CouponOperationServiceImpl implements CouponOperationService {
 
     /**
      * 手动发放优惠券
-     * @param memberId 会员id
-     * @param userId 账户id
      * @param tempCouponList
      */
     @Override
-    public void grantCouponByManual(Long memberId,Long userId ,List<TempCoupon> tempCouponList) {
+    public void grantCouponByManual(List<TempCoupon> tempCouponList) {
         // 优惠券领取、使用历史记录表
         for (TempCoupon tempCoupon : tempCouponList) {
-            tempCoupon.setMemberId(memberId);
-            tempCoupon.setUserId(userId);
             this.refresh(tempCoupon);
         }
     }

@@ -23,6 +23,7 @@ import com.topdraw.business.basicdata.task.service.TaskService;
 import com.topdraw.business.basicdata.task.template.domain.TaskTemplate;
 import com.topdraw.business.basicdata.task.template.service.TaskTemplateService;
 import com.topdraw.business.process.domian.*;
+import com.topdraw.common.ResultInfo;
 import com.topdraw.module.mq.DataSyncMsg;
 import com.topdraw.util.*;
 import lombok.extern.slf4j.Slf4j;
@@ -79,7 +80,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
     private static final Integer POINTS_MIN = 1;
 
     @Override
-    public void dealTask(String content) {
+    public ResultInfo dealTask(String content) {
 
         DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(content, DataSyncMsg.class);
         DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg();
@@ -88,6 +89,12 @@ public class TaskOperationServiceImpl implements TaskOperationService {
 
         long l = System.currentTimeMillis();
 
+        // 检查当前会员的黑名单状态
+        boolean b = this.validatedMemberBlackStatus(memberId);
+        if (!b) {
+            return ResultInfo.forbidden(" 会员已被加入黑名单");
+        }
+
         // 1.通过任务标识获取任务模板，通过模板参数获取具体的模板
         TaskTemplate taskTemplate = this.getTaskTemplate(event);
         // 2.通过任务模板获取对应的任务列表
@@ -105,6 +112,8 @@ public class TaskOperationServiceImpl implements TaskOperationService {
 
         long r = System.currentTimeMillis();
         LOG.info("总耗时======>>>>>" + (r-l));
+        return ResultInfo.success();
+
 
     }
 
@@ -113,13 +122,13 @@ public class TaskOperationServiceImpl implements TaskOperationService {
      * @param memberId
      * @return
      */
-    private boolean validatedMember(Long memberId) {
+    private boolean validatedMemberBlackStatus(Long memberId) {
         log.info("validatedMember -->>【memberId】 -->> " + memberId);
         MemberDTO memberDTO = this.memberService.findById(memberId);
         Long blackStatus = memberDTO.getBlackStatus();
         // TODO 检查balckStatus无法获取的原因
-        if (Objects.isNull(blackStatus) || blackStatus == 1) {
-            log.error("validatedMember -->> 会员不存在或者已被加入黑名单 【blackStatus】 -->> " + blackStatus);
+        if (Objects.nonNull(blackStatus) && blackStatus == 1) {
+            log.error("validatedMember -->> 会员已被加入黑名单 【blackStatus】 -->> " + blackStatus);
             return false;
         }
         return true;
@@ -653,7 +662,8 @@ public class TaskOperationServiceImpl implements TaskOperationService {
                 }
             }
 
-
+        } else {
+            return true;
         }
         return false;
     }

 #配置数据源
 spring:
   datasource:
-#    测试/演示库
-#    url: jdbc:log4jdbc:mysql://139.196.192.242:3306/tj_user_0819?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
-#    username: root
-#    password: Tjlh@2017
-
-    url: jdbc:log4jdbc:mysql://47.100.212.170:3306/ucs?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+#    测试/演示库url:
+    url: jdbc:log4jdbc:mysql://139.196.192.242:3306/tj_user_0819?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
     username: root
-    password: Tjlh@2021
+    password: Tjlh@2017
+
+
+#    url: jdbc:log4jdbc:mysql://47.100.212.170:3306/ucs?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+#    username: root
+#    password: Tjlh@2021
 
 #    url: jdbc:log4jdbc:mysql://122.112.214.149:3306/tj_user?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
 #    username: root

@@ -20,6 +20,16 @@ public class MemberControllerTest extends BaseTest {
     MemberController memberController;
 
     @Test
+    public void doUpdateVip(){
+        Member member = new Member();
+        member.setId(5L);
+        member.setVip(4);
+        String s = JSON.toJSONString(member);
+        ResultInfo byId = this.memberController.doUpdateVip(member);
+        LOG.info("===>>>"+byId);
+    }
+
+    @Test
     public void update(){
         Member member = new Member();
         member.setId(5L);

@@ -45,7 +45,7 @@ public class CouponOperationControllerTest extends BaseTest {
 
         String s = JSON.toJSONString(tempCouponList);
 //        tempCouponList.add(tempCoupon1);
-        ResultInfo byId = this.couponOperationController.grantCouponByManual(memberId,userId,tempCouponList);
+        ResultInfo byId = this.couponOperationController.grantCouponByManual(tempCouponList);
         LOG.info("===>>>"+byId);
     }
 

@@ -33,7 +33,7 @@ public class TaskOperationControllerTest extends BaseTest {
             DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData();
             msgData.setEvent(6); // 类型 1-登录  2-观影  3-参加活动  4-订购  5-优享会员  6-签到
             msgData.setRemarks("remark");
-            msgData.setMemberId(4L);
+            msgData.setMemberId(2261L);
             msgData.setDeviceType(2);
             msgData.setAppCode("WEI_XIN_GOLD_PANDA");
             dataSyncMsg.setMsg(msgData);

 package com.topdraw.test.business.process.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.topdraw.business.basicdata.member.domain.Member;
 import com.topdraw.business.process.service.MemberOperationService;
 import com.topdraw.BaseTest;
@@ -43,6 +44,8 @@ public class MemberOperationServiceTest extends BaseTest {
         member.setUserIptvId(1L);
         member.setBindIptvPlatformType(0);
         member.setUpdateTime(TimestampUtil.now());
+        String s = JSONObject.toJSONString(member);
+
         this.memberOperationService.doUpdateMemberInfo(member);
     }
 

@@ -46,7 +46,7 @@ public class PointsOperationServiceTest extends BaseTest {
 
     @Test
     public void cleanInvalidAvailablePoints() {
-        Long memberId = 10L;
+        Long memberId = 169L;
         this.pointsOperationService.cleanInvalidPointsAndCalculateCurrentPoints(memberId);
     }