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 | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 a6c8ce1..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
@@ -156,6 +156,7 @@
if(shopSame!=null){
throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
}
+ shop.setDelFlag(0);
shop.setShopStatus(3);
shop.setCreateTime(new Date());
shop.setCreateUserId(mgtEditShopDto.getUserId());
@@ -167,7 +168,7 @@
this.saveOrUpdate(shop);
//商户编号
if(mgtEditShopDto.getShopId()==null){
- String shopNo = CodeFactoryUtil.getShopNo(shop.getShopId());
+ String shopNo = CodeFactoryUtil.getShopNo();
shop.setShopNumber(shopNo);
}
//商户标签
@@ -192,8 +193,10 @@
this.saveOrUpdate(shop);
}
//商户归属员工
- SysUser belongSysUser = sysUserService.getSysUser(shop.getBelongUserId()).getData();
- handleShopStaff(shop.getShopId(),belongSysUser);
+ if(shop.getBelongUserId()!=null){
+ SysUser belongSysUser = sysUserService.getSysUser(shop.getBelongUserId()).getData();
+ handleShopStaff(shop.getShopId(),belongSysUser);
+ }
//商户关联人员
String relUserIds = mgtEditShopDto.getRelUserIds();
if(StringUtils.isNotBlank(relUserIds)){
@@ -303,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;
}
@@ -540,4 +547,16 @@
}
return mgtShopIdByCodeVo;
}
+
+ /**
+ * @description 获取商户list
+ * @author jqs
+ * @date 2023/6/12 14:37
+ * @param mgtShopListDto
+ * @return List<MgtShopListSimpleVo>
+ */
+ @Override
+ public List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto){
+ return shopMapper.listMgtShopSimpleVo(mgtShopListDto);
+ }
}
--
Gitblit v1.7.1