From 6cca89c41aea52ae6b23909bb9fbd2834f0094d5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 08 六月 2023 18:43:12 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml | 5 +
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java | 18 +++++-
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java | 9 +++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java | 3 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java | 10 +++
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java | 17 +++--
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java | 10 +++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java | 5 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java | 16 +++++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java | 19 +++--
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java | 19 +++--
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java | 12 ++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java | 12 ++++
14 files changed, 130 insertions(+), 27 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java
index 1fe06a8..b3fea8b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteGoodsFallbackFactory.java
@@ -50,6 +50,11 @@
public R deleteGoodsClass(Long classId) {
return R.fail("删除商品分类失败:" + throwable.getMessage());
}
+
+ @Override
+ public R deleteGoodsTag(String goodsTag) {
+ return R.fail("删除商品标签失败:" + throwable.getMessage());
+ }
};
}
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java
index e571204..825cf7a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteGoodsService.java
@@ -34,4 +34,14 @@
@PostMapping("/goods/deleteGoodsClass")
public R deleteGoodsClass(@RequestBody Long classId);
+
+ /**
+ * @description 删除商品标签
+ * @author jqs
+ * @date 2023/6/8 17:07
+ * @param goodsTag
+ * @return R
+ */
+ @PostMapping("/deleteGoodsTag")
+ public R deleteGoodsTag(@RequestBody String goodsTag);
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
index 1716fa0..cfbfea5 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
@@ -36,5 +36,5 @@
* @return R
*/
@PostMapping("/shop/deleteShopTag")
- public R deleteMemberTag(@RequestBody String tag);
+ public R deleteShopTag(@RequestBody String tag);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java
index f974273..ae92d52 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java
@@ -56,6 +56,13 @@
return R.ok(shopGoods);
}
+ /**
+ * @description 删除商品分类
+ * @author jqs
+ * @date 2023/6/8 17:08
+ * @param classId
+ * @return R
+ */
@PostMapping("/deleteGoodsClass")
public R deleteGoodsClass(@RequestBody Long classId)
{
@@ -63,10 +70,17 @@
return R.ok();
}
+ /**
+ * @description 删除商品标签
+ * @author jqs
+ * @date 2023/6/8 17:07
+ * @param goodsTag
+ * @return R
+ */
@PostMapping("/deleteGoodsTag")
public R deleteGoodsTag(@RequestBody String goodsTag)
{
- //goodsService.deleteGoodsTag(goodsTag);
+ goodsService.deleteGoodsTag(goodsTag);
return R.ok();
}
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java
index ffe07f5..064e259 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/goods/GoodsMapper.java
@@ -82,4 +82,14 @@
* @return void
*/
void deleteGoodsClass(@Param("classId")Long classId);
+
+
+ /**
+ * @description 删除商品标签
+ * @author jqs
+ * @date 2023/6/8 17:02
+ * @param goodsTag
+ * @return void
+ */
+ void deleteGoodsTag(String goodsTag);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java
index a733995..2693a8c 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/goods/GoodsService.java
@@ -123,4 +123,13 @@
* @return void
*/
void deleteGoodsClass(Long classId);
+
+ /**
+ * @description 删除商品标签
+ * @author jqs
+ * @date 2023/6/8 17:02
+ * @param goodsTag
+ * @return void
+ */
+ void deleteGoodsTag(String goodsTag);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
index cccae6c..74dabb1 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java
@@ -424,4 +424,16 @@
public void deleteGoodsClass(Long classId){
goodsMapper.deleteGoodsClass(classId);
}
+
+ /**
+ * @description 删除商品标签
+ * @author jqs
+ * @date 2023/6/8 17:02
+ * @param goodsTag
+ * @return void
+ */
+ @Override
+ public void deleteGoodsTag(String goodsTag){
+ goodsMapper.deleteGoodsTag(goodsTag);
+ }
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 20fc60d..37256f7 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ruoyi-modules/ruoyi-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -369,4 +369,9 @@
<update id="deleteGoodsClass">
UPDATE t_goods set goods_class_id = null WHERE goods_class_id = #{classId}
</update>
+
+ <update id="deleteGoodsTag">
+ UPDATE t_goods SET goods_tags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', goods_tags, ','), CONCAT(',',#{goodsTag},','), ','))
+ WHERE FIND_IN_SET(#{goodsTag}, goods_tags) > 0
+ </update>
</mapper>
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java
index 76a2de7..5d5ea7d 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberSuggest.java
@@ -1,18 +1,16 @@
package com.ruoyi.member.domain.pojo.member;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.Version;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -81,6 +79,11 @@
@TableField("suggest_type")
private Integer suggestType;
+ /**
+ * 商品标签
+ */
+ @TableField("suggest_tags")
+ private String suggestTags;
@Override
protected Serializable pkVal() {
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
index d383461..9dfe764 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
@@ -7,6 +7,7 @@
import com.ruoyi.shop.service.shop.ShopRelUserService;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.service.shop.ShopStaffService;
+import com.ruoyi.shop.service.shop.ShopSuggestService;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.ShopRelUserVo;
@@ -43,6 +44,10 @@
@Resource
private RemoteUserService remoteUserService;
+
+ @Resource
+ private ShopSuggestService shopSuggestService;
+
/**
* 企业微信H5登录
@@ -97,4 +102,11 @@
shopService.deleteShopTag(tag);
return R.ok();
}
+
+ @PostMapping("/deleteShopSuggestTag")
+ public R deleteShopSuggestTag(@RequestBody String tag)
+ {
+ shopSuggestService.deleteShopSuggestTag(tag);
+ return R.ok();
+ }
}
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
index 1c62c78..9ce17f3 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/shop/ShopSuggest.java
@@ -1,18 +1,16 @@
package com.ruoyi.shop.domain.pojo.shop;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.Version;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -74,6 +72,11 @@
@TableField("replay_time")
private Date replayTime;
+ /**
+ * 商品标签
+ */
+ @TableField("suggest_tags")
+ private String suggestTags;
@Override
protected Serializable pkVal() {
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
index 017d29d..b7aa76d 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopSuggestService.java
@@ -32,4 +32,7 @@
* @param merShopSuggestDto
*/
void suggest(MerShopSuggestDto merShopSuggestDto);
+
+
+ void deleteShopSuggestTag( String tag);
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java
index 9e9a65a..27fc504 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/StaffSuggest.java
@@ -1,16 +1,16 @@
package com.ruoyi.system.domain.pojo.config;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -74,6 +74,11 @@
@TableField("shop_id")
private Integer shopId;
+ /**
+ * 商品标签
+ */
+ @TableField("suggest_tags")
+ private String suggestTags;
@Override
protected Serializable pkVal() {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java
index 6f916a4..8f41154 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/SysTagServiceImpl.java
@@ -7,6 +7,9 @@
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.poji.config.SysTag;
+import com.ruoyi.system.api.service.RemoteGoodsService;
+import com.ruoyi.system.api.service.RemoteMemberService;
+import com.ruoyi.system.api.service.RemoteShopService;
import com.ruoyi.system.domain.dto.MgtTagEditDto;
import com.ruoyi.system.domain.dto.MgtTagPageDto;
import com.ruoyi.system.domain.vo.MgtTagPageVo;
@@ -33,6 +36,15 @@
@Resource
private SysTagMapper sysTagMapper;
+
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
+
+ @Resource
+ private RemoteShopService remoteShopService;
+
+ @Resource
+ private RemoteMemberService remoteMemberService;
/**
* 通过id获取系统标签
@@ -135,13 +147,13 @@
//标签类型1用户2合作商3商品4建议
switch (tagType){
case 1:
-
+ remoteMemberService.deleteMemberTag(tagName);
break;
case 2:
-
+ remoteShopService.deleteShopTag(tagName);
break;
case 3:
-
+ remoteGoodsService.deleteGoodsTag(tagName);
break;
case 4:
--
Gitblit v1.7.1