Merge remote-tracking branch 'origin/dev' into dev

README.md

@@ -1 +1,14 @@
-## Inquiry Service
+# Description
+This is Inquiry Service.
+
+# Deploy
+### Test
+* Visit [Jenkins](http://10.10.100.200:5001/job/ps-inquiry.test/)
+* Click "立即构建"
+
+### Production
+* Visit [Jenkins](http://10.10.100.200:5001/job/ps-inquiry.prod.package/)
+* Click "立即构建"
+* Visit [Jenkins](http://119.147.37.222:9091/job/ps-inquiry/)
+* Click "Build with Parameters"
+* Click "开始构建"

src/main/java/com/uas/ps/inquiry/model/Enterprise.java

@@ -4,7 +4,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -52,6 +51,12 @@ public class Enterprise implements Serializable {
     @Column(name = "en_businesscode")
     private  String businesscode;
 
+    /**
+     * 企业管理员UU
+     */
+    @Column(name = "en_adminuu")
+    private Long adminUU;
+
     public Long getUu() {
         return uu;
     }
@@ -92,6 +97,14 @@ public class Enterprise implements Serializable {
         this.businesscode = businesscode;
     }
 
+    public Long getAdminUU() {
+        return adminUU;
+    }
+
+    public void setAdminUU(Long adminUU) {
+        this.adminUU = adminUU;
+    }
+
     @Override
     public String toString() {
         return "Enterprise{" +
@@ -100,6 +113,7 @@ public class Enterprise implements Serializable {
                 ", enTel='" + enTel + '\'' +
                 ", enAddress='" + enAddress + '\'' +
                 ", businesscode='" + businesscode + '\'' +
+                ", adminUU=" + adminUU +
                 '}';
     }
 }

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

@@ -206,7 +206,12 @@ public class PublicInquiryServiceImpl implements PublicInquiryService {
                             model.setReceiverEnuu(user.getEnuu());
                             model.setReceiverUu(user.getUseruu());
                             model.setSenderEnuu(item.getInquiry().getEnUU());
-                            model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
+                            if (null != item.getUserUU() || null != item.getInquiry().getRecorderUU()) {
+                                model.setSenderUu(item.getUserUU() != null ? item.getUserUU() : item.getInquiry().getRecorderUU());
+                            } else {
+                               Enterprise enterprise = enterpriseDao.findOne(item.getInquiry().getEnUU());
+                               model.setSenderUu(null != enterprise ? enterprise.getAdminUU() : 0L);
+                            }
                             model.setSmsType(SMS_TYPE);
                             model.setMailTemplate(MAIL_TEMP_ID);
                             model.setSmTemplate(SMS_TEMP_ID);

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

@@ -19,7 +19,5 @@ 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.product.url=10.10.0.197:8080
-ps.message.url=https://api-message.ubtob.com/
+ps.product.url=https://api-product.usoftmall.com/
+ps.message.url=http://api-message.ubtob.com/

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

@@ -1,4 +1,4 @@
-datasource.url=jdbc:mysql://192.168.253.12:3306/public_resources?characterEncoding=utf-8&useSSL=false
+datasource.url=jdbc:mysql://192.168.253.12:3306/mall_test_dev?characterEncoding=utf-8&useSSL=false
 datasource.username=root
 datasource.password=select111***
 datasource.driverClassName=com.mysql.jdbc.Driver
@@ -19,5 +19,9 @@ datasource.filters=stat,slf4j
 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/
+#ps.product.url=http://192.168.253.12:24000/product/
+#dong localhost
+ps.product.url=http://192.168.253.102:8080/
+ps.message.url=http://192.168.253.12:24000/message/
+# wang localhost
+#ps.message.url=http://192.168.253.131:20000/

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

@@ -19,5 +19,5 @@ datasource.filters=stat,slf4j
 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/
+ps.product.url=http://218.17.158.219:24000/product/
+ps.message.url=http://218.17.158.219:24000/message/