|
|
|
@@ -11,12 +11,14 @@ import com.iformall.controller.base.BillBaseController; |
|
|
|
import com.iformall.domain.dto.WxBillPayDTO; |
|
|
|
import com.iformall.domain.dto.WxBillReceiveUpdateDTO; |
|
|
|
import com.iformall.domain.po.SysConfig; |
|
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxUserDataRule; |
|
|
|
import com.iformall.domain.po.base.WxBillBaseEntity; |
|
|
|
import com.iformall.domain.vo.WxBillAll; |
|
|
|
import com.iformall.domain.vo.WxBillExcelTemplate; |
|
|
|
import com.iformall.domain.vo.WxBillHotNotify; |
|
|
|
import com.iformall.domain.vo.WxBillJianMian; |
|
|
|
import com.iformall.domain.vo.WxBillSum; |
|
|
|
import com.iformall.domain.vo.WxMerchantBillVo; |
|
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
|
@@ -26,6 +28,7 @@ import com.iformall.enums.EnumRentContractManageFeeType; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.service.ExcelService; |
|
|
|
import com.iformall.service.SysConfigService; |
|
|
|
import com.iformall.service.WxBillActionService; |
|
|
|
import com.iformall.service.WxBillAllService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.service.WxPayAccountBillService; |
|
|
|
@@ -42,6 +45,8 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
@@ -71,6 +76,9 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
@Autowired |
|
|
|
ExcelService excelService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxBillActionService wxBillActionService; |
|
|
|
|
|
|
|
/** |
|
|
|
* 商户账单汇总计费列表 |
|
|
|
* @param wxMerchant |
|
|
|
@@ -555,118 +563,152 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
//return wxBillAllService.updateReceivePay(wxBillAll, getUser(),false); |
|
|
|
} |
|
|
|
|
|
|
|
//###################################### 老代码 ###################################### |
|
|
|
|
|
|
|
@GetMapping("exportOweBill") |
|
|
|
@SystemControllerLog(description = "费用收缴数据-生成催缴单") |
|
|
|
public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill"); |
|
|
|
if (null == wxBillAll) { |
|
|
|
wxBillAll = new WxBillAll(); |
|
|
|
} |
|
|
|
//默认查当月第一天到今天 |
|
|
|
if (StringUtils.isNotBlank(wxBillAll.getEndtime())) { |
|
|
|
wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59"); |
|
|
|
} |
|
|
|
wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
|
|
|
|
wxBillAllService.exportOweBill(wxBillAll, request, response); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 欠缴商户列表 |
|
|
|
* @param wxBillAll |
|
|
|
* @param pageNum |
|
|
|
* @param pageSize |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("oweMerchantlist") |
|
|
|
@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 oweMerchantlist(@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<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); |
|
|
|
return new ResultData(result); |
|
|
|
//减免统计 |
|
|
|
@GetMapping("jianmiantj") |
|
|
|
public ResultData jianmiantj(@ModelAttribute WxBillAction wxBillAction) { |
|
|
|
wxBillAction.updateTenantInfo(getTenantInfo()); |
|
|
|
List<WxBillJianMian> jList = wxBillActionService.findJianMian(wxBillAction); |
|
|
|
Map<Integer,String> map = new HashMap<Integer,String>(); |
|
|
|
if (null != jList && jList.size() > 0 ) { |
|
|
|
for (int i = 0 ; i < jList.size() ; i++) { |
|
|
|
WxBillJianMian jm = jList.get(i); |
|
|
|
map.put(jm.getBillType(), jm.getTotal()); |
|
|
|
} |
|
|
|
} |
|
|
|
Map retMap = new HashMap(); |
|
|
|
BigDecimal total = new BigDecimal("0.00"); |
|
|
|
List<WxBillJianMian> retList = new ArrayList<WxBillJianMian>(); |
|
|
|
for (EnumBillAllType at : EnumBillAllType.values()) { |
|
|
|
String money = map.get(at.getCode()); |
|
|
|
if (StringUtils.isBlank(money)) { |
|
|
|
money = "0.00"; |
|
|
|
} |
|
|
|
WxBillJianMian bjm = new WxBillJianMian(); |
|
|
|
bjm.setBillType(at.getCode()); |
|
|
|
bjm.setTotal(money); |
|
|
|
retList.add(bjm); |
|
|
|
total = total.add(new BigDecimal(money)); |
|
|
|
} |
|
|
|
|
|
|
|
retMap.put("total", total.toPlainString()); |
|
|
|
retMap.put("list", retList); |
|
|
|
return new ResultData(retMap); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("oweBillCount") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "contractId", value = "合同id", dataType = "long", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "type", value = "类型1租赁合同2物业合同", dataType = "int", paramType = "query", required = true)}) |
|
|
|
@SystemControllerLog(description = "账单总览-总额") |
|
|
|
public ResultData oweBillCount(Long contractId, Integer type) { |
|
|
|
Long count = wxBillAllService.hasOweBill(contractId, type); |
|
|
|
return new ResultData(count); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("list") |
|
|
|
@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 list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); |
|
|
|
wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
if (null == wxBillAll) { |
|
|
|
wxBillAll = new WxBillAll(); |
|
|
|
} |
|
|
|
wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){ |
|
|
|
wxBillAll.setStatusList(new ArrayList<>()); |
|
|
|
JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr()); |
|
|
|
for (int i = 0; i <jsonArray.size() ; i++) { |
|
|
|
Integer o = (Integer) jsonArray.get(i); |
|
|
|
wxBillAll.getStatusList().add(o); |
|
|
|
} |
|
|
|
} |
|
|
|
if(StringUtils.isNotBlank(wxBillAll.getTypeListStr())){ |
|
|
|
wxBillAll.setTypeList(new ArrayList<>()); |
|
|
|
JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getTypeListStr()); |
|
|
|
for (int i = 0; i <jsonArray.size() ; i++) { |
|
|
|
Integer o = (Integer) jsonArray.get(i); |
|
|
|
wxBillAll.getTypeList().add(o); |
|
|
|
} |
|
|
|
} |
|
|
|
Map<String, Object> result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize); |
|
|
|
return new ResultData(result); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("detail") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "id", value = "编号", dataType = "long", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "type", value = "类型", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData detail( Long id, Integer type) { |
|
|
|
Map<String, Object> result = wxBillAllService.detail(id, type); |
|
|
|
Long merchantId = (Long) result.get("merchantId"); |
|
|
|
WxMerchant merchant = wxMerchantService.getById(merchantId); |
|
|
|
if (null != merchant) { |
|
|
|
result.put("merchantName", merchant.getName()); |
|
|
|
} |
|
|
|
return new ResultData(result); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("allDepositList") |
|
|
|
@SystemControllerLog(description = "账单总览-所有押金列表") |
|
|
|
public ResultData allDepositList(@ModelAttribute WxBillAll wxBillAll) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBillAllController::allDepositList"); |
|
|
|
if (null == wxBillAll) { |
|
|
|
wxBillAll = new WxBillAll(); |
|
|
|
} |
|
|
|
wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
return new ResultData(wxBillAllService.allDepositList(wxBillAll)); |
|
|
|
} |
|
|
|
//###################################### 老代码 ###################################### |
|
|
|
// |
|
|
|
// @GetMapping("exportOweBill") |
|
|
|
// @SystemControllerLog(description = "费用收缴数据-生成催缴单") |
|
|
|
// public void exportOweBill(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweBill"); |
|
|
|
// if (null == wxBillAll) { |
|
|
|
// wxBillAll = new WxBillAll(); |
|
|
|
// } |
|
|
|
// //默认查当月第一天到今天 |
|
|
|
// if (StringUtils.isNotBlank(wxBillAll.getEndtime())) { |
|
|
|
// wxBillAll.setEndtime(wxBillAll.getEndtime() + " 23:59:59"); |
|
|
|
// } |
|
|
|
// wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
// |
|
|
|
// wxBillAllService.exportOweBill(wxBillAll, request, response); |
|
|
|
// } |
|
|
|
// |
|
|
|
// /** |
|
|
|
// * 欠缴商户列表 |
|
|
|
// * @param wxBillAll |
|
|
|
// * @param pageNum |
|
|
|
// * @param pageSize |
|
|
|
// * @return |
|
|
|
// */ |
|
|
|
// @GetMapping("oweMerchantlist") |
|
|
|
// @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 oweMerchantlist(@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<String, Object> result = wxBillAllService.getOweBillAsPage(wxBillAll, pageNum, pageSize); |
|
|
|
// return new ResultData(result); |
|
|
|
// } |
|
|
|
// |
|
|
|
// |
|
|
|
// |
|
|
|
// @GetMapping("oweBillCount") |
|
|
|
// @ApiImplicitParams({ |
|
|
|
// @ApiImplicitParam(name = "contractId", value = "合同id", dataType = "long", paramType = "query", required = true), |
|
|
|
// @ApiImplicitParam(name = "type", value = "类型1租赁合同2物业合同", dataType = "int", paramType = "query", required = true)}) |
|
|
|
// @SystemControllerLog(description = "账单总览-总额") |
|
|
|
// public ResultData oweBillCount(Long contractId, Integer type) { |
|
|
|
// Long count = wxBillAllService.hasOweBill(contractId, type); |
|
|
|
// return new ResultData(count); |
|
|
|
// } |
|
|
|
// |
|
|
|
// @GetMapping("list") |
|
|
|
// @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 list(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxBillAllController::list"); |
|
|
|
// wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
// if (null == wxBillAll) { |
|
|
|
// wxBillAll = new WxBillAll(); |
|
|
|
// } |
|
|
|
// wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
// if(StringUtils.isNotBlank(wxBillAll.getStatusListStr())){ |
|
|
|
// wxBillAll.setStatusList(new ArrayList<>()); |
|
|
|
// JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getStatusListStr()); |
|
|
|
// for (int i = 0; i <jsonArray.size() ; i++) { |
|
|
|
// Integer o = (Integer) jsonArray.get(i); |
|
|
|
// wxBillAll.getStatusList().add(o); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// if(StringUtils.isNotBlank(wxBillAll.getTypeListStr())){ |
|
|
|
// wxBillAll.setTypeList(new ArrayList<>()); |
|
|
|
// JSONArray jsonArray = JSONArray.parseArray(wxBillAll.getTypeListStr()); |
|
|
|
// for (int i = 0; i <jsonArray.size() ; i++) { |
|
|
|
// Integer o = (Integer) jsonArray.get(i); |
|
|
|
// wxBillAll.getTypeList().add(o); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// Map<String, Object> result = wxBillAllService.listAsPage(wxBillAll, pageNum, pageSize); |
|
|
|
// return new ResultData(result); |
|
|
|
// } |
|
|
|
// |
|
|
|
// @GetMapping("detail") |
|
|
|
// @ApiImplicitParams({ |
|
|
|
// @ApiImplicitParam(name = "id", value = "编号", dataType = "long", paramType = "query", required = true), |
|
|
|
// @ApiImplicitParam(name = "type", value = "类型", dataType = "int", paramType = "query", required = true)}) |
|
|
|
// public ResultData detail( Long id, Integer type) { |
|
|
|
// Map<String, Object> result = wxBillAllService.detail(id, type); |
|
|
|
// Long merchantId = (Long) result.get("merchantId"); |
|
|
|
// WxMerchant merchant = wxMerchantService.getById(merchantId); |
|
|
|
// if (null != merchant) { |
|
|
|
// result.put("merchantName", merchant.getName()); |
|
|
|
// } |
|
|
|
// return new ResultData(result); |
|
|
|
// } |
|
|
|
// |
|
|
|
// @GetMapping("allDepositList") |
|
|
|
// @SystemControllerLog(description = "账单总览-所有押金列表") |
|
|
|
// public ResultData allDepositList(@ModelAttribute WxBillAll wxBillAll) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxBillAllController::allDepositList"); |
|
|
|
// if (null == wxBillAll) { |
|
|
|
// wxBillAll = new WxBillAll(); |
|
|
|
// } |
|
|
|
// wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
// return new ResultData(wxBillAllService.allDepositList(wxBillAll)); |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
// @GetMapping("getBillInfo") |
|
|
|
@@ -678,86 +720,86 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
// } |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 应收、承付商户列表 |
|
|
|
* @param wxBillAll |
|
|
|
* @param pageNum |
|
|
|
* @param pageSize |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("receiveAndPayMerchantlist") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
@SystemControllerLog(description = "账单管理-应收、承付商户列表") |
|
|
|
@ApiOperation("应收、承付商户列表") |
|
|
|
public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist"); |
|
|
|
if (null == wxBillAll) { |
|
|
|
wxBillAll = new WxBillAll(); |
|
|
|
} |
|
|
|
wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
PageInfo<Map> page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); |
|
|
|
Map<String, Object> result = new HashMap<>(); |
|
|
|
result.put("pageInfo", page); |
|
|
|
return new ResultData(result); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 导出应收、承付商户列表 |
|
|
|
* @param wxBillAll |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@GetMapping("exportReceiveAndPayMerchantlist") |
|
|
|
@SystemControllerLog(description = "账单管理-导出应收、承付商户列表") |
|
|
|
@ApiOperation("导出应收、承付商户列表") |
|
|
|
public void exportReceiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll,HttpServletRequest request, HttpServletResponse response) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportReceiveAndPayMerchantlist"); |
|
|
|
if (null == wxBillAll) { |
|
|
|
wxBillAll = new WxBillAll(); |
|
|
|
} |
|
|
|
wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("导出欠缴商户列表") |
|
|
|
@GetMapping("/exportOweMerchantlist") |
|
|
|
@SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") |
|
|
|
public void exportOweMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweMerchantlist"); |
|
|
|
if (null == wxBillAll){ |
|
|
|
wxBillAll = new WxBillAll(); |
|
|
|
} |
|
|
|
//默认查当月第一天到今天 |
|
|
|
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ |
|
|
|
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); |
|
|
|
} |
|
|
|
wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
wxBillAllService.exportOweMerchant(wxBillAll, request, response); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("导出待缴商户列表") |
|
|
|
@GetMapping("/exportWaitMerchantlist") |
|
|
|
@SystemControllerLog(description = "费用收缴数据-待缴商户列表-导出") |
|
|
|
public void exportWaitMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportWaitMerchantlist"); |
|
|
|
if (null == wxBillAll){ |
|
|
|
wxBillAll = new WxBillAll(); |
|
|
|
} |
|
|
|
//默认查当月第一天到今天 |
|
|
|
if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ |
|
|
|
wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); |
|
|
|
} |
|
|
|
wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
wxBillAllService.exportWaitMerchant(wxBillAll, request, response); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("exportTemplate") |
|
|
|
@SystemControllerLog(description = "账单-导出模板") |
|
|
|
public void exportTemplate(@ModelAttribute WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxBillAllController::exportTemplate"); |
|
|
|
wxBillAllService.exportTemplate(wxBillExcelTemplate, request, response); |
|
|
|
} |
|
|
|
// /** |
|
|
|
// * 应收、承付商户列表 |
|
|
|
// * @param wxBillAll |
|
|
|
// * @param pageNum |
|
|
|
// * @param pageSize |
|
|
|
// * @return |
|
|
|
// */ |
|
|
|
// @GetMapping("receiveAndPayMerchantlist") |
|
|
|
// @ApiImplicitParams({ |
|
|
|
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
// @SystemControllerLog(description = "账单管理-应收、承付商户列表") |
|
|
|
// @ApiOperation("应收、承付商户列表") |
|
|
|
// public ResultData receiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxBillAllController::receiveAndPayMerchantlist"); |
|
|
|
// if (null == wxBillAll) { |
|
|
|
// wxBillAll = new WxBillAll(); |
|
|
|
// } |
|
|
|
// wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
// PageInfo<Map> page = wxBillAllService.getReceiveAndPayBillAsPage(wxBillAll, pageNum, pageSize); |
|
|
|
// Map<String, Object> result = new HashMap<>(); |
|
|
|
// result.put("pageInfo", page); |
|
|
|
// return new ResultData(result); |
|
|
|
// } |
|
|
|
// |
|
|
|
// /** |
|
|
|
// * 导出应收、承付商户列表 |
|
|
|
// * @param wxBillAll |
|
|
|
// * @return |
|
|
|
// */ |
|
|
|
// @GetMapping("exportReceiveAndPayMerchantlist") |
|
|
|
// @SystemControllerLog(description = "账单管理-导出应收、承付商户列表") |
|
|
|
// @ApiOperation("导出应收、承付商户列表") |
|
|
|
// public void exportReceiveAndPayMerchantlist(@ModelAttribute WxBillAll wxBillAll,HttpServletRequest request, HttpServletResponse response) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportReceiveAndPayMerchantlist"); |
|
|
|
// if (null == wxBillAll) { |
|
|
|
// wxBillAll = new WxBillAll(); |
|
|
|
// } |
|
|
|
// wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
// wxBillAllService.exportReceiveAndPayBillAsPage(wxBillAll, request,response); |
|
|
|
// } |
|
|
|
// |
|
|
|
// |
|
|
|
// @ApiOperation("导出欠缴商户列表") |
|
|
|
// @GetMapping("/exportOweMerchantlist") |
|
|
|
// @SystemControllerLog(description = "费用收缴数据-欠缴商户列表-导出") |
|
|
|
// public void exportOweMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportOweMerchantlist"); |
|
|
|
// if (null == wxBillAll){ |
|
|
|
// wxBillAll = new WxBillAll(); |
|
|
|
// } |
|
|
|
// //默认查当月第一天到今天 |
|
|
|
// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ |
|
|
|
// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); |
|
|
|
// } |
|
|
|
// wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
// wxBillAllService.exportOweMerchant(wxBillAll, request, response); |
|
|
|
// } |
|
|
|
// |
|
|
|
// @ApiOperation("导出待缴商户列表") |
|
|
|
// @GetMapping("/exportWaitMerchantlist") |
|
|
|
// @SystemControllerLog(description = "费用收缴数据-待缴商户列表-导出") |
|
|
|
// public void exportWaitMerchantlist(@ModelAttribute WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportWaitMerchantlist"); |
|
|
|
// if (null == wxBillAll){ |
|
|
|
// wxBillAll = new WxBillAll(); |
|
|
|
// } |
|
|
|
// //默认查当月第一天到今天 |
|
|
|
// if(StringUtils.isNotBlank(wxBillAll.getEndtime())){ |
|
|
|
// wxBillAll.setEndtime(wxBillAll.getEndtime()+" 23:59:59"); |
|
|
|
// } |
|
|
|
// wxBillAll.updateTenantInfo(getTenantInfo()); |
|
|
|
// wxBillAllService.exportWaitMerchant(wxBillAll, request, response); |
|
|
|
// } |
|
|
|
// |
|
|
|
// @GetMapping("exportTemplate") |
|
|
|
// @SystemControllerLog(description = "账单-导出模板") |
|
|
|
// public void exportTemplate(@ModelAttribute WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
// logger.debug("[" + getIpAddr() + "] WxBillAllController::exportTemplate"); |
|
|
|
// wxBillAllService.exportTemplate(wxBillExcelTemplate, request, response); |
|
|
|
// } |
|
|
|
|
|
|
|
} |