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

This commit is contained in:
lijiarao
2021-10-18 15:06:05 +08:00
parent 36c2a020be
commit a9e8cdbf84
@@ -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);
saveMeetingSituation(payMeetingSituation1);
//处理打包
handlePack(payMeetingSituation1);
//handlePack(payMeetingSituation1);
Integer identity = payMeetingSituation1.getIdentity();
//判断是否发送消息,工作组和分标委特殊处理
if (meetingType.equals(Integer.parseInt(MeetingCommon.WORKING_GROUP_MEETING))
@@ -752,7 +752,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
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)) {
ValidUtil.validate(commonPeopleVO);
//存入打包字段
payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
payMeetingSituation1.setAmountReceivable(new BigDecimal(0));
//payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
//缴费方式为汇款或线上缴费
} else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
|| Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) {