Merge remote-tracking branch 'origin/feature/order' into feature/order

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;
 
     /**
      * 审核备注

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/controller/admin/ProdController.java

@@ -121,15 +121,13 @@ public class ProdController {
 
 
 
-/*
+    @GetMapping("/getProdInfo")
-    @GetMapping("/get")
+    @Operation(summary = "获得商品详情a")
-    @Operation(summary = "获得商品")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('tashow-module-product:prod:query')")
+    public CommonResult<ProdDO> getProdInfo(@RequestParam("id") Long id) {
-    public CommonResult<ProdRespVO> getProd(@RequestParam("id") Long id) {
         ProdDO prod = prodService.getProd(id);
-        return success(BeanUtils.toBean(prod, ProdRespVO.class));
+        return success(prod);
-    }*/
+    }
 
     @PermitAll
     @GetMapping("/page")

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