From d53c16a12e612a95dc8f6fb248e3669cbc441eb4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 16:48:41 +0800
Subject: [PATCH] 新增加商品特价接口

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java |   82 ++++++++++++++++++++++++++---------------
 1 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
index 7164b6d..952197d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
@@ -7,14 +7,18 @@
 import com.ruoyi.account.api.model.AppUser;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.other.api.domain.*;
 import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
 import com.ruoyi.other.service.*;
+import com.ruoyi.other.vo.AddGoodsBargainPriceVo;
+import com.ruoyi.other.vo.GoodsBargainPriceInfo;
+import com.ruoyi.other.vo.ShopGoodsList;
+import com.ruoyi.other.vo.ShopGoodsListVo;
 import com.ruoyi.system.api.model.LoginUser;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -64,8 +68,6 @@
     /**
      * 根据商品id和会员等级获取门店特价
      *
-     * @param goodsBargainPrice
-     * @return
      */
     @PostMapping("/getGoodsBargainPrice")
     public R<GoodsBargainPriceDetail> getGoodsBargainPrice(@RequestBody GetGoodsBargainPrice goodsBargainPrice) {
@@ -88,7 +90,7 @@
      * 新增
      */
     @PostMapping("/add")
-    @ApiOperation(value = "商品管理-门店特殊售价-新增", tags = {"管理后台"})
+    @ApiOperation(value = "新增", tags = {"管理后台-商品管理-门店特殊售价"})
     @Transactional(rollbackFor = Exception.class)
     public R<Void> add(@RequestBody GoodsBargainPrice goodsBargainPrice) {
         LoginUser loginUserApplet = tokenService.getLoginUserApplet();
@@ -114,7 +116,7 @@
      * 删除
      */
     @DeleteMapping("/delete")
-    @ApiOperation(value = "商品管理-门店特殊售价-删除", tags = {"管理后台"})
+    @ApiOperation(value = "删除", tags = {"管理后台-商品管理-门店特殊售价-"})
     public R<Void> delete(@ApiParam("id") @RequestParam("id") Integer id) {
         goodsBargainPriceService.removeById(id);
         goodsBargainPriceDetailService.remove(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
@@ -126,7 +128,7 @@
      * 修改
      */
     @PutMapping("/edit")
-    @ApiOperation(value = "商品管理-门店特殊售价-修改", tags = {"管理后台"})
+    @ApiOperation(value = "修改", tags = {"管理后台-商品管理-门店特殊售价"})
     @Transactional(rollbackFor = Exception.class)
     public R<Void> edit(@RequestBody GoodsBargainPrice goodsBargainPrice) {
         goodsBargainPriceService.updateById(goodsBargainPrice);
@@ -140,7 +142,7 @@
      * 详情
      */
     @GetMapping("/detail")
-    @ApiOperation(value = "商品管理-门店特殊售价-详情", tags = {"管理后台"})
+    @ApiOperation(value = "详情", tags = {"管理后台-商品管理-门店特殊售价"})
     public R<GoodsBargainPrice> detail(@ApiParam("id") @RequestParam("id") Integer id) {
         GoodsBargainPrice goodsBargainPrice = goodsBargainPriceService.getById(id);
         List<GoodsBargainPriceDetail> goodsBargainPriceDetailList = goodsBargainPriceDetailService.list(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
@@ -153,7 +155,7 @@
      * 列表
      */
     @GetMapping("/list")
-    @ApiOperation(value = "商品管理-门店特殊售价-列表", tags = {"管理后台"})
+    @ApiOperation(value = "列表", tags = {"管理后台-商品管理-门店特殊售价"})
     public R<Page<GoodsBargainPrice>> list(@ApiParam("页码") @RequestParam(value = "pageNum", required = false) Integer pageNum,
                                            @ApiParam("每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize,
                                            @ApiParam("商品id") @RequestParam(value = "goodsId", required = false) Integer goodsId,
@@ -176,28 +178,48 @@
                 .eq(!CollectionUtils.isEmpty(goodsIds), GoodsBargainPrice::getGoodsId, goodsId)
                 .eq(auditStatus != null, GoodsBargainPrice::getAuditStatus, auditStatus));
 
-        page.getRecords().forEach(goodsBargainPrice -> {
-            goodsList.stream()
-                    .filter(goods -> goods.getId().equals(goodsBargainPrice.getGoodsId()))
-                    .findFirst().ifPresent(g -> {
-                        GoodsCategory goodsCategory = goodsCategoryService.getById(g.getGoodsCategoryId());
-                        Integer shopId = goodsBargainPrice.getShopId();
-                        Shop shop = shopService.getById(shopId);
-                        R<AppUser> r = appUserClient.getAppUserByPhone(shop.getPhone());
-                        if (R.isError(r)){
-                            throw new RuntimeException("获取店长信息失败");
-                        }
-                        goodsBargainPrice.setOwnerName(r.getData().getName());
-                        goodsBargainPrice.setOwnerPhone(shop.getPhone());
-                        goodsBargainPrice.setShopName(shop.getName());
-                        goodsBargainPrice.setGoodsName(g.getName());
-                        goodsBargainPrice.setCategoryName(goodsCategory.getName());
-                    });
-        });
+        page.getRecords().forEach(goodsBargainPrice -> goodsList.stream()
+                .filter(goods -> goods.getId().equals(goodsBargainPrice.getGoodsId()))
+                .findFirst().ifPresent(g -> {
+                    GoodsCategory goodsCategory = goodsCategoryService.getById(g.getGoodsCategoryId());
+                    Integer shopId = goodsBargainPrice.getShopId();
+                    Shop shop = shopService.getById(shopId);
+                    R<AppUser> r = appUserClient.getAppUserByPhone1(shop.getPhone());
+                    if (R.isError(r)){
+                        throw new RuntimeException("获取店长信息失败");
+                    }
+                    goodsBargainPrice.setOwnerName(r.getData().getName());
+                    goodsBargainPrice.setOwnerPhone(shop.getPhone());
+                    goodsBargainPrice.setShopName(shop.getName());
+                    goodsBargainPrice.setGoodsName(g.getName());
+                    goodsBargainPrice.setCategoryName(goodsCategory.getName());
+                }));
 
         return R.ok(page);
     }
-
-
+    
+    
+    
+    
+    @ResponseBody
+    @GetMapping("/getGoodsBargainPriceInfo/{id}")
+    @ApiOperation(value = "获取商品特殊售价详情", tags = {"门店后台-商品管理"})
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "商品id", name = "id", required = true, dataType = "int"),
+    })
+    public R<GoodsBargainPriceInfo> getGoodsBargainPriceInfo(@PathVariable("id") Integer id){
+        GoodsBargainPriceInfo goodsBargainPriceInfo = goodsBargainPriceService.getGoodsBargainPriceInfo(id);
+        return R.ok(goodsBargainPriceInfo);
+    }
+    
+    
+    
+    
+    @ResponseBody
+    @GetMapping("/addGoodsBargainPrice/{id}")
+    @ApiOperation(value = "保存商品特殊售价", tags = {"门店后台-商品管理"})
+    public R addGoodsBargainPrice(@RequestBody AddGoodsBargainPriceVo vo){
+        return goodsBargainPriceService.addGoodsBargainPrice(vo);
+    }
 }
 

--
Gitblit v1.7.1