From c1c78b94f49f44106646b77038561c555fb48a85 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 24 Jul 2024 18:54:27 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 31 ++++++++ .../controller/rent/WxBillAllController.java | 47 ++++++++++++ .../java/com/iformall/utils/UrlCheck.java | 3 +- .../com/iformall/domain/po/WxBillDeposit.java | 3 - .../iformall/domain/po/WxBillProperty.java | 4 - .../domain/po/WxBillPropertyDeposit.java | 3 - .../com/iformall/domain/po/WxBillRent.java | 4 - .../iformall/domain/po/WxBillRentManage.java | 4 - .../com/iformall/domain/po/WxMerchant.java | 3 + .../domain/po/base/WxBillBaseEntity.java | 7 ++ .../mapper/WxFinanceAdvanceMapper.java | 2 + .../iformall/service/WxFinanceService.java | 2 + .../service/helper/WxBillAllHelper.java | 73 +++++++++++++++++++ .../service/impl/WxFinanceServiceImpl.java | 10 ++- .../service/impl/WxMerchantServiceImpl.java | 5 ++ .../resources/mapper/WxBillDailyMapper.xml | 3 + .../resources/mapper/WxBillDepositMapper.xml | 3 + .../mapper/WxBillOtherDepositMapper.xml | 3 + .../resources/mapper/WxBillOtherMapper.xml | 3 + .../mapper/WxBillPropertyDepositMapper.xml | 3 + .../resources/mapper/WxBillPropertyMapper.xml | 3 + .../mapper/WxBillRentManageMapper.xml | 3 + .../resources/mapper/WxBillRentMapper.xml | 3 + .../mapper/WxFinanceAdvanceMapper.xml | 7 ++ 24 files changed, 211 insertions(+), 21 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 8b0672e7e..baf7617b3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -20,6 +20,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import java.math.BigDecimal; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -176,6 +177,36 @@ public class WxFinanceController extends BaseController { return new ResultData(); } + @GetMapping("getMerchantAdvance") + public ResultData getMerchantAdvance(@ModelAttribute WxFinanceAdvance record) { + record.updateTenantInfo(getTenantInfo()); + if (null == record.getMerchantId()) { + return new ResultData(Result.ERROR,"请选择商户"); + } + record.setIsDel(EnumYesOrNo.NO.getCode()); + List advanceList = wxFinanceService.getMerchantAdvanceGroupSumList(record); + BigDecimal total = new BigDecimal(0); + Map retMap = new HashMap(); + if (null != advanceList && advanceList.size() > 0 ) { + WxFinanceAdvanceType fat = new WxFinanceAdvanceType(); + fat.updateTenantInfo(record); + Map advanceTypMap = wxFinanceService.getAdvanceTypeMap(fat); + for (int i = 0 ; i < advanceList.size() ; i++) { + WxFinanceAdvance at = advanceList.get(i); + if (null != advanceTypMap) { + WxFinanceAdvanceType wfat = advanceTypMap.get(at.getAdvanceTypeId()); + if (null != wfat) { + at.setAdvanceTypeName(wfat.getName()); + } + total.add(new BigDecimal(at.getRemainMoney())); + } + } + } + retMap.put("total", total); + retMap.put("details", advanceList); + return new ResultData(retMap); + } + @ApiOperation("新增收款单") @PostMapping("createReceive") public ResultData createReceive(@RequestBody WxFinanceAdvanceType record) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 0bf4040ae..02d13d88e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -13,6 +13,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; import com.iformall.domain.po.SysConfig; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillPayWay; +import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.WxBillBaseEntity; @@ -31,9 +32,11 @@ import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.SysConfigService; import com.iformall.service.WxBillActionService; +import com.iformall.service.WxEnergyService; import com.iformall.service.WxFinanceService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxPayAccountBillService; +import com.iformall.service.WxShopService; import com.iformall.service.helper.WxBillAllHelper; import com.iformall.utils.Constant; @@ -84,6 +87,12 @@ public class WxBillAllController extends BillBaseController { @Autowired WxFinanceService wxFinanceService; + @Autowired + WxShopService wxShopSerivce; + + @Autowired + WxEnergyService wxEnergyService; + /** * 商户账单汇总计费列表 * @param wxMerchant @@ -712,6 +721,44 @@ public class WxBillAllController extends BillBaseController { return new ResultData(); } + //商户可以缴费账单,临期账单以内都可以缴费 + @GetMapping("merchantPayBills") + public ResultData merchantPayBills(@ModelAttribute WxMerchant wxMerchant) { + if (null == wxMerchant.getId()) { + return new ResultData(Result.ERROR,"请选择商户"); + } + wxMerchant.updateTenantInfo(getTenantInfo()); + wxMerchant.setNeedPayPreDays(getNearBillBeforeDays()); + List list = billAllHelper.getMerchantBillList(wxMerchant); + if (null != list && list.size() > 0 ) { + List merchnatIds = new ArrayList(); + merchnatIds.add(wxMerchant.getId()); + Map msMap = wxShopSerivce.getMerchantShopNumberMap(wxMerchant, merchnatIds, EnumYesOrNo.NO.getCode()); + String shopNumber = ""; + if (null != msMap) { + shopNumber = msMap.get(wxMerchant.getId()); + } + WxMerchant m = wxMerchantService.selectById(wxMerchant.getId()); + WxEnergyFees fq = new WxEnergyFees(); + fq.updateTenantInfo(m); + Map feesMap = wxEnergyService.getFeesMap(fq); + for (int i = 0 ; i < list.size(); i++) { + WxBillBaseEntity be = list.get(i); + if (StringUtils.isBlank(be.getShopNumber())) { + be.setShopNumber(shopNumber); + } + if (null != feesMap) { + WxEnergyFees fees = feesMap.get(be.getEnergyFeesId()); + if (null != fees) { + be.setEnergyFeesName(fees.getName()); + } + } + be.setMerchantName(m.getName()); + } + } + return new ResultData(); + } + //###################################### 老代码 ###################################### // diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java index 37aa7bdef..d73185d60 100644 --- a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java +++ b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java @@ -27,7 +27,8 @@ public class UrlCheck { || url.contains("/merchantPoi/importPoi") || url.contains("/merchantPoi/addLocationInfo") || url.contains("/merchantPoi/importMerchantInitByPoi") - || url.contains("/couponPassword/importPrice"); + || url.contains("/couponPassword/importPrice") + || url.contains("/energy/readingCalcuteExport"); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java index bf2a72f69..e754c46b9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -23,9 +23,6 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class WxBillDeposit extends WxBillBaseEntity { - @TableField(exist = false) - private String shopNumber; - @Excel(name = "租金合同ID", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") private Long rentContractId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index a0375acfe..3f8135332 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -102,10 +102,6 @@ public class WxBillProperty extends WxBillBaseEntity { @TableField(exist = false) private Integer allPeriod; - @Excel(name = "商铺号", width = 20, orderNum = "1") - @TableField(exist = false) - private String shopNumber; - //@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") @TableField(exist = false) private Integer depositStatus; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java index b83156bcb..aac328388 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -26,9 +26,6 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class WxBillPropertyDeposit extends WxBillBaseEntity { - @TableField(exist = false) - private String shopNumber; - @Excel(name = "物业合同ID", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") private Long propertyContractId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index d0a423c12..fc5515a07 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -169,10 +169,6 @@ public class WxBillRent extends WxBillBaseEntity { @TableField(exist = false) private Integer allPeriod; - @Excel(name = "商铺号", width = 20, orderNum = "1") - @TableField(exist = false) - private String shopNumber; - //@Excel(name = "押金状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "无押金_0"}, width = 20, orderNum = "3") @TableField(exist = false) private Integer depositStatus; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java index 5ff214783..ed1891dae 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRentManage.java @@ -27,10 +27,6 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class WxBillRentManage extends WxBillBaseEntity { - @Excel(name = "商铺号", width = 20, orderNum = "1") - @TableField(exist = false) - private String shopNumber; - @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") private Long rentContractId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 8a1044d73..430716426 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -469,4 +469,7 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) private Long shopId; + @TableField(exist = false) + private Integer needPayPreDays; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java index bec804e44..4a823d3e5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/WxBillBaseEntity.java @@ -141,6 +141,10 @@ public class WxBillBaseEntity extends TenantEntity { @TableField(exist = false) public Long floor; + @Excel(name = "商铺号", width = 20, orderNum = "1") + @TableField(exist = false) + public String shopNumber; + //滞纳金 @TableField(exist = false) public String billLatePay; @@ -186,4 +190,7 @@ public class WxBillBaseEntity extends TenantEntity { @TableField(exist = false) public Integer notifyed; + @TableField(exist = false) + private Date needPayStartDay; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceAdvanceMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceAdvanceMapper.java index 3f282c414..34602d033 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxFinanceAdvanceMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxFinanceAdvanceMapper.java @@ -15,5 +15,7 @@ public interface WxFinanceAdvanceMapper extends CommonMapper getMerchantAdvanceGroupSumList(WxFinanceAdvance wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index 94f7ef6ad..688761a24 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -1,5 +1,6 @@ package com.iformall.service; +import java.util.List; import java.util.Map; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.MallUserInfo; @@ -32,6 +33,7 @@ public interface WxFinanceService { WxFinanceAdvance getAdvanceById(TenantEntity tenantEntity,Long id); void saveOrUpdateAdvance(WxFinanceAdvance record,MallUserInfo user); void updateAdvanceIsDel(WxFinanceAdvance record); + List getMerchantAdvanceGroupSumList(WxFinanceAdvance record); //收款 PageInfo receiveListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index b7498e812..b8f3fa245 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -129,6 +129,10 @@ public class WxBillAllHelper { bill.setNearBillLastTime(getDateBefore(wxMerchant.getNearBillBeforeDays())); } bill.setStatus(wxMerchant.getBillStatus()); + if (null != wxMerchant.getNeedPayPreDays()) { + bill.setNeedPayStartDay(getDateBefore(wxMerchant.getNeedPayPreDays())); + } + } public WxBillSum getBillRentSum(WxMerchant wxMerchant,Date starttime, Date enttime) { @@ -561,6 +565,75 @@ public class WxBillAllHelper { return null; } + public List getMerchantBillList(WxMerchant wxMerchant) { + List retList = new ArrayList(); + + WxBillRent wxBillRent = new WxBillRent(); + updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillRent.setSortColumns("starttime asc"); + PageInfo rentpage = wxBillRentService.listAsPage(wxBillRent, 1, 30); + if (null != rentpage && null != rentpage.getList() && rentpage.getList().size() > 0 ) { + retList.addAll(rentpage.getList()); + } + + WxBillRentManage wxBillRentManage = new WxBillRentManage(); + updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillRentManage.setSortColumns("starttime asc"); + PageInfo managepage = wxBillRentManageService.listAsPage(wxBillRentManage, 1, 30); + if (null != managepage && null != managepage.getList() && managepage.getList().size() > 0 ) { + retList.addAll(managepage.getList()); + } + + WxBillDeposit wxBillDeposit = new WxBillDeposit(); + updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillDeposit.setSortColumns("starttime asc"); + PageInfo rentdepostpage = wxBillRentDepositService.listAsPage(wxBillDeposit, 1, 30); + if (null != rentdepostpage && null != rentdepostpage.getList() && rentdepostpage.getList().size() > 0 ) { + retList.addAll(rentdepostpage.getList()); + } + + WxBillProperty wxBillProperty = new WxBillProperty(); + updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillProperty.setSortColumns("starttime asc"); + PageInfo propertypage = wxBillPropertyService.listAsPage(wxBillProperty, 1, 30); + if (null != propertypage && null != propertypage.getList() && propertypage.getList().size() > 0 ) { + retList.addAll(propertypage.getList()); + } + + WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); + updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillPropertyDeposit.setSortColumns("starttime asc"); + PageInfo propertyDepositpage = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, 1, 30); + if (null != propertyDepositpage && null != propertyDepositpage.getList() && propertyDepositpage.getList().size() > 0 ) { + retList.addAll(propertyDepositpage.getList()); + } + + WxBillDaily wxBillDaily = new WxBillDaily(); + updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillDaily.setSortColumns("starttime asc"); + PageInfo dailypage = wxBillDailyService.listAsPage(wxBillDaily, 1, 30); + if (null != dailypage && null != dailypage.getList() && dailypage.getList().size() > 0 ) { + retList.addAll(dailypage.getList()); + } + + WxBillOther wxBillOther = new WxBillOther(); + updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillOther.setSortColumns("starttime asc"); + PageInfo otherpage = wxBillOtherService.listAsPage(wxBillOther, 1, 30); + if (null != otherpage && null != otherpage.getList() && otherpage.getList().size() > 0 ) { + retList.addAll(otherpage.getList()); + } + + WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); + updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); + wxBillOtherDeposit.setSortColumns("starttime asc"); + PageInfo odpage = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, 1, 30); + if (null != odpage && null != odpage.getList() && odpage.getList().size() > 0 ) { + retList.addAll(odpage.getList()); + } + return retList; + } + public WxBillSum getBillSum(EnumBillAllType billType,WxMerchant wxMerchant,Date starttime, Date enttime) { if (billType == EnumBillAllType.RENT) { return this.getBillRentSum(wxMerchant, starttime, enttime); 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 20b89b72b..779362446 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -295,8 +295,12 @@ public class WxFinanceServiceImpl implements WxFinanceService { @Override public void updateAdvanceIsDel(WxFinanceAdvance record) { - // TODO Auto-generated method stub - + wxFinanceAdvanceMapper.setIsDel(record.getId(), record.getTenantId(), record.getIsDel()); + } + + @Override + public List getMerchantAdvanceGroupSumList(WxFinanceAdvance record) { + return wxFinanceAdvanceMapper.getMerchantAdvanceGroupSumList(record); } @@ -308,4 +312,6 @@ public class WxFinanceServiceImpl implements WxFinanceService { + + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 337b8bc8d..bb59e4c81 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1335,6 +1335,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { initQueryParam(record,hasRentContractInfo, merchantRentMap); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); if (null != pageInfo && null != pageInfo.getList()) { + Map merchantShopNumber = wxShopService.getMerchantShopNumberMap(record, null, record.getIsDel()); for (WxMerchant merchant : pageInfo.getList()) { if (hasRentContractInfo) { WxRentContract contract = merchantRentMap.get(merchant.getId()); @@ -1343,6 +1344,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchant.setRentalEndDate(contract.getRentalEndDate()); } } + if (null != merchantShopNumber) { + String shopNumber = merchantShopNumber.get(merchant.getId()); + merchant.setShopNumber(shopNumber); + } // if (record.getRentShopType() != null) { // List> shops = new ArrayList<>(); // WxMerchantShop wxMerchantShop = new WxMerchantShop(); diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 9c40c990b..b2a7ca124 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -142,6 +142,9 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) + + and (br.`starttime` <= #{needPayStartDay} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) + and br.`build_way` = #{buildWay} and br.`energy_reading_calcuteId` = #{energyReadingCalcuteId} and br.`energy_reading_id` = #{energyReadingId} diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index a9a98840c..1951791ab 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -172,6 +172,9 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) + + and (br.`starttime` <= #{needPayStartDay} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml index 0f2dddd16..3915b3419 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherDepositMapper.xml @@ -141,6 +141,9 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) + + and (br.`starttime` <= #{needPayStartDay} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index 9b5952ea3..b79e53100 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -134,6 +134,9 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) + + and (br.`starttime` <= #{needPayStartDay} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 8a1e2b717..c46013186 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -140,6 +140,9 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) + + and (br.`starttime` <= #{needPayStartDay} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`merchant_id` in diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 17dc60e2d..853bdaa15 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -166,6 +166,9 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) + + and (br.`starttime` <= #{needPayStartDay} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) + and br.`rent_shop_type` = #{rentShopType} and br.`property_contract_id` = #{propertyContractId} and br.`pay_way` = #{payWay} diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index 3ee183806..810e1c634 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -149,6 +149,9 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) + + and (br.`starttime` <= #{needPayStartDay} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) + and br.`manage_fee_type` = #{manageFeeType} and br.`merchant_id` is not null and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 5c52c90a7..d232d7438 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -165,6 +165,9 @@ and (br.`starttime` > #{oweBillLastTime} and br.`starttime` <= #{nearBillLastTime} and br.status not in (3,6,7)) + + and (br.`starttime` <= #{needPayStartDay} and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7)) + and (br.`last_owe_call_time` is not null and br.`receive_pay` - br.`pay` > 0 and br.status not in (3,6,7) ) and br.`rent_contract_id` in diff --git a/mallinkService/src/main/resources/mapper/WxFinanceAdvanceMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceAdvanceMapper.xml index 88d450cc3..5b9cb242a 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceAdvanceMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceAdvanceMapper.xml @@ -63,6 +63,13 @@ update wx_finance_advance set is_del = #{isDel} where id = #{id} and `tenant_id` = #{tenantId} + +