Merge remote-tracking branch 'origin/v2' into v2

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

@@ -270,7 +270,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
             pageQueryVO.setCompleteDay(DateTimeUtil.formatDate(e.getCompleteTime()));
             pageQueryVO.setStatus(e.getStatus());
             pageQueryVO.setStatusName(MemberAppraisalStatusEnum.getCodeMessage(e.getStatus()));
-            pageQueryVO.setSubmitOrUpdate(MemberAppraisalStatusEnum.WAIT_SUBMIT.getCode().equals(e.getStatus()));
+            pageQueryVO.setSubmitOrUpdate(statusLists.contains(e.getStatus()));
             return pageQueryVO;
         }).collect(Collectors.toList());
 
@@ -942,7 +942,7 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
 
             // 首页统计
             reportFeignService.reduceAndIncreaseReport(OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_PUBLISH_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
-                    OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode(), memberAppraisalDO.getSubMember().getId(), memberAppraisalDO.getSubRole().getId());
+                    OperateDataSourceEnum.MEMBER_KPI.getCode(), MemberKpiOperateTypeEnum.TO_BE_COMMIT_COUNT.getCode(), memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId());
 
             // 发送消息
             messageFeignService.sendSystemMessage(memberAppraisalDO.getMember().getId(), memberAppraisalDO.getRole().getId(),
@@ -1020,7 +1020,10 @@ public class MemberAppraisalServiceImpl implements IMemberAppraisalService {
         }
 
         // 状态校验
-        if (!MemberAppraisalStatusEnum.WAIT_SUBMIT.getCode().equals(memberAppraisalDO.getStatus())) {
+        List<Integer> statusLists = Arrays.asList(MemberAppraisalStatusEnum.WAIT_SUBMIT.getCode(),
+                MemberAppraisalStatusEnum.WAIT_AUDIT_1_REJECT.getCode(),
+                MemberAppraisalStatusEnum.WAIT_AUDIT_2_REJECT.getCode());
+        if (!statusLists.contains(memberAppraisalDO.getStatus())) {
             return Wrapper.fail(ResponseCode.MC_MS_DATA_STATUS_INCORRECT_OPERATE_INVALID);
         }