diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 52dd5c39b..6cf88a708 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -719,13 +719,7 @@ public class WxRentContractController extends WxContractBaseController { if (null == sales) sales = new WxRentContractRevenueSales(); sales.updateTenantInfo(getTenantInfo()); - WxAllBill bq = wxBillAllHelper.generateRentContractQueryBill(sales,sales.getRentContractId(),null,null); - List billList = wxAllBillService.getContractSamePeriodBillSumList(bq); - if (null == billList || billList.size() <= 0 ) { - return new ResultData(); - } - List validBillList = new ArrayList(); - + //查询已录入销售额 WxRentContract rc = new WxRentContract(); rc.updateTenantInfo(sales); rc.setId(sales.getRentContractId()); @@ -737,8 +731,20 @@ public class WxRentContractController extends WxContractBaseController { billSalesMap.put(rs.getStarttime()+"_"+rs.getEndtime(), rs); } } + + //查询所有时间区间,只查询租金的 + WxAllBill bq = wxBillAllHelper.generateRentContractQueryBill(sales,sales.getRentContractId(),null,null); + bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode()); + List billList = wxAllBillService.getContractSamePeriodBillSumList(bq); + if (null == billList || billList.size() <= 0 ) { + return new ResultData(); + } + List validBillList = new ArrayList(); for (int i = 0 ; i < billList.size() ; i ++) { WxAllBill bill = billList.get(i); + WxAllBill nbill = new WxAllBill(); + nbill.setStarttime(bill.getStarttime()); + nbill.setEndtime(bill.getEndtime());; WxRentContractRevenueSales s = billSalesMap.get(bill.getStarttime()+"_"+bill.getEndtime()); if (null != s) { bill.setSales(s.getSaleMoney()); @@ -750,15 +756,51 @@ public class WxRentContractController extends WxContractBaseController { //}else if() { }else { - validBillList.add(bill); + validBillList.add(nbill); } }else { - validBillList.add(bill); + validBillList.add(nbill); } } return new ResultData(validBillList); } + //查询联营扣点,联营取高的合同账单周期 + @GetMapping("revenueBillTimesSaleBills") + public ResultData revenueBillTimesSaleBills(@ModelAttribute WxRentContractRevenueSales sales) { + if (null == sales) sales = new WxRentContractRevenueSales(); + sales.updateTenantInfo(getTenantInfo()); + + Map retMap = new HashMap(); + + //查询已录入销售额 + WxRentContract rc = new WxRentContract(); + rc.updateTenantInfo(sales); + rc.setId(sales.getRentContractId()); + rc.setBillStartTime(sales.getStarttime()); + rc.setBillEndTime(sales.getEndtime()); + List salesList = wxRentContractService.getContractSales(rc); + if (null != salesList && salesList.size() > 0) { + WxRentContractRevenueSales rs = salesList.get(0); + retMap.put("sales", rs); + } + + //查询所有时间区间 + WxAllBill bq = new WxAllBill(); + bq.updateTenantInfo(sales); + bq.setRentContractId(sales.getRentContractId()); + bq.setIsPreview(EnumYesOrNo.NO.getCode()); + bq.setExtraCreateFrom(EnumBillExtraCreateFrom.RNET_REVENUE_SALES.getCode()); + bq.setStarttimeEqual(sales.getStarttime()); + bq.setEndtimeEqual(sales.getEndtime()); + + PageInfo billPage = wxAllBillService.listAsPage(bq,1,100); + if (null != billPage && null != billPage.getList() && billPage.getList().size() > 0 ) { + retMap.put("bills", billPage.getList()); + } + return new ResultData(retMap); + } + //查询商户计租合同列表 @GetMapping("revenuePropertyContract") public ResultData revenuePropertyContract(@ModelAttribute WxRentContract rentContract) { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 0e208d972..67a357158 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -566,6 +566,10 @@ public class WxRentContract extends TenantEntity { @TableField(exist = false) private Date yearsEnd; @TableField(exist = false) + private Date billStartTime; + @TableField(exist = false) + private Date billEndTime; + @TableField(exist = false) List contractDepositList; @TableField(exist = false) private Long queryShopId; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 1d9a5a3e5..957c3c1c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -2280,6 +2280,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { sales.setStarttime(wxRentContract.getYearsBegin()); sales.setEndtime(wxRentContract.getYearsEnd()); } + if (null != wxRentContract.getBillStartTime() && null != wxRentContract.getBillEndTime()) { + sales.setStarttimeEqual(wxRentContract.getBillStartTime()); + sales.setEndtimeEqual(wxRentContract.getBillEndTime()); + } return wxRentContractRevenueSalesMapper.findList(sales); }