Browse Source

怡海能达接口对接

zhouy 2 years ago
parent
commit
0d0863ca6b

+ 3 - 2
src/main/java/com/uas/eis/task/PnsDataSyncTask.java

@@ -95,7 +95,7 @@ public class PnsDataSyncTask {
         try {
             List<PNSSendData> sendSales = baseDao
                     .getJdbcTemplate()
-                    .query(" SELECT SUBSTR(YEAR_MONTH,1,4)||'-'||SUBSTR(YEAR_MONTH,5,2) ymonth,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,ROUND(SUM(QUANTITY),0) QUANTITY,CUST_ID,CUST_NAME FROM PNS_SENDDATADETAIL LEFT JOIN  PNS_SENDDATAMAIN ON PNS_SENDDATADETAIL.MM_ID=PNS_SENDDATAMAIN.MAIN_ID " +
+                    .query(" SELECT SUBSTR(YEAR_MONTH,1,4)||'-'||SUBSTR(YEAR_MONTH,5,2) ymonth,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,ROUND(SUM(QUANTITY),0) QUANTITY,CUST_ID,CUST_NAME FROM YHND_ZA.PNS_SENDDATADETAIL LEFT JOIN  YHND_ZA.PNS_SENDDATAMAIN ON PNS_SENDDATADETAIL.MM_ID=PNS_SENDDATAMAIN.MAIN_ID " +
                             "WHERE BILLSTATUS='已审核' AND UPLOAD=0 GROUP BY YEAR_MONTH,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,CUST_ID,CUST_NAME ORDER BY DATA_TYPE DESC,MODEL_NO_ISP ASC,CONFIRM_DATE ASC ", new BeanPropertyRowMapper<PNSSendData>(PNSSendData.class));
             int num = 0;
             for(PNSSendData sendSale : sendSales) {
@@ -108,7 +108,8 @@ public class PnsDataSyncTask {
                 sendSale.setCust_name("华商龙商务互联");
                 sendSale.setYmonth("2023-04");*/
             }
-            baseDao.execute("UPDATE PNS_SENDDATADETAIL SET UPLOAD=-1 WHERE UPLOAD=0");
+            baseDao.execute("UPDATE YHND_ZA.PNS_SENDDATADETAIL SET UPLOAD=-1 WHERE UPLOAD=0");
+            baseDao.execute("UPDATE YHND_ZA.PNS_SENDDATAMAIN SET UPLOAD_=-1 WHERE UPLOAD=0");
             return sendSales;
         } catch (EmptyResultDataAccessException e) {
             return null;

+ 5 - 5
src/main/resources/application-prod.yml

@@ -2,9 +2,9 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: HSL_PSI
+        username: DATACENTER
         password: select!#%*(
-        url: jdbc:oracle:thin:@10.10.10.103:1521:orcl
+        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 1
         maxActive: 3
         maxWait: 30000
@@ -31,6 +31,6 @@ action:
 
 extral:
     panasonic:
-        route: https://esb-prod.panasonic.cn/esb/open/api/ISP_customerEDI/route
-        if_key: 230522Sn33WtIQhgViiGGyBOwv4FOB
-        cust_id: 80946488
+        route: http://47.100.162.77:10001/esb/open/api/ISP_customerEDI/route
+        if_key: 231121PgjZV6okYcL4dCbQH5ifqfYO
+        cust_id: 80944724