From e557ae3f3046f77805f490219ea447eebcd7355d Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 10 十一月 2022 17:02:48 +0800
Subject: [PATCH] #feat 商品接口提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java | 232 ++++++++++++++++++++--------------------------------------
1 files changed, 80 insertions(+), 152 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
index 39ad2ee..e764885 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopFlowerApi.java
@@ -1,53 +1,17 @@
package com.panzhihua.service_community.api;
-import java.util.List;
+import com.panzhihua.common.model.dtos.shop.ComShopFlowerGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFlowerGoodsDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.shop.AddShopFlowerGoodsVO;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.service_community.service.ComShopFlowerGoodsService;
+import com.panzhihua.service_community.service.ConvenientMerchantService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-
-import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
-import com.panzhihua.service_community.service.*;
-import org.springframework.beans.BeanUtils;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.panzhihua.common.model.dtos.PageDTO;
-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.vos.R;
-import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
-import com.panzhihua.common.model.vos.shop.ComShopSysConfVO;
-import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
-import com.panzhihua.common.model.vos.shop.ShopStoreVO;
-import com.panzhihua.common.service.user.UserService;
-import com.panzhihua.service_community.model.dos.ComShopSysConfDO;
-
-import lombok.extern.slf4j.Slf4j;
@Slf4j
@RestController
@@ -70,8 +34,77 @@
@Resource
private UserService userService;
+
+ /**
+ * 商品列表-分页查询
+ *
+ * @param pageComShopGoodsDTO 查询参数
+ * @return PageShopStoreVO
+ */
+ @PostMapping("pageGoods")
+ public R pageFlowerGoodsList(@RequestBody PageComShopFlowerGoodsDTO pageComShopGoodsDTO) {
+ return comShopFlowerGoodsService.pageFlowerGoodsList(pageComShopGoodsDTO);
+ }
+
+ /**
+ * 商品列表-APP分页查询
+ *
+ * @param comShopFlowerGoodsDTO 查询参数
+ * @return PageShopStoreVO
+ */
+ @PostMapping("pageShopFlowerGoodsByApp")
+ public R pageShopFlowerGoodsByApp(@RequestBody ComShopFlowerGoodsDTO comShopFlowerGoodsDTO) {
+ return comShopFlowerGoodsService.pageShopFlowerGoodsByApp(comShopFlowerGoodsDTO);
+ }
+
+ /**
+ * 新增商品
+ *
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("saveShopGoods")
+ public R saveFlowerShopGoods(@RequestBody AddShopFlowerGoodsVO addShopGoodsVO) {
+ return comShopFlowerGoodsService.saveShopFlowerGoods(addShopGoodsVO);
+ }
+
+ /**
+ * 编辑商品
+ *
+ * @param addShopGoodsVO
+ * @param id 商铺Id
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("editShopGoods/{id}")
+ public R editFlowerShopGoods(@PathVariable("id") Long id, @RequestBody AddShopFlowerGoodsVO addShopGoodsVO) {
+ return comShopFlowerGoodsService.editFlowerShopGoods(id, addShopGoodsVO);
+ }
+
+ /**
+ * 删除商品
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("deleteShopGoods")
+ public R deleteFlowerShopGoods(@RequestBody Long[] id) {
+ return comShopFlowerGoodsService.deleteShopFlowerGoods(id);
+ }
+
+ /**
+ * 修改商品状态
+ *
+ * @param id
+ * @return
+ */
+ @GetMapping("changeShopGoodsStatus")
+ public R changeFlowerStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
+ return comShopFlowerGoodsService.changeStatus(id, status);
+ }
+
/*
- *//**
+ *//**
* 分页查询 商家订单
*
* @param pageComShopOrderSearchDTO
@@ -130,54 +163,6 @@
@PostMapping("shopCartList")
public R shopCartList(@RequestParam("userId") Long userId) {
return comShopCartService.shopCartList(userId);
- }
-
- *//**
- * 查询用户购物车数量
- *
- * @param userId
- * 用户id
- * @return 用户购物车商品数量
- *//*
- @PostMapping("shopCartUserTotal")
- public R shopCartUserTotal(@RequestParam("userId") Long userId) {
- return comShopCartService.shopCartUserTotal(userId);
- }
-
- *//**
- * 购物车添加
- *
- * @param comShopCartDTO
- * 请求参数
- * @return 添加结果
- *//*
- @PostMapping("shopAddCart")
- public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) {
- return comShopCartService.shopAddCart(comShopCartDTO);
- }
-
- *//**
- * 购物车内商品数量添加
- *
- * @param shopEditNubCartDTO
- * 请求参数
- * @return 修改结果
- *//*
- @PostMapping("shopEditNubCart")
- public R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO) {
- return comShopCartService.shopEditNubCart(shopEditNubCartDTO);
- }
-
- *//**
- * 删除购物车记录
- *
- * @param Ids
- * 购物车id集合
- * @return 删除结果
- *//*
- @PostMapping("shopDelCart")
- public R shopDelCart(@RequestBody List<Long> Ids) {
- return comShopCartService.shopDelCart(Ids);
}
*//**
@@ -324,64 +309,7 @@
return comShopOrderService.orderStatistics(userId);
}
- *//**
- * 商品列表-分页查询
- *
- * @param pageComShopGoodsDTO
- * 查询参数
- * @return PageShopStoreVO
- *//*
- @PostMapping("pageGoods")
- public R pageShopStore(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) {
- return comShopFlowerGoodsService.pageGoodsList(pageComShopGoodsDTO);
- }
- *//**
- * 新增商品
- *
- * @param addShopGoodsVO
- * @return
- *//*
- @PostMapping("saveShopGoods")
- public R saveStore(@RequestBody AddShopGoodsVO addShopGoodsVO) {
- return comShopFlowerGoodsService.saveShopGoods(addShopGoodsVO);
- }
-
- *//**
- * 编辑商品
- *
- * @param addShopGoodsVO
- * @param id
- * 商铺Id
- * @return
- *//*
- @Transactional(rollbackFor = Exception.class)
- @PostMapping("editShopGoods/{id}")
- public R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO) {
- return comShopFlowerGoodsService.editShopGoods(id, addShopGoodsVO);
- }
-
- *//**
- * 删除商品
- *
- * @param id
- * @return
- *//*
- @PostMapping("deleteShopGoods")
- public R deleteShopGoods(@RequestBody Long[] id) {
- return comShopFlowerGoodsService.deleteShopGoods(id);
- }
-
- *//**
- * 修改商品状态
- *
- * @param id
- * @return
- *//*
- @GetMapping("changeShopGoodsStatus")
- public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
- return comShopFlowerGoodsService.changeStatus(id, status);
- }
*//**
* 商家资金的订单详情
--
Gitblit v1.7.1