From e3b523b41cb71be1e5982aa208e0df61ca3346f5 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 31 Oct 2025 17:01:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=B7=E4=B8=96=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java | 4 ++--
 .../src/main/resources/mapper/spu/HardSpuMapper.xml           | 2 +-
 .../wallet/controller/act/ActCancelItemController.java        | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java
index 94c910258..2aabf8955 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java
@@ -187,8 +187,8 @@ public class HardSpuServiceImpl extends ServiceImpl<HardSpuMapper, HardSpuEntity
             if (ObjectUtil.isNotEmpty(v.getKsSkuId())) {
                 KsSkuDeleteDto dto = new KsSkuDeleteDto();
                 dto.setKs_sku_id(v.getKsSkuId());
-                KsSkuDeleteVo data = remoterThirdKsService.skuDelete(dto).getData();
-                if (ObjectUtil.isEmpty(data) || !data.isSuccess()) throw new RuntimeException(data.getMessage());
+                // KsSkuDeleteVo data = remoterThirdKsService.skuDelete(dto).getData();
+                // if (ObjectUtil.isEmpty(data) || !data.isSuccess()) throw new RuntimeException(data.getMessage());
             }
         }
         baseMapper.deleteByIds(list);
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml
index 84ba0a06d..986ee5b16 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/spu/HardSpuMapper.xml
@@ -83,7 +83,7 @@
         <if test="dto.spuCategoryIdIsNotNull != null ">
             <if test="dto.spuCategoryIdIsNotNull == true ">
                 and a.spu_category_id is not null
-                and a.ks_status = 5
+                and a.ks_status in ('5','2')
             </if>
         </if>
         <if test="dto.status != null and dto.status != '' ">
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java
index 3fc4a27c1..077d39c7d 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCancelItemController.java
@@ -2,8 +2,6 @@ package com.bsd.pjcloud.wallet.controller.act;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.idempotent.annotation.Idempotent;