fix 会议发送消息

jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java

@@ -12,28 +12,28 @@ import com.jero.common.util.oConvertUtils;
 public enum MessageUrlEnums {
 
     // 管理端
-    M_OPEN_TYPE1("M_OPEN_TYPE1","component","/ProjectDetailModal"),
+    M_OPEN_TYPE1("M_OPEN_TYPE1","component","@comp/ProjectDetailModal"),
     M_OPEN_TYPE2("M_OPEN_TYPE2","url","/contractManagement/RevenueContractDetail"),
     M_OPEN_TYPE3("M_OPEN_TYPE3","url","/contractManagement/RevenueContractDetail"),
     M_OPEN_TYPE4("M_OPEN_TYPE4","url","/contractManagement/RevenueContractDetail"),
-    M_OPEN_TYPE5("M_OPEN_TYPE5","component","/meetManage/modules/AuditModal"),
+    M_OPEN_TYPE5("M_OPEN_TYPE5","component","@views/incomePayments/meetManage/modules/AuditModal"),
-    M_OPEN_TYPE6("M_OPEN_TYPE6","component","/ProjectDetailModal"),
+    M_OPEN_TYPE6("M_OPEN_TYPE6","component","@comp/ProjectDetailModal"),
-    M_OPEN_TYPE7("M_OPEN_TYPE7","component","/ProjectDetailModal"),
+    M_OPEN_TYPE7("M_OPEN_TYPE7","component","@comp/ProjectDetailModal"),
     M_OPEN_TYPE8("M_OPEN_TYPE8","url","/incomePayments/meetManage/SignUpInfoDetail"),
     M_OPEN_TYPE9("M_OPEN_TYPE9","url","/businessManagement/BusinessManagement"),
     // todo 待定企业端
     C_OPEN_TYPE1("C_OPEN_TYPE1","href","http://localhost:3000/signUpEntrance?id"),
-    C_OPEN_TYPE2("C_OPEN_TYPE2","component",""),
+    C_OPEN_TYPE2("C_OPEN_TYPE2","component","MessagePage/MeetingDetailModal"),
-    C_OPEN_TYPE3("C_OPEN_TYPE3","component",""),
+    C_OPEN_TYPE3("C_OPEN_TYPE3","component","MessagePage/MeetingDetailModal"),
-    C_OPEN_TYPE4("C_OPEN_TYPE4","component",""),
+    C_OPEN_TYPE4("C_OPEN_TYPE4","component","MessagePage/MeetingDetailModal"),
-    C_OPEN_TYPE5("C_OPEN_TYPE5","component",""),
+    C_OPEN_TYPE5("C_OPEN_TYPE5","component","MessagePage/UploadMeetingCertificateModal"),
-    C_OPEN_TYPE6("C_OPEN_TYPE6","component",""),
+    C_OPEN_TYPE6("C_OPEN_TYPE6","component","MessagePage/MeetingDetailModal"),
-    C_OPEN_TYPE7("C_OPEN_TYPE7","component",""),
+    C_OPEN_TYPE7("C_OPEN_TYPE7","component","MessagePage/MeetingDetailModal"),
     C_OPEN_TYPE8("C_OPEN_TYPE8","none",""),
     C_OPEN_TYPE9("C_OPEN_TYPE9","",""),
     C_OPEN_TYPE10("C_OPEN_TYPE10","",""),
-    C_OPEN_TYPE11("C_OPEN_TYPE11","component",""),
+    C_OPEN_TYPE11("C_OPEN_TYPE11","component","MessagePage/ProjectDetailModal"),
-    C_OPEN_TYPE12("C_OPEN_TYPE12","component","");
+    C_OPEN_TYPE12("C_OPEN_TYPE12","component","MessagePage/ProjectDetailModal");
 
     /**
      * 业务类型(email:邮件 bpm:流程)

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java

@@ -155,7 +155,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 		sendMessageDTO.setFromUser(payMeeting.getDirectorName());
 		sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode());
 		sendMessageDTO.setTemplateParam(map);
-		sendMessageDTO.setBusType("email");
+		sendMessageDTO.setBusType("C_OPEN_TYPE1");
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put("id",payMeeting.getId());
 		sendMessageDTO.setBusId(jsonObject.toJSONString());

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java

@@ -166,7 +166,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     }
 
     /**
-     * 上传付款凭证发送邮件提醒审批
+     * 上传付款凭证发送邮件提醒审批 M_OPEN_TYPE5
      */
     private void SendPaymentRecordMessage(PayMeetingSituation payMeetingSituation, PayMeeting payMeeting) {
         String paymentRecord = payMeetingSituation.getPaymentRecord();
@@ -276,7 +276,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         handlePack(payMeetingSituation1);
         Integer identity = payMeetingSituation1.getIdentity();
         //如果是参会人判断是上传了缴费凭证
-        if (identity.equals(MeetingSubitemCommon.CAN_HUI_REN)){
         if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))) {
             //工作组以公司为维度
             LambdaQueryWrapper<PayWorkingGroupSubItem> wrapper = new LambdaQueryWrapper<>();
@@ -285,7 +284,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             boolean isSubItem = payWorkingGroupSubItemService.count(wrapper) > 0;
             judgeSend(payMeeting, payMeetingSituation1, isSubItem);
 
-
         } else if (meetingType.equals(Integer.parseInt(MeetingCommon.COMMITTEE_MEETING))) {
             //分标委以人为维度
             LambdaQueryWrapper<PayCaseCommitteeSubitem> wrapper = new LambdaQueryWrapper<>();
@@ -300,7 +298,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         //上传付款凭证发送邮件提醒审批
         SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
     }
-    }
 
     /**
      * 判断发送哪种类型的消息
@@ -308,15 +305,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
      * @param isSubItem           是否是组成员
      */
     private void judgeSend(PayMeeting payMeeting, PayMeetingSituation payMeetingSituation, boolean isSubItem) {
+        Integer payMode = payMeetingSituation.getPayMode();
+        //不是汇款和线上缴费
+        boolean payModeBoolean = !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) && !Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2);
         //工作组成员
         if (isSubItem) {
             //不是汇款和线上缴费
-            if (payMeetingSituation.getPayMode().equals(MeetingSubitemCommon.PAY_MODE_3)) {
+            if (payModeBoolean) {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
             }
         } else {
             //不是汇款和线上缴费
-            if (payMeetingSituation.getPayMode().equals(MeetingSubitemCommon.PAY_MODE_3)) {
+            if (payModeBoolean) {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG2, "C_OPEN_TYPE2");
             } else {
                 sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
@@ -325,9 +325,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     }
 
     /**
-     * 工作组会议/分标委会议的非成员单位人报名发送消息 CompanyMessageEnums.MSG2
+     * 工作组会议/分标委会议
-     * 工作组会议/分标委会议的非成员单位人报名审核允许参会，但是需要上传缴费凭证/订单后四位的发送消息 CompanyMessageEnums.MSG3
+     * 非成员单位人报名，不需要上传缴费凭证的发送消息 CompanyMessageEnums.MSG2
-     * 既不是非成员单位，也不需要上传缴费凭证的直接发送发送消息 CompanyMessageEnums.MSG4
+     * 非成员单位人报名审核允许参会，但是需要上传缴费凭证/订单后四位的发送消息 CompanyMessageEnums.MSG3
+     * 成员单位，不需要上传缴费凭证的直接发送发送消息 CompanyMessageEnums.MSG4
      * 汇款凭证审核不通过 CompanyMessageEnums.MSG5
      * 非成员单位审核通过且上传的缴费凭证审核通过也发送。（即需要审核的都审核通过才发送）CompanyMessageEnums.MSG6
      *
@@ -357,7 +358,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         sendMessageDTO.setTemplateParam(map);
         sendMessageDTO.setBusType(busType);
         JSONObject jsonObject = new JSONObject();
+        if (companyMessageEnums.equals(CompanyMessageEnums.MSG5)){
             jsonObject.put("id",payMeetingSituation.getId());
+            jsonObject.put("meetingId",payMeeting.getId());
+            jsonObject.put("meetingName",payMeeting.getMeetingName());
+        }else {
+            jsonObject.put("id",payMeeting.getId());
+        }
         sendMessageDTO.setBusId(jsonObject.toJSONString());
         sendMessageService.SendMessageService(sendMessageDTO);
     }