From 5b53c595b89ce4b10850862e3e14c2b64d79c66a Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Mon, 9 Jun 2025 10:33:08 +0800 Subject: [PATCH] fix --- .../controller/contract/WxAgileContractController.java | 9 +++++++++ .../service/impl/WxAgileContractServiceImpl.java | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index ea6cf5fe2..48ef2456f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -155,6 +155,15 @@ public class WxAgileContractController extends WxContractBaseController { @PostMapping("saveCustomer") public ResultData saveCustomer(@RequestBody WxRentContract record) { record.updateTenantInfo(this.getTenantInfo()); + if (null == record.getCustomerType()) { + return new ResultData(Result.ERROR,"请选择主体类型"); + } + if (StringUtils.isBlank(record.getCustomerName())) { + return new ResultData(Result.ERROR,"请输入名称"); + } + if (StringUtils.isBlank(record.getCustomerPhone())) { + return new ResultData(Result.ERROR,"请输入电话"); + } try { wxAgileContractService.setCustomers(record,EnumContractCustomersStatus.FORMUL); }catch(Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index 7910967b5..03dea8814 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -263,7 +263,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { List shopList = record.shopIdsByRentInfo(); setShops(record,shopList); //关联客户 - setCustomers(record,EnumContractCustomersStatus.TEMP); + //setCustomers(record,EnumContractCustomersStatus.TEMP); try { record.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); record.setStatus(EnumRentContractStatus.DRAFT.getCode()); @@ -1236,17 +1236,18 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { @Transactional(rollbackFor = {Exception.class}) @Override public void transfer(WxRentContract rentContract,MallUserInfo user) { - this.setCustomers(rentContract,EnumContractCustomersStatus.TEMP); + //this.setCustomers(rentContract,EnumContractCustomersStatus.TEMP); rentContract.setUpdatetime(new Date()); rentContract.setUpdateBy(user.getId()); rentContract.setUpdateByName(user.getName()); wxRentContractMapper.updateById(rentContract); + WxContractCustomers customers = wxContractCustomersMapper.selectById(rentContract.getCustomersId(),rentContract.getTenantId()); //更新账单归属 WxAllBill bill = new WxAllBill(); bill.updateTenantInfo(rentContract); bill.setRentContractId(rentContract.getId()); - bill.setCusName(rentContract.getCustomerName()); + bill.setCusName(customers.getName()); wxAllBillMapper.transferCusName(bill); }