From bffca8fbec25187ac3a35c672c38ef9325cb993b Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sun, 12 Oct 2025 11:13:26 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E7=B3=BB=E7=BB=9F=E8=B0=83?= =?UTF-8?q?=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/constant/Constants.java | 2 +- .../java/com/ruoyi/quartz/task/XktTask.java | 2 +- .../impl/StoreCertificateServiceImpl.java | 2 +- .../service/impl/StoreProductServiceImpl.java | 18 +++++++++++++----- .../xkt/service/impl/StoreServiceImpl.java | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java index 6b8f6ae23..6499db99e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java @@ -212,7 +212,7 @@ public class Constants /** * 档口默认权重 0 */ - public static final Integer STORE_WEIGHT_DEFAULT_ZERO = 0; + public static final Integer WEIGHT_DEFAULT_ZERO = 0; public static final String VERSION_LOCK_ERROR_COMMON_MSG = "系统繁忙，请稍后再试"; diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java index 1f24434ab..8b7011861 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java @@ -785,7 +785,7 @@ public class XktTask { // 构建部分文档更新请求 list.add(new BulkOperation.Builder().update(u -> u .action(a -> a.doc(new HashMap() {{ - put("storeWeight", ObjectUtils.defaultIfNull(storeWeightMap.get(storeProd.getStoreId()), Constants.STORE_WEIGHT_DEFAULT_ZERO)); + put("storeWeight", ObjectUtils.defaultIfNull(storeWeightMap.get(storeProd.getStoreId()), Constants.WEIGHT_DEFAULT_ZERO)); }})) .id(String.valueOf(storeProd.getId())) .index(Constants.ES_IDX_PRODUCT_INFO)) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java index 77b03bed9..c71535fde 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java @@ -225,7 +225,7 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { Date oneYearAfter = Date.from(LocalDate.now().plusYears(1).atStartOfDay(ZoneId.systemDefault()).toInstant()); store.setTrialEndTime(oneYearAfter); // 设置档口默认权重 0 - store.setStoreWeight(Constants.STORE_WEIGHT_DEFAULT_ZERO); + store.setStoreWeight(Constants.WEIGHT_DEFAULT_ZERO); // 设置默认的库存系统为 步橘 ，后续可在条码迁移之处修改 store.setStockSys(StockSysType.BU_JU.getValue()); // 档口浏览次数设置为0 diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 8eabef15e..24de67516 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -1142,11 +1142,19 @@ public class StoreProductServiceImpl implements IStoreProductService { String season = updateDTO.getCateAttr().getSuitableSeason(); // 获取风格 String style = updateDTO.getCateAttr().getStyle(); - return BeanUtil.toBean(storeProd, ESProductDTO.class).setHasVideo(hasVideo) - .setProdCateName(updateDTO.getProdCateName()).setSaleWeight("0").setRecommendWeight("0").setPopularityWeight("0") - .setCreateTime(DateUtils.getTime()).setStoreName(storeName).setMainPicUrl(firstMainPic) - .setParCateId(parCate.getProdCateId().toString()).setParCateName(parCate.getName()).setProdPrice(minPrice.toString()) - .setSeason(season).setStyle(style).setTags(Collections.singletonList(style)); + // 组装 + ESProductDTO esProdDTO = BeanUtil.toBean(storeProd, ESProductDTO.class).setHasVideo(hasVideo) + .setProdCateName(updateDTO.getProdCateName()).setCreateTime(DateUtils.getTime()).setStoreName(storeName).setMainPicUrl(firstMainPic) + .setSaleWeight(WEIGHT_DEFAULT_ZERO.toString()).setRecommendWeight(WEIGHT_DEFAULT_ZERO.toString()).setPopularityWeight(WEIGHT_DEFAULT_ZERO.toString()) + .setParCateId(parCate.getProdCateId().toString()).setParCateName(parCate.getName()).setProdPrice(minPrice.toString()); + if (StringUtils.isNotBlank(season)) { + esProdDTO.setSeason(season); + } + if (StringUtils.isNotBlank(style)) { + esProdDTO.setStyle(style); + esProdDTO.setTags(Collections.singletonList(style)); + } + return esProdDTO; } /** diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index bae744ef1..9bf7650d5 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -97,7 +97,7 @@ public class StoreServiceImpl implements IStoreService { Date oneYearAfter = Date.from(LocalDate.now().plusYears(1).atStartOfDay(ZoneId.systemDefault()).toInstant()); store.setTrialEndTime(oneYearAfter); // 设置档口默认权重 0 - store.setStoreWeight(Constants.STORE_WEIGHT_DEFAULT_ZERO); + store.setStoreWeight(Constants.WEIGHT_DEFAULT_ZERO); int count = this.storeMapper.insert(store); // 创建档口账户 assetService.createInternalAccountIfNotExists(store.getId());