订单中心开发

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -210,17 +210,10 @@ public interface SalesOrderService {
     Integer getSalesOrderNum(SalesOrder salesOrder);
 
     /**
-     *根据订单id 删除订单项
-     * @param salesIds
-     * @return
-     */
-    Integer delSalesOrder(List<String> salesIds);
-
-    /**
      * 批量确认订单
-     * @param salesOrder
+     * @param salesBatchId
      * @return
      */
-    Integer listConfirmSalesOrder(SalesOrder salesOrder);
+    Integer listConfirmSalesOrderByBatch(String salesBatchId);
 
 }

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

@@ -783,26 +783,45 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
 
-    @Override
-    public Integer delSalesOrder(List<String> salesIds){
-        return salesOrderMapper.delSalesOrder(salesIds);
-    }
-
     @Transactional
     @Override
-    public Integer listConfirmSalesOrder(SalesOrder salesOrder) {
-        Integer flag = salesOrderMapper.listConfirmSalesOrder(salesOrder);
-        if(flag < 1){
-            throw new RuntimeException("确认订单失败！");
+    public synchronized Integer listConfirmSalesOrderByBatch(String salesBatchId) {
+        /*
+        *  查询订单
+        *  查询订单项
+        *  删除订单
+        *  修改查询的订单状态
+        *  添加订单
+        */
+        Integer flag = 0;
+        SalesOrder salesOrder = new SalesOrder();
+        salesOrder.setSalesBatchId(salesBatchId);
+        List<SalesOrder> salesOrderList = salesOrderMapper.listSalesOrder(salesOrder);
+        if(salesOrderList == null || salesOrderList.size() < 1){
+            throw  new RuntimeException("查询订单失败！");
         }
 
-        List<String> ids = new ArrayList<>();
-        List<SalesOrder> salesOrderList = salesOrderMapper.listSalesOrder(salesOrder);
         for (SalesOrder so:salesOrderList){
-//            ids.add(so.getSalesId());
-//            salesOrder
-//
-//            flag = salesOrderService.addRstOrderAndIteminfo(so);
+            SalesOrderItem salesOrderItem = new SalesOrderItem();
+            salesOrderItem.setItemOrderId(so.getSalesId());
+            List<SalesOrderItem> salesOrderItemList = salesOrderMapper.listSalesOrderItem(salesOrderItem);
+            so.setSalesOrderItemList(salesOrderItemList);
+            //1：确认 状态
+            so.setSalesStatus(1);
+
+            flag = salesOrderMapper.delOrderById(so.getSalesId());
+            if(flag < 1){
+                throw  new RuntimeException("删除订单失败！");
+            }
+
+            flag = salesOrderMapper.delOrderItem(so.getSalesId());
+            if(flag < 1){
+                throw  new RuntimeException("删除订单项失败！");
+            }
+        }
+        /* 添加订单 */
+        for (SalesOrder so:salesOrderList){
+            boolean fl = salesOrderService.addRstOrderAndIteminfo(so);
         }
         return flag;
     }

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

@@ -163,17 +163,20 @@ public interface SalesOrderMapper {
     Integer delOrderItem(Integer salesId);
 
     /**
-     *根据订单id 删除订单项
-     * @param salesIds
+     * 批量确认订单
+     * @param salesOrder
      * @return
      */
-    Integer delSalesOrder(List<String> salesIds);
+    Integer listConfirmSalesOrder(SalesOrder salesOrder);
+
 
     /**
-     * 批量确认订单
-     * @param salesOrder
+     * 批量删除订单
+     * @param ids
      * @return
      */
-    Integer listConfirmSalesOrder(SalesOrder salesOrder);
+    Integer delOrderById(Integer ids);
+
+
 
 }

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

@@ -751,13 +751,10 @@
     WHERE item_order_id = #{salesId}
   </delete>
 
-    <delete id="delSalesOrder" parameterType="List" >
-        delete
+    <delete id="delOrderById" parameterType="List" >
+        delete FROM
         tb_rst_sales_order_info
-        where sales_id  in
-        <foreach collection="ids" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach >
+        where sales_id  = #{ids}
     </delete>
 
     <!-- 批量确认订单 -->

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -569,7 +569,6 @@ public class AdminCustomerController {
                                            @RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
                                            @RequestParam(value = "pageNO", defaultValue = "1", required = false) Integer pageNO,
                                            @RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum) throws Exception {
-        long x = new Date().getTime();
         ModelAndView mv = new ModelAndView("cm/customer/custome_list");
         if (customerInfo.getAdminId() == null && isFirst == 1) {
             //获取登录员工id
@@ -613,8 +612,6 @@ public class AdminCustomerController {
         sa.addDatePro("yyyy-MM-dd", "startTime", "endTime");
         sa.setModelAndView(customerInfo, mv, "/admin/customer/select_customer_list", pagedResult);
 
-        long y = new Date().getTime();
-        System.out.println("使用时间：" + (y - x));
         return mv;
     }
 

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

@@ -64,10 +64,8 @@ public class AdminOrderBatchController {
         }
 
         SalesOrder salesOrder = new SalesOrder();
-        salesOrder.setSalesBatchId(batchId);
-
         /*确认该批次下的所有订单*/
-        Integer flag = salesOrderService.listConfirmSalesOrder(salesOrder);
+        Integer flag = salesOrderService.listConfirmSalesOrderByBatch(batchId);
 
         rj = ResponseJson.getSUCCESS();
         rj.addResponseKeyValue("number",flag);

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

@@ -1018,26 +1018,30 @@ public class AdminOrderController {
          for(SalesOrder salesOrders: mapsalesOrderList.values()){
              String salesDealCode = salesOrders.getSalesDealCode();
              salesOrders.setSalesBatchId(batchId);
+             //增加订单方式 1：手动增加 2：Excel导入
+
                 try{
-                    bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
-                    if(bl == false){
-                        logger.info("合并订单出错+："+bl + "错误交易号为："+salesDealCode);
-                        for(EfastOrder efastOrderStyle:orderEfasts){
-                            if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
-                                efastOrderStyle.setStyleColor("color:red;");
-                        }
-                    }else{
-                        for(EfastOrder efastOrderStyle:orderEfasts){
-                            if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
-                                efastOrderStyle.setStyleColor("color:black;");
-                        }
-                        sb.append(salesDealCode+"\r\n");
-                    }
+//                    bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
+//                    if(bl == false){
+//                        logger.info("合并订单出错+："+bl + "错误交易号为："+salesDealCode);
+//                        for(EfastOrder efastOrderStyle:orderEfasts){
+//                            if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
+//                                efastOrderStyle.setStyleColor("color:red;");
+//                        }
+//                    }else{
+//                        for(EfastOrder efastOrderStyle:orderEfasts){
+//                            if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
+//                                efastOrderStyle.setStyleColor("color:black;");
+//                        }
+//                        sb.append(salesDealCode+"\r\n");
+//                    }
+                    bl = salesOrderService.addRstOrderinfo(salesOrders,new ArrayList<SalesOrder>());
                 }catch (RuntimeException e){
                     logger.info("插入订单失败；错误信息" + e.getMessage());
                     for(EfastOrder efastOrderStyle:orderEfasts){
-                        if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
+                        if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId())){
                             efastOrderStyle.setStyleColor("color:red;");
+                        }
                     }
                     newFaultNum ++;
                 }
@@ -1063,10 +1067,12 @@ public class AdminOrderController {
                 .addResponseKeyValue("order_list", orderEfasts)
                 .addResponseKeyValue("mapSalesOrderSize",mapsalesOrderList.size())
                 .addResponseKeyValue("fileName", fileName)
+                .addResponseKeyValue("batchId", batchId)
                 .addResponseKeyValue("newFaultNum",newFaultNum);
     }
 
     private Map<String,SalesOrder> mergeOrder(List<EfastOrder>  orderEfasts,String postType) throws Exception{
+        Admin admin = AdminUtils.getLoginAdmin();
         List<SalesOrder> salesOrderList = new ArrayList<SalesOrder>();
         List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
         List<ProductColor> listColor = null;
@@ -1127,19 +1133,18 @@ public class AdminOrderController {
                 salesOrder.setSalesDiscountMoney(salesAmount);
                 salesOrder.setSalesPledgeMoney(salesAmount);
                 salesOrder.setSalesRemainDeposit(salesAmount);
-                salesOrder.setSalesStatus(1);
+                //导入全部要审核
+                salesOrder.setSalesStatus(0);
                 salesOrder.setSalesSendType(2);
                 salesOrder.setSalesSalesTime(date);
                 salesOrder.setSalesAddressInfo(efastOrder.getOrderProvince()+" "+efastOrder.getOrderCity()+" "+efastOrder.getOrderArea()+" "+efastOrder.getOrderAddress());
-                //salesOrder.setSalesAddressInfo(efastOrder.getOrderAddress());
                 salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
                 salesOrder.setSalesAddressName(efastOrder.getOrderAddressName());
                 salesOrder.setSalesAmount(efastOrder.getOrderAmount());
                 salesOrder.setSalesPayMoney(efastOrder.getOrderPayMoney());
                 salesOrder.setSalesPayType(1);
                 salesOrder.setSalesWaitMoney(efastOrder.getOrderAmount() - efastOrder.getOrderPayMoney());
-                //salesOrder.setSalesWaitMoney(money_paid);
-                salesOrder.setSalesShippingFee(0);//??????????
+                salesOrder.setSalesShippingFee(0);
                 salesOrder.setSalesPayTime(date);
                 salesOrder.setSalesLastMoney(efastOrder.getOrderPayMoney());
                 salesOrder.setSalesCreateTime(new Date());
@@ -1151,7 +1156,6 @@ public class AdminOrderController {
                 salesOrder.setSalesCompanyId(storeInfo.getCompanyId());
 
                 salesOrder.setSalesType(1);
-                //salesOrder.setSalesDealCode(String.valueOf(efastOrder.getOid()));
                 salesOrder.setSalesDealCode(orderId);
                 salesOrder.setSalesOrderStatus(1);
                 salesOrder.setSalesShippingStatus(0);
@@ -1162,12 +1166,12 @@ public class AdminOrderController {
                 salesOrder.setSalesIsSeparate(0);
                 salesOrder.setSalesIsDownload(1);
                 salesOrder.setSalesPostFirm(postType);
+                salesOrder.setSalesAddType(2);
+                salesOrder.setSalesAdminId(admin.getAdminId());
                 salesOrder.setSalesOrderItemList(salesOrderItemList);
                 salesOrderList.add(salesOrder);
                 mapsalesOrderList.put(orderId, salesOrder);
             } else {
-                //salesOrder.setSalesDealCode(orderId);
-                // 有订单，合并到原有订单的订单项
                 salesOrderItem = new SalesOrderItem();
                 productColor = new ProductColor();
                 productColor.setColorBar(efastOrder.getOrderProductBarCode());
@@ -1190,7 +1194,6 @@ public class AdminOrderController {
                     salesOrderItem.setItemIsSource(1);
                 }
                 salesOrder.getSalesOrderItemList().add(salesOrderItem);
-                //salesOrder.setSalesDealCode(orderId);
                 mapsalesOrderList.put(orderId, salesOrder);
             }
         }

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

@@ -653,7 +653,7 @@ public class AdminSalesOrderController {
         }
 
         String dealCode = generateKeyUtil.getSalesOrderKey();   //获取交易号
-        salesOrder.setSalesOpenId(dealCode); //身份证号/openid
+        salesOrder.setSalesOpenId("0"); //身份证号/openid
         salesOrder.setSalesPledgeMoney(0);  ///押金金额
         salesOrder.setSalesRemainDeposit(0);     //待提取金额
         salesOrder.setSalesStatus(0);   //确认状态 未确认
@@ -740,19 +740,21 @@ public class AdminSalesOrderController {
 
         try{
             String salesOrderInfo = order.getSalesAddressInfo();
-            String[] salesOrderInfos = new String[4];       //salesOrderInfos
-            if(salesOrderInfo.indexOf("-") > -1){
-                salesOrderInfos = salesOrderInfo.split("-"); //"XXX-XXX"
-            }else if(salesOrderInfo.indexOf(" ") > -1){
-                salesOrderInfos = salesOrderInfo.split("-");
-            }else if(salesOrderInfo.indexOf(",") > -1){
+            String[] salesOrderInfos = new String[4];
+            Integer salesOrderInfoLength = salesOrderInfo.length() - 3;
+            if(salesOrderInfo.indexOf("-") > -1  && salesOrderInfo.replaceAll("-", "").length()<=salesOrderInfoLength){
                 salesOrderInfos = salesOrderInfo.split("-");
+            }else if(salesOrderInfo.indexOf(" ") > -1 && salesOrderInfo.replaceAll(" ", "").length()<=salesOrderInfoLength){
+                salesOrderInfos = salesOrderInfo.split(" ");
+            }else if(salesOrderInfo.indexOf(",") > -1 && salesOrderInfo.replaceAll(",", "").length()<=salesOrderInfoLength){
+                salesOrderInfos = salesOrderInfo.split(",");
             }
             if(salesOrderInfos.length > 3){
                 order.setSalesAddressProvinceName(salesOrderInfos[0]);
                 order.setSalesAddressCityName(salesOrderInfos[1]);
                 order.setSalesAddressCountryName(salesOrderInfos[2]);
-                int descNumber = salesOrderInfo.indexOf(salesOrderInfos[3]);
+                //为了防止，后面的详细地址里面有省市区，so 从市来获取位置，加1，要去掉空格
+                int descNumber = salesOrderInfo.indexOf(salesOrderInfos[2]) + salesOrderInfos[2].length() +1 ;
                 String salesAddressDesc = "";
                 if(descNumber > 0){
                     salesAddressDesc = salesOrderInfo.substring(descNumber,salesOrderInfo.length());

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

@@ -33,7 +33,7 @@ import java.util.*;
 @Controller
 @RequestMapping("/mallorder")
 public class MallOrderController {
-    private static Logger logger = LoggerFactory.getLogger(SysController.class);
+    private static Logger logger = LoggerFactory.getLogger(MallOrderController.class);
     @Autowired
     private SalesOrderService salesOrderService;
     @Autowired
@@ -154,7 +154,8 @@ public class MallOrderController {
             salesOrder.setSalesDiscountMoney(salesAmount);
             salesOrder.setSalesPledgeMoney(salesAmount);
             salesOrder.setSalesRemainDeposit(salesAmount);
-            salesOrder.setSalesStatus(1);
+            //确认状态  0(未确认)
+            salesOrder.setSalesStatus(0);
             salesOrder.setSalesSendType(2);
             salesOrder.setSalesSalesTime(add_time);
             salesOrder.setSalesAddressInfo(province_name+" "+city_name+" "+district_name+" "+address);

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

@@ -517,7 +517,7 @@ public class ExcelUtil {
                 }
 
                 // 如果手机号码校验不通过，则应该不录入
-                if (!ValidateUtil.checkMobile(userTel.trim())) {
+                if (userTel.trim().length() != 11) {
                     //temp.getCell(telColumnIndex).setCellStyle(cellStyle);
                     order.setReturnStatus("error");
                     order.setReturnMsg("手机号码不正确");
@@ -528,7 +528,7 @@ public class ExcelUtil {
                 order.setOrderProductBarCode(OrderProductBarCodeValue);
                 String orderNum = getValue(temp.getCell(numColumnIndex));
                 String orderRemark = getValue(temp.getCell(remarkColumnIndex));
-                if(orderNum == null || "".equals(orderNum)){
+                if(orderNum == null || "".equals(orderNum) || Integer.valueOf(orderNum) == 0){
                     order.setReturnStatus("error");
                     order.setReturnMsg("数量不正确");
                     order.setOrderNum(0);               // 读取购买数量

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

@@ -240,7 +240,7 @@
                 </div>
                 <div class="modal-body">
                     <b style="margin-bottom: 10px">
-                        <p>共<span id="order_total"></span>个订单，失败<span style="color: red;" id="order_fault_num"></span>个</p>
+                        <p>共<span id="order_total"></span>个订单，失败<span style="color: red;" id="order_fault_num"></span>个   &nbsp;&nbsp;&nbsp;批次为：<span id="newBatchId"></span></p>
                         <p>总数不对?
                             &nbsp;&nbsp;<button class="btn btn-primary radius" onclick="check_fault()">查看校验失败内容</button>
                             &nbsp;&nbsp;<button class="btn btn-primary radius" onclick="download_order_id()">保存交易号</button>
@@ -617,6 +617,7 @@
                     error_path = result.returnMsg.errorPath;
                     $("#order_total").text(mapSalesOrderSize);
                     $("#order_fault_num").text(newFaultNum);
+                    $("#newBatchId").text(result.returnMsg.batchId);
                     modaldemo();
 
                     var fileName = result.returnMsg.fileName;
@@ -630,8 +631,6 @@
                 return false;
             }
         });
-
-
     }
 
     var error_path = null;

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

@@ -77,7 +77,6 @@
             </div>
 
             <#if admin.adminDept == 3 || admin.adminDept == 1>
-
                 <div class="row cl sales_channel" id="" style="">
                     <label class="form-label col-1 col-sm-1">销售渠道：</label>
                     <div class="formControls col-2 col-sm-2" style="">
@@ -93,10 +92,8 @@
                     </span>
                     </div>
                 </div>
-
             </#if>
 
-
             <div class="row cl" id="" style="">
                 <label class="form-label col-1 col-sm-1">用户信息：</label>
                 <div class="formControls col-2 col-sm-2">
@@ -171,7 +168,6 @@
                 <label class="form-label col-1 col-sm-1">商品信息：</label>
                 <div class="formControls col-8 col-sm-8">
                     <input type="button" class="btn btn-primary add-order-button" onclick="add_product()" value="添加商品" >
-
                     <table class="table table-border table-bg table-bordered" style="margin-top: 10px;display: none" id="all_add_product">
                         <thead>
                             <tr class="text-c" id="table1">
@@ -186,9 +182,7 @@
                         <tbody id="add_product">
                         </tbody>
                     </table>
-
                     <input type="hidden" id="orderItemString" name="orderItemString" value="" >
-
                 </div>
             </div>
 
@@ -247,9 +241,12 @@
     </div>
 </article>
 
-
+<script type="text/javascript">
+    var url_path = "${path}";
+</script>
 <#--时间控件-->
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/js/salesOrder/salesOrder.js"></script>
 
 <script type="text/javascript">
     var url_path = "${path}";
@@ -270,169 +267,6 @@
     /*初始化销售公司店铺*/
     $(".sales_channel").initSalesChannel();
 
-    /**
-     * 打开订单
-     */
-    function add_product() {
-        layer_show("商品列表",url_path + "/admin/salesOrder/to_add_product","1000","500");
-    }
-
-    $(function(){
-        $("#form-order-add").Validform({
-            tiptype: function (msg, o, cssctl) {
-                if (o.type == 3) {//失败
-                    layer.msg(msg, {icon: 5, time: 3000});
-                    $(window).scrollTop(o.obj.offset().top - 40);
-                }
-            },
-            datatype: {//自定义验证类型
-            },
-            ignoreHidden: true,
-            tipSweep: true, //若为true，则只在表单提交时验证
-            ajaxPost: true, //异步提交
-            beforeCheck: function (curform) {  //验证通过之前执行的函数
-                var flag = false;
-            },
-            beforeSubmit: function (curform) {  //验证通过之后执行的函数
-                var addressProvince = $("#addressProvince").find("option:selected").text();
-                var addressCity = $("#addressCity").find("option:selected").text();
-                var addressCountry = $("#addressCountry").find("option:selected").text();
-                var addressDesc = $("#addressDesc").val();
-                var salesAddressInfo = addressProvince + "-" + addressCity + "-" + addressCountry + "-" + addressDesc
-                $("#salesAddressInfo").val(salesAddressInfo);
-
-                var flag = false;
-                /*封装订单项*/
-                var orderItemArray = new Array();
-                $("#add_product").find("tr").each(function(){
-                    var orderItem = new Object();
-                    orderItem.itemColorId = $(this).find(".color_id").val();
-                    orderItem.itemNum = $(this).find(".item-num").val();
-                    orderItemArray.push(orderItem);
-                    flag = true;
-                })
-                if(!flag){
-                    vailErrorMsg($(".add-order-button"),"必须要有一个产品");
-                    return false;
-                }
-
-                $("#orderItemString").val(JSON.stringify(orderItemArray));
-
-                var index = layer.load(1, {
-                    shade: [0.5,'#fff'] //0.1透明度的白色背景
-                });
-            },
-            callback: function (data) {//异步回调函数
-                if (data) {
-                    var index = layer.alert(data.resultMsg, function (index) {
-                        if (data.resultCode == 200) {
-                            location.href = url_path + "/admin/salesOrder/list_order_page";
-                        }else {
-                            layer.close(index);
-                        }
-                    });
-                }
-            }
-        });
-    });
-
-    /**
-     * 选择商品回调
-     * @param colorIds
-     */
-    function setSelectProduct(colorIds){
-        var index = layer.load(1, {
-            shade: [0.5,'#fff'] //0.1透明度的白色背景
-        });
-
-        $("#all_add_product").show();
-
-        var colorIdArray = colorIds.split("_");
-        for(var i=0;i<colorIdArray.length;i++){
-            var colorId = colorIdArray[i];
-            if(colorId == ""){
-                break;
-            }
-
-            var flag = true;
-            $("#add_product").find("tr").each(function (){
-                var colId = $(this).find(".color_id").eq(0).val();
-                if(colId == colorId){
-                    flag  = false;
-                }
-            })
-            if(!flag){
-                continue;
-            }
-            $.ajax({
-                type: "POST",
-                data: { colorId : colorId},
-                url: "${path}/admin/product/get_product",
-                success: function(data){
-                    var html = "";
-                    if (data.returnCode == 200 && data.returnMsg.productColorList.length > 0 ) {
-                        for(var i=0;i<data.returnMsg.productColorList.length;i++){
-                            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 +'" >' +
-                                    ' <td>'+ cufte(productColor.productName) +'</td>' +
-                                    ' <td>'+ cufte(productColor.colorName) +'</td>' +
-                                    ' <td>'+ cufte(productColor.colorPrice)/100 +'</td>' +
-                                    ' <td>'+ cufte(productColor.colorBar) +'</td>' +
-                                    ' <td><input type="text" class="input-text input-number item-num"  style="width: 100%;border: none;text-align: center;" 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>';
-                        }
-                    }else{
-                        html = '<tr class="text-c"><td colspan="12">没有搜索到商品，请重试!</td></tr>';
-                    }
-                    $("#add_product").append(html);
-                    /*计算价格*/
-                    calculatePrice();
-                }
-            });
-        }
-        layer.close(index);
-    }
-
-    /**
-     *  删除商品
-     */
-    function delProduct($this){
-        $this.parents("tr").remove();
-    }
-
-    /**
-     * 计算价格
-     */
-    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;
-            itemNum = $(this).find(".item-num").val();
-            if(!isEmpty(itemNum)){
-                return;
-            }
-            itemNum = parseInt(itemNum);
-            salesPayMoney = colorPrice -colorDiscount;
-            if(salesPayMoney < 0){
-                salesPayMoney = 0;
-            }
-            colorDiscountAll += colorDiscount*itemNum;
-            colorPriceAll += colorPrice*itemNum;
-            salesPayMoneyAll += salesPayMoney*itemNum;
-        })
-        $("#salesAmount").val(colorPriceAll);
-        $("#salesPayMoney").val(colorDiscountAll);
-        $("#salesDiscountMoney").val(salesPayMoneyAll);
-
-        $("#salesLastMoney").val(colorDiscountAll);
-    }
 
 </script>
 </body>

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

@@ -376,7 +376,7 @@
         /*导出上传到efast的Excel*/
         $('#order_excel').click(function (e) {
             var salesIsDownload = $("#salesIsDownload").val(); //是否导出
-            var salesStatus = $("#salesStatus").val(); //
+            var salesStatus = 1; //导出必须是确认状态
             var salesShippingStatus = $("#salesShippingStatus").val(); //是否已发货
             var salesStoreId = $("#salesStoreId").val(); //店铺
             var startDate = $("#startDate").val();

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

@@ -293,13 +293,13 @@
 
 <#--时间控件-->
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+<script type="text/javascript" charset="utf-8" src="${path}/common/js/salesOrder/salesOrder.js"></script>
 
 <script type="text/javascript">
     var url_path = "${path}";
 </script>
 
 <script type="text/javascript">
-
     $('.skin-minimal input').iCheck({
         checkboxClass: 'icheckbox-blue',
         radioClass: 'iradio-blue',
@@ -312,171 +312,6 @@
 
     /*初始化销售公司店铺*/
     $(".sales_channel").initSalesChannel();
-
-    /**
-     * 打开订单
-     */
-    function add_product() {
-        layer_show("商品列表",url_path + "/admin/salesOrder/to_add_product","1000","500");
-    }
-
-    $(function(){
-        $("#form-order-add").Validform({
-            tiptype: function (msg, o, cssctl) {
-                if (o.type == 3) {//失败
-                    layer.msg(msg, {icon: 5, time: 3000});
-                    $(window).scrollTop(o.obj.offset().top - 40);
-                }
-            },
-            datatype: {//自定义验证类型
-            },
-            ignoreHidden: true,
-            tipSweep: true, //若为true，则只在表单提交时验证
-            ajaxPost: true, //异步提交
-            beforeCheck: function (curform) {  //验证通过之前执行的函数
-                var flag = false;
-            },
-            beforeSubmit: function (curform) {  //验证通过之后执行的函数
-                var addressProvince = $("#addressProvince").find("option:selected").text();
-                var addressCity = $("#addressCity").find("option:selected").text();
-                var addressCountry = $("#addressCountry").find("option:selected").text();
-                var addressDesc = $("#addressDesc").val();
-                var salesAddressInfo = addressProvince + "-" + addressCity + "-" + addressCountry + "-" + addressDesc
-                $("#salesAddressInfo").val(salesAddressInfo);
-
-                var flag = false;
-                /*封装订单项*/
-                var orderItemArray = new Array();
-                $("#add_product").find("tr").each(function(){
-                    var orderItem = new Object();
-                    orderItem.itemColorId = $(this).find(".color_id").val();
-                    orderItem.itemNum = $(this).find(".item-num").val();
-                    orderItemArray.push(orderItem);
-                    flag = true;
-                })
-                if(!flag){
-                    vailErrorMsg($(".add-order-button"),"必须要有一个产品");
-                    return false;
-                }
-
-                $("#orderItemString").val(JSON.stringify(orderItemArray));
-
-                var index = layer.load(1, {
-                    shade: [0.5,'#fff'] //0.1透明度的白色背景
-                });
-            },
-            callback: function (data) {//异步回调函数
-                if (data) {
-                    var index = layer.alert(data.resultMsg, function (index) {
-                        if (data.resultCode == 200) {
-                            location.href = url_path + "/admin/salesOrder/list_order_page";
-                        }else {
-                            layer.close(index);
-                        }
-                    });
-                }
-            }
-        });
-    });
-
-    /**
-     * 选择商品回调
-     * @param colorIds
-     */
-    function setSelectProduct(colorIds){
-        var index = layer.load(1, {
-            shade: [0.5,'#fff'] //0.1透明度的白色背景
-        });
-
-        $("#all_add_product").show();
-
-        var colorIdArray = colorIds.split("_");
-        for(var i=0;i<colorIdArray.length;i++){
-            var colorId = colorIdArray[i];
-            if(colorId == ""){
-                break;
-            }
-
-            var flag = true;
-            $("#add_product").find("tr").each(function (){
-                var colId = $(this).find(".color_id").eq(0).val();
-                if(colId == colorId){
-                    flag  = false;
-                }
-            })
-            if(!flag){
-                continue;
-            }
-            $.ajax({
-                type: "POST",
-                data: { colorId : colorId},
-                url: "${path}/admin/product/get_product",
-                success: function(data){
-                    var html = "";
-                    if (data.returnCode == 200 && data.returnMsg.productColorList.length > 0 ) {
-                        for(var i=0;i<data.returnMsg.productColorList.length;i++){
-                            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 +'" >' +
-                                    ' <td>'+ cufte(productColor.productName) +'</td>' +
-                                    ' <td>'+ cufte(productColor.colorName) +'</td>' +
-                                    ' <td>'+ cufte(productColor.colorPrice)/100 +'</td>' +
-                                    ' <td>'+ cufte(productColor.colorBar) +'</td>' +
-                                    ' <td><input type="text" class="input-text input-number item-num"  style="width: 100%;border: none;text-align: center;" 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>';
-                        }
-                    }else{
-                        html = '<tr class="text-c"><td colspan="12">没有搜索到商品，请重试!</td></tr>';
-                    }
-                    $("#add_product").append(html);
-                    /*计算价格*/
-                    calculatePrice();
-                }
-            });
-        }
-        layer.close(index);
-    }
-
-    /**
-     *  删除商品
-     */
-    function delProduct($this){
-        $this.parents("tr").remove();
-    }
-
-    /**
-     * 计算价格
-     */
-    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;
-            itemNum = $(this).find(".item-num").val();
-            if(!isEmpty(itemNum)){
-                return;
-            }
-            itemNum = parseInt(itemNum);
-            salesPayMoney = colorPrice -colorDiscount;
-            if(salesPayMoney < 0){
-                salesPayMoney = 0;
-            }
-            colorDiscountAll += colorDiscount*itemNum;
-            colorPriceAll += colorPrice*itemNum;
-            salesPayMoneyAll += salesPayMoney*itemNum;
-        })
-        $("#salesAmount").val(colorPriceAll);
-        $("#salesPayMoney").val(colorDiscountAll);
-        $("#salesDiscountMoney").val(salesPayMoneyAll);
-
-        $("#salesLastMoney").val(colorDiscountAll);
-    }
-
 </script>
 </body>
 </html>

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

@@ -0,0 +1,164 @@
+
+/**
+ * 打开订单
+ */
+function add_product() {
+    layer_show("商品列表",url_path + "/admin/salesOrder/to_add_product","1000","500");
+}
+
+$(function(){
+    $("#form-order-add").Validform({
+        tiptype: function (msg, o, cssctl) {
+            if (o.type == 3) {//失败
+                layer.msg(msg, {icon: 5, time: 3000});
+                $(window).scrollTop(o.obj.offset().top - 40);
+            }
+        },
+        datatype: {//自定义验证类型
+        },
+        ignoreHidden: true,
+        tipSweep: true, //若为true，则只在表单提交时验证
+        ajaxPost: true, //异步提交
+        beforeCheck: function (curform) {  //验证通过之前执行的函数
+            var flag = false;
+        },
+        beforeSubmit: function (curform) {  //验证通过之后执行的函数
+            var addressProvince = $("#addressProvince").find("option:selected").text();
+            var addressCity = $("#addressCity").find("option:selected").text();
+            var addressCountry = $("#addressCountry").find("option:selected").text();
+            var addressDesc = $("#addressDesc").val();
+            var salesAddressInfo = addressProvince + " " + addressCity + " " + addressCountry + " " + addressDesc
+            $("#salesAddressInfo").val(salesAddressInfo);
+
+            var flag = false;
+            /*封装订单项*/
+            var orderItemArray = new Array();
+            $("#add_product").find("tr").each(function(){
+                var orderItem = new Object();
+                orderItem.itemColorId = $(this).find(".color_id").val();
+                orderItem.itemNum = $(this).find(".item-num").val();
+                orderItemArray.push(orderItem);
+                flag = true;
+            })
+            if(!flag){
+                vailErrorMsg($(".add-order-button"),"必须要有一个产品");
+                return false;
+            }
+
+            $("#orderItemString").val(JSON.stringify(orderItemArray));
+
+            var index = layer.load(1, {
+                shade: [0.5,'#fff'] //0.1透明度的白色背景
+            });
+        },
+        callback: function (data) {//异步回调函数
+            if (data) {
+                var index = layer.alert(data.resultMsg, function (index) {
+                    if (data.resultCode == 200) {
+                        location.href = url_path + "/admin/salesOrder/list_order_page";
+                    }else {
+                        layer.close(index);
+                    }
+                });
+            }
+        }
+    });
+});
+
+/**
+ * 选择商品回调
+ * @param colorIds
+ */
+function setSelectProduct(colorIds){
+    var index = layer.load(1, {
+        shade: [0.5,'#fff'] //0.1透明度的白色背景
+    });
+
+    $("#all_add_product").show();
+
+    var colorIdArray = colorIds.split("_");
+    for(var i=0;i<colorIdArray.length;i++){
+        var colorId = colorIdArray[i];
+        if(colorId == ""){
+            break;
+        }
+
+        var flag = true;
+        $("#add_product").find("tr").each(function (){
+            var colId = $(this).find(".color_id").eq(0).val();
+            if(colId == colorId){
+                flag  = false;
+            }
+        })
+        if(!flag){
+            continue;
+        }
+        $.ajax({
+            type: "POST",
+            data: { colorId : colorId},
+            url: url_path +"/admin/product/get_product",
+            success: function(data){
+                var html = "";
+                if (data.returnCode == 200 && data.returnMsg.productColorList.length > 0 ) {
+                    for(var i=0;i<data.returnMsg.productColorList.length;i++){
+                        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 +'" >' +
+                            ' <td>'+ cufte(productColor.productName) +'</td>' +
+                            ' <td>'+ cufte(productColor.colorName) +'</td>' +
+                            ' <td>'+ cufte(productColor.colorPrice)/100 +'</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><a href="javascript:void(0)" class="del_product all_down" onclick="delProduct($(this))" >删除</a></td>' +
+                            ' </tr>';
+                    }
+                }else{
+                    html = '<tr class="text-c"><td colspan="12">没有搜索到商品，请重试!</td></tr>';
+                }
+                $("#add_product").append(html);
+                /*计算价格*/
+                calculatePrice();
+            }
+        });
+    }
+    layer.close(index);
+}
+
+/**
+ *  删除商品
+ */
+function delProduct($this){
+    $this.parents("tr").remove();
+}
+
+/**
+ * 计算价格
+ */
+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;
+        itemNum = $(this).find(".item-num").val();
+        if(!isEmpty(itemNum)){
+            return;
+        }
+        itemNum = parseInt(itemNum);
+        salesPayMoney = colorPrice -colorDiscount;
+        if(salesPayMoney < 0){
+            salesPayMoney = 0;
+        }
+        colorDiscountAll += colorDiscount*itemNum;
+        colorPriceAll += colorPrice*itemNum;
+        salesPayMoneyAll += salesPayMoney*itemNum;
+    })
+    $("#salesAmount").val(colorPriceAll);
+    $("#salesPayMoney").val(colorDiscountAll);
+    $("#salesDiscountMoney").val(salesPayMoneyAll);
+
+    $("#salesLastMoney").val(colorDiscountAll);
+}