diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java index 3f4014da3..dc3b5e898 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/paymentWallet/PaymentWalletApplicationService.java @@ -82,13 +82,13 @@ public class PaymentWalletApplicationService { */ public Boolean update(PaymentWalletDO paymentWalletDO) { //根据支付方式编码查询支付方式 - if(!StringUtils.isNotEmpty(paymentWalletDO.getPaymentMethodCode())){ - throw new ServiceException("支付方式编码不能为空"); - } - PaymentManage paymentManage = paymentManageDomainService.selectByPaymentCode(paymentWalletDO.getPaymentMethodCode()); - if(null == paymentManage){ - throw new ServiceException("支付方式信息未找到"); - } +// if(!StringUtils.isNotEmpty(paymentWalletDO.getPaymentMethodCode())){ +// throw new ServiceException("支付方式编码不能为空"); +// } +// PaymentManage paymentManage = paymentManageDomainService.selectByPaymentCode(paymentWalletDO.getPaymentMethodCode()); +// if(null == paymentManage){ +// throw new ServiceException("支付方式信息未找到"); +// } paymentWalletDO.setPaymentMethod(paymentWalletDO.getPaymentMethod()); paymentWalletDO.setPaymentWalletId(paymentWalletDO.getPaymentWalletId()); return paymentWalletDomainService.update(paymentWalletDO); diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java index 544c25154..cc173fbc1 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/settlementCustomers/SettlementCustomersApplicationService.java @@ -293,6 +293,13 @@ public class SettlementCustomersApplicationService { Long settlementEntityId = saveEntity.getSettlementEntityId(); List settlementCustomers = settlementCustomersMapper.selectList(new LambdaQueryWrapper().eq(SettlementCustomers::getSettlementEntityId, settlementEntityId)); if(settlementCustomers != null && settlementCustomers.size() > 0){ + for (SettlementCustomers settlementCustomer : settlementCustomers) { + settlementCustomer.setSettlementEntity(userShipperPo.getUserName()); + settlementCustomer.setSettlementMethodCode("monthly_settle"); + settlementCustomer.setMainRole(1); + settlementCustomer.setNcCode(userShipperPo.getCustomerNcCode()); + settlementCustomersMapper.updateById(settlementCustomer); + } } else { saveEntity(saveEntity); } @@ -325,6 +332,12 @@ public class SettlementCustomersApplicationService { Long settlementEntityId = saveEntity.getSettlementEntityId(); List settlementCustomers = settlementCustomersMapper.selectList(new LambdaQueryWrapper().eq(SettlementCustomers::getSettlementEntityId, settlementEntityId)); if(settlementCustomers != null && settlementCustomers.size() > 0){ + for (SettlementCustomers settlementCustomer : settlementCustomers) { + settlementCustomer.setSettlementEntity(userDriverPo.getUserName()); + settlementCustomer.setSettlementMethodCode("monthly_settle"); + settlementCustomer.setMainRole(1); + settlementCustomersMapper.updateById(settlementCustomer); + } } else { saveEntity(saveEntity); }