Просмотр исходного кода

[账单][修改][修改滞纳金字段]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
efc1e83a95
3 измененных файлов: 10 добавлений и 2 удалений
  1. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java

+ 8
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java Просмотреть файл

@@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.BaseEntity; import com.iformall.domain.po.BaseEntity;
import com.iformall.domain.po.WxBillAction; import com.iformall.domain.po.WxBillAction;
import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillActionService;
import com.iformall.utils.DateUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -14,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@@ -59,7 +61,13 @@ public class WxBillActionController extends BaseController {
wxBillAction.setTenantId(getTenantId()); wxBillAction.setTenantId(getTenantId());
wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC); wxBillAction.setSortColumns(BaseEntity.SortField.Id_DESC);
PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize); PageInfo<WxBillAction> result = wxBillActionService.listAsPage(wxBillAction, pageNum, pageSize);
if(result != null && CollectionUtils.isNotEmpty(result.getList())){


// DateUtils.getDaySet()
// for (WxBillAction action:result.getList()) {
//
// }
}
return new ResultData(result); return new ResultData(result);
} }
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java Просмотреть файл

@@ -142,7 +142,7 @@ public class WxPropertyContract extends BaseEntity {
private String adjustRatio; private String adjustRatio;


@io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayDay") @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayDay")
private Integer latePayDay;
private String latePayDay;


@io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio")
private Integer latePayRatio; private Integer latePayRatio;


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java Просмотреть файл

@@ -227,7 +227,7 @@ public class WxRentContract extends BaseEntity {
private Integer operationType; private Integer operationType;


@io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio") @io.swagger.annotations.ApiModelProperty(value = "滞纳金费率", name = "latePayRatio")
private Integer latePayRatio;
private String latePayRatio;


@io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio")
private Integer latePayDay; private Integer latePayDay;


Загрузка…
Отмена
Сохранить