|
|
|
@@ -274,7 +274,7 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
return new ResultData(wxRentContractService.getRenevueContractList(wxRentContract, pageNum, pageSize)); |
|
|
|
} |
|
|
|
|
|
|
|
//查询联营扣点,联营取高的合同账单周期 |
|
|
|
//销售额设置----查询联营扣点,联营取高的合同账单周期 |
|
|
|
@GetMapping("revenueBillTimes") |
|
|
|
public ResultData revenueBillTimes(@ModelAttribute WxRentContractRevenueSales sales) { |
|
|
|
if (null == sales) sales = new WxRentContractRevenueSales(); |
|
|
|
@@ -337,7 +337,7 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 查询联营扣点,联营取高的合同某一个周期的根据销售额录入生成的账单列表 |
|
|
|
* 查询联营扣点,联营取高的某一个区间录入的销售额 |
|
|
|
* @param sales |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@@ -346,8 +346,6 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
if (null == sales) sales = new WxRentContractRevenueSales(); |
|
|
|
sales.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
|
|
Map retMap = new HashMap(); |
|
|
|
|
|
|
|
//查询已录入销售额 |
|
|
|
WxRentContract rc = new WxRentContract(); |
|
|
|
rc.updateTenantInfo(sales); |
|
|
|
@@ -357,23 +355,9 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
List<WxRentContractRevenueSales> 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<WxAllBill> billPage = wxAllBillService.listAsPage(bq,1,100); |
|
|
|
if (null != billPage && null != billPage.getList() && billPage.getList().size() > 0 ) { |
|
|
|
retMap.put("bills", billPage.getList()); |
|
|
|
return new ResultData(rs); |
|
|
|
} |
|
|
|
return new ResultData(retMap); |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|