From d2b25780f55d481a986942c87e769753c5fa8ea8 Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Wed, 9 Jul 2025 18:24:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=A0=E5=B0=84=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8F=82=E6=95=B0=E4=BC=A0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/controller/ProductMappingController.java | 4 ++-- .../shop/sync/controller/StoreDbConfigController.java | 6 +++--- .../mall/shop/sync/service/ProductMappingService.java | 2 +- .../mall/shop/sync/service/StoreDbConfigService.java | 2 +- .../sync/service/impl/ProductMappingServiceImpl.java | 11 +++++++---- .../sync/service/impl/StoreDbConfigServiceImpl.java | 10 +++++----- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java index c4b27c07..1de040c8 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java @@ -186,8 +186,8 @@ public class ProductMappingController extends BaseControllerImpl { */ @ApiOperation(value = "自动计算并上架商品", notes = "自动计算并上架商品") @RequestMapping(value = "/syncProductMaping", method = RequestMethod.PUT) - public CommonResult syncProductMaping() { - return productMappingService.syncAllProductMapping(); + public CommonResult syncProductMaping(Integer storeId) { + return productMappingService.syncAllProductMapping(storeId); } /** diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/StoreDbConfigController.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/StoreDbConfigController.java index 0315d22f..3a7da6dd 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/StoreDbConfigController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/StoreDbConfigController.java @@ -103,12 +103,12 @@ public class StoreDbConfigController extends BaseControllerImpl { /** * 生产密钥，用来放到app/bin目录，替换原来的密钥 - * @param syncApp + * @param storeDbConfig * @return */ @ApiOperation(value = "客户端primaryKey.txt生产", notes = "密钥生成器") @RequestMapping(value = "/getPrimaryKey", method = RequestMethod.PUT) - public String getPrimaryKey(@RequestBody SyncApp syncApp) { - return storeDbConfigService.getPrimaryKey(syncApp); + public String getPrimaryKey(@RequestBody StoreDbConfig storeDbConfig) { + return storeDbConfigService.getPrimaryKey(storeDbConfig); } } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java index 7a8f9cd5..ba99e2dd 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java @@ -19,7 +19,7 @@ public interface ProductMappingService extends IBaseService { Map getProductMapping(Integer storeId); - CommonResult syncAllProductMapping(); + CommonResult syncAllProductMapping(Integer storeId); CommonResult getSyncProductUnchecked(Integer storeId); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/StoreDbConfigService.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/StoreDbConfigService.java index b5d8c0f4..033d082a 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/StoreDbConfigService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/StoreDbConfigService.java @@ -28,7 +28,7 @@ public interface StoreDbConfigService extends IBaseService { CommonResult updateStoreDbConfig(StoreDbConfig storeDbConfig); CommonResult delStoreDbConfig(StoreDbConfig storeDbConfig); - String getPrimaryKey(SyncApp syncApp); + String getPrimaryKey(StoreDbConfig storeDbConfig); Map getPriorityModeCachByStoreId(Integer storeId); diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java index 4f26a63c..e1361066 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java @@ -377,8 +377,10 @@ public class ProductMappingServiceImpl extends BaseServiceImpl storeDbConfigQueryWrapper = new QueryWrapper<>(); storeDbConfigQueryWrapper.select("priority_mode"); storeDbConfigQueryWrapper.eq("store_id", storeId); @@ -401,8 +403,9 @@ public class ProductMappingServiceImpl extends BaseServiceImpl> futures = new ArrayList<>(); for (int i=1;i<=pages;i++){ int finalI = i; + Integer finalStoreId = storeId; futures.add(executor.submit(() -> { - this.computeProductMapping(shopProductBaseService.lists(queryWrapper, finalI,SHOPBASEPAGE).getRecords(),storeId,false); + this.computeProductMapping(shopProductBaseService.lists(queryWrapper, finalI,SHOPBASEPAGE).getRecords(), finalStoreId,false); return "成功" + finalI; })); } @@ -423,7 +426,7 @@ public class ProductMappingServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("store_id", storeId); + queryWrapper.eq("store_id", Integer.valueOf(storeId)); SyncApp result= syncAppService.getOne(queryWrapper); String primaryKey=""; try {