dockerfile jdk修改

2026-02-10 17:47:33 +08:00
12 changed files with 44 additions and 104 deletions
@@ -12,15 +12,11 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+        server-addr: 10.33.0.129:6010
+        # 线上测试环境配置 容器名+端口号
      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
        #线上正式环境
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
@@ -13,15 +13,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -13,15 +13,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -18,15 +18,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -16,15 +16,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 开启nacos自动刷新，如果这个配置没有或者为false会导致配置不能自动刷新
@@ -110,9 +110,9 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
    private TmsReceiptMapper tmsReceiptMapper;
    //nc测试环境地址
    private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
-    private String zsurl="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
+
    //nc正式环境地址
-    //private String zsurl="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
+    private String zsurl="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
    /**
     * 查询对账单列表
     */
@@ -488,13 +488,10 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                item.setQuantity_de("0");
                                item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight()));
                                item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight()));
-                                BigDecimal rate=tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100));
-                                BigDecimal taxRate=BigDecimal.ONE.add(rate);
-                              //  BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
-                                BigDecimal notax_de=tmsOrder.getDeliveryFreight().divide(taxRate,2,BigDecimal.ROUND_HALF_UP);
-                                BigDecimal tax_de=notax_de.multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+                                BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+                                BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
                                item.setNotax_de(String.valueOf(notax_de));
-                                item.setLocal_tax_de(String.valueOf(tax_de));
+                                item.setLocal_tax_de(String.valueOf(notax_de));
                                item.setTax_de(String.valueOf(tax_de));
                                item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight()));
                                item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
@@ -689,20 +686,16 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                        item.setMoney_de(String.valueOf(reconciliationAccount.getAmount()));
                                        item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount()));
                                        if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){
-                                            BigDecimal rate=reconciliationAccount.getRate().divide(BigDecimal.valueOf(100));
-                                            BigDecimal taxRate=BigDecimal.ONE.add(rate);
-                                            //  BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
-                                            BigDecimal notax_de=reconciliationAccount.getAmount().divide(taxRate,2,BigDecimal.ROUND_HALF_UP);
-                                            BigDecimal tax_de=notax_de.multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
-
+                                            BigDecimal tax_de=reconciliationAccount.getAmount().multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+                                            BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
                                            item.setNotax_de(String.valueOf(notax_de));
-                                            item.setLocal_tax_de(String.valueOf(tax_de));
+                                            item.setLocal_tax_de(String.valueOf(notax_de));
                                            item.setTax_de(String.valueOf(tax_de));
                                        }else{
                                            BigDecimal tax_de=BigDecimal.ZERO;
                                            BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
                                            item.setNotax_de(String.valueOf(notax_de));
-                                            item.setLocal_tax_de(String.valueOf(tax_de));
+                                            item.setLocal_tax_de(String.valueOf(notax_de));
                                            item.setTax_de(String.valueOf(tax_de));
                                        }
                                        item.setPrice(String.valueOf(reconciliationAccount.getAmount()));
@@ -1215,4 +1208,4 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
        }
        return true;
    }
-}
+}
@@ -18,15 +18,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -16,14 +16,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
+        namespace:   # 命名空间id
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
@@ -18,15 +18,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -18,15 +18,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -18,15 +18,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -13,15 +13,10 @@ spring:
  cloud:
    nacos:
      discovery:
-        #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-      config:
+        server-addr: 10.33.0.129:6010
        # 线上测试环境配置 容器名+端口号
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
+      config:
+        server-addr: 10.33.0.129:6010
        # 配置文件格式
        file-extension: yml
        # 共享配置