diff --git a/mall-common/src/main/java/com/suisung/mall/common/utils/ProductTitleUtil.java b/mall-common/src/main/java/com/suisung/mall/common/utils/ProductTitleUtil.java index a0dc5797..397e5181 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/utils/ProductTitleUtil.java +++ b/mall-common/src/main/java/com/suisung/mall/common/utils/ProductTitleUtil.java @@ -26,7 +26,8 @@ public class ProductTitleUtil { "特价", "折扣", "优惠", "促销", "限时", "秒杀", "抢购", "直降", "满减", "赠品", "包邮", "新品", "热卖", "爆款", "推荐", "精选", "特惠", "清仓", "正品", "原装", "官方", "正版", "品牌", "优质", "好用", "新款", "老款", - "【", "】", "(", ")", "[]", "()", "「", "」", "!", "!!", "??", "?","袋装","盒装","约" + "【", "】", "(", ")", "[]", "()", "「", "」", "!", "!!", "??", "?", + "袋装","盒装","约","精品","加工","新","鲜" ))); /** diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/mapper/ShopProductItemSeqMapper.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/mapper/ShopProductItemSeqMapper.java index 30563205..e36a5a50 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/mapper/ShopProductItemSeqMapper.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/mapper/ShopProductItemSeqMapper.java @@ -15,5 +15,5 @@ import org.springframework.stereotype.Repository; @Repository public interface ShopProductItemSeqMapper extends BaseMapper { - + int updateSeqIdByItemIdAndProductId(ShopProductItemSeq shopProductItemSeq); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductItemSeqService.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductItemSeqService.java index cba6b96d..419758f3 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductItemSeqService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/ShopProductItemSeqService.java @@ -13,4 +13,5 @@ import com.suisung.mall.core.web.service.IBaseService; */ public interface ShopProductItemSeqService extends IBaseService { + int updateSeqIdByItemIdAndProductId(ShopProductItemSeq shopProductItemSeq); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java index 3d9bb2f1..a1114485 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java @@ -1007,6 +1007,19 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl itemSeqQueryWrapper = new QueryWrapper<>(); + itemSeqQueryWrapper.eq("item_id",item_row.getItem_id()); + itemSeqQueryWrapper.eq("product_id",item_row.getProduct_id()); + product_item_seq_row= shopProductItemSeqService.findOne(itemSeqQueryWrapper); + if(null!=product_item_seq_row){ + product_item_seq_row.setProduct_item_seq_id(product_item_seq_id); + product_item_seq_row.setProduct_item_seq_val(product_item_seq_val); + shopProductItemSeqService.updateSeqIdByItemIdAndProductId(product_item_seq_row); + } + } + if (null != product_item_seq_row) { item_id = product_item_seq_row.getItem_id(); } else { diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemSeqServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemSeqServiceImpl.java index 163eb2df..71a54b22 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemSeqServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductItemSeqServiceImpl.java @@ -4,6 +4,7 @@ import com.suisung.mall.common.modules.product.ShopProductItemSeq; import com.suisung.mall.core.web.service.impl.BaseServiceImpl; import com.suisung.mall.shop.product.mapper.ShopProductItemSeqMapper; import com.suisung.mall.shop.product.service.ShopProductItemSeqService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,4 +18,11 @@ import org.springframework.stereotype.Service; */ @Service public class ShopProductItemSeqServiceImpl extends BaseServiceImpl implements ShopProductItemSeqService { + + @Autowired + private ShopProductItemSeqMapper shopProductItemSeqMapper; + @Override + public int updateSeqIdByItemIdAndProductId(ShopProductItemSeq shopProductItemSeq) { + return shopProductItemSeqMapper.updateSeqIdByItemIdAndProductId(shopProductItemSeq); + } } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java index e2e439a6..b823d096 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/user/service/impl/ShopUserCartServiceImpl.java @@ -36,6 +36,7 @@ import com.suisung.mall.common.pojo.dto.SameCityDeliveryFeeRespDTO; import com.suisung.mall.common.service.MessageService; import com.suisung.mall.common.utils.CheckUtil; import com.suisung.mall.common.utils.I18nUtil; +import com.suisung.mall.common.utils.StringUtils; import com.suisung.mall.core.web.service.impl.BaseServiceImpl; import com.suisung.mall.shop.base.service.AccountBaseConfigService; import com.suisung.mall.shop.base.service.ShopBaseStateCodeService; @@ -418,13 +419,25 @@ public class ShopUserCartServiceImpl extends BaseServiceImpl + + update shop_product_item_seq set product_item_seq_val=#{product_item_seq_val}, + product_item_seq_id=#{product_item_seq_id} + where item_id=#{item_id} and product_id=#{product_id} +