优化

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -725,36 +725,38 @@ public class YongyouServiceImpl implements YongyouService {
             detail.setCitem_name(orderVO.getProjectSecondName());
             detail.setCitemcode(orderVO.getProjectSecondNo());
 
-            detail.setFmoney(MathUtils.formatDouble1(orderVO.getFmoney(),4));//本币含税合计
+            detail.setFmoney(MathUtils.formatDouble1(orderVO.getFmoney(),2));//本币含税合计
             detail.setFunitprice(MathUtils.formatDouble1(orderVO.getFunitprice(),4));//本币无税单价 = 本币不含税金额 /数量
 
-            Double iorisum = orderVO.getFmoney()*orderVO.getIexchrate();//原币价税合计
-            Double ioritaxprice = iorisum/(1+orderVO.getIpertaxrate())*orderVO.getIpertaxrate();//原币税额
-            Double iorimoney = iorisum-ioritaxprice;//原币不含税金额 = 原币价税合计 - 原币税额
+            Double iorisum = orderVO.getFmoney()/orderVO.getIexchrate();//原币价税合计111
+            Double ioritaxprice = (iorisum/(1+orderVO.getIpertaxrate()/100))*orderVO.getIpertaxrate()/100 ;//原币税额111
+            Double iorimoney = iorisum-ioritaxprice;//原币不含税金额 = 原币价税合计 - 原币税额111
             Double ioricost = iorimoney/orderVO.getNum().doubleValue();//原币不含税单价 = 原币不含税金额 / 数量
             Double ioritaxcost = iorisum/orderVO.getNum().doubleValue();//原币含税单价
-            Double ftaxprice = ioritaxcost*orderVO.getIexchrate();//本币含税单价
-            Double itaxprice = ftaxprice*orderVO.getNum().doubleValue()/(1+orderVO.getIpertaxrate());//本币税额
+            Double ftaxprice = orderVO.getFmoney()/orderVO.getNum().doubleValue();//本币含税单价111111
+//            Double itaxprice = ftaxprice*orderVO.getNum().doubleValue()/(1+orderVO.getIpertaxrate());//本币税额
+            Double itaxprice = (orderVO.getFmoney()/(1+orderVO.getIpertaxrate()/100))*orderVO.getIpertaxrate()/100;//本币税额111
+
             Double imoney = ftaxprice*orderVO.getNum().doubleValue()-itaxprice;///本币不含税金额 = 本币含税单价 * 数量 - 本币税额
 
-            detail.setIorisum(MathUtils.formatDouble1(iorisum,4));
-            detail.setIoritaxprice(MathUtils.formatDouble1(ioritaxprice,4));
+            detail.setIorisum(MathUtils.formatDouble1(iorisum,2));
+            detail.setIoritaxprice(MathUtils.formatDouble1(ioritaxprice,2));
 
-            detail.setIorimoney(MathUtils.formatDouble1(iorimoney,4));
+            detail.setIorimoney(MathUtils.formatDouble1(iorimoney,2));
             detail.setIoricost(MathUtils.formatDouble1(ioricost,4));
 
             detail.setIoritaxcost(MathUtils.formatDouble1(ioritaxcost,4));
             detail.setFtaxprice(MathUtils.formatDouble1(ftaxprice,4));
-            detail.setItaxprice(MathUtils.formatDouble1(itaxprice,4));
-            detail.setImoney(MathUtils.formatDouble1(imoney,4));
+            detail.setItaxprice(MathUtils.formatDouble1(itaxprice,2));
+            detail.setImoney(MathUtils.formatDouble1(imoney,2));
 
 
 
 
             detail.setCbmemo(orderVO.getCbmemo());
-            detail.setFtaxprice(MathUtils.formatDouble1(orderVO.getIpertaxrate(),4));
+//            detail.setFtaxprice(MathUtils.formatDouble1(orderVO.getIpertaxrate(),2));
             detail.setIpertaxrate(MathUtils.formatDouble1(orderVO.getIpertaxrate(),2));
-            detail.setIorisum(MathUtils.formatDouble1(orderVO.getIorisum(),2));
+//            detail.setIorisum(MathUtils.formatDouble1(orderVO.getIorisum(),2));
 
 
 //            detail.setCdefine12(orderVO.getCdefine12());