diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java index 78d4690e5..3137746a1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceiveSetoff.java @@ -28,7 +28,10 @@ public class WxFinanceReceiveSetoff extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="updateTime",name="updateTime") private Date updateTime; - @io.swagger.annotations.ApiModelProperty(value = "预收收款编号", name = "advanceId") + @io.swagger.annotations.ApiModelProperty(value = "收款单编号", name = "advanceId") + private Long receiveId; + + @io.swagger.annotations.ApiModelProperty(value = "收收款编号", name = "advanceId") private Long advanceId; @io.swagger.annotations.ApiModelProperty(value = "账单编号", name = "billId") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 7e9191c52..25c1ae5c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -745,6 +745,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxFinanceReceiveSetoff rb = new WxFinanceReceiveSetoff(); rb.updateTenantInfo(addreceive); rb.setAdvanceId(advance.getId()); + rb.setReceiveId(addreceive.getId()); rb.setBillId(bill.getId()); rb.setBillType(bill.getBillType()); rb.setFeesId(bill.getEnergyFeesId()); @@ -990,7 +991,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { rsq.updateTenantInfo(record); rsq.setBillId(bill.getId()); rsq.setBillType(bill.getBillType()); - rsq.setAdvanceId(rb.getReceiveId()); + rsq.setReceiveId(rb.getReceiveId()); List setoffList = wxFinanceReceiveSetoffMapper.findList(rsq); if (null != setoffList) { for (int j = 0 ; j < setoffList.size() ; j ++) { diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveSetoffMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveSetoffMapper.xml index c2bc68dde..80749b468 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveSetoffMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveSetoffMapper.xml @@ -7,6 +7,7 @@ + @@ -20,7 +21,7 @@ `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`bill_id`,`bill_type`,`fees_id`, - `advance_id`,`setoff`,`merchant_id`,`starttime`,`endtime`,`is_del` + `receive_id`,`advance_id`,`setoff`,`merchant_id`,`starttime`,`endtime`,`is_del` @@ -33,6 +34,7 @@ and `parent_tenant_id` = #{parentTenantId} and `bill_id` = #{billId} + and `receive_id` = #{receiveId} and `bill_type` = #{billType} and `fees_id` = #{feesId} and `advance_id` = #{advanceId}