修改订单显示错误

xiran2018 · Mar 15, 2020 · 3267b4e · 3267b4e
1 parent 6b486dc
commit 3267b4e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/WebRoot/WEB-INF/classes/admin/ru/own/www/logic/order/OrderOperateMapper.xml b/WebRoot/WEB-INF/classes/admin/ru/own/www/logic/order/OrderOperateMapper.xml
@@ -126,6 +126,7 @@
 		    <result property="mailfee" column="mailfee"/>
 			<result property="currencyId" column="currencyId"/>
 			<result property="currencyrate" column="currencyrate"/>
+			<result property="productCurrencyRate" column="productCurrencyRate"/>
 		    <result property="usejifen" column="usejifen"/>
 		    <result property="givejifen" column="givejifen"/>
 		    <result property="userip" column="userip"/>

diff --git a/WebRoot/jqladmin/order/js/order-detail.js b/WebRoot/jqladmin/order/js/order-detail.js
@@ -253,9 +253,11 @@ function generateXiangXiInfo(order,odsvoList,uinfo,currencyArgs)
 		//支付总金额
 		//price
 		// var tempAmount=od.price*od.ordercount;
+		productPrice = parseFloat(productPrice)
 		var tempAmount=productPrice*od.ordercount;
 		productAmount=productAmount+tempAmount//商品总价格
-		var tempAmountEx= parseFloat(calculateFeeByExchangeRate(tempAmount,orderCurrencyRate)).toFixed(2)
+		// var tempAmountEx= parseFloat(calculateFeeByExchangeRate(tempAmount,orderCurrencyRate)).toFixed(2)
+		var tempAmountEx= parseFloat(tempAmount).toFixed(2)
 		var tempAmountPrice=orderCurrencyShowSybol+" "+tempAmountEx;//calculateFeeByExchangeRate in math.js
 		// var tempAmountPrice=orderCurrencyShowSybol+" "+calculateFeeByExchangeRate(tempAmount,orderCurrencyRate);//calculateFeeByExchangeRate in math.js
 		html+="<td class='amount'>";

diff --git a/WebRoot/order/js/order-detail.js b/WebRoot/order/js/order-detail.js
@@ -141,9 +141,11 @@ function generateXiangXiInfo(order,odsvoList,currencyArgs)
 		//支付总金额
 		//price
 		// var tempAmount=od.price*od.ordercount;
+		productPrice = parseFloat(productPrice)
 		var tempAmount=productPrice*od.ordercount;
 		productAmount=productAmount+tempAmount//商品总价格
-		var tempAmountEx= parseFloat(calculateFeeByExchangeRate(tempAmount,orderCurrencyRate)).toFixed(2)
+		// var tempAmountEx= parseFloat(calculateFeeByExchangeRate(tempAmount,orderCurrencyRate)).toFixed(2)
+		var tempAmountEx= parseFloat(tempAmount).toFixed(2)
 		var tempAmountPrice=orderCurrencyShowSybol+" "+tempAmountEx;//calculateFeeByExchangeRate in math.js
 		html+="<td class='amount'>";
 		html+="<span>"+tempAmountPrice+"</span>";

diff --git a/WebRoot/ueditor/ueditor.config.js b/WebRoot/ueditor/ueditor.config.js
@@ -19,8 +19,8 @@
      * 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。
      * window.UEDITOR_HOME_URL = "/xxxx/xxxx/";
      */
-//	var URL = window.UEDITOR_HOME_URL || getUEBasePath();
-    var URL = "/own/ueditor/";
+	var URL = window.UEDITOR_HOME_URL || getUEBasePath();
+//     var URL = "/own/ueditor/";
 
     /**
      * 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。

diff --git a/src/admin/ru/own/www/logic/order/OrderOperateMapper.xml b/src/admin/ru/own/www/logic/order/OrderOperateMapper.xml
@@ -126,6 +126,7 @@
 		    <result property="mailfee" column="mailfee"/>
 			<result property="currencyId" column="currencyId"/>
 			<result property="currencyrate" column="currencyrate"/>
+			<result property="productCurrencyRate" column="productCurrencyRate"/>
 		    <result property="usejifen" column="usejifen"/>
 		    <result property="givejifen" column="givejifen"/>
 		    <result property="userip" column="userip"/>