客户修改

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/DmDealerController.java

@@ -1,7 +1,6 @@
 package com.iamberry.rst.controllers.dm;
 
 import com.iamberry.rst.core.cm.SalesOrder;
-import com.iamberry.rst.core.cm.SalesOrderItem;
 import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.core.dm.*;
 import com.iamberry.rst.core.order.OrderWarehouse;
@@ -841,7 +840,7 @@ public class DmDealerController {
                 row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
                 row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
                 row.add(salesOrder.getItemTotal() == null ? null:salesOrder.getItemTotal()/100);
-                row.add(salesOrder.getItemCostTotal() == null ? null:salesOrder.getItemTotal()/100);
+                row.add(salesOrder.getItemCostTotal() == null ? null:salesOrder.getItemCostTotal()/100);
 
                 String salesShoppingStatus = "";
                 if(salesOrder.getSalesShippingStatus() == null){

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -1081,6 +1081,7 @@ public class AdminOrderController {
 
                      //表示分配剩余总金额
                      Integer lastTotal = salesOrders.getSalesAmount();
+                     Integer total = salesOrders.getSalesAmount();
                      for (int p =0 ;p<salesOrders.getSalesOrderItemList().size(); p++ ){
                          SalesOrderItem salesOrderItem = salesOrders.getSalesOrderItemList().get(p);
 
@@ -1139,7 +1140,7 @@ public class AdminOrderController {
                                      Double priceRate = Double.valueOf(aoncePrice) / Double.valueOf(allPrice);
 
                                      //当前订单项按照比例得出的实际总价
-                                     Double itemTotalByDouble = lastTotal * priceRate;
+                                     Double itemTotalByDouble = total * priceRate;
                                      Integer itemTotal = itemTotalByDouble.intValue();
                                      salesOrderItem.setItemTotal(itemTotal);
                                      //减去当前订单项的金额

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -663,6 +663,9 @@ public class ExcelUtil {
                 }else{
                     //赋值小结
                     Double orderTotal = Double.valueOf(colorDiscount);
+                    if(orderTotal > 20000000){
+                        orderTotal = 0.00;
+                    }
                     orderTotal = orderTotal*100;
                     order.setOrderTotal(orderTotal.intValue());
                 }

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

@@ -156,7 +156,7 @@
                         <div style="float: left;line-height: 30px;color: red;">*自营店铺导单需要导入产品总额，自营店铺指淘宝，天猫，京东</div>
                     </div>-->
 
-                    <select  class="my-select"  name="product-shop-discount" id="product-shop-discount" matchSelect="售价|单价|折扣价|价格|金额|产品价格|下单价格|商品金额合计" style="height: 30px;width: 180px;margin: 0px;float: left;">
+                    <select  class="my-select"  name="product-shop-discount" id="product-shop-discount" matchSelect="售价|单价|折扣价|价格|金额|产品价格|下单价格|商品金额合计|量" style="height: 30px;width: 180px;margin: 0px;float: left;">
                         <#list heads as head>
                             <option value="${head}" >${head}</option>
                         </#list>