From 5e49326c89e423f2cdc37eb01ea056f95a593003 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 11 Nov 2025 15:05:07 +0800
Subject: [PATCH 1/2] 11

---
 .../wallet/service/impl/act/ActCancelItemServiceImpl.java        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
index 67963731e..44f69e7b5 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/act/ActCancelItemServiceImpl.java
@@ -1,7 +1,6 @@
 package com.bsd.pjcloud.wallet.service.impl.act;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

From b6ab272f7f6be69ce1d8b6fe1a7529aafa410be2 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 11 Nov 2025 15:50:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=85=B3=E9=94=AE=E5=AD=97=E6=8B=89?=
 =?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 local.env                                                    | 4 ++++
 .../bsd/pjcloud/hard/controller/spu/HardSpuController.java   | 4 ++--
 .../java/com/bsd/pjcloud/hard/service/HardSpuService.java    | 2 +-
 .../pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java    | 5 ++++-
 .../src/main/resources/mapper/spu/HardSpuMapper.xml          | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 local.env

diff --git a/local.env b/local.env
new file mode 100644
index 000000000..ba45f1487
--- /dev/null
+++ b/local.env
@@ -0,0 +1,4 @@
+MYSQL_HOST=123.157.250.162
+MYSQL_PORT=2881
+MYSQL_USER=root@sys
+MYSQL_PWD=bsd.1799
\ No newline at end of file
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuController.java
index cb53ab33b..dcdc999b5 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/spu/HardSpuController.java
@@ -97,8 +97,8 @@ public class HardSpuController {
 
     @Operation(summary = "拉取旷世商品", description = "拉取旷世商品")
     @GetMapping("/async-all")
-    public R asyncAll() {
-        hardSpuService.asyncAll();
+    public R asyncAll(@ParameterObject HardSpuDto dto) {
+        hardSpuService.asyncAll(dto);
         return R.ok();
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuService.java
index 88b47d3a4..d02c3d186 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuService.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardSpuService.java
@@ -76,7 +76,7 @@ public interface HardSpuService extends IService<HardSpuEntity> {
     /**
      * 拉取旷世商品
      */
-    void asyncAll();
+    void asyncAll(HardSpuDto dto);
 
     /**
      * 检验商品
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 2aabf8955..c9f436a0f 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
@@ -297,9 +297,12 @@ public class HardSpuServiceImpl extends ServiceImpl<HardSpuMapper, HardSpuEntity
      * 拉取旷世商品
      */
     @Override
-    public void asyncAll() {
+    public void asyncAll(HardSpuDto dto) {
         int pageNum = 1;
         KsBarcodeLikeDto likeDto = new KsBarcodeLikeDto();
+        if (ObjectUtil.isNotEmpty(dto.getName())) {
+            likeDto.setSearch(dto.getName());
+        }
         likeDto.setPage_num(pageNum);
         while (true) {
             boolean hasnext = asyncAllGroup(likeDto);
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 986ee5b16..dffa157f5 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
@@ -71,7 +71,7 @@
         <if test="dto.name != null ">
             and a.name like concat('%', #{dto.name}, '%')
         </if>
-        <if test="dto.skuType != null ">
+        <if test="dto.skuType != null and dto.skuType != '' ">
             and a.sku_type = #{dto.skuType}
         </if>
         <if test="dto.spuCategoryId != null ">