From b06908a106977cccffe4342dad35d5ad0e2aeefd Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 10 Jan 2025 13:42:13 +0800
Subject: [PATCH] refactor(mall): 优化活动商品编号生成逻辑和下架活动商品

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
index 4bb947e..a1eadb1 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ActivityServiceImpl.java
@@ -147,7 +147,7 @@
     private Long addGoodsEntity(MallActivity mallActivity,BigDecimal discountSize,MallGoods mallGoodsItem){
         mallGoodsItem.setIsNormal(GoodsTypeEnum.HUO_DONG.getValue());
         mallGoodsItem.setGoodsName(mallActivity.getName()+"-"+(StrUtil.isEmpty(mallGoodsItem.getGoodsName()) ? "":mallGoodsItem.getGoodsName()));
-        mallGoodsItem.setGoodsNo(mallGoodsItem.getGoodsNo()+"-"+mallActivity.getCode());
+        mallGoodsItem.setGoodsNo("HD"+mallActivity.getId()+"-"+mallGoodsItem.getGoodsNo());
         mallGoodsItem.setActivityId(mallActivity.getId());
         BigDecimal presentPrice = new BigDecimal(mallGoodsItem.getPresentPrice()).multiply(discountSize).setScale(2, RoundingMode.DOWN);
         mallGoodsItem.setPresentPrice(presentPrice.toString());
@@ -228,9 +228,11 @@
                             .eq(MallGoods::getActivityId, id)
             );
             if(CollUtil.isNotEmpty(mallGoods)){
-                mallGoodsMapper.update(null,
+                MallGoods goods = new MallGoods();
+                goods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
+                mallGoodsMapper.update(goods,
                         new LambdaQueryWrapper<MallGoods>()
-                                .eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_DISABLED)
+                                .eq(MallGoods::getIsSale, MallGoods.ISSALE_STATUS_ENABLE)
                                 .eq(MallGoods::getActivityId, id)
                 );
             }

--
Gitblit v1.9.1