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

fix 标协会员开票只能一次，推送数据增加收费二维码

Browse Source
This commit is contained in:
lijiarao
2021-09-26 20:30:29 +08:00
parent 5f3e8531d7
commit ec1bf5b9ce
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+3 -2
View File
@@ -204,6 +204,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
BillingInfo billingInfo = new BillingInfo(); BillingInfo billingInfo = new BillingInfo();
billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber()); billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId()); billingInfo.setMemberId(tbMemberProjectSubitem.getMemberId());
billingInfo.setMobile(tbMemberProjectSubitem.getMobile());
billingInfo.setBillNo(payMailBill.getBillNo()); billingInfo.setBillNo(payMailBill.getBillNo());
billingInfo.setSendMethod(payMailBill.getSendMethod()); billingInfo.setSendMethod(payMailBill.getSendMethod());
billingInfo.setSendDate(payMailBill.getSendDate()); billingInfo.setSendDate(payMailBill.getSendDate());
@@ -372,8 +373,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
//之前开票总额+本次开票金额 //之前开票总额+本次开票金额
invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP); invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
//开票总额>应收 //开票总额>应收
if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) == 1){ if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
return "开票金额大于当前欠未开票金额，输入有误！"; return "开票金额应等于当前未开票金额，输入有误！";
} }
break; break;
default: default:
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+1
View File
@@ -106,6 +106,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
); );
meetingHotelContactsService.saveBatch(hotelContactsList); meetingHotelContactsService.saveBatch(hotelContactsList);
} }
//新增会员系统标协会议
if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) { if (payMeeting.getMeetingType().equals(Integer.parseInt(MeetingCommon.STANDARD_MEETING))) {
stableCrossTrainingService.add(payMeeting,hotelContactsList); stableCrossTrainingService.add(payMeeting,hotelContactsList);
} }
jero-boot-incoming-payment/src/main/java/com/jero/standards/xuanguan/stablecrosstraining/service/impl/StableCrossTrainingServiceImpl.java
+1
View File
@@ -233,6 +233,7 @@ public class StableCrossTrainingServiceImpl extends ServiceImpl<StableCrossTrain
.set(StringUtils.isNotBlank(stableCrossTraining.getMeetingApply()), StableCrossTraining::getMeetingApply, stableCrossTraining.getMeetingApply())//会议报名：校验网址格式 .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingApply()), StableCrossTraining::getMeetingApply, stableCrossTraining.getMeetingApply())//会议报名：校验网址格式
.set(StableCrossTraining::getMeetingFiles, stableCrossTraining.getMeetingFiles())//会议文件 .set(StableCrossTraining::getMeetingFiles, stableCrossTraining.getMeetingFiles())//会议文件
.set(StableCrossTraining::getMeetingNotifyFiles, stableCrossTraining.getMeetingNotifyFiles())//会议通知文件 .set(StableCrossTraining::getMeetingNotifyFiles, stableCrossTraining.getMeetingNotifyFiles())//会议通知文件
.set(StableCrossTraining::getPaymentQrCode, stableCrossTraining.getPaymentQrCode())//付款二维码
.set(StringUtils.isNotBlank(stableCrossTraining.getMeetingDescription()), StableCrossTraining::getMeetingDescription, stableCrossTraining.getMeetingDescription())//会议简介 .set(StringUtils.isNotBlank(stableCrossTraining.getMeetingDescription()), StableCrossTraining::getMeetingDescription, stableCrossTraining.getMeetingDescription())//会议简介
.set(StringUtils.isNotBlank(stableCrossTraining.getRemark()), StableCrossTraining::getRemark, stableCrossTraining.getRemark())//备注 .set(StringUtils.isNotBlank(stableCrossTraining.getRemark()), StableCrossTraining::getRemark, stableCrossTraining.getRemark())//备注
.set(StringUtils.isNotBlank(stableCrossTraining.getQrCode()), StableCrossTraining::getQrCode, stableCrossTraining.getQrCode())//二维码 .set(StringUtils.isNotBlank(stableCrossTraining.getQrCode()), StableCrossTraining::getQrCode, stableCrossTraining.getQrCode())//二维码