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 4cb73b7e1..9fc77f3df 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -26,6 +26,7 @@ import com.iformall.domain.vo.WxBillSum; import com.iformall.domain.vo.WxMerchantBillVo; import com.iformall.domain.vo.WxMerchantMicroPayVo; import com.iformall.domain.vo.WxShopVo; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.ExcelService; import com.iformall.service.WxBillAllService; import com.iformall.service.WxBillDailyService; @@ -102,7 +103,15 @@ public class WxBillAllController extends BaseController { Date starttime = wxMerchant.getStarttime(); Date enttime = wxMerchant.getEndtime(); wxMerchant.setStarttime(null); - wxMerchant.setEndtime(null); + wxMerchant.setEndtime(null); + if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { + List mids = billAllHelper.getOwdMerchantIds(wxMerchant, starttime, enttime); + if (null != mids && mids.size() > 0 ) { + wxMerchant.setIds(mids);; + }else { + wxMerchant.setId(-1L); + } + } PageInfo merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) { List retList = new ArrayList(); @@ -113,14 +122,14 @@ public class WxBillAllController extends BaseController { vo.setMerchantName(m.getName()); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); - WxBillSum rentSum = billAllHelper.getBillRentSum(wxMerchant,starttime, enttime); - WxBillSum rentManageSum = billAllHelper.getBillRentManage(wxMerchant, starttime, enttime); - WxBillSum rentDepositSum = billAllHelper.getBillDeposit(wxMerchant, starttime, enttime); - WxBillSum propertySum = billAllHelper.getBillProperty(wxMerchant, starttime, enttime); - WxBillSum propertyDepositSum = billAllHelper.getBillPropertyDeposit(wxMerchant, starttime, enttime); - WxBillSum dailySum = billAllHelper.getBillDaily(wxMerchant, starttime, enttime); - WxBillSum otherSum = billAllHelper.getBillOther(wxMerchant, starttime, enttime); - WxBillSum otherDepositSum = billAllHelper.getBillOtherDeposit(wxMerchant, starttime, enttime); + WxBillSum rentSum = billAllHelper.getBillRentSum(wxMerchant,starttime, enttime,null); + WxBillSum rentManageSum = billAllHelper.getBillRentManage(wxMerchant, starttime, enttime,null,null); + WxBillSum rentDepositSum = billAllHelper.getBillDeposit(wxMerchant, starttime, enttime,null); + WxBillSum propertySum = billAllHelper.getBillProperty(wxMerchant, starttime, enttime,null); + WxBillSum propertyDepositSum = billAllHelper.getBillPropertyDeposit(wxMerchant, starttime, enttime,null); + WxBillSum dailySum = billAllHelper.getBillDaily(wxMerchant, starttime, enttime,null); + WxBillSum otherSum = billAllHelper.getBillOther(wxMerchant, starttime, enttime,null); + WxBillSum otherDepositSum = billAllHelper.getBillOtherDeposit(wxMerchant, starttime, enttime,null); vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); @@ -176,14 +185,14 @@ public class WxBillAllController extends BaseController { vo.setMerchantName(m.getName()); vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); - WxBillSum rentSum = billAllHelper.getBillRentSum(wxMerchant,starttime, enttime); - WxBillSum rentManageSum = billAllHelper.getBillRentManage(wxMerchant, starttime, enttime); - WxBillSum rentDepositSum = billAllHelper.getBillDeposit(wxMerchant, starttime, enttime); - WxBillSum propertySum = billAllHelper.getBillProperty(wxMerchant, starttime, enttime); - WxBillSum propertyDepositSum = billAllHelper.getBillPropertyDeposit(wxMerchant, starttime, enttime); - WxBillSum dailySum = billAllHelper.getBillDaily(wxMerchant, starttime, enttime); - WxBillSum otherSum = billAllHelper.getBillOther(wxMerchant, starttime, enttime); - WxBillSum otherDepositSum = billAllHelper.getBillOtherDeposit(wxMerchant, starttime, enttime); + WxBillSum rentSum = billAllHelper.getBillRentSum(wxMerchant,starttime, enttime,null); + WxBillSum rentManageSum = billAllHelper.getBillRentManage(wxMerchant, starttime, enttime,null,null); + WxBillSum rentDepositSum = billAllHelper.getBillDeposit(wxMerchant, starttime, enttime,null); + WxBillSum propertySum = billAllHelper.getBillProperty(wxMerchant, starttime, enttime,null); + WxBillSum propertyDepositSum = billAllHelper.getBillPropertyDeposit(wxMerchant, starttime, enttime,null); + WxBillSum dailySum = billAllHelper.getBillDaily(wxMerchant, starttime, enttime,null); + WxBillSum otherSum = billAllHelper.getBillOther(wxMerchant, starttime, enttime,null); + WxBillSum otherDepositSum = billAllHelper.getBillOtherDeposit(wxMerchant, starttime, enttime,null); vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); @@ -206,6 +215,34 @@ public class WxBillAllController extends BaseController { return new ResultData(vo); } + + /** + * 欠缴商户列表 + * @param wxBillAll + * @param pageNum + * @param pageSize + * @return + */ + @GetMapping("oweBillList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "费用收缴数据-欠缴商户列表") + public ResultData oweBillList(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::oweMerchantlist"); + if (null == wxBillAll) { + wxBillAll = new WxBillAll(); + } + //默认查当月第一天到今天 + if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ + wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); + } + wxBillAll.updateTenantInfo(getTenantInfo()); + Map result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); + return new ResultData(result); + } + + /** * 欠缴商户列表 * @param wxBillAll 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 05f41f9fa..fc0176061 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -444,4 +444,7 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) private String initLog; + @TableField(exist = false) + private Integer onlyOwe; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java index b6e52df01..26f3c7c6c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDailyMapper.java @@ -22,5 +22,7 @@ public interface WxBillDailyMapper extends CommonMapper { List queryBillDailyList(WxBillDaily record); WxBillSum getBillMonthSum(WxBillDaily record); + + List getMerchantIdList(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 b0c279b15..0575ceb62 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillDepositMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxBillDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.vo.WxBillSum; @@ -33,4 +34,6 @@ public interface WxBillDepositMapper extends CommonMapper { WxBillSum getBillMonthSum(WxBillDeposit wxBillDeposit); + List getMerchantIdList(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 8584bbab8..4ea60941e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherDepositMapper.java @@ -22,5 +22,7 @@ public interface WxBillOtherDepositMapper extends CommonMapper queryBillList(WxBillOtherDeposit record); WxBillSum getBillMonthSum(WxBillOtherDeposit record); + + List getMerchantIdList(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 2fd5cfe2f..fcb53b5c6 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillOtherMapper.java @@ -26,4 +26,6 @@ public interface WxBillOtherMapper extends CommonMapper { Map queryOweInfo(Map params); WxBillSum getBillMonthSum(WxBillOther record); + + List getMerchantIdList(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 07866ef70..4f52b87d7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyDepositMapper.java @@ -30,5 +30,5 @@ public interface WxBillPropertyDepositMapper extends CommonMapper getMerchantIdList(WxBillPropertyDeposit wxBillPropertyDeposit); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index 85a7f64e3..75524febf 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -66,5 +66,7 @@ public interface WxBillPropertyMapper extends CommonMapper WxBillSum getBillMonthSum(WxBillProperty propertyQuery); + List getMerchantIdList(WxBillProperty propertyQuery); + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java index ca9c23a0b..082167fbb 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentManageMapper.java @@ -33,5 +33,7 @@ public interface WxBillRentManageMapper extends CommonMapper resultList); WxBillSum getBillMonthSum(WxBillRentManage wxBillRentManage); + + List getMerchantIdList(WxBillRentManage wxBillRentManage); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 714d74fe5..864e4e8bf 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -62,5 +62,7 @@ public interface WxBillRentMapper extends CommonMapper { void updateOwe(); WxBillSum getBillMonthSum(WxBillRent wxBillRent); + + List getMerchantIdList(WxBillRent wxBillRent); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java index d78e70b1c..394bf264f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java @@ -9,6 +9,8 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.domain.vo.WxBillSum; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -62,5 +64,7 @@ public interface WxBillDailyService { void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillDaily wxBillDaily); WxBillSum getBillMonthSum(WxBillDaily wxBillDaily); + + List getMerchantIds(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 2ee284933..2c31c006f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java @@ -1,9 +1,12 @@ package com.iformall.service; +import java.util.List; + import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.vo.WxBillSum; @@ -54,5 +57,7 @@ public interface WxBillDepositService { void computeTotalMoney(Integer decimalSize,WxPayAccountBill wxPayAccountBill, WxBillDeposit deposit); WxBillSum getBillMonthSum(WxBillDeposit wxBillDeposit); + + List getMerchantIds(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 56f6fe6b8..7df785003 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -8,6 +8,8 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillSum; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -61,5 +63,7 @@ public interface WxBillOtherDepositService { void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillOtherDeposit wxBillDeposit); WxBillSum getBillMonthSum(WxBillOtherDeposit wxBillDeposit); + + List getMerchantIds(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 3439618fb..f666fa798 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java @@ -8,6 +8,8 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillSum; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -57,5 +59,7 @@ public interface WxBillOtherService { void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillOther wxBillOther); WxBillSum getBillMonthSum(WxBillOther wxBillOther); + + List getMerchantIds(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 610f6a598..5a31434a4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java @@ -1,5 +1,7 @@ package com.iformall.service; +import java.util.List; + import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; @@ -58,4 +60,6 @@ public interface WxBillPropertyDepositService { void computeTotalMoney(Integer decimalSize,WxPayAccountBill wxPayAccountBill, WxBillPropertyDeposit deposit); WxBillSum getBillMonthSum(WxBillPropertyDeposit deposit); + + List getMerchantIds(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 93367c8cb..de1e1a31a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java @@ -8,6 +8,8 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillSum; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -72,4 +74,6 @@ public interface WxBillPropertyService { void exportBill(HttpServletRequest request, HttpServletResponse response, WxBillProperty wxBillProperty); WxBillSum getBillMonthSum(WxBillProperty wxBillProperty); + + List getMerchantIds(WxBillProperty wxBillProperty); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java index 43b4f8a83..1b9916924 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java @@ -9,6 +9,8 @@ import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillSum; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -70,4 +72,5 @@ public interface WxBillRentManageService { WxBillSum getBillMonthSum(WxBillRentManage wxBillRentManage); + List getMerchantIds(WxBillRentManage wxBillRentManage); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java index 6c5f55c7c..a59f6d609 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillRentService.java @@ -7,6 +7,8 @@ import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillSum; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -73,5 +75,7 @@ public interface WxBillRentService { WxBillSum getBillMonthSum(WxBillRent wxBillRent); + List getMerchantIds(WxBillRent wxBillRent); + } 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 7d98f181e..646492318 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -2,9 +2,12 @@ package com.iformall.service.helper; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.Collection; import java.util.Date; import java.util.List; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,6 +24,7 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillSum; import com.iformall.domain.vo.WxShopVo; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxBillDailyService; import com.iformall.service.WxBillDepositService; import com.iformall.service.WxBillOtherDepositService; @@ -29,7 +33,6 @@ import com.iformall.service.WxBillPropertyDepositService; import com.iformall.service.WxBillPropertyService; import com.iformall.service.WxBillRentManageService; import com.iformall.service.WxBillRentService; -import com.iformall.service.WxMerchantService; import com.iformall.service.WxShopService; @Service @@ -62,11 +65,12 @@ public class WxBillAllHelper { @Autowired private WxShopService wxShopService; - public WxBillSum getBillRentSum(TenantEntity tenantEntity,Date starttime, Date enttime) { + public WxBillSum getBillRentSum(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { WxBillRent br = new WxBillRent(); br.updateTenantInfo(tenantEntity); br.setStarttime(starttime); br.setEndtime(enttime); + br.setOnlyOwe(onlyOwe); WxBillSum rentSum = wxBillRentService.getBillMonthSum(br); if (null == rentSum) { rentSum = new WxBillSum(); @@ -75,11 +79,22 @@ public class WxBillAllHelper { return rentSum; } - public WxBillSum getBillRentManage(TenantEntity tenantEntity,Date starttime, Date enttime) { + public List getBillRentMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { + WxBillRent br = new WxBillRent(); + br.updateTenantInfo(tenantEntity); + br.setStarttime(starttime); + br.setEndtime(enttime); + br.setOnlyOwe(onlyOwe); + return wxBillRentService.getMerchantIds(br); + } + + public WxBillSum getBillRentManage(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe,Integer manageFeeType) { WxBillRentManage brm = new WxBillRentManage(); brm.updateTenantInfo(tenantEntity); brm.setStarttime(starttime); brm.setEndtime(enttime); + brm.setOnlyOwe(onlyOwe); + brm.setManageFeeType(manageFeeType); WxBillSum rentManageSum = wxBillRentManageService.getBillMonthSum(brm); if (null == rentManageSum) { rentManageSum = new WxBillSum(); @@ -88,11 +103,22 @@ public class WxBillAllHelper { return rentManageSum; } - public WxBillSum getBillDeposit(TenantEntity tenantEntity,Date starttime, Date enttime) { + public List getBillRentManageMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe,Integer manageFeeType) { + WxBillRentManage brm = new WxBillRentManage(); + brm.updateTenantInfo(tenantEntity); + brm.setStarttime(starttime); + brm.setEndtime(enttime); + brm.setOnlyOwe(onlyOwe); + brm.setManageFeeType(manageFeeType); + return wxBillRentManageService.getMerchantIds(brm); + } + + public WxBillSum getBillDeposit(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { WxBillDeposit bd = new WxBillDeposit(); bd.updateTenantInfo(tenantEntity); bd.setStarttime(starttime); bd.setEndtime(enttime); + bd.setOnlyOwe(onlyOwe); WxBillSum rentDepositSum = wxBillRentDepositService.getBillMonthSum(bd); if (null == rentDepositSum) { rentDepositSum = new WxBillSum(); @@ -101,11 +127,21 @@ public class WxBillAllHelper { return rentDepositSum; } - public WxBillSum getBillProperty(TenantEntity tenantEntity,Date starttime, Date enttime) { + public List getBillDepositMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { + WxBillDeposit bd = new WxBillDeposit(); + bd.updateTenantInfo(tenantEntity); + bd.setStarttime(starttime); + bd.setEndtime(enttime); + bd.setOnlyOwe(onlyOwe); + return wxBillRentDepositService.getMerchantIds(bd); + } + + public WxBillSum getBillProperty(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { WxBillProperty bp = new WxBillProperty(); bp.updateTenantInfo(tenantEntity); bp.setStarttime(starttime); bp.setEndtime(enttime); + bp.setOnlyOwe(onlyOwe); WxBillSum propertySum = wxBillPropertyService.getBillMonthSum(bp); if (null == propertySum) { propertySum = new WxBillSum(); @@ -114,11 +150,21 @@ public class WxBillAllHelper { return propertySum; } - public WxBillSum getBillPropertyDeposit(TenantEntity tenantEntity,Date starttime, Date enttime) { + public List getBillPropertyMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { + WxBillProperty bp = new WxBillProperty(); + bp.updateTenantInfo(tenantEntity); + bp.setStarttime(starttime); + bp.setEndtime(enttime); + bp.setOnlyOwe(onlyOwe); + return wxBillPropertyService.getMerchantIds(bp); + } + + public WxBillSum getBillPropertyDeposit(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { WxBillPropertyDeposit pd = new WxBillPropertyDeposit(); pd.updateTenantInfo(tenantEntity); pd.setStarttime(starttime); pd.setEndtime(enttime); + pd.setOnlyOwe(onlyOwe); WxBillSum propertyDepositSum = wxBillPropertyDepositService.getBillMonthSum(pd); if (null == propertyDepositSum) { propertyDepositSum = new WxBillSum(); @@ -127,11 +173,21 @@ public class WxBillAllHelper { return propertyDepositSum; } - public WxBillSum getBillDaily(TenantEntity tenantEntity,Date starttime, Date enttime) { + public List getBillPropertyDepositMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { + WxBillPropertyDeposit pd = new WxBillPropertyDeposit(); + pd.updateTenantInfo(tenantEntity); + pd.setStarttime(starttime); + pd.setEndtime(enttime); + pd.setOnlyOwe(onlyOwe); + return wxBillPropertyDepositService.getMerchantIds(pd); + } + + public WxBillSum getBillDaily(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { WxBillDaily bdd = new WxBillDaily(); bdd.updateTenantInfo(tenantEntity); bdd.setStarttime(starttime); bdd.setEndtime(enttime); + bdd.setOnlyOwe(onlyOwe); WxBillSum dailySum = wxBillDailyService.getBillMonthSum(bdd); if (null == dailySum) { dailySum = new WxBillSum(); @@ -140,11 +196,21 @@ public class WxBillAllHelper { return dailySum; } - public WxBillSum getBillOther(TenantEntity tenantEntity,Date starttime, Date enttime) { + public List getBillDailyMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { + WxBillDaily bdd = new WxBillDaily(); + bdd.updateTenantInfo(tenantEntity); + bdd.setStarttime(starttime); + bdd.setEndtime(enttime); + bdd.setOnlyOwe(onlyOwe); + return wxBillDailyService.getMerchantIds(bdd); + } + + public WxBillSum getBillOther(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { WxBillOther bo = new WxBillOther(); bo.updateTenantInfo(tenantEntity); bo.setStarttime(starttime); - bo.setEndtime(enttime); + bo.setEndtime(enttime); + bo.setOnlyOwe(onlyOwe); WxBillSum otherSum = wxBillOtherService.getBillMonthSum(bo); if (null == otherSum) { otherSum = new WxBillSum(); @@ -153,11 +219,21 @@ public class WxBillAllHelper { return otherSum; } - public WxBillSum getBillOtherDeposit(TenantEntity tenantEntity,Date starttime, Date enttime) { + public List getBillOtherMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { + WxBillOther bo = new WxBillOther(); + bo.updateTenantInfo(tenantEntity); + bo.setStarttime(starttime); + bo.setEndtime(enttime); + bo.setOnlyOwe(onlyOwe); + return wxBillOtherService.getMerchantIds(bo); + } + + public WxBillSum getBillOtherDeposit(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { WxBillOtherDeposit bod = new WxBillOtherDeposit(); bod.updateTenantInfo(tenantEntity); bod.setStarttime(starttime); - bod.setEndtime(enttime); + bod.setEndtime(enttime); + bod.setOnlyOwe(onlyOwe); WxBillSum otherDepositSum = wxBillOtherDepositService.getBillMonthSum(bod); if (null == otherDepositSum) { otherDepositSum = new WxBillSum(); @@ -166,6 +242,15 @@ public class WxBillAllHelper { return otherDepositSum; } + public List getBillOtherDepositMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime,Integer onlyOwe) { + WxBillOtherDeposit bod = new WxBillOtherDeposit(); + bod.updateTenantInfo(tenantEntity); + bod.setStarttime(starttime); + bod.setEndtime(enttime); + bod.setOnlyOwe(onlyOwe); + return wxBillOtherDepositService.getMerchantIds(bod); + } + public String calcuteSum(String... money) { if (null != money) { BigDecimal total = new BigDecimal(0); @@ -193,4 +278,30 @@ public class WxBillAllHelper { } return null; } + + public List getOwdMerchantIds(TenantEntity tenantEntity,Date starttime, Date enttime) { + List rentMids = this.getBillRentMerchantIds(tenantEntity, starttime, enttime, EnumYesOrNo.YES.getCode()); + List rentManageMids = this.getBillRentManageMerchantIds(tenantEntity, starttime, enttime, EnumYesOrNo.YES.getCode(), null); + List rentDepositMids = this.getBillDepositMerchantIds(tenantEntity, starttime, enttime, EnumYesOrNo.YES.getCode()); + List propertyMids = this.getBillPropertyMerchantIds(tenantEntity, starttime, enttime, EnumYesOrNo.YES.getCode()); + List propertyDepositMids = this.getBillPropertyDepositMerchantIds(tenantEntity, starttime, enttime, EnumYesOrNo.YES.getCode()); + List dailyMids = this.getBillDailyMerchantIds(tenantEntity, starttime, enttime, EnumYesOrNo.YES.getCode()); + List otherMids = this.getBillOtherMerchantIds(tenantEntity, starttime, enttime, EnumYesOrNo.YES.getCode()); + List otherDepositMids = this.getBillOtherDepositMerchantIds(tenantEntity, starttime, enttime, EnumYesOrNo.YES.getCode()); + return getUnionIds(rentMids,rentManageMids,rentDepositMids,propertyMids,propertyDepositMids,dailyMids,otherMids,otherDepositMids); + } + + private List getUnionIds(List...lists ) { + if (null != lists && lists.length > 0 ) { + List retList = new ArrayList(); + for (int i = 0 ; i < lists.length; i++) { + List list = lists[i]; + if (null != list) { + retList = (List) CollectionUtils.union(retList, list); + } + } + return retList; + } + return null; + } } 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 ffaf0d3f7..70e20ea97 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -463,5 +463,11 @@ public class WxBillDailyServiceImpl implements WxBillDailyService { updateQueryParam(record); return wxBillDailyMapper.getBillMonthSum(record); } + + @Override + public List getMerchantIds(WxBillDaily record) { + updateQueryParam(record); + return wxBillDailyMapper.getMerchantIdList(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 a3aaf3625..0f31acfb1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillDeposit; 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.WxShop; @@ -368,6 +369,12 @@ public class WxBillDepositServiceImpl implements WxBillDepositService { setQueryParam(wxBillDeposit); return wxBillDepositMapper.getBillMonthSum(wxBillDeposit); } + + @Override + public List getMerchantIds(WxBillDeposit wxBillDeposit) { + setQueryParam(wxBillDeposit); + return wxBillDepositMapper.getMerchantIdList(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 8dccf8f2d..ab9507f89 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -426,5 +426,11 @@ public class WxBillOtherDepositServiceImpl implements WxBillOtherDepositService updateQueryParam(wxBillDeposit); return wxBillOtherDepositMapper.getBillMonthSum(wxBillDeposit); } + + @Override + public List getMerchantIds(WxBillOtherDeposit wxBillDeposit) { + updateQueryParam(wxBillDeposit); + return wxBillOtherDepositMapper.getMerchantIdList(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 3de3ea2f0..faab8cca8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -370,4 +370,10 @@ public class WxBillOtherServiceImpl implements WxBillOtherService { updateQueryParam(wxBillOther); return wxBillOtherMapper.getBillMonthSum(wxBillOther); } + + @Override + public List getMerchantIds(WxBillOther wxBillOther) { + updateQueryParam(wxBillOther); + return wxBillOtherMapper.getMerchantIdList(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 adcba91c1..67d47d455 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillDeposit; import com.iformall.domain.po.WxBillPropertyDeposit; +import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxShop; @@ -366,6 +367,12 @@ public class WxBillPropertyDepositServiceImpl implements WxBillPropertyDepositSe updateQueryParam(deposit); return wxBillPropertyDepositMapper.getBillMonthSum(deposit); } + + @Override + public List getMerchantIds(WxBillPropertyDeposit deposit) { + updateQueryParam(deposit); + return wxBillPropertyDepositMapper.getMerchantIdList(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 16106d43e..6c3a7bccb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -516,4 +516,10 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { updateQueryParam(wxBillProperty); return wxBillPropertyMapper.getBillMonthSum(wxBillProperty); } + + @Override + public List getMerchantIds(WxBillProperty wxBillProperty) { + updateQueryParam(wxBillProperty); + return wxBillPropertyMapper.getMerchantIdList(wxBillProperty); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index 7cc07c1c5..8c1bf32e1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -433,5 +433,11 @@ public class WxBillRentManageServiceImpl implements WxBillRentManageService { updateQueryParam(wxBillRentManage); return wxBillRentManageMapper.getBillMonthSum(wxBillRentManage); } + + @Override + public List getMerchantIds(WxBillRentManage wxBillRentManage) { + updateQueryParam(wxBillRentManage); + return wxBillRentManageMapper.getMerchantIdList(wxBillRentManage); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 5b3e6d731..8685f9f7e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -602,4 +602,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { updateQueryParam(wxBillRent); return wxBillRentMapper.getBillMonthSum(wxBillRent); } + + @Override + public List getMerchantIds(WxBillRent wxBillRent) { + updateQueryParam(wxBillRent); + return wxBillRentMapper.getMerchantIdList(wxBillRent); + } } diff --git a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml index a31b005bc..3da605040 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDailyMapper.xml @@ -101,7 +101,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and br.`owe` > 0 + and br.`owe` > 0 and br.`build_way` = #{buildWay} and br.`merchant_id` in @@ -134,6 +134,11 @@ + + 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 95191e243..bc10eec3d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillDepositMapper.xml @@ -123,7 +123,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and br.`owe` > 0 + and br.`owe` > 0 and br.`merchant_id` in @@ -142,6 +142,11 @@ + + + + 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 48dbd1344..b550eca88 100644 --- a/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillOtherMapper.xml @@ -102,7 +102,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and br.`owe` > 0 + and br.`owe` > 0 and br.`merchant_id` in @@ -133,6 +133,11 @@ select sum(br.receive_pay) receive_pay , sum(br.pay) paid, sum(br.owe) owe from wx_bill_other br + + 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 fe06d1fc6..30e93315c 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyDepositMapper.xml @@ -113,7 +113,7 @@ and date_format(br.starttime,'%Y-%m') <= #{month} and date_format(br.endtime,'%Y-%m') >= #{month} - and br.`owe` > 0 + and br.`owe` > 0 and br.`merchant_id` in @@ -142,6 +142,11 @@ + + + + + + - @@ -185,8 +184,11 @@ + -