订单修改

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmDealerMapper.xml

@@ -224,7 +224,7 @@
     </delete>
 
 
-    <select id="listDmDealerStatistic" resultMap="DmDealer" parameterType="DmDealer" >
+    <select id="listDmDealerStatistic" resultType="DmDealer" parameterType="DmDealer" >
         SELECT
             t.dealer_id,
             sa.admin_name,

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -265,12 +265,12 @@
             <input type="hidden" class="input-text" value="0" placeholder="本次支付金额" id="salesLastMoneyTest" name="salesLastMoneyTest"  >
             <input type="hidden" class="input-text" value="0" placeholder="邮费" id="salesShippingFeeTest" name="salesShippingFeeTest"  >
 
-            <input type="hidden"  id="salesAmount" name="salesAmount"  >
-            <input type="hidden"  id="salesPayMoney" name="salesPayMoney"  >
-            <input type="hidden"  id="salesDiscountMoney" name="salesDiscountMoney"  >
-            <input type="hidden"  id="salesWaitMoney" name="salesWaitMoney"  >
-            <input type="hidden"  id="salesLastMoney" name="salesLastMoney"  >
-            <input type="hidden"  id="salesShippingFee" name="salesShippingFee"  >
+            <input type="hidden"  id="salesAmount" name="salesAmount" value="0" >
+            <input type="hidden"  id="salesPayMoney" name="salesPayMoney" value="0" >
+            <input type="hidden"  id="salesDiscountMoney" name="salesDiscountMoney" value="0" >
+            <input type="hidden"  id="salesWaitMoney" name="salesWaitMoney" value="0" >
+            <input type="hidden"  id="salesLastMoney" name="salesLastMoney" value="0" >
+            <input type="hidden"  id="salesShippingFee" name="salesShippingFee"  value="0">
             <span style="color: #dd0000;margin-left: 190px;margin-top: 20px;"><strong>请认真填写实付金额，如果不知道实际销售价格，请联系业务员获取</strong></span>
             <div class="row cl">
                 <label class="form-label col-3">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/update_order.ftl

@@ -306,12 +306,12 @@
             <input type="hidden" class="input-text" value="${((order.salesLastMoney/100)?string("0.##"))!''}" placeholder="本次支付金额" id="salesLastMoneyTest" name="salesLastMoneyTest"  >
             <input type="hidden" class="input-text" value="${((order.salesShippingFee/100)?string("0.##"))!''}" placeholder="邮费" id="salesShippingFeeTest" name="salesShippingFeeTest"  >
 
-            <input type="hidden"  id="salesAmount" name="salesAmount"  >
-            <input type="hidden"  id="salesPayMoney" name="salesPayMoney"  >
-            <input type="hidden"  id="salesDiscountMoney" name="salesDiscountMoney"  >
-            <input type="hidden"  id="salesWaitMoney" name="salesWaitMoney"  >
-            <input type="hidden"  id="salesLastMoney" name="salesLastMoney"  >
-            <input type="hidden"  id="salesShippingFee" name="salesShippingFee"  >
+            <input type="hidden"  id="salesAmount" name="salesAmount" value="0" >
+            <input type="hidden"  id="salesPayMoney" name="salesPayMoney" value="0" >
+            <input type="hidden"  id="salesDiscountMoney" name="salesDiscountMoney" value="0" >
+            <input type="hidden"  id="salesWaitMoney" name="salesWaitMoney" value="0" >
+            <input type="hidden"  id="salesLastMoney" name="salesLastMoney" value="0" >
+            <input type="hidden"  id="salesShippingFee" name="salesShippingFee"  value="0">
 
             <div class="row cl">
                 <label class="form-label col-3">

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -113,12 +113,12 @@ $(function(){
                     return false;
                 }
             }
-            var salesAmountTest = $("#salesAmountTest").val();
-            var salesPayMoneyTest = $("#salesPayMoneyTest").val();
-            var salesDiscountMoneyTest = $("#salesDiscountMoneyTest").val();
-            var salesWaitMoneyTest = $("#salesWaitMoneyTest").val();
-            var salesLastMoneyTest = $("#salesLastMoneyTest").val();
-            var salesShippingFeeTest = $("#salesShippingFeeTest").val();
+            var salesAmountTest = cufteInt($("#salesAmountTest").val());
+            var salesPayMoneyTest = cufteInt($("#salesPayMoneyTest").val());
+            var salesDiscountMoneyTest = cufteInt($("#salesDiscountMoneyTest").val());
+            var salesWaitMoneyTest = cufteInt($("#salesWaitMoneyTest").val());
+            var salesLastMoneyTest = cufteInt($("#salesLastMoneyTest").val());
+            var salesShippingFeeTest = cufteInt($("#salesShippingFeeTest").val());
             $("#salesAmount").val(accMul(salesAmountTest,100));
             $("#salesPayMoney").val(accMul(salesPayMoneyTest,100));
             $("#salesDiscountMoney").val(accMul(salesDiscountMoneyTest,100));