From 9fef5e91afa0073f95dd203159b5eccf68555536 Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Tue, 19 Aug 2025 11:20:12 +0800 Subject: [PATCH] refactor(mall): 修改 WxxcxJob 类的条件加载配置- 将 @ConditionalOnProperty 注解的 havingValue 属性从 "true" 改为 "false"- 此修改改变了 WxxcxJob 类的加载条件,根据配置项 system.job 的值来决定是否加载该类 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java index 9140dcf..2bcd490 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java @@ -252,13 +252,14 @@ apiSocialMuseVo.setLocationRemarkList(locationRemarkList); } apiSocialMuseVo.setTotalAmount(totalAmount.setScale(2, RoundingMode.DOWN)); - if( - ObjectUtil.isNotNull(clothesArt) - && ObjectUtil.isNotNull(clothesSize) - && ObjectUtil.isNotNull(clothesCloth) - ){ - apiSocialInfoVo.setMuse(apiSocialMuseVo); - } +// if( +// ObjectUtil.isNotNull(clothesArt) +// && ObjectUtil.isNotNull(clothesSize) +// && ObjectUtil.isNotNull(clothesCloth) +// ){ +// apiSocialInfoVo.setMuse(apiSocialMuseVo); +// } + apiSocialInfoVo.setMuse(apiSocialMuseVo); // Integer likeCnt = clothesSocial.getLikeCnt(); @@ -532,6 +533,10 @@ vo.setPatternPrice(pattern.getPrice()); vo.setPatternId(pattern.getId()); vo.setPatternRemark(patternRemark.getRemark()); + vo.setBoxHeight(pattern.getBoxHeight()); + vo.setBoxWidth(pattern.getBoxWidth()); + vo.setLeftPercent(pattern.getLeftPercent()); + vo.setTopPercent(pattern.getTopPercent()); patternRemarkList.add( vo); totalPatternAmount = totalPatternAmount.add(pattern.getPrice()); @@ -556,6 +561,10 @@ vo.setLocationImage(clothesLocation.getImage()); vo.setLocationPrice(clothesLocation.getPrice()); vo.setLocationId(clothesLocation.getId()); + vo.setBoxHeight(clothesLocation.getBoxHeight()); + vo.setBoxWidth(clothesLocation.getBoxWidth()); + vo.setLeftPercent(clothesLocation.getLeftPercent()); + vo.setTopPercent(clothesLocation.getTopPercent()); locationRemarkList.add(vo); totalLocationAmount = totalLocationAmount.add(clothesLocation.getPrice()); -- Gitblit v1.9.1