From f318c18606d2405f4f315939da2dea92f4859def Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Tue, 23 Dec 2025 13:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E5=A5=97=E9=A4=90=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=A9=E5=8A=9B=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/PpHelpRecordService.java   |  4 ++++
 .../service/impl/PpHelpRecordServiceImpl.java |  7 ++++++
 .../service/impl/PpPackageServiceImpl.java    | 22 +++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java
index 84ef8f07d..d579e9023 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java
@@ -6,6 +6,8 @@ import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.PpHelpRecord;
 
+import java.util.List;
+
 /**
  * 套餐推广助力记录 服务层。
  *
@@ -20,5 +22,7 @@ public interface PpHelpRecordService extends IService<PpHelpRecord> {
 
     void removeHelpRecord(Long orderId);
 
+    void deleteByOrderIds(List<Long> orderIds);
+
     Page<PpHelpRecordDTO> helpPage(PageQueryParam reqVo);
 }
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java
index 21f8360e5..ae76e9e50 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java
@@ -15,6 +15,8 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * 套餐推广助力记录 服务层实现。
  *
@@ -55,6 +57,11 @@ public class PpHelpRecordServiceImpl extends ServiceImpl<PpHelpRecordMapper, PpH
         remove(QueryWrapper.create().eq(PpHelpRecord::getOrderId, orderId));
     }
 
+    @Override
+    public void deleteByOrderIds(List<Long> orderIds) {
+        remove(QueryWrapper.create().in(PpHelpRecord::getOrderId, orderIds));
+    }
+
     @Override
     public Page<PpHelpRecordDTO> helpPage(PageQueryParam reqVo) {
         QueryWrapper wrapper = QueryWrapper.create().eq(PpHelpRecord::getOrderId, reqVo.getRecordId());
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java
index 1f9b41ab9..2a41a87b7 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java
@@ -12,16 +12,19 @@ import com.czg.constants.SystemConstants;
 import com.czg.exception.CzgException;
 import com.czg.market.entity.PpPackage;
 import com.czg.market.entity.PpPackageOrder;
+import com.czg.market.service.PpHelpRecordService;
 import com.czg.market.service.PpPackageService;
 import com.czg.market.vo.PpPackagePageReqVo;
 import com.czg.market.vo.PpPackageVO;
 import com.czg.sa.StpKit;
 import com.czg.service.market.mapper.PpPackageMapper;
+import com.czg.service.market.mapper.PpPackageOrderMapper;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.update.UpdateChain;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.cache.annotation.CacheEvict;
@@ -31,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 套餐推广套餐 服务层实现。
@@ -48,6 +52,12 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
     @DubboReference
     private ShopConfigService shopConfigService;
 
+    @Resource
+    private PpHelpRecordService ppHelpRecordService;
+
+    @Resource
+    private PpPackageOrderMapper ppPackageOrderMapper;
+
     @Override
     public Integer getPackagePromotionSwitch(Long shopId) {
         Integer isPackagePromotion = shopConfigService.getById(shopId).getIsPackagePromotion();
@@ -254,6 +264,18 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
     }
 
     public void cancelProgressingPackageOrder(Long shopId, Long packageId) {
+        // 查询订单 id 集合，删除助力记录
+        QueryWrapper wrapper = QueryWrapper.create();
+        if (packageId != null && packageId > 0L) {
+            wrapper.eq(PpPackageOrder::getPackageId, packageId);
+        }
+        wrapper.eq(PpPackageOrder::getShopId, shopId)
+                .in(PpPackageOrder::getStatus, PpPackageConstants.OrderStatus.PROCESSING, PpPackageConstants.OrderStatus.TIMEOUT);
+        List<PpPackageOrder> orderList = ppPackageOrderMapper.selectListByQuery(wrapper);
+        if (orderList != null && !orderList.isEmpty()) {
+            ppHelpRecordService.deleteByOrderIds(orderList.stream().map(PpPackageOrder::getId).collect(Collectors.toList()));
+        }
+
         UpdateChain<PpPackageOrder> update = UpdateChain.of(PpPackageOrder.class)
                 .set(PpPackageOrder::getStatus, PpPackageConstants.OrderStatus.CANCEL)
                 .set(PpPackageOrder::getCancelTime, LocalDateTime.now())