From f475b78a0f8fd22370453a145c20e77acf4a09d8 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Wed, 11 Sep 2024 15:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=9B=B4=E6=96=B0=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E5=AD=97=E7=AC=A6=E4=B8=B2=E3=80=81=E5=AD=97=E8=8A=82?=
 =?UTF-8?q?=E5=92=8Cvoid=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=9A=84?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在NumPy文档中，常规介绍部分现已包括关于字符串、字节和void数据类型的信息，以及现有的数值类型。
---
 .gitignore                                                   | 5 ++++-
 .../lets/plugin/sales/SoSaleReturnPluginInitializerToC.java  | 1 -
 buildpackage/src/main/resources/application-lets.yml         | 2 ++
 buildpackage/src/main/resources/application-letsprod.yml     | 5 ++++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b1d7c41..a6e8b2a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,10 +49,13 @@ $RECYCLE.BIN/
 *.msix
 *.msm
 *.msp
+*.iml
 
 # Windows shortcuts
 *.lnk
-./idea/
+/.idea/
+/log/
+/file/
 /buildpackage/src/main/resources/banner.txt
 /webapp/target/
 /service/target/
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
index 58c0b02a..47b25acc 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
@@ -458,7 +458,6 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                             BigDecimal noriginalcursummny = null;//价税合计
                             BigDecimal noriginalcurtaxmny = null;//税额=价税合计-无税金额
                             try {
-                                //TODO 这个金额取错了，需要取售后订单的退款金额
                                 noriginalcurtaxprice = goodsRertunSonDetailsDto.getGroupTotalPayAmount().divide(goodsRertunSonDetailsDto.getGroupShipQty(), 20, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP);
                                 noriginalcurprice = noriginalcurtaxprice.divide(new BigDecimal(1).add(new BigDecimal(tax)), 20, BigDecimal.ROUND_HALF_UP).setScale(4, BigDecimal.ROUND_HALF_UP);
                                 noriginalcurmny = noriginalcurprice.multiply(goodsRertunSonDetailsDto.getGroupShipQty()).setScale(2, BigDecimal.ROUND_HALF_UP);
diff --git a/buildpackage/src/main/resources/application-lets.yml b/buildpackage/src/main/resources/application-lets.yml
index 8c1c4baa..41192191 100644
--- a/buildpackage/src/main/resources/application-lets.yml
+++ b/buildpackage/src/main/resources/application-lets.yml
@@ -19,6 +19,8 @@ spring:
 savefile:
     #    文件保存路径
   path: /Users/liuyang/workspaces/hzya/kangarooDataCenterV3/file
+  pluginpath: xxx
+  tomcatpath: D:\server\apache-tomcat-9.0.91
 zt:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:
diff --git a/buildpackage/src/main/resources/application-letsprod.yml b/buildpackage/src/main/resources/application-letsprod.yml
index 764a805a..5df58e28 100644
--- a/buildpackage/src/main/resources/application-letsprod.yml
+++ b/buildpackage/src/main/resources/application-letsprod.yml
@@ -19,6 +19,8 @@ spring:
 savefile:
     #    文件保存路径
   path: D:\server\ztfile
+  pluginpath: xxx
+  tomcatpath: D:\server\apache-tomcat-9.0.91
 zt:
   url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface
 cbs8:
@@ -34,4 +36,5 @@ cbs8:
   #电子回单下载临时存放位置
   elec_path: /Users/xiangerlin/Downloads/
 OA:
-  data_source_code: yc_oa
\ No newline at end of file
+  data_source_code: yc_oa
+