fix: 会员整改,考评首页统计调整

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/service/feign/IReportFeignService.java

@@ -19,25 +19,18 @@ public interface IReportFeignService {
     void memberValidateReport(MemberRelationDO relationDO, Integer lastInnerStatus, String reason);
 
     /**
-     * 会员订单评价之后发送首页统计通知
-     * @param typeEnum 会员评价类型
-     * @param memberId 会员id
-     * @param roleId 角色id
-     */
-    void memberOrderCommentReport(Integer typeEnum, Long memberId, Long roleId);
-
-    /**
      * 首页统计增加
      */
-    void increaseReport(Integer dataSource, Long memberId, Long roleId, Integer operateType);
+    void increaseReport(Integer dataSource, Integer operateType, Long memberId, Long roleId);
 
     /**
      * 首页统计减少
      */
-    void reduceReport(Integer dataSource, Long memberId, Long roleId, Integer operateType);
+    void reduceReport(Integer dataSource, Integer operateType, Long memberId, Long roleId);
 
     /**
      * 首页统计一方减少一方增加
      */
-    void reduceAndIncreaseReport(Integer dataSource, Long memberId, Long roleId, Integer operateType, Long subMemberId, Long subRoleId, Integer subOperateType);
+    void reduceAndIncreaseReport(Integer dataSource, Integer operateType, Long memberId, Long roleId,
+                                 Integer subDataSource, Integer subOperateType, Long subMemberId, Long subRoleId);
 }

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/feign/ReportFeignServiceImpl.java

@@ -3,11 +3,12 @@ package com.ssy.lingxi.member.merchant.serviceimpl.feign;
 import com.ssy.lingxi.common.response.ResponseCode;
 import com.ssy.lingxi.common.response.Wrapper;
 import com.ssy.lingxi.member.merchant.entity.MemberRelationDO;
-import com.ssy.lingxi.member.merchant.model.constant.*;
+import com.ssy.lingxi.member.merchant.model.constant.MemberInnerStatusEnum;
+import com.ssy.lingxi.member.merchant.model.constant.MemberProcessTypeEnum;
+import com.ssy.lingxi.member.merchant.model.constant.MemberRelationTypeEnum;
+import com.ssy.lingxi.member.merchant.model.constant.PlatformInnerStatusEnum;
 import com.ssy.lingxi.member.merchant.service.feign.IReportFeignService;
 import com.ssy.lingxi.report.api.enums.OperateDataSourceEnum;
-import com.ssy.lingxi.report.api.enums.PurchaseOrderOperateTypeEnum;
-import com.ssy.lingxi.report.api.enums.SaleOrderOperateTypeEnum;
 import com.ssy.lingxi.report.api.feign.ReportControllerFeign;
 import com.ssy.lingxi.report.api.vo.request.OperateNoticeVO;
 import org.slf4j.Logger;
@@ -95,34 +96,7 @@ public class ReportFeignServiceImpl implements IReportFeignService {
 
     @Async
     @Override
-    public void memberOrderCommentReport(Integer typeEnum, Long memberId, Long roleId) {
-        // 通知对象
-        OperateNoticeVO operateNoticeVO = new OperateNoticeVO();
-        operateNoticeVO.setMemberId(memberId);
-        operateNoticeVO.setRoleId(roleId);
-
-        if (MemberTradeTypeEnum.BUYER.getTypeEnum().equals(typeEnum)) {
-            // 买方
-            operateNoticeVO.setDataSource(OperateDataSourceEnum.TRADE_PURCHASE_ORDER.getCode());
-            operateNoticeVO.setReduceOperateType(PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode());
-            operateNoticeVO.setReduceCount(1L);
-        } else if (MemberTradeTypeEnum.SELLER.getTypeEnum().equals(typeEnum)) {
-            // 卖方
-            operateNoticeVO.setDataSource(OperateDataSourceEnum.TRADE_SALE_ORDER.getCode());
-            operateNoticeVO.setReduceOperateType(SaleOrderOperateTypeEnum.TO_BE_EVALUATE.getCode());
-            operateNoticeVO.setReduceCount(1L);
-        }
-
-        try {
-            reportControllerFeign.addOperateNotice(operateNoticeVO);
-        } catch (Exception e) {
-            logger.error("会员订单评价数据通知错误", e);
-        }
-    }
-
-    @Async
-    @Override
-    public void increaseReport(Integer dataSource, Long memberId, Long roleId, Integer operateType) {
+    public void increaseReport(Integer dataSource, Integer operateType, Long memberId, Long roleId) {
         List<OperateNoticeVO> operateNoticeVOList = new ArrayList<>();
         // 待发送 - 增加
         OperateNoticeVO increaseOperateNotice = new OperateNoticeVO();
@@ -142,7 +116,7 @@ public class ReportFeignServiceImpl implements IReportFeignService {
 
     @Async
     @Override
-    public void reduceReport(Integer dataSource, Long memberId, Long roleId, Integer operateType) {
+    public void reduceReport(Integer dataSource, Integer operateType, Long memberId, Long roleId) {
         List<OperateNoticeVO> operateNoticeVOList = new ArrayList<>();
         // 待整改 - 减少
         OperateNoticeVO reduceOperateNotice = new OperateNoticeVO();
@@ -162,7 +136,7 @@ public class ReportFeignServiceImpl implements IReportFeignService {
 
     @Async
     @Override
-    public void reduceAndIncreaseReport(Integer dataSource, Long memberId, Long roleId, Integer operateType, Long subMemberId, Long subRoleId, Integer subOperateType) {
+    public void reduceAndIncreaseReport(Integer dataSource, Integer operateType, Long memberId, Long roleId, Integer subDataSource, Integer subOperateType, Long subMemberId, Long subRoleId) {
         List<OperateNoticeVO> operateNoticeVOList = new ArrayList<>();
         // 减少
         OperateNoticeVO reduceOperateNotice = new OperateNoticeVO();

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberCommentServiceImpl.java

@@ -337,14 +337,12 @@ public class MemberCommentServiceImpl implements IMemberCommentService {
 
         if (MemberTradeTypeEnum.BUYER.equals(memberTradeTypeEnum)) {
             // 首页统计
-            reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_PURCHASE_ORDER.getCode(),
-                    memberOrderCommentDO.getBuyerMemberId(), memberOrderCommentDO.getBuyerRoleId(),
-                    PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode());
+            reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_PURCHASE_ORDER.getCode(), PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode(),
+                    memberOrderCommentDO.getBuyerMemberId(), memberOrderCommentDO.getBuyerRoleId());
         } else {
             // 首页统计
-            reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_SALE_ORDER.getCode(),
-                    memberOrderCommentDO.getVendorMemberId(), memberOrderCommentDO.getVendorRoleId(),
-                    PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode());
+            reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_SALE_ORDER.getCode(), PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode(),
+                    memberOrderCommentDO.getVendorMemberId(), memberOrderCommentDO.getVendorRoleId());
         }
 
         return Wrapper.success();

merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberRectifyServiceImpl.java

@@ -506,8 +506,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
         memberRectifyRepository.saveAndFlush(memberRectifyDO);
 
         // 首页统计
-        reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(),
-                memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode());
+        reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(),
+                memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId());
 
         // 发送消息
         messageFeignService.sendSystemMessage(memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(),
@@ -570,8 +570,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
         memberRectifyRepository.delete(memberRectifyDO);
 
         // 首页统计
-        reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(),
-                memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode());
+        reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(),
+                memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId());
 
         return Wrapper.success();
     }
@@ -627,9 +627,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
         }
 
         // 首页统计
-        reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(),
-                memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(),
-                memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode());
+        reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(), memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(),
+                OperateDataSourceEnum.MEMBER_RECTIFY_NOTICE.getCode(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode(), memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId());
 
         // 发送消息
         messageFeignService.sendSystemMessage(memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(),
@@ -676,9 +675,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
         memberRectifyRepository.saveAndFlush(memberRectifyDO);
 
         // 首页统计
-        reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(),
-                memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode(),
-                memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_CONFIRM_NOTICE_COUNT.getCode());
+        reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_RECTIFY_NOTICE.getCode(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode(), memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(),
+                OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_CONFIRM_NOTICE_COUNT.getCode(), memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId());
 
         // 发送消息
         messageFeignService.sendSystemMessage(memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(),
@@ -735,12 +733,12 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
 
         if (EnableDisableStatus.ENABLE.getCode().equals(agreeVO.getAgree())) {
             // 首页统计
-            reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(),
-                    memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_CONFIRM_NOTICE_COUNT.getCode());
+            reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_CONFIRM_NOTICE_COUNT.getCode(),
+                    memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId());
         } else {
             // 首页统计
-            reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(),
-                    memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode());
+            reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode(),
+                    memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId());
 
             // 发送消息
             messageFeignService.sendSystemMessage(memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(),