diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java index 4c0f8b7d4..24d1ac625 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java @@ -80,7 +80,15 @@ public class WxFlowAbleController extends BaseController { logger.debug("[" + getIpAddr() + "] FlowAbleController::myApplyList"); record.setUserId(super.getUser().getId()); record.setStatus(EnumFlowRecordStatus.NEW.getCode()); - return new ResultData(wxFlowService.listAsPage(record,pageNum,pageSize)); + + PageInfo pageInfo = wxFlowService.listAsPage(record,pageNum,pageSize); + List recordList = pageInfo.getList(); + for (WxFlowRecord wxFlowRecord:recordList) { + if(StringUtils.isBlank(wxFlowRecord.getVariables())){ + wxFlowRecord.setVariables("{}"); + } + } + return new ResultData(pageInfo); } /** diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java index d342b6fa5..dfd40b37f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java @@ -131,6 +131,15 @@ public class WxBillProperty implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; + @io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate") + private Integer receivePayUpdate; + public Integer getReceivePayUpdate() { + return receivePayUpdate; + } + public void setReceivePayUpdate(Integer receivePayUpdate) { + this.receivePayUpdate = receivePayUpdate; + } + public String getComments() { return comments; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 5a2ad5ed9..1cc460e38 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -134,6 +134,15 @@ public class WxBillRent implements Serializable { @io.swagger.annotations.ApiModelProperty(value = "备注", name = "comments") private String comments; + @io.swagger.annotations.ApiModelProperty(value = "调整后的合同金额", name = "receivePayUpdate") + private Integer receivePayUpdate; + public Integer getReceivePayUpdate() { + return receivePayUpdate; + } + public void setReceivePayUpdate(Integer receivePayUpdate) { + this.receivePayUpdate = receivePayUpdate; + } + public String getComments() { return comments; } diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 9b054e522..58d2b8929 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -30,7 +30,7 @@ - + @@ -38,7 +38,7 @@ `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, - `pay_way`,`late_pay_status`,`comments` + `pay_way`,`late_pay_status`,`comments`,receive_pay_update @@ -92,7 +92,7 @@ else br.late_pay_price end latePayPrice, (select max(period) from wx_bill_property where property_contract_id=br.property_contract_id) allPeriod,d.`status` depositStatus,br.`shop_info` shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus, - br.`comments` + br.`comments`,br.receive_pay_update from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id left join wx_bill_property_deposit d on br.property_contract_id=d.property_contract_id diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 59a530d18..092906f35 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -30,6 +30,9 @@ + + + @@ -38,7 +41,7 @@ `createtime`,`expired_day`,`tenant_id`,`owe`,`status`,`is_del`,`need_pay`, `merchant_id`,`user_id`,`shop_id`,`updatetime`,`rent_shop_type`, `revenue`,`late_pay_ratio`,`late_pay_time`,`late_pay_price`,`period`,`is_preview`,`shop_info`, - `pay_way`,`late_pay_status`,`comments` + `pay_way`,`late_pay_status`,`comments`,receive_pay_update @@ -95,7 +98,7 @@ else br.late_pay_price end latePayPrice, (select max(period) from wx_bill_rent where rent_contract_id=br.rent_contract_id) allPeriod,d.`status` depositStatus,br.shop_info shopInfo,br.pay_way payWay,br.late_pay_status latePayStatus, - br.`comments` + br.`comments`,br.receive_pay_update from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id left join wx_rent_contract r on br.rent_contract_id=r.id