From 1421ef8ac977ff208af82cc75ff42db0e4b6a7c3 Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 4 May 2024 22:07:40 +0800 Subject: [PATCH] fix --- .../rent/WxBillDailyController.java | 15 +++++ .../rent/WxBillDepositController.java | 16 +++++ .../rent/WxBillOtherController.java | 16 +++++ .../rent/WxBillOtherDepositController.java | 16 +++++ .../rent/WxBillPropertyController.java | 16 +++++ .../rent/WxBillPropertyDepositController.java | 16 +++++ .../com/iformall/domain/po/WxBillDaily.java | 3 + .../com/iformall/domain/po/WxBillDeposit.java | 3 + .../com/iformall/domain/po/WxBillOther.java | 3 + .../domain/po/WxBillOtherDeposit.java | 3 + .../iformall/domain/po/WxBillProperty.java | 3 + .../domain/po/WxBillPropertyDeposit.java | 3 + .../iformall/mapper/WxBillDailyMapper.java | 4 ++ .../iformall/mapper/WxBillDepositMapper.java | 2 + .../mapper/WxBillOtherDepositMapper.java | 4 ++ .../iformall/mapper/WxBillOtherMapper.java | 4 ++ .../mapper/WxBillPropertyDepositMapper.java | 4 ++ .../iformall/mapper/WxBillPropertyMapper.java | 5 ++ .../iformall/service/WxBillDailyService.java | 4 ++ .../service/WxBillDepositService.java | 3 + .../service/WxBillOtherDepositService.java | 4 ++ .../iformall/service/WxBillOtherService.java | 4 ++ .../service/WxBillPropertyDepositService.java | 4 ++ .../service/WxBillPropertyService.java | 4 ++ .../service/impl/WxBillDailyServiceImpl.java | 14 +++- .../impl/WxBillDepositServiceImpl.java | 14 +++- .../impl/WxBillOtherDepositServiceImpl.java | 14 +++- .../service/impl/WxBillOtherServiceImpl.java | 15 ++++- .../WxBillPropertyDepositServiceImpl.java | 14 +++- .../impl/WxBillPropertyServiceImpl.java | 14 +++- .../resources/mapper/WxBillDailyMapper.xml | 32 ++++++--- .../resources/mapper/WxBillDepositMapper.xml | 66 ++++++++++++------- .../mapper/WxBillOtherDepositMapper.xml | 30 +++++++-- .../resources/mapper/WxBillOtherMapper.xml | 32 ++++++--- .../mapper/WxBillPropertyDepositMapper.xml | 29 ++++++-- .../resources/mapper/WxBillPropertyMapper.xml | 16 ++++- 36 files changed, 385 insertions(+), 64 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 22566b34a..3807b1d42 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -10,6 +10,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.controller.mem.BillDailyAsyncTask; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillDaily; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.enums.EnumBillDailyBuildWay; import com.iformall.exception.MallinkException; @@ -74,6 +75,20 @@ public class WxBillDailyController extends BaseController { final PageInfo page = wxBillDailyService.listAsPage(wxBillDaily, pageNum, pageSize); return new ResultData(page); } + + @GetMapping("monthBillSum") + public ResultData monthBillSum(@ModelAttribute WxBillDaily wxBillDaily) { + if (StringUtils.isBlank(wxBillDaily.getMonth())) { + new ResultData(Result.ERROR, "请选择月份"); + } + wxBillDaily.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillDaily.setFloorForRule(dataRule.getFloorIds()); + wxBillDaily.setBusinessForRule(dataRule.getBussinessIds()); + } + return new ResultData(wxBillDailyService.getBillMonthSum(wxBillDaily)); + } @PostMapping("add") @SystemControllerLog(description = "日常账单-新增") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java index f5e0cde93..74fb53d72 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -1,11 +1,13 @@ package com.iformall.controller.rent; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.service.WxBillDepositService; import io.swagger.annotations.ApiImplicitParam; @@ -45,6 +47,20 @@ public class WxBillDepositController extends BaseController { final PageInfo page = wxBillDepositService.listAsPage(wxBillDeposit, pageNum, pageSize); return new ResultData(page); } + + @GetMapping("monthBillSum") + public ResultData monthBillSum(@ModelAttribute WxBillDeposit wxBillDeposit) { + if (StringUtils.isBlank(wxBillDeposit.getMonth())) { + new ResultData(Result.ERROR, "请选择月份"); + } + wxBillDeposit.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillDeposit.setFloorForRule(dataRule.getFloorIds()); + wxBillDeposit.setBusinessForRule(dataRule.getBussinessIds()); + } + return new ResultData(wxBillDepositService.getBillMonthSum(wxBillDeposit)); + } @PostMapping("add") @SystemControllerLog(description = "租赁押金-新增") 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 38e3b6e63..c9efdb33f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -1,5 +1,6 @@ package com.iformall.controller.rent; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; @@ -7,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOther; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.service.WxBillOtherService; import io.swagger.annotations.ApiImplicitParam; @@ -48,6 +50,20 @@ public class WxBillOtherController extends BaseController { final PageInfo page = wxBillOtherService.listAsPage(wxBillOther, pageNum, pageSize); return new ResultData(page); } + + @GetMapping("monthBillSum") + public ResultData monthBillSum(@ModelAttribute WxBillOther wxBillOther) { + if (StringUtils.isBlank(wxBillOther.getMonth())) { + new ResultData(Result.ERROR, "请选择月份"); + } + wxBillOther.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillOther.setFloorForRule(dataRule.getFloorIds()); + wxBillOther.setBusinessForRule(dataRule.getBussinessIds()); + } + return new ResultData(wxBillOtherService.getBillMonthSum(wxBillOther)); + } @PostMapping("add") @SystemControllerLog(description = "其它账单-新增") 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 9314ec137..fd3747c1e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -1,5 +1,6 @@ package com.iformall.controller.rent; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; @@ -7,6 +8,7 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOtherDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.service.WxBillOtherDepositService; import io.swagger.annotations.ApiImplicitParam; @@ -49,6 +51,20 @@ public class WxBillOtherDepositController extends BaseController { final PageInfo page = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, pageNum, pageSize); return new ResultData(page); } + + @GetMapping("monthBillSum") + public ResultData monthBillSum(@ModelAttribute WxBillOtherDeposit wxBillOtherDeposit) { + if (StringUtils.isBlank(wxBillOtherDeposit.getMonth())) { + new ResultData(Result.ERROR, "请选择月份"); + } + wxBillOtherDeposit.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillOtherDeposit.setFloorForRule(dataRule.getFloorIds()); + wxBillOtherDeposit.setBusinessForRule(dataRule.getBussinessIds()); + } + return new ResultData(wxBillOtherDepositService.getBillMonthSum(wxBillOtherDeposit)); + } @PostMapping("add") @SystemControllerLog(description = "其它押金账单-新增") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index cc457f8b7..8a51ad419 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -1,11 +1,13 @@ package com.iformall.controller.rent; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxBillPropertyService; @@ -51,6 +53,20 @@ public class WxBillPropertyController extends BaseController { PageInfo result = wxBillPropertyService.listAsPage(wxBillProperty, pageNum, pageSize); return new ResultData(result); } + + @GetMapping("monthBillSum") + public ResultData monthBillSum(@ModelAttribute WxBillProperty wxBillProperty) { + if (StringUtils.isBlank(wxBillProperty.getMonth())) { + new ResultData(Result.ERROR, "请选择月份"); + } + wxBillProperty.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillProperty.setFloorForRule(dataRule.getFloorIds()); + wxBillProperty.setBusinessForRule(dataRule.getBussinessIds()); + } + return new ResultData(wxBillPropertyService.getBillMonthSum(wxBillProperty)); + } @PostMapping("add") @SystemControllerLog(description = "物业账单-新增") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java index 2a0ba52d2..796c5222b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -1,11 +1,13 @@ package com.iformall.controller.rent; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillPropertyDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxUserDataRule; import com.iformall.service.WxBillPropertyDepositService; import io.swagger.annotations.ApiImplicitParam; @@ -45,6 +47,20 @@ public class WxBillPropertyDepositController extends BaseController { PageInfo result = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, pageNum, pageSize); return new ResultData(result); } + + @GetMapping("monthBillSum") + public ResultData monthBillSum(@ModelAttribute WxBillPropertyDeposit wxBillPropertyDeposit) { + if (StringUtils.isBlank(wxBillPropertyDeposit.getMonth())) { + new ResultData(Result.ERROR, "请选择月份"); + } + wxBillPropertyDeposit.updateTenantInfo(getTenantInfo()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxBillPropertyDeposit.setFloorForRule(dataRule.getFloorIds()); + wxBillPropertyDeposit.setBusinessForRule(dataRule.getBussinessIds()); + } + return new ResultData(wxBillPropertyDepositService.getBillMonthSum(wxBillPropertyDeposit)); + } @PostMapping("add") @SystemControllerLog(description = "物业押金账单-新增") 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 6c9ec8a8b..0766e6d75 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -131,4 +131,7 @@ public class WxBillDaily extends TenantEntity { private String serviceChargePayUpdate; @TableField(exist = false) private List merchantIds; + + @TableField(exist = false) + private String month; } 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 174993ba8..ce54de005 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDeposit.java @@ -99,4 +99,7 @@ public class WxBillDeposit extends TenantEntity { private List rentContractIdList; @TableField(exist = false) private List merchantIds; + + @TableField(exist = false) + private String month; } 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 c745151f9..1c391b8c0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOther.java @@ -163,5 +163,8 @@ public class WxBillOther extends TenantEntity { @TableField(exist = false) private List merchantIds; + + @TableField(exist = false) + private String month; } 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 be0d0ea54..ed63627aa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillOtherDeposit.java @@ -166,4 +166,7 @@ public class WxBillOtherDeposit extends TenantEntity { @TableField(exist = false) private List merchantIds; + + @TableField(exist = false) + private String month; } 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 47b5b7c6d..a08558c32 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -231,4 +231,7 @@ public class WxBillProperty extends TenantEntity { @TableField(exist = false) private List merchantIds; + + @TableField(exist = false) + private String month; } 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 7a290148c..702de6208 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillPropertyDeposit.java @@ -98,4 +98,7 @@ public class WxBillPropertyDeposit extends TenantEntity { private List propertyContractIdList; @TableField(exist = false) private List merchantIds; + + @TableField(exist = false) + private String month; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java index 784ee8503..b6e52df01 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java @@ -2,6 +2,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillDaily; +import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.vo.WxBillSum; import java.util.List; import java.util.Map; @@ -18,5 +20,7 @@ public interface WxBillDailyMapper extends CommonMapper { void updateWaitPayStatus(Map params); List queryBillDailyList(WxBillDaily record); + + WxBillSum getBillMonthSum(WxBillDaily record); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java index eb2018680..b0c279b15 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java @@ -4,6 +4,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxRentContract; +import com.iformall.domain.vo.WxBillSum; import java.util.List; import java.util.Map; @@ -30,5 +31,6 @@ public interface WxBillDepositMapper extends CommonMapper { long queryOweCount(WxRentContract wxRentContract); + WxBillSum getBillMonthSum(WxBillDeposit wxBillDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java index d75a7b8a5..8584bbab8 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java @@ -2,6 +2,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillOtherDeposit; +import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.vo.WxBillSum; import java.util.List; import java.util.Map; @@ -18,5 +20,7 @@ public interface WxBillOtherDepositMapper extends CommonMapper params); List queryBillList(WxBillOtherDeposit record); + + WxBillSum getBillMonthSum(WxBillOtherDeposit record); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java index 1ad11c6f4..2fd5cfe2f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java @@ -2,6 +2,8 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillOther; +import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.vo.WxBillSum; import java.util.List; import java.util.Map; @@ -22,4 +24,6 @@ public interface WxBillOtherMapper extends CommonMapper { Map queryPayInfoTotal(Map params); Map queryOweInfo(Map params); + + WxBillSum getBillMonthSum(WxBillOther record); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java index d1ab8c550..07866ef70 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java @@ -2,7 +2,9 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillPropertyDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.vo.WxBillSum; import java.util.List; import java.util.Map; @@ -26,5 +28,7 @@ public interface WxBillPropertyDepositMapper extends CommonMapper void updateServiceCharge(WxPayAccountBill tenantId); void updateOwe(); + + WxBillSum getBillMonthSum(WxBillProperty propertyQuery); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java index c40d297a8..d78e70b1c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java @@ -4,8 +4,10 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillDaily; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillDailyVo; +import com.iformall.domain.vo.WxBillSum; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -58,5 +60,7 @@ public interface WxBillDailyService { void insertData(WxBillDailyVo billDaily, String importKey, MallUserInfo user); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillDaily wxBillDaily); + + WxBillSum getBillMonthSum(WxBillDaily wxBillDaily); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java index eb5f2515d..2ee284933 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -5,6 +5,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxPayAccountBill; +import com.iformall.domain.vo.WxBillSum; public interface WxBillDepositService { @@ -51,5 +52,7 @@ public interface WxBillDepositService { ResultData adjustDeposit(WxBillDeposit wxBillDeposit); void computeTotalMoney(Integer decimalSize,WxPayAccountBill wxPayAccountBill, WxBillDeposit deposit); + + WxBillSum getBillMonthSum(WxBillDeposit wxBillDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java index e0489a7c6..56f6fe6b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOtherDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillSum; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -57,5 +59,7 @@ public interface WxBillOtherDepositService { ResultData adjustDeposit(WxBillOtherDeposit wxBillDeposit); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillOtherDeposit wxBillDeposit); + + WxBillSum getBillMonthSum(WxBillOtherDeposit wxBillDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java index a3bf7004a..3439618fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOther; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillSum; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -53,5 +55,7 @@ public interface WxBillOtherService { ResultData updatePaid(Long id); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillOther wxBillOther); + + WxBillSum getBillMonthSum(WxBillOther wxBillOther); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java index ed2c20615..610f6a598 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillPropertyDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPayAccountBill; +import com.iformall.domain.vo.WxBillSum; /** * @author gongbiao @@ -54,4 +56,6 @@ public interface WxBillPropertyDepositService { ResultData adjustDeposit(WxBillPropertyDeposit wxBillPropertyDeposit); void computeTotalMoney(Integer decimalSize,WxPayAccountBill wxPayAccountBill, WxBillPropertyDeposit deposit); + + WxBillSum getBillMonthSum(WxBillPropertyDeposit deposit); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java index 26a452dac..93367c8cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillSum; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -68,4 +70,6 @@ public interface WxBillPropertyService { ResultData updateLatePayStatus(WxBillProperty wxBillProperty); void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillProperty wxBillProperty); + + WxBillSum getBillMonthSum(WxBillProperty wxBillProperty); } 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 b1432edde..ffaf0d3f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillDailyExportVo; import com.iformall.domain.vo.WxBillDailyVo; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillDailyMapper; @@ -77,7 +78,7 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { return getBillRentPropertyList(pageIndex, pageSize, record, wxPayAccountBill); } - private PageInfo getBillRentPropertyList(Integer pageIndex, Integer pageSize,WxBillDaily record,WxPayAccountBill wxPayAccountBill) { + private void updateQueryParam(WxBillDaily record) { if (null != record.getFloorForRule()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); if (null != merchantIds) { @@ -107,7 +108,10 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { record.setId(-1L); } } - + } + + private PageInfo getBillRentPropertyList(Integer pageIndex, Integer pageSize,WxBillDaily record,WxPayAccountBill wxPayAccountBill) { + updateQueryParam(record); PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillDailyMapper.queryBillDailyList(record)); if (null == page) { return null; @@ -453,5 +457,11 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { excelService.exportExcel(datalist, null, "日常费用账单", WxBillDailyExportVo.class, "日常费用账单.xlsx", response, false); } + + @Override + public WxBillSum getBillMonthSum(WxBillDaily record) { + updateQueryParam(record); + return wxBillDailyMapper.getBillMonthSum(record); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index ea0f721c0..a3aaf3625 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -14,6 +14,7 @@ import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxShop; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillPayWay; import com.iformall.enums.EnumBillRentStatus; @@ -72,7 +73,7 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { return getBillDepositPropertyList(wxPayAccountBill, record, pageIndex, pageSize); } - private PageInfo getBillDepositPropertyList(WxPayAccountBill wxPayAccountBill,WxBillDeposit record, Integer pageIndex, Integer pageSize) { + private void setQueryParam(WxBillDeposit record) { if (null != record.getFloorForRule()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); if (null != merchantIds) { @@ -102,7 +103,10 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { record.setId(-1L); } } - + } + + private PageInfo getBillDepositPropertyList(WxPayAccountBill wxPayAccountBill,WxBillDeposit record, Integer pageIndex, Integer pageSize) { + setQueryParam(record); PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillDepositMapper.queryBillDepositList(record)); if (null == page) { return null; @@ -359,5 +363,11 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { return new ResultData(Result.SUCCESS, "租赁押金调整成功", wxBillDeposit); } + @Override + public WxBillSum getBillMonthSum(WxBillDeposit wxBillDeposit) { + setQueryParam(wxBillDeposit); + return wxBillDepositMapper.getBillMonthSum(wxBillDeposit); + } + } 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 84259c2b5..8dccf8f2d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -11,9 +11,11 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillDaily; import com.iformall.domain.po.WxBillOtherDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillOtherDepositMapper; @@ -80,7 +82,7 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService } - private PageInfo getBillRentPropertyList(Integer pageIndex, Integer pageSize,WxBillOtherDeposit record,WxPayAccountBill wxPayAccountBill) { + private void updateQueryParam(WxBillOtherDeposit record) { if (null != record.getFloorForRule()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); if (null != merchantIds) { @@ -110,7 +112,10 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService record.setId(-1L); } } - + } + + private PageInfo getBillRentPropertyList(Integer pageIndex, Integer pageSize,WxBillOtherDeposit record,WxPayAccountBill wxPayAccountBill) { + updateQueryParam(record); PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillOtherDepositMapper.queryBillList(record)); if (null == page) { return null; @@ -416,5 +421,10 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService excelService.exportExcel(list, null, "其他押金账单", WxBillOtherDeposit.class, "其他押金账单.xlsx", response, false); } + @Override + public WxBillSum getBillMonthSum(WxBillOtherDeposit wxBillDeposit) { + updateQueryParam(wxBillDeposit); + return wxBillOtherDepositMapper.getBillMonthSum(wxBillDeposit); + } } 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 6e20c6964..3de3ea2f0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -11,9 +11,11 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillDaily; import com.iformall.domain.po.WxBillOther; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillOtherMapper; @@ -80,7 +82,7 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { } - private PageInfo getBillOtherPropertyList(Integer pageIndex, Integer pageSize,WxBillOther record,WxPayAccountBill wxPayAccountBill) { + private void updateQueryParam(WxBillOther record) { if (null != record.getFloorForRule()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); if (null != merchantIds) { @@ -110,7 +112,10 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { record.setId(-1L); } } - + } + + private PageInfo getBillOtherPropertyList(Integer pageIndex, Integer pageSize,WxBillOther record,WxPayAccountBill wxPayAccountBill) { + updateQueryParam(record); PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillOtherMapper.queryBillList(record)); if (null == page) { return null; @@ -360,5 +365,9 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { excelService.exportExcel(list, null, "其他费用账单", WxBillOther.class, "其他费用账单.xlsx", response, false); } - + @Override + public WxBillSum getBillMonthSum(WxBillOther wxBillOther) { + updateQueryParam(wxBillOther); + return wxBillOtherMapper.getBillMonthSum(wxBillOther); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java index aeab4baaf..adcba91c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -14,6 +14,7 @@ import com.iformall.domain.po.WxBillPropertyDeposit; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxShop; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillPayWay; import com.iformall.enums.EnumBillRentStatus; @@ -70,7 +71,7 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe return getBillDepositPropertyList(wxPayAccountBill, record, pageIndex, pageSize); } - private PageInfo getBillDepositPropertyList(WxPayAccountBill wxPayAccountBill,WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize) { + private void updateQueryParam(WxBillPropertyDeposit record) { if (null != record.getFloorForRule()) { List merchantIds = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule(), null, null, 0, 0); if (null != merchantIds) { @@ -100,7 +101,10 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe record.setId(-1L); } } - + } + + private PageInfo getBillDepositPropertyList(WxPayAccountBill wxPayAccountBill,WxBillPropertyDeposit record, Integer pageIndex, Integer pageSize) { + updateQueryParam(record); PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillPropertyDepositMapper.queryBillDepositList(record)); if (null == page) { return null; @@ -357,5 +361,11 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe return new ResultData(Result.SUCCESS, "物业押金调整成功", wxBillDeposit); } + @Override + public WxBillSum getBillMonthSum(WxBillPropertyDeposit deposit) { + updateQueryParam(deposit); + return wxBillPropertyDepositMapper.getBillMonthSum(deposit); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 87a7f9bc6..16106d43e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxBillSum; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillActionMapper; @@ -79,7 +80,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { return getBillPropertyList(pageIndex, pageSize, wxPayAccountBill, record); } - private PageInfo getBillPropertyList(Integer pageIndex, Integer pageSize,WxPayAccountBill wxPayAccountBill,WxBillProperty record) { + private void updateQueryParam(WxBillProperty record) { if(null != record.getDepositStatus()) { WxBillPropertyDeposit bdq1 = new WxBillPropertyDeposit(); bdq1.updateTenantInfo(record); @@ -120,7 +121,10 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { record.setId(-1L); } } - + } + + private PageInfo getBillPropertyList(Integer pageIndex, Integer pageSize,WxPayAccountBill wxPayAccountBill,WxBillProperty record) { + updateQueryParam(record); PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillPropertyMapper.queryBillPropertyList(record)); if (null == page) { return null; @@ -506,4 +510,10 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { wxBillPropertyMapper.updateById(property); return new ResultData(); } + + @Override + public WxBillSum getBillMonthSum(WxBillProperty wxBillProperty) { + updateQueryParam(wxBillProperty); + return wxBillPropertyMapper.getBillMonthSum(wxBillProperty); + } } diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index 5cde0653d..689d26711 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -81,12 +81,7 @@ - + select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day` , + case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`updatetime`,br.`merchant_id`,br.shop_id, + br.shop_name,br.type,br.`rent_shop_type`,br.pay_way,br.price_detail,br.`starttime`,br.`endtime`,br.`build_way`, + br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time` + from wx_bill_daily br + order by ${sortColumns} order by id desc + + + + + + + update wx_bill_daily set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) where status!=#{paid} diff --git a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml index 981c899a1..3ce7e42b6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -97,31 +97,51 @@ br.`owe`,br.`status`,br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, br.`rent_shop_type`,br.`return_price`, br.pay_way,br.shop_info ,br.freeze,br.service_charge_pay from wx_bill_rent_deposit br - - 1 = 1 - and br.`id` = #{id} - and br.`merchant_id` = #{merchantId} - - and br.`tenant_id` = #{tenantId} - - - and br.`parent_tenant_id` = #{parentTenantId} - - and br.`status` = #{status} - and br.`apply_status` = #{applyStatus} - and br.`is_del` = #{isDel} - and br.`rent_shop_type` = #{rentShopType} - and br.`rent_contract_id` = #{rentContractId} - and br.`pay_way` = #{payWay} - - and br.`merchant_id` in - - #{midItem} - - - + order by br.id desc + + + + 1 = 1 + and br.`id` = #{id} + and br.`merchant_id` = #{merchantId} + + and br.`tenant_id` = #{tenantId} + + + and br.`parent_tenant_id` = #{parentTenantId} + + and br.`status` = #{status} + and br.`apply_status` = #{applyStatus} + and br.`is_del` = #{isDel} + and br.`rent_shop_type` = #{rentShopType} + and br.`rent_contract_id` = #{rentContractId} + and br.`pay_way` = #{payWay} + and br.`starttime` <= #{starttime} + and br.`endtime` >= #{endtime} + + and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} + + + and br.`merchant_id` in + + #{midItem} + + + + + + + + + + + + - + select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, + br.`owe`,br.`status`,br.shop_name,br.`updatetime`,br.`return_price`,br.`merchant_id`,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time`, + br.shop_id,br.name,br.comments,br.`rent_shop_type`,br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay + from wx_bill_other_deposit br + order by ${sortColumns} order by id desc + + + + + + + update wx_bill_other_deposit set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) where status!=#{paid} diff --git a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml index e2923184c..687bba15d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -83,12 +83,7 @@ - + select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`, br.`pay_date`,br.`createtime`,br.`expired_day`, + case when br.status=1 then br.owe else 0 end owe,br.`status`,br.shop_name,br.`updatetime`,br.`apply_status`, + br.`apply_pay_img`,br.`apply_update_time`,br.`merchant_id`,br.shop_id,br.name,br.comments,br.`rent_shop_type`, + br.pay_way,br.`starttime`,br.`endtime`,br.freeze,br.service_charge_pay + from wx_bill_other br + order by ${sortColumns} order by id desc + + + + + + + update wx_bill_other set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml index 9706386c2..f91412b4c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -92,11 +92,7 @@ - + select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`,br.`owe`,br.`status`, + br.`need_pay`,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,br.`return_price`,br.`shop_info`,br.pay_way, + br.freeze,br.service_charge_pay,br.`apply_status`,br.`apply_pay_img`,br.`apply_update_time` + from wx_bill_property_deposit br + order by id desc + + + + + + + + + + + + + +