|
|
|
@@ -14,9 +14,11 @@ import com.iformall.domain.po.SysConfig; |
|
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
|
import com.iformall.domain.po.WxAllBill; |
|
|
|
import com.iformall.domain.po.WxBillPayWay; |
|
|
|
import com.iformall.domain.po.WxCoupon; |
|
|
|
import com.iformall.domain.po.WxEnergyFees; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxUserDataRule; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.vo.WxBillBad; |
|
|
|
import com.iformall.domain.vo.WxBillExcelTemplate; |
|
|
|
import com.iformall.domain.vo.WxBillHotNotify; |
|
|
|
@@ -26,10 +28,12 @@ import com.iformall.domain.vo.WxMerchantBillVo; |
|
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
|
import com.iformall.enums.EnumBillOweOrNearType; |
|
|
|
import com.iformall.enums.EnumBillStatus; |
|
|
|
import com.iformall.enums.EnumCouponType; |
|
|
|
import com.iformall.enums.EnumRentContractManageFeeType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.service.ExcelService; |
|
|
|
import com.iformall.service.SysConfigService; |
|
|
|
import com.iformall.service.WxAllBillService; |
|
|
|
import com.iformall.service.WxBillActionService; |
|
|
|
import com.iformall.service.WxEnergyService; |
|
|
|
import com.iformall.service.WxFinanceService; |
|
|
|
@@ -61,11 +65,11 @@ import java.util.Map; |
|
|
|
*/ |
|
|
|
@RestController |
|
|
|
@RequestMapping("wxBillAll") |
|
|
|
public class WxBillAllController extends BillBaseController { |
|
|
|
public class WxAllBillController extends BillBaseController { |
|
|
|
//@Autowired |
|
|
|
//private WxBillAllService wxBillAllService; |
|
|
|
|
|
|
|
private Logger logger = LoggerFactory.getLogger(WxBillAllController.class); |
|
|
|
private Logger logger = LoggerFactory.getLogger(WxAllBillController.class); |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxPayAccountBillService wxPayAccountBillService; |
|
|
|
@@ -91,6 +95,9 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
@Autowired |
|
|
|
WxEnergyService wxEnergyService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxAllBillService wxAllBillService; |
|
|
|
|
|
|
|
/** |
|
|
|
* 商户账单汇总计费列表 |
|
|
|
* @param wxMerchant |
|
|
|
@@ -207,35 +214,6 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { |
|
|
|
wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); |
|
|
|
} |
|
|
|
// WxBillSum rentSum = billAllHelper.getBillRentSum(wxMerchant,starttime, enttime); |
|
|
|
// WxBillSum rentBussinessManageSum = billAllHelper.getBillRentManageSum(wxMerchant, starttime, enttime,EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE); |
|
|
|
// WxBillSum rentOperationManageSum = billAllHelper.getBillRentManageSum(wxMerchant, starttime, enttime,EnumRentContractManageFeeType.RENT_OPERATING_MANAGE_FEE); |
|
|
|
// WxBillSum rentDepositSum = billAllHelper.getBillDepositSum(wxMerchant, starttime, enttime); |
|
|
|
// WxBillSum propertySum = billAllHelper.getBillPropertySum(wxMerchant, starttime, enttime); |
|
|
|
// WxBillSum propertyDepositSum = billAllHelper.getBillPropertyDepositSum(wxMerchant, starttime, enttime); |
|
|
|
// WxBillSum dailySum = billAllHelper.getBillDailySum(wxMerchant, starttime, enttime,null); |
|
|
|
// WxBillSum otherSum = billAllHelper.getBillOtherSum(wxMerchant, starttime, enttime); |
|
|
|
// WxBillSum otherDepositSum = billAllHelper.getBillOtherDepositSum(wxMerchant, starttime, enttime); |
|
|
|
// |
|
|
|
// vo.setNeedPay(billAllHelper.calcuteSum(rentSum.getNeedPay(),rentBussinessManageSum.getNeedPay(),rentOperationManageSum.getNeedPay(),rentDepositSum.getNeedPay(),propertySum.getNeedPay(), |
|
|
|
// propertyDepositSum.getNeedPay(),dailySum.getNeedPay(),otherSum.getNeedPay(),otherDepositSum.getNeedPay())); |
|
|
|
// vo.setPaid(billAllHelper.calcuteSum(rentSum.getPaid(),rentBussinessManageSum.getPaid(),rentOperationManageSum.getPaid(),rentDepositSum.getPaid(),propertySum.getPaid(), |
|
|
|
// propertyDepositSum.getPaid(),dailySum.getPaid(),otherSum.getPaid(),otherDepositSum.getPaid())); |
|
|
|
// vo.setOwe(billAllHelper.calcuteSum(rentSum.getOwe(),rentBussinessManageSum.getOwe(),rentOperationManageSum.getOwe(),rentDepositSum.getOwe(),propertySum.getOwe(), |
|
|
|
// propertyDepositSum.getOwe(),dailySum.getOwe(),otherSum.getOwe(),otherDepositSum.getOwe())); |
|
|
|
// |
|
|
|
// List<WxBillSum> sumlist = new ArrayList<>(); |
|
|
|
// sumlist.add(rentSum); |
|
|
|
// sumlist.add(rentBussinessManageSum); |
|
|
|
// sumlist.add(rentOperationManageSum); |
|
|
|
// sumlist.add(rentDepositSum); |
|
|
|
// sumlist.add(propertySum); |
|
|
|
// sumlist.add(propertyDepositSum); |
|
|
|
// sumlist.add(dailySum); |
|
|
|
// sumlist.add(otherSum); |
|
|
|
// sumlist.add(otherDepositSum); |
|
|
|
// vo.setBillSumList(sumlist); |
|
|
|
|
|
|
|
return new ResultData(vo); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -278,6 +256,19 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
return new ResultData(tmap); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("费用科目列表") |
|
|
|
@GetMapping("feesList") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), |
|
|
|
}) |
|
|
|
public ResultData feesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 欠缴账单列表 |
|
|
|
@@ -631,5 +622,51 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
} |
|
|
|
return new ResultData(list); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("分页列表接口") |
|
|
|
@GetMapping("list") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData list(@ModelAttribute WxAllBill record, Integer pageNum, Integer pageSize,Boolean isList) { |
|
|
|
if (record == null) record = new WxAllBill(); |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
record.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
record.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
if (null != record.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { |
|
|
|
record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); |
|
|
|
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { |
|
|
|
record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); |
|
|
|
record.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays())); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
record.setSortColumns("status asc, starttime asc , merchant_id desc"); |
|
|
|
return new ResultData(wxAllBillService.listAsPage(record, pageNum, pageSize)); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("exportBill") |
|
|
|
public void exportBill(@ModelAttribute WxAllBill wxBillRent, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
wxBillRent.updateTenantInfo(getTenantInfo()); |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
wxBillRent.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
if (null != wxBillRent.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { |
|
|
|
wxBillRent.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); |
|
|
|
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { |
|
|
|
wxBillRent.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); |
|
|
|
wxBillRent.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays())); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
wxAllBillService.exportBill(request, response, wxBillRent); |
|
|
|
} |
|
|
|
|
|
|
|
} |