From 059d6edc1276194de70018de9b7355f60ce5c4a3 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Sat, 22 Nov 2025 00:41:35 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=20=E6=9F=A5=E8=AF=A2affiliate=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=B7=B2=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=88=A0=E9=99=A4affiliate?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=8A=B6=E6=80=81=E4=B9=9F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/service/impl/AffiliateServiceImpl.java     | 9 +++++----
 src/main/resources/mapper/primary/AffiliateMapper.xml    | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
index 51fe8a28..49ac6658 100644
--- a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
@@ -212,10 +212,7 @@ public class AffiliateServiceImpl extends ServiceImpl<AffiliateMapper, Affiliate
 
         // operationType Active -> 激活 | Inactive -> 关闭 | Delete -> 删除
         if (!StringUtil.isNullOrEmpty(operationType)) {
-            if (operationType.equals("Delete")) {
-                baseMapper.deleteById(id);
-                return;
-            } else if (operationType.equals("Active") || operationType.equals("Inactive")) {
+            if (operationType.equals("Delete") || operationType.equals("Active") || operationType.equals("Inactive")) {
                 affiliate.setStatus(operationType);
             } else {
                 throw new BusinessException("unknown.operationType");
@@ -223,6 +220,10 @@ public class AffiliateServiceImpl extends ServiceImpl<AffiliateMapper, Affiliate
         }
         affiliate.setUpdateTime(LocalDateTime.now());
         baseMapper.updateById(affiliate);
+
+        if (operationType.equals("Delete")) {
+            baseMapper.deleteById(id);
+        }
     }
 
     // 定时计算佣金
diff --git a/src/main/resources/mapper/primary/AffiliateMapper.xml b/src/main/resources/mapper/primary/AffiliateMapper.xml
index 666c6f32..89b5e24c 100644
--- a/src/main/resources/mapper/primary/AffiliateMapper.xml
+++ b/src/main/resources/mapper/primary/AffiliateMapper.xml
@@ -37,6 +37,7 @@
             <if test="affiliateId != null">
                 AND f.id = #{affiliateId}
             </if>
+            AND f.is_deleted = 0
         </where>
         <choose>
             <when test="sortField != null and sortField != ''">
@@ -83,6 +84,7 @@
                 AND f.id = #{affiliateId}
             </if>
         </where>
+        AND f.is_deleted = 0
     </select>
 
     <select id="selectAllAffiliateUsername" resultType="java.util.Map">