From 17870eeeca47c08244b244c0acb7fe3f3216621f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 18 十一月 2022 11:20:19 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
index 8fa41f7..9093d45 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java
@@ -11,6 +11,7 @@
 import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
 import com.panzhihua.common.model.vos.shop.*;
 import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
 import com.panzhihua.common.validated.PutGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -60,11 +61,34 @@
     }
 
     @ApiOperation(value = "查询商品详情", response = ComShopFlowerGoodsVO.class)
-    @PostMapping("shopGoodsDetail")
+    @GetMapping("shopGoodsDetail")
     @ApiImplicitParam(name = "goodsId", value = "商品id", required = true)
     public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
         return communityService.shopFlowerGoodsDetail(goodsId);
     }
+    @ApiOperation(value = "删除商品")
+    @DeleteMapping("/goods/delete")
+    public R deleteShopGoods(@RequestParam("goodsId") Long goodsId) {
+        return communityService.deleteFlowerShopGoods(goodsId);
+    }
+    @ApiOperation(value = "商品上下架")
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "商品Id"),
+            @ApiImplicitParam(name = "status", value = "1.上架  2.下架 ")})
+    @GetMapping("/goods/changeStatus")
+    public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
+        return communityService.changeFlowerStatus(id, status);
+    }
+    @ApiOperation(value = "编辑商品")
+    @PostMapping("/goods/edit/{id}")
+    public R editShopGoods(@PathVariable("id") Long id,
+                           @RequestBody @Validated(AddGroup.class) AddShopFlowerGoodsVO addShopGoodsVO) {
+        return communityService.editFlowerShopGoods(id, addShopGoodsVO);
+    }
+    @ApiOperation(value = "新增商品")
+    @PostMapping("/goods/save")
+    public R saveShopGoods(@RequestBody @Validated(AddGroup.class) AddShopFlowerGoodsVO addShopGoodsVO) {
+        return communityService.saveFlowerShopGoods(addShopGoodsVO);
+    }
 
     @ApiOperation(value = "查询用户收货地址列表", response = ComShopUserAddressVO.class)
     @PostMapping("shopUserAddressList")

--
Gitblit v1.7.1