dockerfile jdk修改

Merge branch 'test'
# Conflicts: # mhd-auth/src/main/resources/bootstrap.yml # mhd-gateway/src/main/resources/bootstrap.yml # mhd-modules/mhd-system/src/main/resources/bootstrap.yml # mhd-user-center/src/main/resources/bootstrap.yml # mhd_bms/src/main/resources/bootstrap.yml # mhd_finance/src/main/resources/bootstrap.yml # mhd_oms/src/main/resources/bootstrap.yml # mhd_product/src/main/resources/bootstrap.yml # mhd_thrid_party/src/main/resources/bootstrap.yml # mhd_transport/src/main/resources/bootstrap.yml # mhd_wms/src/main/resources/bootstrap.yml
2026-02-10 17:47:09 +08:00 · 2026-02-10 11:30:27 +08:00 · 2026-02-10 11:22:51 +08:00 · 2026-02-10 11:18:36 +08:00 · 2026-02-09 14:59:37 +08:00 · 2026-01-20 16:04:51 +08:00
12 changed files with 104 additions and 44 deletions
@@ -12,11 +12,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        #线上正式环境
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
@@ -13,10 +13,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -13,10 +13,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -18,10 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -16,10 +16,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        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,10 +488,13 @@ 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 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);
+                                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);
                                item.setNotax_de(String.valueOf(notax_de));
-                                item.setLocal_tax_de(String.valueOf(notax_de));
+                                item.setLocal_tax_de(String.valueOf(tax_de));
                                item.setTax_de(String.valueOf(tax_de));
                                item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight()));
                                item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
@@ -686,16 +689,20 @@ 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 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);
+                                            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);
+
                                            item.setNotax_de(String.valueOf(notax_de));
-                                            item.setLocal_tax_de(String.valueOf(notax_de));
+                                            item.setLocal_tax_de(String.valueOf(tax_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(notax_de));
+                                            item.setLocal_tax_de(String.valueOf(tax_de));
                                            item.setTax_de(String.valueOf(tax_de));
                                        }
                                        item.setPrice(String.valueOf(reconciliationAccount.getAmount()));
@@ -1208,4 +1215,4 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
        }
        return true;
    }
-}
+}
@@ -18,10 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -16,10 +16,14 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
@@ -18,10 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -18,10 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -18,10 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -13,10 +13,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        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
+        # 线上测试环境配置 容器名+端口号
+        server-addr: 10.102.192.5:6848
+        username: nacos
+        password: manhuoda@2023
        # 配置文件格式
        file-extension: yml
        # 共享配置
Author	SHA1	Message	Date
王奎兴	4a0ac011b9	dockerfile jdk修改	2026-02-10 17:47:09 +08:00
王奎兴	0363e6fdc5	Merge branch 'test' # Conflicts: # mhd-auth/src/main/resources/bootstrap.yml # mhd-gateway/src/main/resources/bootstrap.yml # mhd-modules/mhd-system/src/main/resources/bootstrap.yml # mhd-user-center/src/main/resources/bootstrap.yml # mhd_bms/src/main/resources/bootstrap.yml # mhd_finance/src/main/resources/bootstrap.yml # mhd_oms/src/main/resources/bootstrap.yml # mhd_product/src/main/resources/bootstrap.yml # mhd_thrid_party/src/main/resources/bootstrap.yml # mhd_transport/src/main/resources/bootstrap.yml # mhd_wms/src/main/resources/bootstrap.yml	2026-02-10 11:30:27 +08:00
王奎兴	ee873473fb	nacos配置修改;	2026-02-10 11:22:51 +08:00
王奎兴	b7233d4052	Merge branch 'dev' # Conflicts: # mhd_finance/src/main/resources/bootstrap.yml	2026-02-10 11:18:36 +08:00
王奎兴	144a5f625a	bms及bms达梦配置修改;	2026-02-09 14:59:37 +08:00
王奎兴	a2e3f23798	nc推送地址修改	2026-01-20 16:04:51 +08:00
王奎兴	7a45568be6	nc推送地址修改	2026-01-20 14:03:38 +08:00
王奎兴	8ba0c64b62	nc推送地址修改	2026-01-20 14:01:13 +08:00
hjx	22d5a1ea3f	nc组装报文修改	2026-01-19 20:53:49 +08:00
hjx	258417cac7	nc改成测试环境	2026-01-19 18:59:52 +08:00
hjx	a7b7e2c82d	nc改成测试环境	2026-01-19 18:58:56 +08:00
hjx	88ac989ced	南歧nc推送税费金额修改	2026-01-19 16:55:50 +08:00