fix 订单号后四位不回显，更新参会人报错

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

@@ -196,6 +196,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
 			);
 			meetingHotelContactsService.saveBatch(hotelContactsList);
 		}
+		//编辑标协会议
 		if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
 			stableCrossTrainingService.edit(payMeeting,hotelContactsList);
 		}

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

@@ -567,7 +567,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                 HashMap<String, String> map = new HashMap<>();
                 map.put("meetingName", payMeeting.getMeetingName());
                 map.put("userName1", sysUser.getUsername());
-                map.put("userName2", payMeetingSituation.getCompanyContactName());
+                map.put("userName2", payMeetingSituation1.getCompanyContactName());
                 map.put("record", record);
                 sendMessageDTO.setFromUser(sysUser.getUsername());
                 sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG8.getCode());
@@ -679,14 +679,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
                     Date endTime = payMeeting.getEndTime();
                     //如果不在会议期间，不允许上传缴费凭证
                     if (!belongCalendar(new Date(), startTime, endTime)) {
-                        throw new JeroBootException("线上缴费时，付款凭证和订单后四位编码只能在会议期间上传");
+                        throw new JeroBootException("线上缴费时，付款凭证只能在会议期间上传");
                     }
                     payMeetingSituation1.setPaymentRecord(paymentRecord);
-                    payMeetingSituation1.setOrderCode(payMeetingSituation.getOrderCode());
                 } else {
                     payMeetingSituation1.setPaymentRecord(paymentRecord);
                 }
-
+                payMeetingSituation1.setOrderCode(payMeetingSituation.getOrderCode());
                 payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
 
                 //如果是标协会议判断会员类型