update 需求变更 新增参会人时,选择打包后可以选择发票
This commit is contained in:
+1
-10
@@ -990,15 +990,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
|||||||
BeanUtils.copyProperties(payMeetingSituation, commonPeopleVO);
|
BeanUtils.copyProperties(payMeetingSituation, commonPeopleVO);
|
||||||
Integer payMode = commonPeopleVO.getPayMode();
|
Integer payMode = commonPeopleVO.getPayMode();
|
||||||
payMeetingSituation1.setPayMode(payMode);
|
payMeetingSituation1.setPayMode(payMode);
|
||||||
//缴费方式为打包时,不处理邮寄联系人和地址
|
//所有缴费方式,都有需要发票
|
||||||
if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_3)) {
|
|
||||||
ValidUtil.validate(commonPeopleVO);
|
|
||||||
//存入打包字段
|
|
||||||
//payMeetingSituation1.setPack(PayProjectCommon.PACKAGING1);
|
|
||||||
payMeetingSituation1.setAmountReceivable(payMeeting.getMeetingCosts());
|
|
||||||
//缴费方式为汇款或线上缴费
|
|
||||||
} else if (Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_1)
|
|
||||||
|| Objects.equals(payMode, MeetingSubitemCommon.PAY_MODE_2)) {
|
|
||||||
Integer needInvoice = commonPeopleVO.getNeedInvoice();
|
Integer needInvoice = commonPeopleVO.getNeedInvoice();
|
||||||
//需要发票时校验邮寄
|
//需要发票时校验邮寄
|
||||||
if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
|
if (!needInvoice.equals(ProjectCommon.NEED_INVOICE0)){
|
||||||
@@ -1068,7 +1060,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
|
|||||||
throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
|
throw new JeroBootException("邮寄联系人不是所选企业的企业联系人");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
payMeetingSituation1.setCheckInHotel(payMeetingSituation.getCheckInHotel());
|
payMeetingSituation1.setCheckInHotel(payMeetingSituation.getCheckInHotel());
|
||||||
payMeetingSituation1.setArrivalTime(payMeetingSituation.getArrivalTime());
|
payMeetingSituation1.setArrivalTime(payMeetingSituation.getArrivalTime());
|
||||||
payMeetingSituation1.setDepartureTime(payMeetingSituation.getDepartureTime());
|
payMeetingSituation1.setDepartureTime(payMeetingSituation.getDepartureTime());
|
||||||
|
|||||||
Reference in New Issue
Block a user