Skip to content

L
lingxi-lxy-yanshou
Commit d0a9050b authored by yzc's avatar yzc
Browse files
Options

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

parent f872d9f9
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 105 deletions
merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/service/feign/IReportFeignService.java
View file @ d0a9050b
...@@ -19,25 +19,18 @@ public interface IReportFeignService { ...@@ -19,25 +19,18 @@ public interface IReportFeignService {
void memberValidateReport(MemberRelationDO relationDO, Integer lastInnerStatus, String reason); 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
View file @ d0a9050b
...@@ -3,11 +3,12 @@ package com.ssy.lingxi.member.merchant.serviceimpl.feign; ...@@ -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.ResponseCode;
import com.ssy.lingxi.common.response.Wrapper; import com.ssy.lingxi.common.response.Wrapper;
import com.ssy.lingxi.member.merchant.entity.MemberRelationDO; 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.member.merchant.service.feign.IReportFeignService;
import com.ssy.lingxi.report.api.enums.OperateDataSourceEnum; 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.feign.ReportControllerFeign;
import com.ssy.lingxi.report.api.vo.request.OperateNoticeVO; import com.ssy.lingxi.report.api.vo.request.OperateNoticeVO;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -95,34 +96,7 @@ public class ReportFeignServiceImpl implements IReportFeignService { ...@@ -95,34 +96,7 @@ public class ReportFeignServiceImpl implements IReportFeignService {
@Async @Async
@Override @Override
public void memberOrderCommentReport(Integer typeEnum, Long memberId, Long roleId) { public void increaseReport(Integer dataSource, Integer operateType, 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) {
List<OperateNoticeVO> operateNoticeVOList = new ArrayList<>(); List<OperateNoticeVO> operateNoticeVOList = new ArrayList<>();
// 待发送 - 增加 // 待发送 - 增加
OperateNoticeVO increaseOperateNotice = new OperateNoticeVO(); OperateNoticeVO increaseOperateNotice = new OperateNoticeVO();
...@@ -142,7 +116,7 @@ public class ReportFeignServiceImpl implements IReportFeignService { ...@@ -142,7 +116,7 @@ public class ReportFeignServiceImpl implements IReportFeignService {
@Async @Async
@Override @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<>(); List<OperateNoticeVO> operateNoticeVOList = new ArrayList<>();
// 待整改 - 减少 // 待整改 - 减少
OperateNoticeVO reduceOperateNotice = new OperateNoticeVO(); OperateNoticeVO reduceOperateNotice = new OperateNoticeVO();
...@@ -162,7 +136,7 @@ public class ReportFeignServiceImpl implements IReportFeignService { ...@@ -162,7 +136,7 @@ public class ReportFeignServiceImpl implements IReportFeignService {
@Async @Async
@Override @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<>(); List<OperateNoticeVO> operateNoticeVOList = new ArrayList<>();
// 减少 // 减少
OperateNoticeVO reduceOperateNotice = new OperateNoticeVO(); OperateNoticeVO reduceOperateNotice = new OperateNoticeVO();
......
merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberAppraisalServiceImpl.java
View file @ d0a9050b
...@@ -480,7 +480,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -480,7 +480,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
itemVO.setContent(e.getContent()); itemVO.setContent(e.getContent());
itemVO.setType(e.getType()); itemVO.setType(e.getType());
itemVO.setUserId(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getId() : 0L); itemVO.setUserId(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getId() : 0L);
itemVO.setUserName(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getName(): "系统"); itemVO.setUserName(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getName() : "系统");
itemVO.setSendAppraisal(e.getSendAppraisal()); itemVO.setSendAppraisal(e.getSendAppraisal());
itemVO.setScoreWeight(e.getScoreWeight()); itemVO.setScoreWeight(e.getScoreWeight());
itemVO.setGrade(e.getGrade()); itemVO.setGrade(e.getGrade());
...@@ -528,7 +528,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -528,7 +528,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
itemVO.setContent(e.getContent()); itemVO.setContent(e.getContent());
itemVO.setType(e.getType()); itemVO.setType(e.getType());
itemVO.setUserId(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getId() : 0L); itemVO.setUserId(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getId() : 0L);
itemVO.setUserName(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getName(): "系统"); itemVO.setUserName(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getName() : "系统");
itemVO.setSendAppraisal(e.getSendAppraisal()); itemVO.setSendAppraisal(e.getSendAppraisal());
itemVO.setScoreWeight(e.getScoreWeight()); itemVO.setScoreWeight(e.getScoreWeight());
itemVO.setGrade(e.getGrade()); itemVO.setGrade(e.getGrade());
...@@ -547,7 +547,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -547,7 +547,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
if (StringUtils.isBlank(memberAppraisalDO.getTaskId()) && MemberAppraisalStatusEnum.SUBMIT_NOTIFICATION.getCode().equals(memberAppraisalDO.getStatus())) { if (StringUtils.isBlank(memberAppraisalDO.getTaskId()) && MemberAppraisalStatusEnum.SUBMIT_NOTIFICATION.getCode().equals(memberAppraisalDO.getStatus())) {
memberAppraisalResultVO.setCurrentStep(7); memberAppraisalResultVO.setCurrentStep(7);
} else{ } else {
memberAppraisalResultVO.setCurrentStep((result.getData().getCurrentStep())); memberAppraisalResultVO.setCurrentStep((result.getData().getCurrentStep()));
} }
memberAppraisalResultVO.setVerifySteps(result.getData().getStepList()); memberAppraisalResultVO.setVerifySteps(result.getData().getStepList());
...@@ -586,7 +586,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -586,7 +586,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
itemVO.setContent(e.getContent()); itemVO.setContent(e.getContent());
itemVO.setType(e.getType()); itemVO.setType(e.getType());
itemVO.setUserId(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getId() : 0L); itemVO.setUserId(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getId() : 0L);
itemVO.setUserName(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getName(): "系统"); itemVO.setUserName(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getName() : "系统");
itemVO.setSendAppraisal(e.getSendAppraisal()); itemVO.setSendAppraisal(e.getSendAppraisal());
itemVO.setScoreWeight(e.getScoreWeight()); itemVO.setScoreWeight(e.getScoreWeight());
itemVO.setGrade(e.getGrade()); itemVO.setGrade(e.getGrade());
...@@ -605,7 +605,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -605,7 +605,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
if (StringUtils.isBlank(memberAppraisalDO.getTaskId()) && MemberAppraisalStatusEnum.SUBMIT_NOTIFICATION.getCode().equals(memberAppraisalDO.getStatus())) { if (StringUtils.isBlank(memberAppraisalDO.getTaskId()) && MemberAppraisalStatusEnum.SUBMIT_NOTIFICATION.getCode().equals(memberAppraisalDO.getStatus())) {
memberAppraisalVO.setCurrentStep(7); memberAppraisalVO.setCurrentStep(7);
} else{ } else {
memberAppraisalVO.setCurrentStep((result.getData().getCurrentStep())); memberAppraisalVO.setCurrentStep((result.getData().getCurrentStep()));
} }
memberAppraisalVO.setVerifySteps(result.getData().getStepList()); memberAppraisalVO.setVerifySteps(result.getData().getStepList());
...@@ -653,7 +653,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -653,7 +653,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
itemVO.setContent(e.getContent()); itemVO.setContent(e.getContent());
itemVO.setType(e.getType()); itemVO.setType(e.getType());
itemVO.setUserId(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getId() : 0L); itemVO.setUserId(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getId() : 0L);
itemVO.setUserName(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getName(): "系统"); itemVO.setUserName(MemberAppraisalItemTypeEnum.DEFINITION.getCode().equals(e.getType()) ? e.getByUser().getName() : "系统");
itemVO.setSendAppraisal(e.getSendAppraisal()); itemVO.setSendAppraisal(e.getSendAppraisal());
itemVO.setScoreWeight(e.getScoreWeight()); itemVO.setScoreWeight(e.getScoreWeight());
itemVO.setGrade(e.getGrade()); itemVO.setGrade(e.getGrade());
...@@ -672,7 +672,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -672,7 +672,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
if (StringUtils.isBlank(memberAppraisalDO.getTaskId()) && MemberAppraisalStatusEnum.SUBMIT_NOTIFICATION.getCode().equals(memberAppraisalDO.getStatus())) { if (StringUtils.isBlank(memberAppraisalDO.getTaskId()) && MemberAppraisalStatusEnum.SUBMIT_NOTIFICATION.getCode().equals(memberAppraisalDO.getStatus())) {
memberAppraisalVO.setCurrentStep(7); memberAppraisalVO.setCurrentStep(7);
} else{ } else {
memberAppraisalVO.setCurrentStep((result.getData().getCurrentStep())); memberAppraisalVO.setCurrentStep((result.getData().getCurrentStep()));
} }
memberAppraisalVO.setVerifySteps(result.getData().getStepList()); memberAppraisalVO.setVerifySteps(result.getData().getStepList());
...@@ -795,8 +795,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -795,8 +795,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
memberAppraisalRepository.saveAndFlush(memberAppraisalDO); memberAppraisalRepository.saveAndFlush(memberAppraisalDO);
// 首页统计 // 首页统计
reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode()); memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
...@@ -901,8 +901,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -901,8 +901,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
for (MemberAppraisalDO memberAppraisalDO : memberAppraisalDOList) { for (MemberAppraisalDO memberAppraisalDO : memberAppraisalDOList) {
// 首页统计 // 首页统计
reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode()); memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
} }
return Wrapper.success(); return Wrapper.success();
...@@ -941,9 +941,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -941,9 +941,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
MemberAppraisalStatusEnum.getCodeMessage(memberAppraisalDO.getStatus()), result.getData().getOperation(), ""); MemberAppraisalStatusEnum.getCodeMessage(memberAppraisalDO.getStatus()), result.getData().getOperation(), "");
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_PUBLISH_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_PUBLISH_COUNT.getCode(), OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode(), memberAppraisalDO.getSubMember().getId(), memberAppraisalDO.getSubRole().getId());
memberAppraisalDO.getSubMember().getId(), memberAppraisalDO.getSubRole().getId(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
...@@ -954,8 +953,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -954,8 +953,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
.collect(Collectors.groupingBy(item -> item.getByUser().getId())); .collect(Collectors.groupingBy(item -> item.getByUser().getId()));
for (Long userId : userItems.keySet()) { for (Long userId : userItems.keySet()) {
// 首页统计 // 首页统计
reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_SCORING_COUNT.getCode(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_SCORING_COUNT.getCode()); memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
// 发送消息 // 发送消息
messageFeignService.sendUserSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), userId, messageFeignService.sendUserSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), userId,
...@@ -1005,8 +1004,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -1005,8 +1004,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
MemberAppraisalItemStatusEnum.GRADE_COMPLETE.getMessage(), "考评打分", ""); MemberAppraisalItemStatusEnum.GRADE_COMPLETE.getMessage(), "考评打分", "");
// 首页统计 // 首页统计
reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_SCORING_COUNT.getCode(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_SCORING_COUNT.getCode()); memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
return Wrapper.success(); return Wrapper.success();
} }
...@@ -1071,9 +1070,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -1071,9 +1070,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
memberAppraisalRepository.saveAndFlush(memberAppraisalDO); memberAppraisalRepository.saveAndFlush(memberAppraisalDO);
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode(), OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP1_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP1_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
...@@ -1112,18 +1110,16 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -1112,18 +1110,16 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
if (EnableDisableStatus.ENABLE.getCode().equals(agreeVO.getAgree())) { if (EnableDisableStatus.ENABLE.getCode().equals(agreeVO.getAgree())) {
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP1_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP1_COUNT.getCode(), OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
MessageTemplateCode.mc_appraisal_result_audit_step_2, Arrays.asList(memberAppraisalDO.getRole().getRoleName(), memberAppraisalDO.getMember().getName())); MessageTemplateCode.mc_appraisal_result_audit_step_2, Arrays.asList(memberAppraisalDO.getRole().getRoleName(), memberAppraisalDO.getMember().getName()));
} else { } else {
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP1_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP1_COUNT.getCode(), OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
...@@ -1165,9 +1161,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -1165,9 +1161,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
memberAppraisalRepository.saveAndFlush(memberAppraisalDO); memberAppraisalRepository.saveAndFlush(memberAppraisalDO);
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP1_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP1_COUNT.getCode(), OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
...@@ -1207,18 +1202,16 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -1207,18 +1202,16 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
if (EnableDisableStatus.ENABLE.getCode().equals(agreeVO.getAgree())) { if (EnableDisableStatus.ENABLE.getCode().equals(agreeVO.getAgree())) {
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode(), OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_NOTICE_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_NOTICE_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
MessageTemplateCode.mc_appraisal_notification, Arrays.asList(memberAppraisalDO.getRole().getRoleName(), memberAppraisalDO.getMember().getName())); MessageTemplateCode.mc_appraisal_notification, Arrays.asList(memberAppraisalDO.getRole().getRoleName(), memberAppraisalDO.getMember().getName()));
} else { } else {
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode(), OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
...@@ -1260,9 +1253,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -1260,9 +1253,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
memberAppraisalRepository.saveAndFlush(memberAppraisalDO); memberAppraisalRepository.saveAndFlush(memberAppraisalDO);
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_VALIFY_STEP2_COUNT.getCode(), OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_NOTICE_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_NOTICE_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
...@@ -1305,8 +1297,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService { ...@@ -1305,8 +1297,8 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
memberAppraisalRepository.saveAndFlush(memberAppraisalDO); memberAppraisalRepository.saveAndFlush(memberAppraisalDO);
// 首页统计 // 首页统计
reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_NOTICE_COUNT.getCode(),
memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(), MemberKpiOperateTypeEnum.TO_BE_NOTICE_COUNT.getCode()); memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
memberHistoryService.saveMemberAppraisalHistory(loginUser, memberAppraisalDO.getId(), memberAppraisalDO.getStatus(), memberHistoryService.saveMemberAppraisalHistory(loginUser, memberAppraisalDO.getId(), memberAppraisalDO.getStatus(),
MemberAppraisalStatusEnum.getCodeMessage(memberAppraisalDO.getStatus()), result.getData().getOperation(), ""); MemberAppraisalStatusEnum.getCodeMessage(memberAppraisalDO.getStatus()), result.getData().getOperation(), "");
......
merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberCommentServiceImpl.java
View file @ d0a9050b
...@@ -337,14 +337,12 @@ public class MemberCommentServiceImpl implements IMemberCommentService { ...@@ -337,14 +337,12 @@ public class MemberCommentServiceImpl implements IMemberCommentService {
if (MemberTradeTypeEnum.BUYER.equals(memberTradeTypeEnum)) { if (MemberTradeTypeEnum.BUYER.equals(memberTradeTypeEnum)) {
// 首页统计 // 首页统计
reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_PURCHASE_ORDER.getCode(), reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_PURCHASE_ORDER.getCode(), PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode(),
memberOrderCommentDO.getBuyerMemberId(), memberOrderCommentDO.getBuyerRoleId(), memberOrderCommentDO.getBuyerMemberId(), memberOrderCommentDO.getBuyerRoleId());
PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode());
} else { } else {
// 首页统计 // 首页统计
reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_SALE_ORDER.getCode(), reportFeignService.reduceReport(OperateDataSourceEnum.TRADE_SALE_ORDER.getCode(), PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode(),
memberOrderCommentDO.getVendorMemberId(), memberOrderCommentDO.getVendorRoleId(), memberOrderCommentDO.getVendorMemberId(), memberOrderCommentDO.getVendorRoleId());
PurchaseOrderOperateTypeEnum.TO_BE_EVALUATE.getCode());
} }
return Wrapper.success(); return Wrapper.success();
......
merchant-member-service/src/main/java/com/ssy/lingxi/member/merchant/serviceimpl/web/MemberRectifyServiceImpl.java
View file @ d0a9050b
...@@ -506,8 +506,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService { ...@@ -506,8 +506,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
memberRectifyRepository.saveAndFlush(memberRectifyDO); memberRectifyRepository.saveAndFlush(memberRectifyDO);
// 首页统计 // 首页统计
reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(),
memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode()); memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), messageFeignService.sendSystemMessage(memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(),
...@@ -570,8 +570,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService { ...@@ -570,8 +570,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
memberRectifyRepository.delete(memberRectifyDO); memberRectifyRepository.delete(memberRectifyDO);
// 首页统计 // 首页统计
reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(),
memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode()); memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId());
return Wrapper.success(); return Wrapper.success();
} }
...@@ -627,9 +627,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService { ...@@ -627,9 +627,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
} }
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(), memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(),
memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_SEND_NOTICE_COUNT.getCode(), OperateDataSourceEnum.MEMBER_RECTIFY_NOTICE.getCode(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode(), memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId());
memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(), messageFeignService.sendSystemMessage(memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(),
...@@ -676,9 +675,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService { ...@@ -676,9 +675,8 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
memberRectifyRepository.saveAndFlush(memberRectifyDO); memberRectifyRepository.saveAndFlush(memberRectifyDO);
// 首页统计 // 首页统计
reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_RECTIFY_NOTICE.getCode(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode(), memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(),
memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode(), OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_CONFIRM_NOTICE_COUNT.getCode(), memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId());
memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_CONFIRM_NOTICE_COUNT.getCode());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), messageFeignService.sendSystemMessage(memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(),
...@@ -735,12 +733,12 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService { ...@@ -735,12 +733,12 @@ public class MemberRectifyServiceImpl implements IMemberRectifyService {
if (EnableDisableStatus.ENABLE.getCode().equals(agreeVO.getAgree())) { if (EnableDisableStatus.ENABLE.getCode().equals(agreeVO.getAgree())) {
// 首页统计 // 首页统计
reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), reportFeignService.reduceReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyOperateTypeEnum.TO_BE_CONFIRM_NOTICE_COUNT.getCode(),
memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId(), MemberRectifyOperateTypeEnum.TO_BE_CONFIRM_NOTICE_COUNT.getCode()); memberRectifyDO.getMember().getId(), memberRectifyDO.getRole().getId());
} else { } else {
// 首页统计 // 首页统计
reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), reportFeignService.increaseReport(OperateDataSourceEnum.MEMBER_RECTIFY.getCode(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode(),
memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(), MemberRectifyNoticeOperateTypeEnum.TO_BE_RECTIFY_COUNT.getCode()); memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId());
// 发送消息 // 发送消息
messageFeignService.sendSystemMessage(memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(), messageFeignService.sendSystemMessage(memberRectifyDO.getSubMember().getId(), memberRectifyDO.getSubRole().getId(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment