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..be530e2c6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -30,7 +30,6 @@ - diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 59a530d18..7e56b80b9 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -30,6 +30,8 @@ + + @@ -61,7 +63,6 @@ and `shop_id` = #{shopId} and `updatetime` = #{updatetime} and `rent_shop_type` = #{rentShopType} - and is_preview = 0 and is_preview = #{isPreview} and `pay_way` = #{payWay} and `late_pay_status` = #{latePayStatus}