From f2f4900bdfe5fd7f42bc3981a4d0066ce5bcb71a Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 13 Sep 2024 14:29:24 +0800 Subject: [PATCH] fix --- .../main/java/com/iformall/domain/po/WxFinanceReceive.java | 3 +++ .../java/com/iformall/service/impl/WxFinanceServiceImpl.java | 1 + .../src/main/resources/mapper/WxFinanceReceiveMapper.xml | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java index 1cd6d377b..a53ba84f0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java @@ -170,6 +170,9 @@ public class WxFinanceReceive extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否已打印", name = "isPrint") private Integer isPrint; + @io.swagger.annotations.ApiModelProperty(value = "父编号,红冲单据", name = "parentId") + private Long parentId; + @TableField(exist = false) private List bills; @TableField(exist = false) 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 3a23783b8..8a852a214 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1421,6 +1421,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { record.setPayMoney("-"+record.getPayMoney()); } record.setStatus(EnumFinanceReceiveStatus.RED_SETOFF.getCode()); + record.setParentId(oldRecordId); wxFinanceReceiveMapper.insert(record); WxFinanceReceiveBill rbq = new WxFinanceReceiveBill(); diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index 2c144bfd3..80b6a994f 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -25,12 +25,12 @@ + `id`,`tenant_id`,`parent_tenant_id`,`create_time`,`update_time`,`receive_date`,`receive_money`,`pay_money`,`set_off_money`,`cut_money`,`status`,`type`, - `money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`rent_shop_type`,`remark`, - `fees_id`,`is_print`,`is_finish` + `money_detail`,`create_by`,`create_by_name`,`update_by`,`update_by_name`,`merchant_id`,`rent_shop_type`,`remark`,`fees_id`,`is_print`,`is_finish`,`parent_id` @@ -54,6 +54,7 @@ and `rent_shop_type` = #{rentShopType} and `is_print` = #{isPrint} and `is_finish` = #{isFinish} + and `parent_id` = #{parentId} and merchant_id in