diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023031300001__upd_cardSpend.sql b/mallinkAdmin/src/main/resources/db/migration/V2023031300001__upd_cardSpend.sql
index 2a64e7fe0..1b06e49c8 100644
--- a/mallinkAdmin/src/main/resources/db/migration/V2023031300001__upd_cardSpend.sql
+++ b/mallinkAdmin/src/main/resources/db/migration/V2023031300001__upd_cardSpend.sql
@@ -1,2 +1,7 @@
ALTER TABLE `mallink`.`wx_card_spend`
-ADD COLUMN `pay_type` smallint(2) NOT NULL DEFAULT 0 AFTER `owner_id`;
\ No newline at end of file
+ADD COLUMN `pay_type` smallint(2) NOT NULL DEFAULT 0 AFTER `owner_id`;
+
+
+ALTER TABLE `mallink`.`wx_card_spend`
+ADD COLUMN `refund_status` smallint(2) NOT NULL DEFAULT 0 COMMENT '退款状态' AFTER `subsidy`,
+ADD COLUMN `refund_remark` varchar(255) AFTER `refund_status`;
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java
index bcb6090a1..2739eb8f2 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java
@@ -77,6 +77,12 @@ public class WxCardSpend extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="说明",name="remark")
private String remark;
+ @io.swagger.annotations.ApiModelProperty(value="EnumRentContractAppStatus ",name="refundStatus")
+ private Integer refundStatus;
+
+ @io.swagger.annotations.ApiModelProperty(value="说明",name="refundRemark")
+ private String refundRemark;
+
@TableField(exist = false)
@Excel(name = "消费金额(元)", width = 20, orderNum = "7")
private String deductionAmountStr;
diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCardSpendStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumCardSpendStatus.java
index c49422157..bdc70800b 100644
--- a/mallinkService/src/main/java/com/iformall/enums/EnumCardSpendStatus.java
+++ b/mallinkService/src/main/java/com/iformall/enums/EnumCardSpendStatus.java
@@ -12,7 +12,7 @@ public enum EnumCardSpendStatus {
MANUAL_PAY(2, "已人工分账"),
PREV_PAY(10, "预支付(POS短期内占用)"),
- PENDING_REFUND(3, "待退款"),//占库存
+ PENDING_REFUND(3, "待退款"),
REFUND_SUCCESS(4,"已退款"),
;
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
index d77440be3..2d56712a3 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
@@ -1311,6 +1311,10 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
cardSpendUpd.setId(cardSend.getId());
cardSpendUpd.updateTenantInfo(cardSend);
cardSpendUpd.setPayStatus(EnumCardSpendStatus.REFUND_SUCCESS.getCode());
+ if(!EnumRentContractAppStatus.DEFAULT.equals(cardSend.getRefundStatus())){
+ cardSpendUpd.setRefundStatus(EnumRentContractAppStatus.FINISH.getCode());
+ }
+ cardSpendUpd.setRefundRemark("success!");
cardSpendUpd.setUpdateDate(currentDate);
try {
wxCardSpendMapper.updateById(cardSpendUpd);
@@ -1469,6 +1473,8 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
cardSpendUpd.setId(cardSend.getId());
cardSpendUpd.updateTenantInfo(cardSend);
cardSpendUpd.setPayStatus(EnumCardSpendStatus.NOT_PAY.getCode());
+ cardSpendUpd.setRefundStatus(EnumRentContractAppStatus.REJECT.getCode());
+ cardSpendUpd.setRefundRemark(remark);
cardSpendUpd.setUpdateDate(currentDate);
try {
wxCardSpendMapper.updateById(cardSpendUpd);
diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml
index 545352741..d69bf5ec0 100644
--- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml
@@ -23,13 +23,15 @@
+
+
`id`,`tenant_id`,`parent_tenant_id`,`card_id`,`owner_id`,`pay_type`,`merchant_id`,`order_id`,`pos_order_id`,
`deduction_amount`,`payment`,`real_payment`,`subsidy`, `card_remain_amount`,
`card_before_amount`,`card_remain_real_amount`,`card_before_real_amount`,
- `create_date`, `update_date`, `pay_status`, `pay_from`
+ `create_date`, `update_date`, `pay_status`, `pay_from`, `refund_status`, `refund_remark`
@@ -94,6 +96,9 @@
and `pay_from` = #{payFrom}
+
+ and `refund_status` = #{refundStatus}
+
and `create_date` >= #{startdate}