订单价格修改处理，导入添加价格

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -41,7 +41,7 @@ public class SalesOrder implements Serializable {
     private String salesAddressName;        //收件人姓名
     private String salesAddressPostcode;        //收件人邮政编码
     private Integer salesAmount;            //订单总金额
-    private Integer salesPayMoney;          //已付金额 - 支付金额
+    private Integer salesPayMoney;          //已付金额 - 支付金额/折扣价
     private Integer salesPayType;           //付款方式  1：微信支付 2：现金支付3：已支付定金￥99 4：刷卡支付 5：支付宝支付
     private Integer salesWaitMoney;         //待付金额
     private Integer salesLastMoney;         //本次支付金额

watero-rst-core/src/main/java/com.iamberry.rst.core/order/EfastOrder.java

@@ -32,6 +32,10 @@ public class EfastOrder implements Serializable{
 
     private Integer orderAmount;                 //商品总价(单位为分)
     private Integer orderPayMoney;               //应付款,应付款金额要与已付款金额相同(单位为分)
+
+    private Integer orderProductPrice;   //产品市场价
+    private Integer orderProductDiscount;//产品折扣价
+
     private String orderProductBarCode;          //产品SKU
     private Integer orderPayType;                 //支付方式    1：微信支付  2：现金支付  3：已支付定金￥99  4：刷卡支付  5：支付宝支付
     private Integer orderNum;                    // 产品数量
@@ -311,4 +315,20 @@ public class EfastOrder implements Serializable{
     public void setStoreId(Integer storeId) {
         this.storeId = storeId;
     }
+
+    public Integer getOrderProductPrice() {
+        return orderProductPrice;
+    }
+
+    public void setOrderProductPrice(Integer orderProductPrice) {
+        this.orderProductPrice = orderProductPrice;
+    }
+
+    public Integer getOrderProductDiscount() {
+        return orderProductDiscount;
+    }
+
+    public void setOrderProductDiscount(Integer orderProductDiscount) {
+        this.orderProductDiscount = orderProductDiscount;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -124,6 +124,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             throw new RuntimeException("删除订单项失败！");
         }
 
+        calculationTotal(salesOrder,salesOrder.getSalesOrderItemList());
+
         //修改订单
         flag = salesOrderMapper.updateSalesOrder(salesOrder);
         if (flag <= 0) {
@@ -239,6 +241,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             return true;
         }
         //添加订单数据
+        calculationTotal(salesOrder,list);
         try {
             int orderNum = salesOrderMapper.addSalesOrder(salesOrder);
             if (orderNum <= 0) {
@@ -262,6 +265,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Override
     @Transactional
     public SalesOrder addOrderAndIteminfo(SalesOrder salesOrder, List<SalesOrderItem> list) {
+        calculationTotal(salesOrder,list);
+
         //添加订单数据
         int orderNum = salesOrderMapper.addSalesOrder(salesOrder);
         if (orderNum <= 0) {
@@ -444,6 +449,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             mainOrder.setSalesCreateTime(new Date());
         }
 
+        calculationTotal(mainOrder,mainOrder.getSalesOrderItemList());
         int orderNum = salesOrderMapper.addSalesOrder(mainOrder);
         if (orderNum <= 0) {
             throw  new RuntimeException("添加订单出错--------！");
@@ -464,6 +470,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     }
                     listSalesOrder.get(i).setSalesMainOrderId(mainOrder.getSalesId());
                     listSalesOrder.get(i).setSalesId(null);
+
+                    calculationTotal(listSalesOrder.get(i),listSalesOrder.get(i).getSalesOrderItemList());
                     orderNum = salesOrderMapper.addSalesOrder(listSalesOrder.get(i));
                     if (orderNum <= 0) {
                         throw  new RuntimeException("添加订单出错--------！");
@@ -1471,6 +1479,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     throw new RuntimeException("删除订单项失败，订单交易号："+salesOrder.getSalesDealCode());
                 }
 
+                calculationTotal(null,salesOrder.getSalesOrderItemList());
                 flag = salesOrderMapper.addOrderItemList(salesOrder.getSalesOrderItemList());
                 if(flag < 1){
                     throw new RuntimeException("添加订单项失败，订单交易号："+salesOrder.getSalesDealCode());
@@ -1518,4 +1527,21 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.getSalesOrderByOrderId(salesOrderId);
     }
 
+    public void calculationTotal(SalesOrder salesOrder,List<SalesOrderItem> salesOrderItemList){
+        Integer salesAmount=0,salesPayMoney=0;
+
+        for (SalesOrderItem soi:salesOrderItemList) {
+            if(soi.getItemTotal() == null || soi.getItemTotal() == 0){
+                soi.setItemTotal(soi.getItemNum() * soi.getItemProductDiscount());
+            }
+            salesAmount += (soi.getItemNum() * soi.getItemProductPrice());
+            salesPayMoney += soi.getItemTotal();
+        }
+
+        if(salesOrder != null && salesPayMoney!=0){
+            salesOrder.setSalesAmount(salesAmount);
+            salesOrder.setSalesPayMoney(salesPayMoney);
+        }
+    }
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -485,6 +485,7 @@
             item_product_price,
             item_product_discount,
             item_is_source,
+            item_total,
             item_create_time,
             pi.product_abbreviation,
             pc.color_abbreviation,
@@ -716,14 +717,14 @@
       (
         item_order_id,item_product_id,item_num,item_color_id,item_product_type,
         item_product_name,item_product_pic,item_product_color,item_color_bar,
-        item_product_price,item_product_discount,item_create_time,item_is_source
+        item_product_price,item_product_discount,item_total,item_create_time,item_is_source
       )
     VALUES
     <foreach collection="list" item="item" separator=",">
       (
         #{item.itemOrderId},#{item.itemProductId},#{item.itemNum},#{item.itemColorId},
         #{item.itemProductType},#{item.itemProductName},#{item.itemProductPic},#{item.itemProductColor},
-        #{item.itemColorBar},#{item.itemProductPrice},#{item.itemProductDiscount},#{item.itemCreateTime},
+        #{item.itemColorBar},#{item.itemProductPrice},#{item.itemProductDiscount},#{item.itemTotal},#{item.itemCreateTime},
         #{item.itemIsSource}
       )
     </foreach>

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

@@ -985,6 +985,7 @@ public class AdminOrderController {
                                        @RequestParam("tel[]") String tel,
                                        @RequestParam("info[]") String[] infos,
                                        @RequestParam("num[]") String num,
+                                       @RequestParam("discount[]") String discount,
                                        @RequestParam("remark[]") String remark,
                                        @RequestParam("filePath") String filePath,
                                        @RequestParam("postType") String postType,
@@ -1008,7 +1009,7 @@ public class AdminOrderController {
         }
         // 读取文件中内容
         List<EfastOrder> orderEfasts = excelUtil.readCell(request.getServletContext().getRealPath(filePath),
-                productName, maps, infos, tel, name,platformOrder, num,remark, priceMap, postType,orderStoreInfoSt,isOtherStore, storeArray);
+                productName, maps, infos, tel, name,platformOrder, num,discount,remark, priceMap, postType,orderStoreInfoSt,isOtherStore, storeArray);
         logger.info("---------orderEfasts订单个数为："+orderEfasts.size() + "------------");
 
         //Efast升级 2018-6-8
@@ -1024,7 +1025,7 @@ public class AdminOrderController {
         Integer orderBatchNum = orderBatchService.getOrderBatchNum(new OrderBatch());
 
         String batchId = "";
-        if(orderBatch == null || "1".equals(orderBatch)){
+        if(orderBatch == null || "".equals(orderBatch) || "1".equals(orderBatch)){
             batchId =  generateKeyUtil.getSalesBatchIdSC();
             OrderBatch ob = new OrderBatch();
             ob.setBatchId(batchId);
@@ -1044,6 +1045,16 @@ public class AdminOrderController {
              salesOrders.setSalesBatchId(batchId);
              //增加订单方式 1：手动增加 2：Excel导入
 
+             //计算订单总金额
+             Integer itemProductPrice=0;   //产品市场价
+             Integer itemProductDiscount=0; //产品折扣价
+             for (SalesOrderItem salesOrderItem:salesOrders.getSalesOrderItemList()) {
+                 itemProductPrice += salesOrderItem.getItemProductPrice() * salesOrderItem.getItemNum();
+                 itemProductDiscount += salesOrderItem.getItemProductDiscount() * salesOrderItem.getItemNum();
+             }
+             salesOrders.setSalesAmount(itemProductPrice);
+             salesOrders.setSalesPayMoney(itemProductDiscount);
+
                 try{
 //                    bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
 //                    if(bl == false){
@@ -1148,8 +1159,8 @@ public class AdminOrderController {
                     salesOrderItem.setItemProductPic(productColor.getColorPicture());
                     salesOrderItem.setItemProductColor(productColor.getColorName());
                     salesOrderItem.setItemColorBar(productColor.getColorBar());
-                    salesOrderItem.setItemProductPrice(productColor.getColorPrice());
-                    salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
+                    salesOrderItem.setItemProductPrice(efastOrder.getOrderProductPrice());
+                    salesOrderItem.setItemProductDiscount(efastOrder.getOrderProductDiscount());
                     salesOrderItem.setItemIsSource(1);
                 }
                 salesOrderItemList.add(salesOrderItem);
@@ -1196,8 +1207,8 @@ public class AdminOrderController {
 
                 salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
                 salesOrder.setSalesAddressName(efastOrder.getOrderAddressName());
-                salesOrder.setSalesAmount(efastOrder.getOrderAmount());
-                salesOrder.setSalesPayMoney(efastOrder.getOrderPayMoney());
+//                salesOrder.setSalesAmount(efastOrder.getOrderAmount());
+//                salesOrder.setSalesPayMoney(efastOrder.getOrderPayMoney());
                 salesOrder.setSalesPayType(1);
                 salesOrder.setSalesWaitMoney(efastOrder.getOrderAmount() - efastOrder.getOrderPayMoney());
                 salesOrder.setSalesShippingFee(0);
@@ -1245,8 +1256,8 @@ public class AdminOrderController {
                     salesOrderItem.setItemProductPic(productColor.getColorPicture());
                     salesOrderItem.setItemProductColor(productColor.getColorName());
                     salesOrderItem.setItemColorBar(productColor.getColorBar());
-                    salesOrderItem.setItemProductPrice(productColor.getColorPrice());
-                    salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
+                    salesOrderItem.setItemProductPrice(efastOrder.getOrderProductPrice());
+                    salesOrderItem.setItemProductDiscount(efastOrder.getOrderProductDiscount());
                     salesOrderItem.setItemIsSource(1);
                 }
                 salesOrder.getSalesOrderItemList().add(salesOrderItem);

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

@@ -777,8 +777,8 @@ public class AdminSalesOrderController {
                 salesOrderItem.setItemProductPic(productColor.getColorPicture());
                 salesOrderItem.setItemProductColor(productColor.getColorName());
                 salesOrderItem.setItemColorBar(productColor.getColorBar()); ///产品SKU码(百胜)
-                salesOrderItem.setItemProductPrice(productColor.getColorPrice());
-                salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
+//                salesOrderItem.setItemProductPrice(productColor.getColorPrice());
+//                salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
                 salesOrderItem.setItemCreateTime(new Date());
                 salesOrderItem.setItemIsSource(1);
             }else{
@@ -816,7 +816,7 @@ public class AdminSalesOrderController {
 
         salesOrder.setSalesOrderItemList(salesOrderItemList);
 
-        if(salesOrder.getSalesBatchId() == null || "1".equals(salesOrder.getSalesBatchId())){
+        if(salesOrder.getSalesBatchId() == null || "".equals(salesOrder.getSalesBatchId()) || "1".equals(salesOrder.getSalesBatchId())){
             String batchId = generateKeyUtil.getSalesBatchIdSD();
             OrderBatch ob = new OrderBatch();
             ob.setBatchId(batchId);
@@ -945,8 +945,8 @@ public class AdminSalesOrderController {
                 salesOrderItem.setItemProductColor(productColor.getColorName());
                 ///产品SKU码(百胜)
                 salesOrderItem.setItemColorBar(productColor.getColorBar());
-                salesOrderItem.setItemProductPrice(productColor.getColorPrice());
-                salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
+//                salesOrderItem.setItemProductPrice(productColor.getColorPrice());
+//                salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
                 salesOrderItem.setItemCreateTime(new Date());
                 salesOrderItem.setItemIsSource(1);
                 //---- updata new add
@@ -983,12 +983,12 @@ public class AdminSalesOrderController {
         }catch (Exception e){
             errorMsg = e.getMessage();
             e.printStackTrace();
-            return  new ResponseJson(500, "添加订单失败,失败原因："+errorMsg, 500);
+            return  new ResponseJson(500, "修改订单失败,失败原因："+errorMsg, 500);
         }
         if(bl > 0){
-            return new ResponseJson(200, "添加订单成功，订单交易号为："+ salesOrder.getSalesDealCode(), 200);
+            return new ResponseJson(200, "修改订单成功，订单交易号为："+ salesOrder.getSalesDealCode(), 200);
         }else{
-            return  new ResponseJson(500, "添加订单失败,失败原因："+errorMsg, 500);
+            return  new ResponseJson(500, "修改订单失败,失败原因："+errorMsg, 500);
         }
     }
 

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

@@ -92,8 +92,6 @@ public class MallOrderController {
             Integer goods_amount = (Integer)requstMap.get("goods_amount");//商品总价
             Integer goods_count = (Integer)requstMap.get("goods_count");//产品数量
             String mobile = (String)requstMap.get("mobile");//手机号
-            Integer money_paid = (Integer)requstMap.get("money_paid");//已付款
-            Integer order_amount = (Integer)requstMap.get("order_amount");//应付款,应付款金额要与已付款金额相同
             String oid = (String)requstMap.get("oid");//交易号或系统订单号
             String pay_name = (String)requstMap.get("pay_name");//支付方式名称
             Date pay_time = format.parse(requstMap.get("pay_time").toString());//支付时间
@@ -103,6 +101,8 @@ public class MallOrderController {
             Integer shipping_fee = (Integer)requstMap.get("shipping_fee");//邮费
             String shipping_name = (String)requstMap.get("shipping_name");//快递公司代码
             String tel = (String)requstMap.get("tel");//收货人电话
+            Integer money_paid = (Integer)requstMap.get("money_paid");//已付款
+            Integer order_amount = (Integer)requstMap.get("order_amount");//应付款,应付款金额要与已付款金额相同
             Integer total_amount = (Integer)requstMap.get("total_amount");//订单总金额
             String user_name = (String)requstMap.get("user_name");//用户名称
             String zipcode = (String)requstMap.get("zipcode");//邮编
@@ -128,6 +128,9 @@ public class MallOrderController {
                  List<ProductColor> listColor = productService.listproductAndColor(productColor);
                  SalesOrderItem salesOrderItem = new SalesOrderItem();
                  salesOrderItem.setItemNum(Integer.valueOf(orderItem.get("goods_number").toString()));
+                 salesOrderItem.setItemProductPrice(Integer.valueOf(orderItem.get("goods_price").toString()));
+                 salesOrderItem.setItemProductDiscount(Integer.valueOf(orderItem.get("goods_discount").toString()));
+                 salesOrderItem.setItemTotal(Integer.valueOf(orderItem.get("goods_total").toString()));
                  /*salesOrderItem.setItemProductName(orderItem.get("goods_name").toString());*/
                  if (listColor.size() > 0) {
                     productColor = listColor.get(0);
@@ -139,8 +142,8 @@ public class MallOrderController {
                     salesOrderItem.setItemProductPic(productColor.getColorPicture());
                     salesOrderItem.setItemProductColor(productColor.getColorName());
                     salesOrderItem.setItemColorBar(productColor.getColorBar());
-                    salesOrderItem.setItemProductPrice(productColor.getColorPrice());
-                    salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
+//                    salesOrderItem.setItemProductPrice(productColor.getColorPrice());
+//                    salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
                     salesOrderItem.setItemIsSource(1);
                     salesAmount += productColor.getColorDiscount();
                 }else{

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

@@ -8,7 +8,6 @@ import com.iamberry.wechat.tools.AddrUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
-import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -374,7 +373,7 @@ public class ExcelUtil {
 
 
     public List<EfastOrder> readCell(String filePath, String productName, String[] maps,
-                                            String[] infos, String tel, String name,String platformOrder, String num,String remark,
+                                            String[] infos, String tel, String name,String platformOrder, String num, String discount,String remark,
                                             Map<String, ProductColor> price, String postType, String orderStoreInfoSt, Integer isOtherStore,String[] storeArray)
             throws IOException {
         Map<String, String> map = new HashMap<>();
@@ -408,6 +407,7 @@ public class ExcelUtil {
         int telColumnIndex = -1;
         int productColumnIndex = -1;
         int numColumnIndex = -1;
+        int discountColumnIndex = -1;
         int remarkColumnIndex = -1;
         int orderStoreInfoStColumnIndex = -1;
         int[] infoColumnIndex = new int[infos.length];
@@ -438,6 +438,10 @@ public class ExcelUtil {
                 // 匹配购买数量
                 numColumnIndex = cell.getColumnIndex();
             }
+            if (discount.trim().equals(cell.getStringCellValue().trim())) {
+                // 匹配购买数量
+                discountColumnIndex = cell.getColumnIndex();
+            }
             if (remark.trim().equals(cell.getStringCellValue().trim())) {
                 // 匹配备注
                 remarkColumnIndex = cell.getColumnIndex();
@@ -546,6 +550,24 @@ public class ExcelUtil {
                 }
                 order.setOrderRemark(orderRemark);
 
+                String colorDiscount = getValue(temp.getCell(discountColumnIndex)).trim();
+                if(colorDiscount != null && !"".equals(colorDiscount)){
+                    colorDiscount = colorDiscount.replaceAll("\\r|\\r|\\n","");
+                }
+                if(colorDiscount == null || "".equals(colorDiscount) || Integer.valueOf(colorDiscount) == 0){
+                    order.setReturnStatus("error");
+                    order.setReturnMsg("价格不正确");
+                    // 读取购买数量
+                    order.setOrderProductDiscount(0);
+                    order.setOrderProductPrice(0);
+                }else{
+                    // 读取购买数量
+                    Double colorDiscountDou = Double.valueOf(colorDiscount);
+                    colorDiscountDou = colorDiscountDou*100;
+                    order.setOrderProductDiscount(colorDiscountDou.intValue());
+                    order.setOrderProductPrice(colorDiscountDou.intValue());
+                }
+
                 try{
                     if (infoColumnIndex.length == 1){
                         // 如果infoColumnIndex = 1, 则表示需要截取（可能是-、“ ”）

watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -5,21 +5,10 @@ jdbc.driver=com.mysql.jdbc.Driver
 #jdbc.password=watero_RST
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
-#\u6D4B\u8BD5
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/test_rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=rst_test
-#jdbc.password=RST_test
-
 jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
 jdbc.username=rst_test
 jdbc.password=RST_test
 
-### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD
-#jdbc.url=jdbc:mysql://192.168.1.254/rst_test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=root
-#jdbc.password=root
-### \uFFFD\uFFFD\uFFFD\u053B\uFFFD\uFFFD\uFFFD end ######
-
 #pool settings
 jdbc.pool.init=1
 jdbc.pool.minIdle=3

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

@@ -21,12 +21,7 @@
 
     <div style="margin-top: 10px;margin-bottom: 10px;">
         批次编号:
-        <select class="my-select" name="order_batch" id="order_batch" matchSelect="订单编号|订单号|交易号|序号" style="height: 30px;width: 180px;margin: 0px;">
-            <option value="1" >新增批次</option>
-            <#list orderBatchs as orderBatch>
-                <option value="${orderBatch.batchId}" >${orderBatch.batchId}</option>
-            </#list>
-        </select>
+        <input type="text"  style="width: 180px;" class="input-text" value="" placeholder="填写批次编号，新增可不填。" id="order_batch" name="order_batch">
     </div>
 
     <table class="table table-border table-bordered table-bg">
@@ -145,6 +140,16 @@
                 </td>
             </tr>
             <tr class="text-c">
+                <td width="55">购买产品售价</td>
+                <td style="text-align: left;">
+                    <select class="my-select"  name="product-shop-discount" id="product-shop-discount" matchSelect="售价|单价|折扣价|价格|产品价格|下单价格" style="height: 30px;width: 180px;margin: 0px;">
+                        <#list heads as head>
+                            <option value="${head}" >${head}</option>
+                        </#list>
+                    </select>
+                </td>
+            </tr>
+            <tr class="text-c">
                 <td width="55">备注</td>
                 <td style="text-align: left;">
                     <select class="my-select" name="product-remark" id="product-remark" matchSelect="备注|店铺|订单来源" style="height: 30px;width: 180px;margin: 0px;">
@@ -532,6 +537,10 @@
         var numArray = new Array();
         numArray[0] = productShopNum;
 
+        var productShopDiscount = $("#product-shop-discount").val();  // 销售数量
+        var discountArray = new Array();
+        discountArray[0] = productShopDiscount;
+
         var orderRemark = $("#product-remark").val();   // 备注
         var remarkArray = new Array();
         remarkArray[0] = orderRemark;
@@ -596,6 +605,7 @@
                 "orderStoreInfoSt":orderStoreInfoSt,
                 "storeArray":storeArray,
                 "num":numArray,
+                "discount":discountArray,
                 "remark":remarkArray,
                 "orderBatch":orderBatch
             },

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

@@ -106,14 +106,7 @@
             <div class="row cl">
                 <label class="form-label col-1 col-sm-1">批次编号：</label>
                 <div class="formControls col-2 col-sm-2" style="">
-                    <span class="select-box">
-                        <select class="select" id="salesBatchId" name="salesBatchId" >
-                            <option value="1" >新增批次</option>
-                            <#list orderBatchs as orderBatch>
-                                <option value="${orderBatch.batchId}" >${orderBatch.batchId}</option>
-                            </#list>
-                        </select>
-				    </span>
+                    <input type="text" class="input-text" value="" placeholder="填写批次编号，新增可不填。" id="salesBatchId" name="salesBatchId">
                 </div>
             </div>
 
@@ -236,8 +229,8 @@
             </div>
 
             <div class="row cl" id="" style="">
-                <label class="form-label col-1 col-sm-1">总金额：</label>
-                <div class="formControls col-2 col-sm-2">
+                <label class="form-label col-1 col-sm-1" style="display: none">总金额：</label>
+                <div class="formControls col-2 col-sm-2" style="display: none">
                     <input type="text" class="input-text" value="" placeholder="总金额" datatype="*" errormsg="必须要输入总金额！" id="salesAmount" name="salesAmount"  >
                 </div>
                 <label class="form-label col-2 col-sm-2">实付金额：</label>

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

@@ -238,16 +238,15 @@
                             <#list order.salesOrderItemList as item>
                                 <tr class="text-c">
                                     <input type="hidden" class="color_id" id="" value="${item.itemColorId}">
-                                    <input type="hidden" class="color_price" id="" value="${item.itemProductPrice}">
-                                    <input type="hidden" class="color_discount" id="" value="${item.itemProductDiscount}">
+                                    <input type="hidden" class="color_price" id="" value="${((item.itemProductPrice/100)?string("0.##"))!''}">
                                     <td>${item.itemProductName}</td>
                                     <td>${item.itemProductColor}</td>
-                                    <td>${item.itemProductDiscount/100}</td>
+                                    <td><input type="text" class="input-text input-number color_discount" style="text-align: center" value="${((item.itemProductDiscount/100)?string("0.##"))!''}"  name="" id="" placeholder="售价" onkeyup="keyFun($(this),99999,1)" onpaste="keyFun($(this),99999,1)"></td>
                                     <td>${item.itemColorBar}</td>
                                     <td>
                                         <input type="text"
                                                class="input-text input-number item-num"
-                                               style="width: 100%;border: none;text-align: center;"
+                                               style="text-align: center"
                                                name=""
                                                id=""
                                                value="${item.itemNum}"
@@ -265,9 +264,11 @@
                 </div>
             </div>
 
+
+
             <div class="row cl" id="" style="">
-                <label class="form-label col-1 col-sm-1">总金额：</label>
-                <div class="formControls col-2 col-sm-2">
+                <label class="form-label col-1 col-sm-1" style="display: none">总金额：</label>
+                <div class="formControls col-2 col-sm-2" style="display: none">
                     <input type="text" class="input-text" value="${order.salesAmount/100!'0'}" placeholder="总金额" datatype="*" errormsg="必须要输入总金额！" id="salesAmount" name="salesAmount"  >
                 </div>
                 <label class="form-label col-2 col-sm-2">实付金额：</label>
@@ -278,7 +279,7 @@
                     <input type="text" class="input-text" value="${order.salesDiscountMoney/100!'0'}" placeholder="优惠金额" datatype="*" errormsg="必须要输入总金额！" id="salesDiscountMoney" name="salesDiscountMoney"  >
                 </div>
 
-                <div class="formControls col-2 col-sm-2">
+                <div class="formControls col-2 col-sm-2" >
                     <input type="button" style="width: 100%;" class="btn btn-primary add-order-button" onclick="calculatePrice()" value="计算商品总价" >
                 </div>
             </div>

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

@@ -80,6 +80,8 @@ $(function(){
                 var orderItem = new Object();
                 orderItem.itemColorId = $(this).find(".color_id").val();
                 orderItem.itemNum = $(this).find(".item-num").val();
+                orderItem.itemProductPrice = accMul($(this).find(".color_price").val(),100);
+                orderItem.itemProductDiscount = accMul($(this).find(".color_discount").val(),100);
                 orderItemArray.push(orderItem);
                 flag = true;
             });
@@ -248,13 +250,12 @@ function setSelectProduct(colorIds){
                         var productColor = data.returnMsg.productColorList[i];
                         html += '<tr class="text-c">' +
                             '<input type="hidden" class="color_id" id="" value="'+ productColor.colorId +'" >' +
-                            '<input type="hidden" class="color_price" id="" value="'+ productColor.colorPrice +'" >' +
-                            '<input type="hidden" class="color_discount" id="" value="'+ productColor.colorDiscount +'" >' +
+                            '<input type="hidden" class="color_price" id="" value="'+ accDiv(productColor.colorPrice,100) +'" >' +
                             ' <td>'+ cufte(productColor.productName) +'</td>' +
                             ' <td>'+ cufte(productColor.colorName) +'</td>' +
-                            ' <td>'+ cufte(productColor.colorPrice)/100 +'</td>' +
+                            ' <td><input type="text" class="input-text input-number color_discount" style="text-align: center" value="'+ accDiv(productColor.colorPrice,100) +'"  name="" id="" placeholder="售价" onkeyup="keyFun($(this),99999,1)" onpaste="keyFun($(this),99999,1)"></td>' +
                             ' <td>'+ cufte(productColor.colorBar) +'</td>' +
-                            ' <td><input type="text" class="input-text input-number item-num" value="1"  style="width: 100%;border: none;text-align: center;" name="" id="" placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>' +
+                            ' <td><input type="text" class="input-text input-number item-num" style="text-align: center" value="1"  name="" id="" placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>' +
                             ' <td><a href="javascript:void(0)" class="del_product all_down" onclick="delProduct($(this))" >删除</a></td>' +
                             ' </tr>';
                     }
@@ -275,6 +276,7 @@ function setSelectProduct(colorIds){
  */
 function delProduct($this){
     $this.parents("tr").remove();
+    calculatePrice();
 }
 
 /**
@@ -285,8 +287,8 @@ function calculatePrice(){
     var colorDiscountAll = 0,colorPriceAll = 0,salesPayMoneyAll=0;
     $("#add_product").find("tr").each(function(){
         var colorDiscount = 0,colorPrice = 0,salesPayMoney=0,itemNum=0;
-        colorDiscount = parseInt($(this).find(".color_discount").val())/100;
-        colorPrice = parseInt($(this).find(".color_price").val())/100;
+        colorDiscount = parseInt($(this).find(".color_discount").val());
+        colorPrice = parseInt($(this).find(".color_price").val());
         itemNum = $(this).find(".item-num").val();
         if(!isEmpty(itemNum)){
             return;
@@ -303,7 +305,6 @@ function calculatePrice(){
     $("#salesAmount").val(colorPriceAll);
     $("#salesPayMoney").val(colorDiscountAll);
     $("#salesDiscountMoney").val(salesPayMoneyAll);
-
     $("#salesLastMoney").val(colorDiscountAll);
 }