zhengfangyuan 3 лет назад
Родитель
Сommit
7c2b1fd4d3
2 измененных файлов: 1 добавлений и 1 удалений
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentManageController.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

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

@@ -88,7 +88,6 @@ public class WxBillRentManageController extends BaseController {
@ApiImplicitParam(name = "manageFeeType", 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)})
@SystemControllerLog(description = "租赁押金账单-根据商户获取")
public ResultData findByRentContractId(Long rentContractId, Integer manageFeeType,Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillRentController::findByRentContractId");
WxBillRentManage record = new WxBillRentManage();


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -954,6 +954,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
operatingManageSum = omList.stream().collect(Collectors.summingLong(b -> status == null && filterHasPay == null ? b.getReceivePay() + b.getLatePayPrice() + b.getServiceChargePay() : b.getOwe()));
}
wxBillAll.setManageFeeType(null);
//物业
wxBillAll.setBillTypeValue(EnumBillQueryType.PROPERTY.getCode());
List<WxBillAllVo> propertyList = this.list(wxBillAll);


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