From d6e5d5a71112fb1f0a7361485e80692cc03bc4c3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 13 六月 2023 19:01:48 +0800
Subject: [PATCH] 优惠券管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 0533a2f..497cb16 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -168,7 +168,7 @@
this.saveOrUpdate(shop);
//商户编号
if(mgtEditShopDto.getShopId()==null){
- String shopNo = CodeFactoryUtil.getShopNo(shop.getShopId());
+ String shopNo = CodeFactoryUtil.getShopNo();
shop.setShopNumber(shopNo);
}
//商户标签
@@ -306,8 +306,12 @@
* @return
*/
@Override
- public List<MgtShopPageVo> pageShop(Page page, MgtShopPageDto mgtShopPageDto){
- List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageShop(page, mgtShopPageDto);
+ public List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto){
+ //处理标签为正则表达
+ if(StringUtils.isNotBlank(mgtShopPageDto.getShopTags())){
+ mgtShopPageDto.setShopTags(mgtShopPageDto.getShopTags().replace(",","|"));
+ }
+ List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto);
return mgtShopPageVoList;
}
--
Gitblit v1.7.1