| @@ -98,13 +98,13 @@ public class WxMerchantController extends BaseController { | |||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| }) | }) | ||||
| @SystemControllerLog(description = "商户-列表") | @SystemControllerLog(description = "商户-列表") | ||||
| public ResultData IdAndNamelist(@ModelAttribute WxMerchant wxMerchant, Integer type,Integer pageNum, Integer pageSize) { | |||||
| public ResultData IdAndNamelist(Integer type,Integer pageNum, Integer pageSize) { | |||||
| logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); | logger.debug("[" + getIpAddr() + "] WxMerchantController::list"); | ||||
| if (null == wxMerchant) wxMerchant = new WxMerchant(); | |||||
| WxMerchant wxMerchant = new WxMerchant(); | |||||
| wxMerchant.updateTenantInfo(getTenantInfo()); | wxMerchant.updateTenantInfo(getTenantInfo()); | ||||
| wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); | ||||
| wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); | wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); | ||||
| wxMerchant.setType(type); | |||||
| wxMerchant.setRentShopType(type); | |||||
| return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); | return new ResultData(wxMerchantService.queryIdAndNames(wxMerchant)); | ||||
| } | } | ||||
| @@ -432,9 +432,15 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| @SystemControllerLog(description = "租赁合同-列表") | @SystemControllerLog(description = "租赁合同-列表") | ||||
| public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { | |||||
| public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer validStatus, Integer pageNum, Integer pageSize) { | |||||
| logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); | logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); | ||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | wxRentContract.updateTenantInfo(getTenantInfo()); | ||||
| if (1 == validStatus) { | |||||
| List<Integer> statuss = new ArrayList<Integer>(); | |||||
| statuss.add(EnumRentContractStatus.PAING.getCode()); | |||||
| statuss.add(EnumRentContractStatus.OUT_DATE.getCode()); | |||||
| wxRentContract.setStatuss(statuss); | |||||
| } | |||||
| return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); | return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); | ||||
| } | } | ||||
| @@ -231,7 +231,7 @@ public class WxRentContract extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") | ||||
| private String latePayRatio; | private String latePayRatio; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayDay") | |||||
| private Integer latePayDay; | private Integer latePayDay; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "联营扣点率", name = "busDiscountRatio") | @io.swagger.annotations.ApiModelProperty(value = "联营扣点率", name = "busDiscountRatio") | ||||