ソースを参照

fix

release_toaliyun_real
winter 1年前
コミット
789a9d2121
3個のファイルの変更59行の追加9行の削除
  1. +51
    -9
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 51
- 9
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(); if (null == sales) sales = new WxRentContractRevenueSales();
sales.updateTenantInfo(getTenantInfo()); sales.updateTenantInfo(getTenantInfo());
WxAllBill bq = wxBillAllHelper.generateRentContractQueryBill(sales,sales.getRentContractId(),null,null);
List<WxAllBill> billList = wxAllBillService.getContractSamePeriodBillSumList(bq);
if (null == billList || billList.size() <= 0 ) {
return new ResultData();
}
List<WxAllBill> validBillList = new ArrayList<WxAllBill>();
//查询已录入销售额
WxRentContract rc = new WxRentContract(); WxRentContract rc = new WxRentContract();
rc.updateTenantInfo(sales); rc.updateTenantInfo(sales);
rc.setId(sales.getRentContractId()); rc.setId(sales.getRentContractId());
@@ -737,8 +731,20 @@ public class WxRentContractController extends WxContractBaseController {
billSalesMap.put(rs.getStarttime()+"_"+rs.getEndtime(), rs); billSalesMap.put(rs.getStarttime()+"_"+rs.getEndtime(), rs);
} }
} }
//查询所有时间区间,只查询租金的
WxAllBill bq = wxBillAllHelper.generateRentContractQueryBill(sales,sales.getRentContractId(),null,null);
bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode());
List<WxAllBill> billList = wxAllBillService.getContractSamePeriodBillSumList(bq);
if (null == billList || billList.size() <= 0 ) {
return new ResultData();
}
List<WxAllBill> validBillList = new ArrayList<WxAllBill>();
for (int i = 0 ; i < billList.size() ; i ++) { for (int i = 0 ; i < billList.size() ; i ++) {
WxAllBill bill = billList.get(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()); WxRentContractRevenueSales s = billSalesMap.get(bill.getStarttime()+"_"+bill.getEndtime());
if (null != s) { if (null != s) {
bill.setSales(s.getSaleMoney()); bill.setSales(s.getSaleMoney());
@@ -750,15 +756,51 @@ public class WxRentContractController extends WxContractBaseController {
//}else if() { //}else if() {
}else { }else {
validBillList.add(bill);
validBillList.add(nbill);
} }
}else { }else {
validBillList.add(bill);
validBillList.add(nbill);
} }
} }
return new ResultData(validBillList); 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<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(retMap);
}
//查询商户计租合同列表 //查询商户计租合同列表
@GetMapping("revenuePropertyContract") @GetMapping("revenuePropertyContract")
public ResultData revenuePropertyContract(@ModelAttribute WxRentContract rentContract) { public ResultData revenuePropertyContract(@ModelAttribute WxRentContract rentContract) {


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java ファイルの表示

@@ -566,6 +566,10 @@ public class WxRentContract extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private Date yearsEnd; private Date yearsEnd;
@TableField(exist = false) @TableField(exist = false)
private Date billStartTime;
@TableField(exist = false)
private Date billEndTime;
@TableField(exist = false)
List<WxRentContractAgileDeposit> contractDepositList; List<WxRentContractAgileDeposit> contractDepositList;
@TableField(exist = false) @TableField(exist = false)
private Long queryShopId; private Long queryShopId;


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java ファイルの表示

@@ -2280,6 +2280,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
sales.setStarttime(wxRentContract.getYearsBegin()); sales.setStarttime(wxRentContract.getYearsBegin());
sales.setEndtime(wxRentContract.getYearsEnd()); sales.setEndtime(wxRentContract.getYearsEnd());
} }
if (null != wxRentContract.getBillStartTime() && null != wxRentContract.getBillEndTime()) {
sales.setStarttimeEqual(wxRentContract.getBillStartTime());
sales.setEndtimeEqual(wxRentContract.getBillEndTime());
}
return wxRentContractRevenueSalesMapper.findList(sales); return wxRentContractRevenueSalesMapper.findList(sales);
} }


読み込み中…
キャンセル
保存