From 114a94b37bac39a9d063fe9ac4d6a4c336e7836a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 29 Apr 2024 20:30:47 +0800
Subject: [PATCH] md

---
 .../service/impl/EmisWaybillServiceImpl.java  |  3 +++
 .../xdadan/erp/emis/utils/WaybillHelper.java  | 20 +++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index ece06aa5c..afabdfa84 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -11,6 +11,7 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -485,6 +486,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         double volumeWeight=0.0D;
         if(!StringUtils.isEmpty(emisTransLine.getMeterRate())) {
             volumeWeight=totalVolume * (1000000 / Double.valueOf(emisTransLine.getMeterRate()));
+            DecimalFormat df = new DecimalFormat("#.#####");
+            volumeWeight= Double.parseDouble(df.format(volumeWeight));
         }else{
             volumeWeight=billWeight;
         }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
index aa501edec..d8aecb59c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/utils/WaybillHelper.java
@@ -4,9 +4,13 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 
 import java.math.BigDecimal;
+import java.text.DecimalFormat;
 
 public class WaybillHelper {
 
+    // 5位小数
+    public  static DecimalFormat  dfCalc = new DecimalFormat("#.#####");
+
     public static String genOrderSn(){
         Snowflake snowflake = IdUtil.getSnowflake(0, 0);
         Long orderId = snowflake.nextId();
@@ -55,6 +59,8 @@ public class WaybillHelper {
             setteldWeight=weight;
         }
 
+        setteldWeight= Double.parseDouble(dfCalc.format(setteldWeight));
+
         return setteldWeight;
     }
 
@@ -108,7 +114,7 @@ public class WaybillHelper {
             settledFee = fee;
         }
 
-
+        settledFee= Double.parseDouble(dfCalc.format(settledFee));
         return settledFee;
     }
 
@@ -118,8 +124,14 @@ public class WaybillHelper {
         // 1.02*10 = 10.2 , 1.11*10 = 11.1
         // 0.2
 
-//        double w=calcSettledWeight(1.005D,"2");
-        double w=calcSettledFee(1.49D,"2");
-        System.out.println(w);
+        double m=0.000001D;
+        double vw=m*(1000000.0D/5000.0D);
+        double d= Double.parseDouble(dfCalc.format(vw));
+//        get_double = Double.parseDouble(df.format(result_value));
+        // vw 1.005D
+//        double w=calcSettledWeight(vw,"2");
+//        double w=calcSettledFee(1.49D,"2");
+//        System.out.println(w);
+        System.out.println(d);
     }
 }