java110 5 роки тому
батько
коміт
bf0db3cd73

+ 19 - 0
service-goods/src/main/java/com/java110/goods/bmo/product/impl/GetProductBMOImpl.java

@@ -1,12 +1,14 @@
 package com.java110.goods.bmo.product.impl;
 package com.java110.goods.bmo.product.impl;
 
 
 import com.java110.dto.file.FileRelDto;
 import com.java110.dto.file.FileRelDto;
+import com.java110.dto.groupBuyProduct.GroupBuyProductDto;
 import com.java110.dto.product.ProductDto;
 import com.java110.dto.product.ProductDto;
 import com.java110.dto.product.ProductSpecDetailDto;
 import com.java110.dto.product.ProductSpecDetailDto;
 import com.java110.dto.productDetail.ProductDetailDto;
 import com.java110.dto.productDetail.ProductDetailDto;
 import com.java110.dto.productSpecValue.ProductSpecValueDto;
 import com.java110.dto.productSpecValue.ProductSpecValueDto;
 import com.java110.goods.bmo.product.IGetProductBMO;
 import com.java110.goods.bmo.product.IGetProductBMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
 import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.goods.IGroupBuyProductInnerServiceSMO;
 import com.java110.intf.goods.IProductDetailInnerServiceSMO;
 import com.java110.intf.goods.IProductDetailInnerServiceSMO;
 import com.java110.intf.goods.IProductInnerServiceSMO;
 import com.java110.intf.goods.IProductInnerServiceSMO;
 import com.java110.intf.goods.IProductSpecDetailInnerServiceSMO;
 import com.java110.intf.goods.IProductSpecDetailInnerServiceSMO;
@@ -38,6 +40,9 @@ public class GetProductBMOImpl implements IGetProductBMO {
     @Autowired
     @Autowired
     private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
     private IProductSpecDetailInnerServiceSMO productSpecDetailInnerServiceSMOImpl;
 
 
+    @Autowired
+    private IGroupBuyProductInnerServiceSMO groupBuyProductInnerServiceSMOImpl;
+
     /**
     /**
      * @param productDto
      * @param productDto
      * @return 订单服务能够接受的报文
      * @return 订单服务能够接受的报文
@@ -128,6 +133,8 @@ public class GetProductBMOImpl implements IGetProductBMO {
         }
         }
 
 
         freshProductSpecValue(productDtos);
         freshProductSpecValue(productDtos);
+        judgeGroupBuyProduct(productDtos.get(0));
+
 
 
         ProductDetailDto productDetailDto = new ProductDetailDto();
         ProductDetailDto productDetailDto = new ProductDetailDto();
         productDetailDto.setProductId(productDtos.get(0).getProductId());
         productDetailDto.setProductId(productDtos.get(0).getProductId());
@@ -141,6 +148,18 @@ public class GetProductBMOImpl implements IGetProductBMO {
         productDtos.get(0).setContent(productDetailDtos.get(0).getContent());
         productDtos.get(0).setContent(productDetailDtos.get(0).getContent());
     }
     }
 
 
+    private void judgeGroupBuyProduct(ProductDto productDto) {
+        //判断商品是否 拼团
+        GroupBuyProductDto groupBuyProductDto = new GroupBuyProductDto();
+        groupBuyProductDto.setProductId(productDto.getProductId());
+        groupBuyProductDto.setStoreId(productDto.getStoreId());
+        List<GroupBuyProductDto> groupBuyProductDtos = groupBuyProductInnerServiceSMOImpl.queryGroupBuyProducts(groupBuyProductDto);
+
+        if (groupBuyProductDtos == null || groupBuyProductDtos.size() < 1) {
+            return;
+        }
+    }
+
     private void freshProductSpecValue(List<ProductDto> productDtos) {
     private void freshProductSpecValue(List<ProductDto> productDtos) {
         ProductSpecValueDto productSpecValueDto = new ProductSpecValueDto();
         ProductSpecValueDto productSpecValueDto = new ProductSpecValueDto();
         productSpecValueDto.setProductId(productDtos.get(0).getProductId());
         productSpecValueDto.setProductId(productDtos.get(0).getProductId());

+ 1 - 1
service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java

@@ -62,7 +62,7 @@ public class ReportServiceApplicationStart {
      * @return restTemplate
      * @return restTemplate
      */
      */
     @Bean
     @Bean
-    public com.java110.core.client.RestTemplate outRestTemplate() {
+    public RestTemplate outRestTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
         RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
         return restTemplate;
         return restTemplate;

+ 31 - 0
service-sequence/src/main/java/com/java110/code/CodeServiceApplicationStart.java

@@ -4,6 +4,7 @@ package com.java110.code;
  * Hello world!
  * Hello world!
  */
  */
 
 
+import com.java110.core.client.RestTemplate;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.constant.ResponseConstant;
 import com.java110.utils.exception.StartException;
 import com.java110.utils.exception.StartException;
 import com.java110.utils.factory.ApplicationContextFactory;
 import com.java110.utils.factory.ApplicationContextFactory;
@@ -18,12 +19,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.converter.StringHttpMessageConverter;
 
 
 import java.net.InetAddress;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.net.UnknownHostException;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -44,6 +50,31 @@ public class CodeServiceApplicationStart {
     protected final static Logger logger = LoggerFactory.getLogger(CodeServiceApplicationStart.class);
     protected final static Logger logger = LoggerFactory.getLogger(CodeServiceApplicationStart.class);
 
 
 
 
+    /**
+     * 实例化RestTemplate,通过@LoadBalanced注解开启均衡负载能力.
+     *
+     * @return restTemplate
+     */
+    @Bean
+    @LoadBalanced
+    public RestTemplate restTemplate() {
+        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
+        return restTemplate;
+    }
+
+    /**
+     * 实例化RestTemplate
+     *
+     * @return restTemplate
+     */
+    @Bean
+    public RestTemplate outRestTemplate() {
+        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
+        return restTemplate;
+    }
+
     public static void main(String[] args) throws Exception {
     public static void main(String[] args) throws Exception {
 
 
         ApplicationContext context = SpringApplication.run(CodeServiceApplicationStart.class, args);
         ApplicationContext context = SpringApplication.run(CodeServiceApplicationStart.class, args);