Forráskód Böngészése

【越加红电子发票】

DINGYL 1 éve
szülő
commit
81a840bb77

+ 7 - 7
src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -47,7 +47,7 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public Map<String, Object> pushInvoiceOrder(String master, int id) {
         Map<String, Object> map = new HashMap<String, Object>();
-        Object[] obs = baseDao.getFieldsDataByCondition("YITOA_DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
+        Object[] obs = baseDao.getFieldsDataByCondition("DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
         String url = donlimConfig.getRoute();
         System.out.println(url);
         String appKey = donlimConfig.getAppKey();
@@ -63,7 +63,7 @@ public class ERPServiceImpl implements ERPService {
         logger.info("pushInvoiceOrder begin: master {} ,id {} ", master, id);
         SpObserver.putSp(master);
         SqlRowList rs_main = baseDao.queryForRowSet("select * from invoiceOrder left join customer on io_cucode=cu_code " +
-                " left join YITOA_DATACENTER.custinvoicemsg on ci_cucode = cu_code " +
+                " left join custinvoicemsg on ci_cucode = cu_code " +
                 " where io_id=" + id);
         if (rs_main.next()) {
             //String autoInvoiceFlag= baseDao.isDBSetting("InvoiceOrder", "autoInvoice")?"true":"false";
@@ -151,7 +151,7 @@ public class ERPServiceImpl implements ERPService {
 
     @Override
     public Map<String, Object> invoiceOrderSubmitKp(String master, int id) {
-        Object[] obs = baseDao.getFieldsDataByCondition("YITOA_DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
+        Object[] obs = baseDao.getFieldsDataByCondition("DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
         String url = donlimConfig.getRoute();
         System.out.println(url);
         String appKey = donlimConfig.getAppKey();
@@ -186,7 +186,7 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public Map<String, Object> findOrderState(String master, int id) {
         Map<String, Object> map = new HashMap<String, Object>();
-        Object[] obs = baseDao.getFieldsDataByCondition("YITOA_DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
+        Object[] obs = baseDao.getFieldsDataByCondition("DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
         if (obs == null) {
             return null;//对接信息为配置
         }
@@ -238,7 +238,7 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public Map<String, Object> cancelInvoiceOrder(String master, int id) {
         Map<String, Object> map = new HashMap<String, Object>();
-        Object[] obs = baseDao.getFieldsDataByCondition("YITOA_DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
+        Object[] obs = baseDao.getFieldsDataByCondition("DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
         if (obs == null) {
             return null;//对接信息为配置
         }
@@ -296,7 +296,7 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public Map<String, Object> getElecInvoicesById(String master, Integer id) {
         Map<String, Object> map = new HashMap<String, Object>();
-        Object[] obs = baseDao.getFieldsDataByCondition("YITOA_DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
+        Object[] obs = baseDao.getFieldsDataByCondition("DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
         if (obs == null) {
             return null;//对接信息为配置
         }
@@ -415,7 +415,7 @@ public class ERPServiceImpl implements ERPService {
     @Override
     public Map<String, Object> rushRed(String master, int id) {
         Map<String, Object> map = new HashMap<String, Object>();
-        Object[] obs = baseDao.getFieldsDataByCondition("YITOA_DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
+        Object[] obs = baseDao.getFieldsDataByCondition("DATACENTER.dock_invoice_config", new String[]{"appKey", "appSecret", "token", "taxnum"}, "username='" + master + "'");
         String url = donlimConfig.getRoute();
         String appKey = donlimConfig.getAppKey();
         String appSecret = donlimConfig.getAppSecret();

+ 6 - 6
src/main/java/com/uas/eis/task/ElecInvoiceTask.java

@@ -47,7 +47,7 @@ public class ElecInvoiceTask {
      * */
     @Scheduled(cron = "0 0/2 * * * ?")
     public void elecInvoiceDownLoad(){
-        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("YITOA_DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
+        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
         if(!CollectionUtil.isEmpty(obsList)){
             logger.info("ElecI-DownLoad Begin");
             for (Object[] obs: obsList) {
@@ -94,7 +94,7 @@ public class ElecInvoiceTask {
     @Scheduled(cron = "0 0/2 * * * ?")
     //PDF文件转存 一次转存
     public void elecInvoiceAttachSave(){
-        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("YITOA_DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
+        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
         if(!CollectionUtil.isEmpty(obsList)){
             logger.info("ElecI-AttachSave Begin");
             for (Object[] obs: obsList) {
@@ -169,7 +169,7 @@ public class ElecInvoiceTask {
     @Scheduled(cron = "0 0/2 * * * ?")
     //发票红字确认状态查询
     public void elecInvoiceRedConfirmStateUpdate(){
-        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("YITOA_DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
+        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
         if(!CollectionUtil.isEmpty(obsList)){
             logger.info("ElecI-RedConfirmStateUpdate Begin");
             for (Object[] obs: obsList) {
@@ -219,7 +219,7 @@ public class ElecInvoiceTask {
     //红票PDF地址获取
     @Scheduled(cron = "0 0/2 * * * ?")
     public void redPdfUrlUpdate(){
-        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("YITOA_DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
+        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
         if(!CollectionUtil.isEmpty(obsList)){
             logger.info("ElecI-redPdfUrlUpdate Begin");
             for (Object[] obs: obsList) {
@@ -262,7 +262,7 @@ public class ElecInvoiceTask {
     @Scheduled(cron = "0 0/2 * * * ?")
     //红字PDF文件转存 一次转存
     public void elecInvoiceRedAttachSave(){
-        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("YITOA_DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
+        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
         if(!CollectionUtil.isEmpty(obsList)){
             logger.info("ElecI-AttachSave Begin");
             for (Object[] obs: obsList) {
@@ -332,7 +332,7 @@ public class ElecInvoiceTask {
     //退货单 红票获取
     @Scheduled(cron = "0 0/2 * * * ?")
     public void saleReturnElecInvoiceDownLoad(){
-        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("YITOA_DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
+        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
         if(!CollectionUtil.isEmpty(obsList)){
             logger.info("RedReturnElecI-DownLoad Begin");
             for (Object[] obs: obsList) {

+ 1 - 1
src/main/java/com/uas/eis/task/InvoiceOrderTask.java

@@ -32,7 +32,7 @@ public class InvoiceOrderTask {
      * */
     @Scheduled(cron = "0 0/2 * * * ?")
     public void InvoiceOrderStateUpdate(){
-        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("YITOA_DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
+        List<Object[]> obsList=baseDao.getFieldsDatasByCondition("DATACENTER.dock_invoice_config",new String[]{"appKey","appSecret","token","taxnum","username"},"1=1");
         if(!CollectionUtil.isEmpty(obsList)){
             logger.info("InvoiceOrder-StateUpdate Begin");
             for (Object[] obs: obsList) {

+ 6 - 6
src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: YITOA_DATACENTER
+        username: DATACENTER
         password: select!#%*(
-        url: jdbc:oracle:thin:@10.10.10.103:1521:orcl
+        url: jdbc:oracle:thin:@10.1.81.208:11652:orcl
         initialSize: 1
         maxActive: 3
         maxWait: 30000
@@ -32,8 +32,8 @@ action:
 extral:
     donlim:
         route: https://sdk.nuonuo.com/open/v1/services
-        appKey : 78607195
-        appSecret : 26A860C451744A21
-        token  : 77f21f617f87135fcd97ef1ueud3dxdi
-        taxnum : 339901999999199
+        appKey : 29385114
+        appSecret : 3796A0A52D164BEA
+        token  : d3660b95d4e385b3025fd20t7e8jb00s
+        taxnum : 91440300685380148A
         isProd : true

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

@@ -2,9 +2,9 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: YITOA_DATACENTER
+        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
@@ -32,8 +32,8 @@ action:
 extral:
     donlim:
         route: https://sdk.nuonuo.com/open/v1/services
-        appKey: 47646161
-        appSecret: B6681C05C3EA4408
-        token:  3792fb46bc927024c7f6a504fzow07cs
-        taxnum: 91440300319521190W
+        appKey: 29385114
+        appSecret: 3796A0A52D164BEA
+        token:  d3660b95d4e385b3025fd20t7e8jb00s
+        taxnum: 91440300685380148A
         isProd: true