1

src/main/java/net/chenlin/dp/common/support/orm/db/DataSourceEnum.java

@@ -10,7 +10,8 @@ public enum DataSourceEnum {
 
     SLAVE("slave-data-source", false),
 
-    SLAVE2("slave-data-source999",false),
+    SLAVE2("slave-data-source02",false),
+    SLAVE3("slave-data-source03",false),
 
     LAST("last-data-source",false);
 

src/main/java/net/chenlin/dp/common/support/orm/db/DynamicDataSourceConfig.java

@@ -36,20 +36,27 @@ public class DynamicDataSourceConfig {
     }
 
     @Bean
-    @ConfigurationProperties("spring.datasource.druid.slave-data-source999")
+    @ConfigurationProperties("spring.datasource.druid.slave-data-source02")
     public DataSource slave2DataSource(){
         return DruidDataSourceBuilder.create().build();
     }
 
+    @Bean
+    @ConfigurationProperties("spring.datasource.druid.slave-data-source03")
+    public DataSource slave3DataSource(){
+        return DruidDataSourceBuilder.create().build();
+    }
+
 
     @Bean
     @Primary
     public DynamicDataSource dataSource(DataSource defaultDataSource,DataSource slaveDataSource) {
-        Map<String, DataSource> targetDataSources = new HashMap<>(4);
+        Map<String, DataSource> targetDataSources = new HashMap<>(5);
         targetDataSources.put(DataSourceEnum.MASTER.getName(), defaultDataSource);
         targetDataSources.put(DataSourceEnum.SLAVE.getName(), slaveDataSource);
         targetDataSources.put(DataSourceEnum.LAST.getName(), lastDataSource());
         targetDataSources.put(DataSourceEnum.SLAVE2.getName(), slave2DataSource());
+        targetDataSources.put(DataSourceEnum.SLAVE3.getName(), slave3DataSource());
         return new DynamicDataSource(defaultDataSource, targetDataSources);
     }
 }

src/main/java/net/chenlin/dp/modules/api/controller/SaleOrderController.java

@@ -96,6 +96,7 @@ public class SaleOrderController {
      * 销售订单
      */
     public void SaleOrder() throws OpenAPIException {
+
         service.getToaccount();
         service.ISaleOrder();
     }

src/main/java/net/chenlin/dp/modules/api/mapper/SaleOrderMapper.xml

@@ -290,7 +290,7 @@
 		(	#{saleOrderFTHMins.autoid},
 			#{saleOrderFTHMins.dlid},
 			#{saleOrderFTHMins.icorid},
-			#{saleOrderFTHMins.cwhcode},
+			'98',
 			#{saleOrderFTHMins.cinvcode},
 			#{saleOrderFTHMins.iquantity},
 			#{saleOrderFTHMins.inum},

src/main/java/net/chenlin/dp/modules/api/service/SaleOrderService.java

@@ -419,7 +419,7 @@ public class SaleOrderService {
             if (saleOrderFTHS!=null&&saleOrderFTHS.size()>0){
                 for (SaleOrderFTH i:saleOrderFTHS){
                     BigDecimal bigDecimal=new BigDecimal(id);
-                    BigDecimal bigDecimal1=new BigDecimal("1");
+                    BigDecimal bigDecimal1=new BigDecimal("10");
                     BigDecimal add = bigDecimal.add(bigDecimal1);
                     String cid=i.getDlid();
                     i.setPoid("75");
@@ -441,7 +441,7 @@ public class SaleOrderService {
                         if (saleOrderFTHMins!=null &&saleOrderFTHMins.size()>0){
                             for (SaleOrderFTHMin ls:saleOrderFTHMins){
                                 BigDecimal a=new BigDecimal(s);
-                                BigDecimal b=new BigDecimal("1");
+                                BigDecimal b=new BigDecimal("10");
                                 BigDecimal c = a.add(b);
                                 ls.setAutoid(c.toString());
                                 ls.setDlid(add.toString());
@@ -546,7 +546,7 @@ public class SaleOrderService {
             if (saleOrderBJS!=null&&saleOrderBJS.size()>0){
                 for (SaleOrderBJ i:saleOrderBJS){
                     BigDecimal a=new BigDecimal(s);
-                    BigDecimal b=new BigDecimal("1");
+                    BigDecimal b=new BigDecimal("10");
                     BigDecimal add = a.add(b);
                      String cid=i.getID();
                     i.setID(add.toString());
@@ -562,7 +562,7 @@ public class SaleOrderService {
                     if (saleOrderBJMins!=null&&saleOrderBJMins.size()>0){
                         for (SaleOrderBJMin t:saleOrderBJMins){
                             BigDecimal a1=new BigDecimal(st);
-                            BigDecimal b1=new BigDecimal("1");
+                            BigDecimal b1=new BigDecimal("10");
                             BigDecimal add1 = a1.add(b1);
                             t.setID(add.toString());
                             t.setAutoID(add1.toString());
@@ -602,7 +602,7 @@ public class SaleOrderService {
             if (saleOrderFTHS!=null&&saleOrderFTHS.size()>0){
                 for (SaleOrderFTH i:saleOrderFTHS){
                     BigDecimal bigDecimal=new BigDecimal(id);
-                    BigDecimal bigDecimal1=new BigDecimal("1");
+                    BigDecimal bigDecimal1=new BigDecimal("10");
                     BigDecimal add = bigDecimal.add(bigDecimal1);
                     String cid=i.getDlid();
                     i.setPoid("75");
@@ -623,7 +623,7 @@ public class SaleOrderService {
                         if (saleOrderFTHMins!=null &&saleOrderFTHMins.size()>0){
                             for (SaleOrderFTHMin ls:saleOrderFTHMins){
                                 BigDecimal a=new BigDecimal(s);
-                                BigDecimal b=new BigDecimal("1");
+                                BigDecimal b=new BigDecimal("10");
                                 BigDecimal c = a.add(b);
                                 ls.setAutoid(c.toString());
                                 ls.setDlid(add.toString());

src/main/resources/application-sit.yml

@@ -6,21 +6,35 @@ spring:
         driverClassName: com.mysql.jdbc.Driver
         url: jdbc:mysql://127.0.0.1:3306/jinmilong?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
         username: root
-        password: root
+        password: 123
       slave-data-source:
         driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
         url: jdbc:sqlserver://10.0.0.199:1433;DatabaseName=UFDATA_998_2021
         username: sa
         password: 123@qaz
+      slave-data-source02:
+        driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        url: jdbc:sqlserver://10.0.0.199:1433;DatabaseName=UFDATA_999_2014
+        username: sa
+        password: 123@qaz
+      slave-data-source03:
+        driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        url: jdbc:sqlserver://10.0.0.199:1433;DatabaseName=UFDATA_999_2014
+        username: sa
+        password: 123@qaz
       last-data-source:
+#        driverClassName: com.mysql.jdbc.Driver
+#        url: jdbc:mysql://127.0.0.1:3306/crm_u8_system?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#        username: root
+#        password: 123
         driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
         url: jdbc:sqlserver://10.0.0.199:1433;DatabaseName=CRM_U8_System
         username: sa
         password: 123@qaz
 #      slave-data-source:
 #        driverClassName: oracle.jdbc.driver.OracleDriver
-#        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
-#        username: system
+#        url: jdbc:oracle:thin:@139.196.93.8:1521:gxhq
+#        username: icappx
 #        password: 1
       initial-size: 10
       max-active: 100