|
|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.SysConfig; |
|
|
|
import com.iformall.domain.po.WxAllBill; |
|
|
|
import com.iformall.domain.po.WxBillPayWay; |
|
|
|
import com.iformall.domain.po.WxEnergyFees; |
|
|
|
import com.iformall.domain.po.WxFinanceCheckOut; |
|
|
|
import com.iformall.domain.po.WxFinanceFinish; |
|
|
|
import com.iformall.domain.po.WxFinanceFinishReceive; |
|
|
|
import com.iformall.domain.po.WxFinanceReceive; |
|
|
|
@@ -769,6 +770,20 @@ public class WxFinanceController extends BaseController { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("结账列表") |
|
|
|
@GetMapping("checkOutList") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), |
|
|
|
}) |
|
|
|
public ResultData checkOutList(@ModelAttribute WxFinanceCheckOut record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns("period desc"); |
|
|
|
PageInfo<WxFinanceFinish> page = wxFinanceService.finishListAsPage(record, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
private boolean isValidPayTime(Date date) { |
|
|
|
// SysConfig sysconfig = wxFinanceService.getFinishEndTime(this.getTenantInfo()); |
|
|
|
// String fdatestr = sysconfig.getConfigItemValue(); |
|
|
|
|