From f0546a0716b8e7af4ecaaffd7fa3c20223ef7b2f Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Wed, 15 Oct 2025 15:18:51 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E5=88=86=E4=BA=AB=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=20=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6(=E5=95=86=E5=93=81=E5=90=8D/?= =?UTF-8?q?=E5=95=86=E5=93=81=E7=B1=BB=E5=88=AB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ApiRetailWaresController.java | 2 +- .../retail/wares/param/WaresShareParam.java | 8 +++ .../controller/api/ApiBdWaresController.java | 5 +- .../hzs/sale/wares/mapper/BdWaresMapper.java | 5 +- .../hzs/sale/wares/param/CuWaresParams.java | 4 ++ .../sale/wares/service/IBdWaresService.java | 3 +- .../service/impl/BdWaresServiceImpl.java | 6 +- .../mapper/sale/wares/BdWaresMapper.xml | 57 +++++++++++++------ .../common/domain/sale/ext/BdWaresExt.java | 4 ++ 9 files changed, 68 insertions(+), 26 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java index c6aab0c2..ffe48184 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/controller/api/ApiRetailWaresController.java @@ -415,7 +415,7 @@ public class ApiRetailWaresController extends BaseController { List waresParamsList = new ArrayList<>(); // 查询商品列表 - List bdWaresExtList = iBdWaresService.listWaresShare(param.getSpecialArea(), param.getIsMakerGift(), param.getPkCountry()); + List bdWaresExtList = iBdWaresService.listWaresShare(param); if (CollectionUtil.isNotEmpty(bdWaresExtList)) { // 商品主键列表 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/param/WaresShareParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/param/WaresShareParam.java index 1e5e125b..ae7f5b4b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/param/WaresShareParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/wares/param/WaresShareParam.java @@ -28,4 +28,12 @@ public class WaresShareParam { */ private Integer pkCountry; + /** + * 分类ID + */ + private Integer pkAreaClassify; + /** + * 商品名称 + */ + private String waresName; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java index 5e14ce30..2d5fe500 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java @@ -102,7 +102,7 @@ public class ApiBdWaresController extends BaseController { List waresParamsList = new ArrayList<>(); // 查询商品列表 - List bdWaresExtList = iBdWaresService.listWaresShare(param.getSpecialArea(), param.getIsMakerGift(), param.getPkCountry()); + List bdWaresExtList = iBdWaresService.listWaresShare(param); if (CollectionUtil.isNotEmpty(bdWaresExtList)) { // 商品主键列表 @@ -214,7 +214,7 @@ public class ApiBdWaresController extends BaseController { } } } - return AjaxResult.success(waresParamsList); + return AjaxResult.success((waresParamsList)); } /** @@ -785,5 +785,4 @@ public class ApiBdWaresController extends BaseController { waresInfoVo.setWaresSpecsSkuInfoList(waresItemWaresInfos); return AjaxResult.success(waresInfoVo); } - } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java index bce4471f..4eac9e98 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/mapper/BdWaresMapper.java @@ -5,6 +5,7 @@ import com.hzs.common.domain.sale.ext.BdWaresExt; import com.hzs.common.domain.sale.wares.BdWares; import com.hzs.common.domain.system.config.BdAgreement; import com.hzs.retail.wares.param.RetailWaresParam; +import com.hzs.retail.wares.param.WaresShareParam; import com.hzs.sale.wares.param.WaresNoSaleParam; import com.hzs.sale.wares.param.WaresParams; import com.hzs.sale.wares.vo.WaresAuthorityVo; @@ -147,7 +148,5 @@ public interface BdWaresMapper extends BaseMapper { * @param pkCountry 所属国家 * @return: List */ - List listWaresShare(@Param("specialArea") Integer specialArea, - @Param("isMakerGift") Integer isMakerGift, - @Param("pkCountry") Integer pkCountry); + List listWaresShare(@Param("param") WaresShareParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java index 89e7f68d..0a049ea0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/param/CuWaresParams.java @@ -293,4 +293,8 @@ public class CuWaresParams implements Serializable { * 消费配置主键 */ private Integer pkSpecialCurrency; + + private Integer pkAreaClassifyParent; + + private String areaClassifyName; } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java index cb0bee87..3b20ffbe 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/IBdWaresService.java @@ -7,6 +7,7 @@ import com.hzs.common.domain.sale.wares.BdWaresAuthority; import com.hzs.common.domain.system.config.BdAgreement; import com.hzs.common.domain.system.config.ext.BdRangeExt; import com.hzs.retail.wares.param.RetailWaresParam; +import com.hzs.retail.wares.param.WaresShareParam; import com.hzs.sale.wares.param.ComputeWaresPrice; import com.hzs.sale.wares.param.WaresNoSaleParam; import com.hzs.sale.wares.param.WaresParams; @@ -212,5 +213,5 @@ public interface IBdWaresService extends IService { * @param pkCountry 所属国家 * @return: List */ - List listWaresShare(Integer specialArea, Integer isMakerGift, Integer pkCountry); + List listWaresShare(WaresShareParam param); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java index cf4f8dd9..f96de193 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/service/impl/BdWaresServiceImpl.java @@ -21,6 +21,7 @@ import com.hzs.common.domain.system.config.ext.BdRangeExt; import com.hzs.member.base.IMemberServiceApi; import com.hzs.retail.wares.param.RetailWaresParam; +import com.hzs.retail.wares.param.WaresShareParam; import com.hzs.sale.product.service.IBdSpecsService; import com.hzs.sale.wares.param.*; import com.hzs.common.security.utils.SecurityUtils; @@ -1149,6 +1150,7 @@ public class BdWaresServiceImpl extends ServiceImpl impl bdWares.setSortStatus(-1); bdWares.setPkId(waresId); this.updateById(bdWares); + } @Override @@ -1163,7 +1165,7 @@ public class BdWaresServiceImpl extends ServiceImpl impl @Override - public List listWaresShare(Integer specialArea, Integer isMakerGift, Integer pkCountry) { - return baseMapper.listWaresShare(specialArea, isMakerGift, pkCountry); + public List listWaresShare(WaresShareParam param) { + return baseMapper.listWaresShare(param); } } diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index ce5fec98..ebfdea81 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -473,32 +473,57 @@ - + select + bac.PK_PARENT as pkAreaClassifyParent, + bw.PK_AREA_CLASSIFY as pkAreaClassify, + bac.CLASSIFY_NAME as areaClassifyName, + bw.PK_COUNTRY, + bw.PK_ID, + be.pk_id PK_WARES_EXTEND, + be.IS_MAKER_GIFT, + bw.WARES_CODE, + bw.WARES_NAME, + bw.COVER, + bw.COVER1, + bw.COVER2, + bw.WARES_PRICE, + bw.WARES_ACHIEVE, + bw.SORT, + SPECIAL_AREA, + IS_PUT_ON, + PRE_SALE_STATUS, + PREFIX_LABEL, + COOL_LABEL, + S_LABEL, + SALES, + IS_SALE, + ARRIVAL_TIME, + WARN_MESSAGE, + be.PK_SPECIAL_CURRENCY from bd_wares bw inner join bd_wares_extend be on bw.pk_id = be.pk_wares + left join BD_AREA_CLASSIFY bac on bac.pk_id = bw.PK_AREA_CLASSIFY where bw.del_flag = 0 and be.del_flag = 0 and be.is_put_on = 0 and bw.wares_status = 5 - - and bw.special_area = #{specialArea} + + and bw.special_area = #{param.specialArea} - - and be.is_maker_gift = #{isMakerGift} + + and be.is_maker_gift = #{param.isMakerGift} - - and bw.pk_country = #{pkCountry} + + and bw.pk_country = #{param.pkCountry} + + + and bw.PK_AREA_CLASSIFY = #{param.pkAreaClassify} or bac.pk_parent = + + + and bw.WARES_NAME = '%' || #{param.waresName} || '%' order by bw.SORT_STATUS desc , bw.sort desc, bw.WARES_PRICE ,bw.CREATION_TIME desc diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java index adb7205b..0fe0d945 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/ext/BdWaresExt.java @@ -175,4 +175,8 @@ public class BdWaresExt extends BdWares { */ private Integer pkSpecialCurrency; + + private Integer pkAreaClassifyParent; + + private String areaClassifyName; }