no message

src/main/java/com/gree/mall/contest/controller/pc/CarouselMapController.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @Tag(name = "轮播图管理", description = "轮播图管理")
-@RequestMapping(value = "/carouselMap", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/carouselMap", produces = "application/json; charset=utf-8")
 public class CarouselMapController {
 
     @Resource

src/main/java/com/gree/mall/contest/controller/pc/FreightController.java

@@ -20,7 +20,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @Tag(name = "运费管理", description = "运费管理")
-@RequestMapping(value = "/freight", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/freight", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class FreightController {
     

src/main/java/com/gree/mall/contest/controller/pc/StorageController.java

@@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 @RestController
 @Tag(name = "仓储管理", description = "仓储管理")
-@RequestMapping(value = "/storage", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/storage", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class StorageController {
     

src/main/java/com/gree/mall/contest/controller/pc/common/CompanyRecordController.java

@@ -26,7 +26,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @Tag(name = "公司备案API", description = "公司备案API")
-@RequestMapping(value = "/pcapi/record", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/record", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class CompanyRecordController {
 

src/main/java/com/gree/mall/contest/controller/pc/goods/GoodsController.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @Tag(name = "商品列表", description = "商品列表")
-@RequestMapping(value = "/goods", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/goods", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class GoodsController {
 

src/main/java/com/gree/mall/contest/controller/pc/goods/GoodsNewsCategoryController.java

@@ -18,7 +18,7 @@ import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @Tag(name = "小程序首页活动", description = "首页活动")
-@RequestMapping(value = "/goods/news/category", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/goods/news/category", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class GoodsNewsCategoryController {
 

src/main/java/com/gree/mall/contest/controller/pc/goods/GoodsTagController.java

@@ -0,0 +1,47 @@
+package com.gree.mall.contest.controller.pc.goods;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gree.mall.contest.helper.ResponseHelper;
+import com.gree.mall.contest.logic.goods.GoodsTagLogic;
+import com.gree.mall.contest.plus.entity.GoodsTag;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@Tag(name = "商品标签", description = "商品标签")
+@RequestMapping(value = "/pc/goods/tag/", produces = "application/json; charset=utf-8")
+@RequiredArgsConstructor
+public class GoodsTagController {
+    
+    private final GoodsTagLogic goodsTagLogic;
+    
+    @Operation(summary = "分页查询商品标签")
+    @GetMapping("/page")
+    public ResponseHelper<IPage<GoodsTag>> pageGoodsTag(
+            HttpServletRequest request,
+            @Parameter(description ="1 属性标签  2标签",required = true) @RequestParam(required = true) Integer type,
+            @Parameter(description = "页号",required = true) @RequestParam("pageNum") Integer pageNum,
+            @Parameter(description = "页大小(-1即为不分页)", required = true) @RequestParam("pageSize") Integer pageSize
+    ) {
+        return ResponseHelper.success(goodsTagLogic.pageGoodsTag(request, pageNum, pageSize,type));
+    }
+
+
+    @Operation(summary = "批量编辑标签")
+    @PostMapping("/add")
+    public ResponseHelper updateGoodsTag(
+            HttpServletRequest request,
+            @Parameter(description="标签(格式: 标签1,标签2 )",required = true) @RequestParam(required = true) String tags,
+            @Parameter(description="1 属性标签  2标签",required = true) @RequestParam(required = true) Integer type
+    ) {
+        goodsTagLogic.updateGoodsTag(request, tags,type);
+        return ResponseHelper.success();
+    }
+
+
+}

src/main/java/com/gree/mall/contest/controller/pc/member/MemberController.java

@@ -24,7 +24,7 @@ import java.io.IOException;
 @Slf4j
 @RestController
 @Tag(name = "会员管理", description = "会员管理")
-@RequestMapping(value = "/member", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/member", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class MemberController {
 

src/main/java/com/gree/mall/contest/controller/pc/member/MemberCouponController.java

@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 @RestController
 @Tag(name = "券领取记录", description = "券领取记录")
-@RequestMapping(value = "/coupon/receive", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/coupon/receive", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class MemberCouponController {
 

src/main/java/com/gree/mall/contest/controller/pc/notice/MiniNoticeController.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @Tag(name = "提醒通知接口" ,description = "提醒通知接口")
-@RequestMapping(value = "/notice/mini" ,produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/notice/mini" ,produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class MiniNoticeController {
     

src/main/java/com/gree/mall/contest/controller/pc/notice/NoticeController.java

@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 @Slf4j
 @RestController
 @Tag(name = "消息通知接口", description = "消息通知接口")
-@RequestMapping(value = "/notice/", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/notice/", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class NoticeController {
     

src/main/java/com/gree/mall/contest/controller/pc/order/OrderController.java

@@ -32,7 +32,7 @@ import java.util.concurrent.locks.Lock;
 @Slf4j
 @RestController
 @Tag(name = "订单管理", description = "订单管理")
-@RequestMapping(value = "/order", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/order", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class OrderController {
 

src/main/java/com/gree/mall/contest/controller/pc/order/OrderRefundController.java

@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 @Slf4j
 @RestController
 @Tag(name = "订单售后管理", description = "订单售后管理")
-@RequestMapping(value = "/order/refund", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/order/refund", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class OrderRefundController {
 

src/main/java/com/gree/mall/contest/controller/pc/order/OrderShareController.java

@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 @Slf4j
 @RestController
 @Tag(name = "订单结算管理", description = "订单结算管理")
-@RequestMapping(value = "/order/share", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/order/share", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class OrderShareController {
 

src/main/java/com/gree/mall/contest/controller/pc/template/TemplateController.java

@@ -19,7 +19,7 @@ import java.text.ParseException;
 @Slf4j
 @RestController
 @Tag(name = "公共模板", description = "公共模板")
-@RequestMapping(value = "/template", produces = "application/json; charset=utf-8")
+@RequestMapping(value = "/pc/template", produces = "application/json; charset=utf-8")
 @RequiredArgsConstructor
 public class TemplateController {
     private final TemplateLogic templateLogic;

src/main/java/com/gree/mall/contest/logic/goods/GoodsTagLogic.java

@@ -0,0 +1,84 @@
+package com.gree.mall.contest.logic.goods;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gree.mall.contest.bean.admin.AdminUserCom;
+import com.gree.mall.contest.exception.RemoteServiceException;
+import com.gree.mall.contest.logic.common.CommonLogic;
+import com.gree.mall.contest.plus.entity.GoodsTag;
+import com.gree.mall.contest.plus.service.GoodsTagService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class GoodsTagLogic {
+
+    private final GoodsTagService goodsTagService;
+    private final CommonLogic commonLogic;
+
+
+    /**
+     * page查询商品标签
+     */
+    public IPage<GoodsTag> pageGoodsTag(HttpServletRequest request, Integer pageNum, Integer pageSize, Integer type) {
+        AdminUserCom adminUser = commonLogic.getAdminUser(request);
+        List<String> companyWechatIds = adminUser.getCompanyWechatIds();
+
+        return goodsTagService.lambdaQuery()
+                .in(CollectionUtil.isNotEmpty(companyWechatIds), GoodsTag::getCompanyWechatId, companyWechatIds)
+                .eq(type != null, GoodsTag::getType, type)
+                .page(new Page<>(pageNum, pageSize));
+    }
+
+
+
+
+    /**
+     * 批量编辑标签
+     */
+    public void updateGoodsTag(HttpServletRequest request, String tags,Integer type) {
+        AdminUserCom adminUser = commonLogic.getAdminUser(request);
+        String loginCompanyWechatId = adminUser.getLoginCompanyWechatId();
+        if (StringUtils.isEmpty(loginCompanyWechatId)) {
+            throw new RemoteServiceException("无编辑标签权限");
+        }
+
+        //清除旧标签
+        goodsTagService.lambdaUpdate()
+                .eq(GoodsTag::getCompanyWechatId, loginCompanyWechatId)
+                .eq(GoodsTag::getType, type)
+                .remove();
+
+        //添加新标签
+        if (StringUtils.isNotEmpty(tags)) {
+            List<String> tagList = Arrays.asList(tags.trim().split(","));
+
+            List<GoodsTag> saveTagList = new ArrayList<>();
+            for (String tagStr : tagList
+            ) {
+                GoodsTag goodsTag = new GoodsTag();
+                goodsTag.setGoodsTagName(tagStr);
+                goodsTag.setCreateBy(adminUser.getAdminUserId());
+                goodsTag.setCompanyWechatId(loginCompanyWechatId);
+                goodsTag.setCompanyName(adminUser.getLoginCompanyName());
+                goodsTag.setType(type);
+                saveTagList.add(goodsTag);
+            }
+            goodsTagService.saveBatch(saveTagList);
+        }
+
+    }
+
+
+
+}