From c88a59f3caf852d69611318548bc70179fa650ee Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 26 May 2024 14:47:09 +0800 Subject: [PATCH] fix --- .../rent/WxBillDailyController.java | 6 +++++ .../rent/WxBillOtherController.java | 6 +++++ .../rent/WxBillOtherDepositController.java | 6 +++++ .../com/iformall/domain/po/WxBillDaily.java | 2 ++ .../com/iformall/domain/po/WxBillOther.java | 3 +++ .../domain/po/WxBillOtherDeposit.java | 3 +++ .../service/impl/WxBillDailyServiceImpl.java | 24 ++++++++++++++++--- .../impl/WxBillOtherDepositServiceImpl.java | 21 ++++++++++++++-- .../service/impl/WxBillOtherServiceImpl.java | 24 ++++++++++++++++--- .../resources/mapper/WxBillDailyMapper.xml | 16 ++++++++++++- .../mapper/WxBillOtherDepositMapper.xml | 14 +++++++++++ .../resources/mapper/WxBillOtherMapper.xml | 14 +++++++++++ 12 files changed, 130 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 90f030e38..250fccb07 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -133,6 +133,9 @@ public class WxBillDailyController extends BillBaseController { wxBillDaily.updateTenantInfo(user); wxBillDaily.setUserId(user.getId()); wxBillDaily.setBuildWay(EnumBillDailyBuildWay.HAND.getCode()); + wxBillDaily.setPayWay(null); + wxBillDaily.setPayDate(null); + wxBillDaily.setReceiveDate(wxBillDaily.getStarttime()); return wxBillDailyService.saveOrUpdate(wxBillDaily, user); } @@ -141,6 +144,9 @@ public class WxBillDailyController extends BillBaseController { MallUserInfo user = getUser(); wxBillDaily.updateTenantInfo(user); wxBillDaily.setUserId(user.getId()); + wxBillDaily.setPayWay(null); + wxBillDaily.setPayDate(null); + wxBillDaily.setReceiveDate(wxBillDaily.getStarttime()); return wxBillDailyService.saveOrUpdate(wxBillDaily, user); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index 844d3574d..eb3807ca9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -110,6 +110,9 @@ public class WxBillOtherController extends BillBaseController { MallUserInfo user = getUser(); wxBillOther.updateTenantInfo(user); wxBillOther.setUserId(user.getId()); + wxBillOther.setPayWay(null); + wxBillOther.setPayDate(null); + wxBillOther.setReceiveDate(wxBillOther.getStarttime()); return wxBillOtherService.saveOrUpdate(wxBillOther, user); } @@ -118,6 +121,9 @@ public class WxBillOtherController extends BillBaseController { MallUserInfo user = getUser(); wxBillOther.updateTenantInfo(user); wxBillOther.setUserId(user.getId()); + wxBillOther.setPayWay(null); + wxBillOther.setPayDate(null); + wxBillOther.setReceiveDate(wxBillOther.getStarttime()); return wxBillOtherService.saveOrUpdate(wxBillOther, user); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index 48dea5e18..0666e97d2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -110,6 +110,9 @@ public class WxBillOtherDepositController extends BillBaseController { MallUserInfo user = getUser(); wxBillOtherDeposit.updateTenantInfo(user); wxBillOtherDeposit.setUserId(user.getId()); + wxBillOtherDeposit.setPayWay(null); + wxBillOtherDeposit.setPayDate(null); + wxBillOtherDeposit.setReceiveDate(wxBillOtherDeposit.getStarttime()); return wxBillOtherDepositService.saveOrUpdate(wxBillOtherDeposit, user); } @@ -118,6 +121,9 @@ public class WxBillOtherDepositController extends BillBaseController { MallUserInfo user = getUser(); wxBillOtherDeposit.updateTenantInfo(user); wxBillOtherDeposit.setUserId(user.getId()); + wxBillOtherDeposit.setPayWay(null); + wxBillOtherDeposit.setPayDate(null); + wxBillOtherDeposit.setReceiveDate(wxBillOtherDeposit.getStarttime()); return wxBillOtherDepositService.saveOrUpdate(wxBillOtherDeposit, user); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index 59b008308..902c289cf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -105,6 +105,8 @@ public class WxBillDaily extends WxBillBaseEntity { private String serviceChargePayUpdate; @TableField(exist = false) private List merchantIds; + @TableField(exist = false) + private List notInIds; //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java index b3e035d74..ff480156c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -106,6 +106,9 @@ public class WxBillOther extends WxBillBaseEntity { @TableField(exist = false) private List merchantIds; + @TableField(exist = false) + private List notInIds; + //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java index 27cf1d4cc..75f0bf34b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -115,6 +115,9 @@ public class WxBillOtherDeposit extends WxBillBaseEntity { @TableField(exist = false) private List merchantIds; + @TableField(exist = false) + private List notInIds; + //TODO billTypeName应该也这么处理,不应该到mapper.xml里面写,后面再改 @Override public Integer getBillType() { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index bfc43b5f4..87893fd6e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -243,15 +243,18 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD dailyQuery.setType(record.getType()); dailyQuery.updateTenantInfo(user); dailyQuery.setMerchantId(record.getMerchantId()); - dailyQuery.setReceiveDate(record.getReceiveDate()); + //dailyQuery.setReceiveDate(record.getReceiveDate()); + dailyQuery.setStarttime(record.getStarttime()); + dailyQuery.setEndtime(record.getEndtime()); dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List dailyList = wxBillDailyMapper.findList(dailyQuery); if (null != dailyList && dailyList.size() > 0 ) { - return new ResultData(ErrorCode.BILL_IS_FOUND); + return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在包含该时间端的费用账单"); } final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - record.setStatus(record.getReceiveDate().after(date)?EnumBillStatus.WAIT_PAY.getCode():EnumBillStatus.NOT_PAID.getCode()); + //record.setStatus(record.getReceiveDate().after(date)?EnumBillStatus.WAIT_PAY.getCode():EnumBillStatus.NOT_PAID.getCode()); + record.setStatus(EnumBillStatus.WAIT_PAY.getCode()); record.setCreatetime(date); record.setUpdatetime(date); record.setExpiredDay(0L); @@ -271,6 +274,21 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD if(wxBillDaily==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } + WxBillDaily dailyQuery = new WxBillDaily(); + dailyQuery.setType(record.getType()); + dailyQuery.updateTenantInfo(user); + dailyQuery.setMerchantId(record.getMerchantId()); + //dailyQuery.setReceiveDate(record.getReceiveDate()); + dailyQuery.setStarttime(record.getStarttime()); + dailyQuery.setEndtime(record.getEndtime()); + dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + List notinidlist = new ArrayList(); + notinidlist.add(record.getId()); + dailyQuery.setNotInIds(notinidlist); + List dailyList = wxBillDailyMapper.findList(dailyQuery); + if (null != dailyList && dailyList.size() > 0 ) { + return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在其他包含该时间端的费用账单"); + } wxBillDaily.setUpdatetime(date); wxBillDailyMapper.updateById(wxBillDaily); return new ResultData(Result.SUCCESS, "更新日常账单成功"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index e81e77b95..d3cbe119a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -246,12 +246,14 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); otherDepositQuery.updateTenantInfo(user); otherDepositQuery.setMerchantId(record.getMerchantId()); - otherDepositQuery.setReceiveDate(record.getReceiveDate()); + //otherDepositQuery.setReceiveDate(record.getReceiveDate()); + otherDepositQuery.setStarttime(record.getStarttime()); + otherDepositQuery.setEndtime(record.getEndtime()); otherDepositQuery.setComments(record.getComments()); otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List otherDeposit = wxBillOtherDepositMapper.findList(otherDepositQuery); if (otherDeposit != null && otherDeposit.size() > 0 ) { - return new ResultData(ErrorCode.BILL_IS_FOUND); + return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在包含该时间端的费用账单"); } final IdWorker idWorker = IdWorker.get(); @@ -276,6 +278,21 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements if (wxBillOtherDeposit == null) { return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } + WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); + otherDepositQuery.updateTenantInfo(user); + otherDepositQuery.setMerchantId(record.getMerchantId()); + //otherDepositQuery.setReceiveDate(record.getReceiveDate()); + otherDepositQuery.setStarttime(record.getStarttime()); + otherDepositQuery.setEndtime(record.getEndtime()); + otherDepositQuery.setComments(record.getComments()); + otherDepositQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + List notinidlist = new ArrayList(); + notinidlist.add(record.getId()); + otherDepositQuery.setNotInIds(notinidlist); + List otherDeposit = wxBillOtherDepositMapper.findList(otherDepositQuery); + if (otherDeposit != null && otherDeposit.size() > 0 ) { + return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在包含该时间端的费用账单"); + } record.setUpdatetime(date); wxBillOtherDepositMapper.updateById(record); return new ResultData(Result.SUCCESS, "更新其他账单成功"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index fca9aa8ff..8d3c5866e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -246,16 +246,19 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO WxBillOther otherQuery = new WxBillOther(); otherQuery.updateTenantInfo(user); otherQuery.setMerchantId(record.getMerchantId()); - otherQuery.setReceiveDate(record.getReceiveDate()); + //otherQuery.setReceiveDate(record.getReceiveDate()); + otherQuery.setStarttime(record.getStarttime()); + otherQuery.setEndtime(record.getEndtime()); otherQuery.setName(record.getName()); otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); List other = wxBillOtherMapper.findList(otherQuery); if (other != null && other.size() > 0) { - return new ResultData(ErrorCode.BILL_IS_FOUND); + return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在包含该时间端的费用账单"); } final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); - record.setStatus(record.getReceiveDate().after(date)?EnumBillStatus.WAIT_PAY.getCode():EnumBillStatus.NOT_PAID.getCode()); + //record.setStatus(record.getReceiveDate().after(date)?EnumBillStatus.WAIT_PAY.getCode():EnumBillStatus.NOT_PAID.getCode()); + record.setStatus(EnumBillStatus.WAIT_PAY.getCode()); record.setCreatetime(date); record.setUpdatetime(date); record.setExpiredDay(0L); @@ -276,6 +279,21 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO if(wxBillOther==null){ return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND); } + WxBillOther otherQuery = new WxBillOther(); + otherQuery.updateTenantInfo(user); + otherQuery.setMerchantId(record.getMerchantId()); + //otherQuery.setReceiveDate(record.getReceiveDate()); + otherQuery.setStarttime(record.getStarttime()); + otherQuery.setEndtime(record.getEndtime()); + otherQuery.setName(record.getName()); + otherQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + List notinidlist = new ArrayList(); + notinidlist.add(record.getId()); + otherQuery.setNotInIds(notinidlist); + List other = wxBillOtherMapper.findList(otherQuery); + if (other != null && other.size() > 0) { + return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在其他包含该时间端的费用账单"); + } record.setUpdatetime(date); wxBillOtherMapper.updateById(record); return new ResultData(Result.SUCCESS, "更新其他押金账单成功"); diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index b4dcda8b0..89c71d118 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -75,7 +75,15 @@ #{idItem} - + + + + and id not in + + #{nidItem} + + + order by ${sortColumns} @@ -122,6 +130,12 @@ #{midItem} + + and br.`id` not in + + #{nidItem} + + diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 3eb9f1dc1..db4a7cdc1 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -78,6 +78,13 @@ #{idItem} + + + and id not in + + #{nidItem} + + order by ${sortColumns} @@ -126,6 +133,13 @@ #{midItem} + + + and br.id not in + + #{nidItem} + + diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 9e026845b..f46324b9e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -77,6 +77,13 @@ #{idItem} + + + and id not in + + #{nidItem} + + order by ${sortColumns} @@ -121,6 +128,13 @@ #{midItem} + + + and br.id not in + + #{nidItem} + +