增加各个公共服务的访问地址

src/main/java/com/uas/ps/inquiry/AccessConfiguration.java

@@ -0,0 +1,41 @@
+package com.uas.ps.inquiry;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 获取本地配置的相关信息
+ *
+ * Created by hejq on 2018-01-27.
+ */
+@Configuration
+public class AccessConfiguration {
+
+    /**
+     * 公共物料访问地址
+     */
+    @Value("${ps.product.url}")
+    private String PsProductUrl;
+
+    /**
+     * 公共物料访问地址
+     */
+    @Value("${ps.message.url}")
+    private String PsMessageUrl;
+
+    public String getPsProductUrl() {
+        return PsProductUrl;
+    }
+
+    public void setPsProductUrl(String psProductUrl) {
+        PsProductUrl = psProductUrl;
+    }
+
+    public String getPsMessageUrl() {
+        return PsMessageUrl;
+    }
+
+    public void setPsMessageUrl(String psMessageUrl) {
+        PsMessageUrl = psMessageUrl;
+    }
+}

src/main/java/com/uas/ps/inquiry/service/impl/PublicInquiryServiceImpl.java

@@ -1,9 +1,11 @@
 package com.uas.ps.inquiry.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.uas.ps.core.util.ContextUtils;
 import com.uas.ps.entity.Product;
 import com.uas.ps.entity.ProductUsers;
 import com.uas.ps.entity.Status;
+import com.uas.ps.inquiry.AccessConfiguration;
 import com.uas.ps.inquiry.dao.*;
 import com.uas.ps.inquiry.entity.*;
 import com.uas.ps.inquiry.model.*;
@@ -118,6 +120,16 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      */
     private final String CONSUMERAPP = "B2B,MALL,ERP";
 
+    /**
+     * 公共物料访问地址
+     */
+    private final String PS_PRODUCT_URL = ContextUtils.getBean(AccessConfiguration.class).getPsProductUrl();
+
+    /**
+     * 公共消息访问地址
+     */
+    private final String PS_MESSAGE_URL = ContextUtils.getBean(AccessConfiguration.class).getPsMessageUrl();
+
     /**
      * 保存公共询价信息
      *
@@ -160,7 +172,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
      */
     private void notify(List<PurcInquiryItem> inquiryItems) {
         for (PurcInquiryItem item : inquiryItems) {
-            String url = "http://192.168.253.12:24000/productuser/getProductUsersByEnUUAndCmpCode";
+            String url = PS_PRODUCT_URL + "/productuser/getProductUsersByEnUUAndCmpCode";
             JSONObject formData = new JSONObject();
             formData.put("enUU", item.getInquiry().getEnUU());
             formData.put("cmpCode", item.getCmpCode());
@@ -216,7 +228,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
             @Override
             public void run() {
                 try {
-                    HttpUtil.doPost("http://192.168.253.131:8080", FlexJsonUtils.toJsonDeep(models));
+                    HttpUtil.doPost(PS_MESSAGE_URL, FlexJsonUtils.toJsonDeep(models));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -271,6 +283,7 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             item.setUserName(batch.getEm_name());
                             item.setUserTel(batch.getBip_mobile());
                             item.setUserCode(batch.getBip_buyercode());
+                            item.setOfferAmount(0);
                             if(null != inquiry.getBi_date()) {
                                 item.setDate(inquiry.getBi_date());
                             } else {
@@ -676,9 +689,10 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                         info.expression(PredicateUtils.lte("date", new Date(filter.getEndDate()), false));
                     }
                     if (!StringUtils.isEmpty(filter.getKeyword())) {
-                        SimpleExpression code = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
+                        SimpleExpression cmpCode = new SimpleExpression("cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
                         SimpleExpression brand = new SimpleExpression("inbrand", filter.getKeyword(), CriterionExpression.Operator.LIKE);
-                        SimpleExpression[] simpleExpressions = new SimpleExpression[]{code, brand};
+                        SimpleExpression code = new SimpleExpression("product.cmpCode", filter.getKeyword(), CriterionExpression.Operator.LIKE);
+                        SimpleExpression[] simpleExpressions = new SimpleExpression[]{cmpCode, code, brand};
                         LogicalExpression logicalExpression = PredicateUtils.or(simpleExpressions);
                         info.expression(logicalExpression);
                     }

src/main/resources/config/application-cloud.properties

@@ -0,0 +1,23 @@
+#datasource.url=jdbc:mysql://192.168.253.12:3306/public_resources?characterEncoding=utf-8&useSSL=false
+#datasource.username=root
+#datasource.password=select111***
+#datasource.driverClassName=com.mysql.jdbc.Driver
+#datasource.initialSize=1
+#datasource.minIdle=1
+#datasource.maxActive=20
+#datasource.maxWait=60000
+#datasource.timeBetweenEvictionRunsMillis=60000
+#datasource.minEvictableIdleTimeMillis=300000
+#datasource.validationQuery=SELECT 1 FROM DUAL
+#datasource.testWhileIdle=true
+#datasource.testOnBorrow=true
+#datasource.testOnReturn=false
+#datasource.poolPreparedStatements=true
+#datasource.timeBetweenLogStatsMillis=60000
+#datasource.maxPoolPreparedStatementPerConnectionSize=20
+#datasource.filters=stat,slf4j
+#datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+# Access path
+ps.product.url=https://api-product.usoftmall.com/
+ps.message.url=https://api-message.ubtob.com/

src/main/resources/config/application-dev.properties

@@ -16,4 +16,8 @@ datasource.poolPreparedStatements=true
 datasource.timeBetweenLogStatsMillis=60000
 datasource.maxPoolPreparedStatementPerConnectionSize=20
 datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+# Access path
+ps.product.url=http://192.168.253.12:24000/product/
+ps.message.url=http://192.168.253.12:24000/message/

src/main/resources/config/application-test.properties

@@ -16,4 +16,8 @@ datasource.poolPreparedStatements=true
 datasource.timeBetweenLogStatsMillis=60000
 datasource.maxPoolPreparedStatementPerConnectionSize=20
 datasource.filters=stat,slf4j
-datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+datasource.connectionProperties=druid.stat.mergeSql=false;druid.stat.slowSqlMillis=5000
+
+# Access path
+ps.product.url=http://192.168.253.12:24000/product/
+ps.message.url=http://192.168.253.12:24000/message/