From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java
index d3e15ac..ffea8ad 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PayHuiminServiceImpl.java
@@ -9,6 +9,7 @@
import com.dsh.activity.entity.THuiminRecord;
import com.dsh.activity.entity.TPayHuimin;
import com.dsh.activity.entity.TStudent;
+import com.dsh.activity.enums.HuiminCardPaymentTypeEnum;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
@@ -97,6 +98,7 @@
@Override
public Map<String, BigDecimal> getStaticsData(HuiminPayQuery query) {
+ query.setGiftPaymentType(HuiminCardPaymentTypeEnum.GIFT.getCode());
return baseMapper.getStaticsData(query);
}
@@ -104,14 +106,9 @@
public ResultUtil<?> refund(Integer id) throws AlipayApiException {
TPayHuimin payHuimin = this.getById(id);
if (Objects.nonNull(payHuimin)) {
- // 后台录入订单直接修改为已退款
- if (payHuimin.getPaymentType()==3){
- payHuimin.setStatus(3);
- payHuimin.setRefundStatus(3);
- payHuimin.setRefundNumber(payHuimin.getCode());
- payHuimin.setRefundTime(new Date());
- this.updateById(payHuimin);
- return ResultUtil.success();
+ // 赠送订单不产生支付金额，禁止退款。
+ if (HuiminCardPaymentTypeEnum.isGift(payHuimin.getPaymentType())){
+ throw new IllegalArgumentException("赠送惠民卡不允许退款");
}
Integer count = huiminRecordService.lambdaQuery()
.eq(THuiminRecord::getPayId, payHuimin.getId())
--
Gitblit v1.7.1