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 +