Преглед изворни кода

fix contract

release_toaliyun_real
xiaohanzi пре 5 година
родитељ
комит
1622f13ba8
3 измењених фајлова са 11 додато и 5 уклоњено
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  2. +7
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java Прегледај датотеку

@@ -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));
} }




+ 7
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Прегледај датотеку

@@ -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));
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Прегледај датотеку

@@ -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")


Loading…
Откажи
Сачувај