From 4fb3c5ec60986120553a3ae528febb483285605f Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sat, 23 Nov 2024 15:36:42 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 2 +- .../service/impl/WxFinanceServiceImpl.java | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index 56d0ddbe6..fdb2f25af 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -263,7 +263,7 @@ public class WxFinanceController extends BaseController { @ApiOperation("增加临时费用") @PostMapping("createTempFees") - public ResultData saveAdvance(@RequestBody WxAllBill record) { + public ResultData createTempFees(@RequestBody WxAllBill record) { record.updateTenantInfo(getTenantInfo()); if (StringUtils.isBlank(record.getReceivePay())) { return new ResultData(Result.ERROR,"请填写金额"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 0338bcc69..f5fed5916 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -362,7 +362,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { if (null == shopId) { shopId = be.getShopId(); } - if (shopId != be.getShopId()) { + if (shopId.longValue() != be.getShopId().longValue()) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"多个房源合并收款不能冲抵"); } } @@ -1223,13 +1223,17 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxAllBill advanceBill = new WxAllBill(); advanceBill.updateTenantInfo(record); advanceBill.setShopId(wxShop.getId()); - WxShopUsers su = new WxShopUsers(); - su.updateTenantInfo(record); - su.setShopId(wxShop.getId()); - su.setStatus(EnumShopUsersStatus.LIVE.getCode()); - WxShopUsers wsu = wxShopService.getOneShopUsers(su); - if (null != wsu) { - advanceBill.setCusName(wsu.getName()); + if (StringUtils.isNotBlank(record.getCusName())) { + advanceBill.setCusName(record.getCusName()); + }else { + WxShopUsers su = new WxShopUsers(); + su.updateTenantInfo(record); + su.setShopId(wxShop.getId()); + su.setStatus(EnumShopUsersStatus.LIVE.getCode()); + WxShopUsers wsu = wxShopService.getOneShopUsers(su); + if (null != wsu) { + advanceBill.setCusName(wsu.getName()); + } } advanceBill.setNeedPay(record.getReceivePay()); advanceBill.setReceivePay(receivePay); @@ -1237,7 +1241,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { advanceBill.setUseMoney("0"); advanceBill.setBillType(billType.getCode()); //advanceBill.setPayWay(); - advanceBill.setPayDate(new Date()); + //advanceBill.setPayDate(new Date()); advanceBill.setStarttime(starttime); advanceBill.setEndtime(endtime); advanceBill.setReceiveDate(starttime);