From 4c0f9a7eb32a1a449fa472a01d9284642f19cc25 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 17:13:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   80 +++++++++++++++++++++++++++++----------
 1 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 4759fbd..c290301 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -24,6 +24,7 @@
 import com.panzhihua.common.model.dtos.neighbor.*;
 import com.panzhihua.common.model.dtos.property.PagePropertyWorkerDTO;
 import com.panzhihua.common.model.dtos.property.PropertyWorkerDTO;
+import com.panzhihua.common.model.dtos.shop.*;
 import com.panzhihua.common.model.vos.civil.ComActSocialWorkerVO;
 import com.panzhihua.common.model.vos.community.acid.ComActAcidCheckRecordVO;
 import com.panzhihua.common.model.vos.community.acid.ComActAcidMemberVO;
@@ -33,6 +34,7 @@
 import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
 import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
 import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO;
+import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;
@@ -203,27 +205,6 @@
 import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
 import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
 import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
-import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
-import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
-import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
-import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
 import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
 import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
@@ -2952,6 +2933,63 @@
     R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
 
     /**
+     * 商品列表-分页查询
+     *
+     * @param pageComShopGoodsDTO
+     *            添加数据
+     */
+    @PostMapping("/shopFlower/pageGoods")
+    R pageFlowerGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO);
+
+    /**
+     * 商品列表-分页查询
+     *
+     * @param comShopFlowerGoodsDTO
+     *            添加数据
+     */
+    @PostMapping("/shopFlower/pageShopFlowerGoodsByApp")
+    R pageShopFlowerGoodsByApp(@RequestBody  ComShopFlowerGoodsDTO comShopFlowerGoodsDTO);
+
+
+    /**
+     * 新增商品
+     *
+     * @param addShopGoodsVO
+     * @return
+     */
+    @PostMapping("/shopFlower/saveShopGoods")
+    R saveFlowerShopGoods(@RequestBody AddShopFlowerGoodsVO addShopGoodsVO);
+
+    /**
+     * 编辑商品
+     *
+     * @param id
+     * @param addShopGoodsVO
+     * @return
+     */
+    @PostMapping("/shopFlower/editShopGoods/{id}")
+    R editFlowerShopGoods(@PathVariable("id") Long id, @RequestBody AddShopFlowerGoodsVO addShopGoodsVO);
+
+    /**
+     * 删除商品
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/shopFlower/deleteShopGoods")
+    R deleteFlowerShopGoods(@RequestBody Long[] id);
+
+    /**
+     * 修改商品状态
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/shopFlower/changeShopGoodsStatus")
+    R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status);
+
+
+    /**
      * 结果
      *
      * @param shopOperlog

--
Gitblit v1.7.1