LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 40789 其他会议-新增参会人为打包时，逻辑有问题（其他会议也有同样的问题）

Browse Source
This commit is contained in:
lijiarao
2021-10-18 15:06:05 +08:00
parent 36c2a020be
commit a9e8cdbf84
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+5 -5
View File
@@ -165,7 +165,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
} }
//处理打包情况 //处理打包情况
handlePack(payMeetingSituation1); //handlePack(payMeetingSituation1);
} }
/** /**
@@ -281,7 +281,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation); PayMeetingSituation payMeetingSituation1 = getPayMeetingSituation(payMeetingSituation);
saveMeetingSituation(payMeetingSituation1); saveMeetingSituation(payMeetingSituation1);
//处理打包 //处理打包
handlePack(payMeetingSituation1); //handlePack(payMeetingSituation1);
Integer identity = payMeetingSituation1.getIdentity(); Integer identity = payMeetingSituation1.getIdentity();
//判断是否发送消息，工作组和分标委特殊处理 //判断是否发送消息，工作组和分标委特殊处理
if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING)) if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))
@@ -752,7 +752,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
SendPaymentRecordMessage(payMeetingSituation1, payMeeting); SendPaymentRecordMessage(payMeetingSituation1, payMeeting);
} }
//处理打包情况 //处理打包情况
handlePack(payMeetingSituation1); //handlePack(payMeetingSituation1);
} }
/** /**
@@ -847,8 +847,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_3)) { if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_3)) {
ValidUtil.validate(commonPeopleVO); ValidUtil.validate(commonPeopleVO);
//存入打包字段 //存入打包字段
payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1); //payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
payMeetingSituation1.setAmountReceivable(new BigDecimal(0)); payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
//缴费方式为汇款或线上缴费 //缴费方式为汇款或线上缴费
} else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1) } else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
|| Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) { || Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) {