From b2e0cca80441aa1ac9ad698881cde1a10605e5de Mon Sep 17 00:00:00 2001
From: xuelijun <977662702@qq.com>
Date: Fri, 24 Oct 2025 17:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productapi/api/product/vo/prod/ProdListVO.java   |  4 ++++
 .../product/controller/admin/ProdController.java     | 12 +++++-------
 .../src/main/resources/mapper/product/ProdMapper.xml |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java
index d4ae332..734bf15 100644
--- a/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java
+++ b/tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/vo/prod/ProdListVO.java
@@ -70,6 +70,10 @@ public class ProdListVO {
      * 还剩多少天
      */
     private Long remainingDays;
+    /**
+     * 图片
+     */
+    private String pic;
 
     /**
      * 审核备注
diff --git a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java
index 93a7716..fbdf2a4 100644
--- a/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java
+++ b/tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java
@@ -121,15 +121,13 @@ public class ProdController {
 
 
 
-/*
-    @GetMapping("/get")
-    @Operation(summary = "获得商品")
+    @GetMapping("/getProdInfo")
+    @Operation(summary = "获得商品详情a")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('tashow-module-product:prod:query')")
-    public CommonResult<ProdRespVO> getProd(@RequestParam("id") Long id) {
+    public CommonResult<ProdDO> getProdInfo(@RequestParam("id") Long id) {
         ProdDO prod = prodService.getProd(id);
-        return success(BeanUtils.toBean(prod, ProdRespVO.class));
-    }*/
+        return success(prod);
+    }
 
     @PermitAll
     @GetMapping("/page")
diff --git a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
index 1d744e7..7aed837 100644
--- a/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
+++ b/tashow-module/tashow-module-product/src/main/resources/mapper/product/ProdMapper.xml
@@ -585,7 +585,7 @@
 
     <select id="getProdPageList" resultMap="ProdListMap" >
         select tp.prod_id,tp.prod_name,tp.category_name,tp.shop_id,tsd.shop_name,tpsa.area_name,min_eri.response_hours,
-        tprc.reservation_time_slots,tp.delete_time,tp.create_time,tp.update_time,tp.status,tp.is_prohibit,
+        tprc.reservation_time_slots,tp.delete_time,tp.create_time,tp.update_time,tp.status,tp.is_prohibit,tp.pic,
         tp.process_notes processNotes
         from tz_prod tp
         left join tz_shop_detail tsd on tp.shop_id = tsd.shop_id