调整产品

tashow-feign/tashow-product-api/src/main/java/com/tashow/cloud/productapi/api/product/ProdApi.java

@@ -1,11 +1,13 @@
 package com.tashow.cloud.productapi.api.product;
 
+import com.tashow.cloud.common.pojo.CommonResult;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.productapi.api.product.dto.ProdDO;
 import com.tashow.cloud.productapi.api.product.vo.prod.ProdListVO;
 import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO;
 import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO;
 import com.tashow.cloud.productapi.enums.ApiConstants;
+import jakarta.annotation.security.PermitAll;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -22,8 +24,9 @@ public interface ProdApi {
      * @return 编号
      */
 
-    @GetMapping(PREFIX + "/getProdInfo1")
+    @GetMapping(PREFIX + "/getProdInfo")
-    ProdDO getProdInfo(@RequestParam(value = "id", required = false) Long id);
+    @PermitAll
+    CommonResult<ProdDO> getProdInfo(@RequestParam(value = "id", required = false) Long id);
 
     /**
      * 获取商品服务配置

tashow-framework/tashow-framework-env/src/main/java/com/tashow/cloud/env/config/EnvEnvironmentPostProcessor.java

@@ -33,7 +33,7 @@ public class EnvEnvironmentPostProcessor implements EnvironmentPostProcessor {
             environment.getSystemProperties().put(hostNameKey, EnvUtils.getHostName());
         }
 
-        // 1.1 如果没有 yudao.env.tag 配置项，则不进行配置项的修改
+        // 1.1 如果没有 tashow.env.tag 配置项，则不进行配置项的修改
         String tag = EnvUtils.getTag(environment);
         if (StrUtil.isEmpty(tag)) {
             return;

tashow-framework/tashow-framework-security/src/main/java/com/tashow/cloud/security/security/config/WebSecurityConfigurerAdapter.java

@@ -136,7 +136,7 @@ public class WebSecurityConfigurerAdapter {
                     .requestMatchers(HttpMethod.DELETE, permitAllUrls.get(HttpMethod.DELETE).toArray(new String[0])).permitAll()
                     .requestMatchers(HttpMethod.HEAD, permitAllUrls.get(HttpMethod.HEAD).toArray(new String[0])).permitAll()
                     .requestMatchers(HttpMethod.PATCH, permitAllUrls.get(HttpMethod.PATCH).toArray(new String[0])).permitAll()
-                    // 1.3 基于 yudao.security.permit-all-urls 无需认证
+                    // 1.3 基于 tashow.security.permit-all-urls 无需认证
                     .requestMatchers(securityProperties.getPermitAllUrls().toArray(new String[0])).permitAll()
                 )
                 // ②：每个项目的自定义规则

tashow-module/tashow-module-product/src/main/java/com/tashow/cloud/product/ProductServerApplication.java

@@ -1,10 +1,8 @@
 package com.tashow.cloud.product;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
+import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 应用服务启动类

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

@@ -1,17 +1,14 @@
 package com.tashow.cloud.product.api;
 
+import com.tashow.cloud.common.pojo.CommonResult;
 import com.tashow.cloud.common.pojo.PageResult;
 import com.tashow.cloud.product.service.ProdService;
-import com.tashow.cloud.product.service.ShopDetailService;
 import com.tashow.cloud.productapi.api.product.ProdApi;
-import com.tashow.cloud.productapi.api.product.ShopDetailApi;
 import com.tashow.cloud.productapi.api.product.dto.ProdDO;
-import com.tashow.cloud.productapi.api.product.dto.ShopDetailDO;
 import com.tashow.cloud.productapi.api.product.vo.prod.ProdListVO;
 import com.tashow.cloud.productapi.api.product.vo.prod.ProdPageReqVO;
 import com.tashow.cloud.productapi.api.product.vo.prod.ProdServiceVO;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,8 +20,8 @@ public class ProdImpl implements ProdApi {
     private ProdService prodService;
 
     @Override
-    public ProdDO getProdInfo(Long id) {
+    public CommonResult<ProdDO> getProdInfo(Long id) {
-        return prodService.getProd(id);
+        return CommonResult.success(prodService.getProd(id));
     }
 
     @Override

tashow-module/tashow-module-trade/src/main/java/com/tashow/cloud/trade/controller/admin/order/TradeOrderController.java

@@ -163,8 +163,8 @@ public class TradeOrderController {
         //获取交易订单详情
         TradeOrderItemDO orderItem = tradeOrderQueryService.getOrderItem(reqVo.getItemId());
         //获取产品详情
-        ProdDO prodInfo = prodApi.getProdInfo(reqVo.getSpuId());
+        CommonResult<ProdDO> prodInfo = prodApi.getProdInfo(reqVo.getSpuId());
-        return success(TradeOrderConvert.INSTANCE.convert(orderItem,prodInfo));
+        return success(TradeOrderConvert.INSTANCE.convert(orderItem,prodInfo.getData()));
     }
 
     /**