nc推送地址修改

mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java

@@ -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";
     /**
      * 查询对账单列表
      */
@@ -486,10 +486,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 rate=tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100));
-                                BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
+                                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()));
@@ -684,16 +687,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 rate=reconciliationAccount.getRate().divide(BigDecimal.valueOf(100));
-                                            BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
+                                            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()));
@@ -1206,4 +1213,4 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
         }
         return true;
     }
-}
+}

mhd_finance/src/main/resources/bootstrap.yml

@@ -20,32 +20,32 @@ spring:
       discovery:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.33.0.129:6010
+        server-addr: 10.33.0.129:6010
+        #server-addr: 10.102.192.5:6848
+        #username: nacos
+        #password: manhuoda@2023
+        #线上正式环境
 #        server-addr: 10.102.192.5:6848
 #        username: nacos
 #        password: manhuoda@2023
         #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-        #线上正式环境
 #        server-addr: 10.102.192.105:6848
       config:
 #        server-addr: 127.0.0.1:8848
 #        server-addr: 116.204.23.92:8848
 #         线上测试环境配置 容器名+端口号
-#        server-addr: 10.33.0.129:6010
+        server-addr: 10.33.0.129:6010
+        #server-addr: 10.102.192.5:6848
+        #username: nacos
+        #password: manhuoda@2023
+        #线上正式环境
 #        server-addr: 10.102.192.5:6848
 #        username: nacos
 #        password: manhuoda@2023
         #线上正式环境
-        server-addr: 10.102.192.5:6848
-        username: nacos
-        password: manhuoda@2023
-        #线上正式环境
 #        server-addr: 10.102.192.105:6848
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
         file-extension: yml   #默认properties
         # 共享配置
         shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}