From b6b39120d597918d61f2a9ffd7beb875cd1f3d66 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 8 Jan 2025 17:54:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/canteen/vo/APPOnlineSpuVO.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/APPOnlineSpuVO.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/APPOnlineSpuVO.java
index ddb57f29e..92926665d 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/APPOnlineSpuVO.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/APPOnlineSpuVO.java
@@ -78,16 +78,16 @@ public class APPOnlineSpuVO {
 	* 商品价格，单位使用：分
 	*/
     @Schema(description="商品价格")
-	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+//	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+//	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
     private Integer price;
 
 	/**
 	* 市场价，单位使用：分
 	*/
     @Schema(description="市场价")
-	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
-	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+//	@JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+//	@JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
     private Integer marketPrice;
 
 	/**

From a4c45192c3abce175f94dc2d54f0bc1d4a6de847 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 8 Jan 2025 18:06:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/feign/RemoteOnlineCanteenSpuService.java      |  9 +++++++++
 .../controller/CanteenOnlineSpuController.java        | 11 +++++++++++
 2 files changed, 20 insertions(+)

diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteOnlineCanteenSpuService.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteOnlineCanteenSpuService.java
index d29be2be6..229d00a9c 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteOnlineCanteenSpuService.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteOnlineCanteenSpuService.java
@@ -51,6 +51,15 @@ public interface RemoteOnlineCanteenSpuService {
                                               @RequestParam(value = "merchantId") String merchantId);
 
 
+
+    /**
+     * 获取详情接口
+     * @param id spuid
+     * @return
+     */
+    @GetMapping("/canteenOnlineSpu/app/getCanteenSpuDetails")
+    R<APPOnlineSpuVO> getCanteenSpuDetails(@RequestParam(value = "id") Long id);
+
     /**
      * 扣减菜品库存
      * @param updateStockReqDTO
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java
index 95835d7bf..26c2a9c13 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenOnlineSpuController.java
@@ -141,6 +141,17 @@ public class CanteenOnlineSpuController {
         return canteenOnlineSpuService.getCanteenOnlineSpuList(categoryId,merchantId);
     }
 
+
+    @GetMapping("/app/getCanteenSpuDetails")
+    @Operation(summary = "获取详情接口" , description = "通过spu的id" )
+    public R<APPOnlineSpuVO> getCanteenSpuDetails(@RequestParam(value = "id") Long id ) {
+        CanteenOnlineSpuEntity canteenOnlineSpuEntity = canteenOnlineSpuService.getById(id);
+        APPOnlineSpuVO bean = BeanUtils.toBean(canteenOnlineSpuEntity, APPOnlineSpuVO.class);
+        return R.ok(bean);
+    }
+
+
+
     @PostMapping("/app/updateSkuStock")
     @SysLog("更新菜品库存")
     public R updateSkuStock(@RequestBody CanteenOnlineSpuUpdateStockReqDTO canteenOnlineSpuUpdateStockReqDTO) {