From a312e70d3bcb91c2cb5a77d2c239a9431cbb0dc7 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 24 五月 2024 11:47:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java
index ba42bb0..df8f693 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/GoodsSkuController.java
@@ -1,17 +1,15 @@
package com.ruoyi.goods.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.goods.domain.pojo.GoodsSku;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.goods.domain.GoodsSku;
import com.ruoyi.goods.service.IGoodsSkuService;
+import javax.annotation.Resource;
+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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
/**
* <p>
@@ -32,11 +30,19 @@
* 获取当前商品信息
*
*/
- @RequestMapping("/getGoodsSkuOne")
+ @PostMapping("/getGoodsSkuOne")
@ResponseBody
- public GoodsSku getGoodsSkuOne(Integer goodsSkuId) {
+ public R<GoodsSku> getGoodsSkuOne(@RequestBody Integer goodsSkuId) {
GoodsSku goodsSkuOne=iGoodsSkuService.getById(goodsSkuId);
- return goodsSkuOne;
+ return R.ok(goodsSkuOne);
+
+ }
+
+
+ @PostMapping("/updateGoodsSkuOne")
+ @ResponseBody
+ public R<Boolean> updateGoodsSkuOne(@RequestBody GoodsSku goodsSku) {
+ return R.ok(iGoodsSkuService.updateById(goodsSku));
}
--
Gitblit v1.7.1