Merge branch 'refs/heads/xlj' into feature/order

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/api/ShopApiImpl.java

@@ -0,0 +1,27 @@
+package com.tashow.cloud.product.api;
+
+import com.tashow.cloud.product.service.CategoryService;
+import com.tashow.cloud.product.service.ShopDetailService;
+import com.tashow.cloud.productapi.api.product.CategoryApi;
+import com.tashow.cloud.productapi.api.product.ShopDetailApi;
+import com.tashow.cloud.productapi.api.product.dto.CategoryDO;
+import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController // 提供 RESTful API 接口，给 Feign 调用
+@Validated
+public class ShopApiImpl implements ShopDetailApi {
+
+    @Resource
+    private ShopDetailService shopDetailService;
+
+
+    @Override
+    public ShopDetailDO getShopInfo(Long id) {
+        return shopDetailService.getShopDetail(id);
+    }
+}

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

@@ -32,7 +32,7 @@ import static com.tashow.cloud.web.apilog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 店铺信息")
 @RestController
-@RequestMapping("/tz/shop-detail")
+@RequestMapping("/shop")
 @Validated
 public class ShopDetailController {