售后流程修改

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/ComplaintDetectInfo.java

@@ -62,7 +62,8 @@ public class ComplaintDetectInfo implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date signclosedDate;//签收时间
 
-    private Date maintenanceCutTime;//待维修截止时间
+    private Date maintenanceCutTime;//待检测截止时间
+    private Date completeCutTime;//待完成维修截止时间
 
     //5月8号新增字段
     private String detectProduction;//生产月份
@@ -434,4 +435,12 @@ public class ComplaintDetectInfo implements Serializable {
     public void setDetectNumber(String detectNumber) {
         this.detectNumber = detectNumber;
     }
+
+    public Date getCompleteCutTime() {
+        return completeCutTime;
+    }
+
+    public void setCompleteCutTime(Date completeCutTime) {
+        this.completeCutTime = completeCutTime;
+    }
 }

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

@@ -95,6 +95,13 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
     @Override
     public Integer updateSalesOrder(SalesOrder salesOrder) {
+        //作废订单时需要返还库存
+        if(salesOrder.getSalesStatus() != null && salesOrder.getSalesStatus() == 3){
+            //如果已出库则返还库存
+            if(salesOrderMapper.getSalesOrderById(salesOrder.getSalesId()).getSalesDeliver() == 2){
+                returnInventory(salesOrder.getSalesId());
+            }
+        }
         return salesOrderMapper.updateSalesOrder(salesOrder);
     }
 
@@ -871,12 +878,44 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Override
     @Transactional
     public Integer delSalesOrder(Integer id) {
+        //查询出库状态判断是否需要返还库存
+        if(salesOrderMapper.getSalesOrderById(id).getSalesDeliver() == 2){
+            returnInventory(id);
+        }
         // 检查客诉是否使用订单，如果有使用订单，无法删除
         salesOrderMapper.delOrderItem(id);
         salesOrderMapper.delSalesOrder(id);
         return 1;
     }
 
+    //执行删除和作废订单时返还库存
+    public boolean returnInventory(Integer salesId){
+        SalesOrderItem salesOrderItem = new SalesOrderItem();
+        salesOrderItem.setItemOrderId(salesId);
+        List<SalesOrderItem> listOrderitem = salesOrderService.listSalesOrderItem(salesOrderItem);
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for(SalesOrderItem item : listOrderitem){
+            InventoryInfo info = inventoryMapper.getByInventoryByBar(item.getItemColorBar());
+            if(info != null){
+                    info.setInventoryGoodProductNum(info.getInventoryGoodProductNum() + item.getItemNum());
+                info.setInventoryRecentRecord(sdf.format(new Date())+"删除/作废订单返还库存："+item.getItemNum()+"件");
+                inventoryMapper.updateById(info);
+                //添加日志
+                InventoryLog inventoryLog = new InventoryLog();
+                inventoryLog.setLogProductName(info.getInventoryProductName());
+                inventoryLog.setLogProductBar(info.getInventoryProductBar());
+                inventoryLog.setLogRemainingNum(item.getItemNum());
+                inventoryLog.setLogType(1);
+                inventoryLog.setLogOperationType(1);
+                inventoryLog.setLogDesc(sdf.format(new Date())+"删除/作废订单返还库存："+item.getItemNum()+"件");
+                inventoryLog.setLogQualityType(1);
+                inventoryLog.setLogWarehouseId(1);
+                inventoryLogMapper.insert(inventoryLog);
+            }
+
+        }
+        return true;
+    }
     @Override
     public Integer updateOrderItem(SalesOrderItem salesOrderItem) {
         return salesOrderMapper.updateOrderItem(salesOrderItem);
@@ -1030,7 +1069,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public Integer updateDeliver(SalesOrder salesOrder) {
             if(salesOrder.getSalesDeliver() == 2){//修改库存
                 if(!updateInventory(salesOrder.getSalesId())){
-                    throw  new RuntimeException("标记出库-修改库存失败！");
+                    return 0;
                 }
             }
         return salesOrderMapper.updateDeliver(salesOrder);

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/ComplaintDetectInfoServiceImpl.java

@@ -17,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -130,10 +132,14 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
     public boolean customerConfirm(ComplaintDetectInfo detectInfo) {
         ComplaintDetectInfo detect = complaintDetectInfoMapper.getDetectById(detectInfo.getDetectId());
         /*ProcMethod procMethod = procMethodMapper.getProcMethodById(detectInfo.getProcMethodId());*/
+        Calendar date = Calendar.getInstance();
+        date.setTime(new Date());
+        date.set(Calendar.DATE, date.get(Calendar.DATE) + 5);
         switch (detectInfo.getDetectState()){
             case 30:
                 if(detectInfo.getDetectProcessingResults() == 1){//付费维修
                     detectInfo.setDetectState(31);//同意付费维修
+                    detectInfo.setCompleteCutTime(date.getTime());
                 }
                 if(detectInfo.getDetectProcessingResults() == 3 || detectInfo.getDetectProcessingResults() == 4){//退货、换货
                     if(detect.getDetectRenovation() == 1){
@@ -148,13 +154,16 @@ public class ComplaintDetectInfoServiceImpl implements ComplaintDetectInfoServic
                 break;
             case 34:
                 detectInfo.setDetectState(35);
+                detectInfo.setCompleteCutTime(date.getTime());
                 break;
             case 38:
                 if(detectInfo.getDetectProcessingResults() == 1){//付费维修
                     detectInfo.setDetectState(31);//同意付费维修
+                    detectInfo.setCompleteCutTime(date.getTime());
                 }
                 if(detectInfo.getDetectProcessingResults() == 2){//免费维修
                     detectInfo.setDetectState(35);//同意免费维修
+                    detectInfo.setCompleteCutTime(date.getTime());
                 }
                 if(detectInfo.getDetectProcessingResults() == 3 || detectInfo.getDetectProcessingResults() == 4){//退货、换货
                     if(detect.getDetectRenovation() == 1){

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -34,6 +34,7 @@
       detect_is_refurbishing detectIsRefurbishing,
       maintenance_results maintenanceResults,
       detect_number detectNumber,
+      complete_cut_time completeCutTime,
       cd.signclosed_id signclosedId,
       pi.product_name productName,
       ci.color_name colorName,
@@ -87,6 +88,7 @@
     cd.detect_is_refurbishing detectIsRefurbishing,
     cd.maintenance_results maintenanceResults,
     cd.detect_number detectNumber,
+    cd.complete_cut_time completeCutTime,
     qd.describe_title questionTitle,
     pi.product_name productName,
     pt.type_name productTypeName,
@@ -230,7 +232,10 @@
           maintenance_results = #{maintenanceResults,jdbcType=VARCHAR},
       </if>
       <if test="detectNumber != null and detectNumber != ''" >
-          detect_number = #{detectNumber,jdbcType=VARCHAR}
+          detect_number = #{detectNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="completeCutTime != null and completeCutTime != ''" >
+        complete_cut_time = #{completeCutTime,jdbcType=VARCHAR}
       </if>
     </set>
     where

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -201,13 +201,13 @@
       <if test="signclosedSendTel != null" >
         signclosed_send_tel = #{signclosedSendTel,jdbcType=VARCHAR},
       </if>
-      <if test="signclosedAddrProvinces != null" >
+      <if test="signclosedAddrProvinces != null and signclosedAddrProvinces != ''" >
         signclosed_addr_provinces = #{signclosedAddrProvinces,jdbcType=VARCHAR},
       </if>
-      <if test="signclosedAddrCity != null" >
+      <if test="signclosedAddrCity != null and signclosedAddrCity != ''" >
         signclosed_addr_city = #{signclosedAddrCity,jdbcType=VARCHAR},
       </if>
-      <if test="signclosedAddrArea != null" >
+      <if test="signclosedAddrArea != null and signclosedAddrArea != ''" >
         signclosed_addr_area = #{signclosedAddrArea,jdbcType=VARCHAR},
       </if>
       <if test="signclosedDate != null" >

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/inventoryLogMapper.xml

@@ -74,6 +74,7 @@
         and il.log_warehouse_id = #{logWarehouseId}
       </if>
     </where>
+    ORDER BY il.log_create_time DESC
   </select>
 
   <update id="updateById" parameterType="InventoryLog" >

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/inventoryMapper.xml

@@ -103,6 +103,8 @@
 
     WHERE
     oi.sales_shipping_status IN (0,3,11)
+    AND  oi.sales_deliver = 1
+    AND  oi.sales_status IN (0,1,2)
     GROUP BY soi.item_color_id
     ) imn on imn.colorId  = pc.color_id
     <where>
@@ -128,6 +130,7 @@
         and pc.color_bar = #{inventoryProductBar}
       </if>
     </where>
+    ORDER BY inventory_sorting
   </select>
 
   <update id="updateById" parameterType="InventoryInfo" >

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

@@ -87,7 +87,7 @@ public class AdminSignclosedController {
     public ModelAndView selectDetectList(HttpServletRequest request,
                                         @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
                                         @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
-                                        @RequestParam(value = "pageSize", defaultValue = "5", required = false) int pageSize,
+                                        @RequestParam(value = "pageSize", defaultValue = "10", required = false) int pageSize,
                                          ComplaintSignclosedInfo signclosedInfo) {
         ModelAndView mv = new ModelAndView("cm/signclosed/signclosed_list");
         if(signclosedInfo.getIsBinding() != null && signclosedInfo.getIsBinding() == 1){

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

@@ -1,6 +1,8 @@
 package com.iamberry.rst.controllers.order;
 
 import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.fm.InventoryInfo;
+import com.iamberry.rst.core.fm.InventoryLog;
 import com.iamberry.rst.core.order.*;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
@@ -1237,6 +1239,7 @@ public class AdminSalesOrderController {
         Integer res = salesOrderService.delSalesOrder(id);
         return res <= 0 ? ResponseJson.getFAILURE() : ResponseJson.getSUCCESS();
     }
+
     /**
      * 进入修改订单备注页面
      * @param salesId
@@ -1726,4 +1729,60 @@ public class AdminSalesOrderController {
             return new ResponseJson(500, "发送短信失败，失败原因：" + result, 500);
         }
     }
+
+    /**
+     * 进入发送售后短信页面
+     * @param request
+     * @return
+     */
+    @RequestMapping("/to_adminDetectOrder")
+    public ModelAndView to_adminDetectOrder(HttpServletRequest request){
+        ModelAndView mv = new ModelAndView("order/salesOrder/delete_order");
+        return mv;
+    }
+
+
+    /**
+     * 手动删除订单（管理员使用）（支持订单号和批次号，支持返还库存）
+     *
+     * @param request
+     * type  1订单id 2批次号 3订单号 4交易号
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("salesOrder:delete:salesOrder")
+    @RequestMapping("/adminDetectOrder")
+    public ResponseJson adminDetectOrder(HttpServletRequest request,String id,Integer type) throws Exception {
+        if (id == null || id.equals("")|| type == null) {
+            return new ResponseJson(500, "未获取到参数!", 500);
+        }
+        StringBuffer ret1 = new StringBuffer("成功：");
+        StringBuffer ret2 = new StringBuffer("失败：");
+        SalesOrder order = new SalesOrder();
+        if(type == 1){//id
+            order.setSalesId(Integer.valueOf(id));
+        }else if(type == 2){//批次号
+            order.setSalesBatchId(id);
+        }else if(type == 3){//订单号
+            order.setSalesOrderId(id);
+        }else if(type == 4){//交易号
+            order.setSalesDealCode(id);
+        }
+        List<SalesOrder> orderList = salesOrderService.salesOrderListAndItem(order);
+        if(orderList.size() > 0 && orderList.size() < 2000){
+            for (SalesOrder salesOrder : orderList){
+                Integer res = salesOrderService.delSalesOrder(salesOrder.getSalesId());
+                if (res != 1){//失败单号
+                    ret2.append(salesOrder.getSalesId()+":");
+                }else{
+                    ret1.append(salesOrder.getSalesId()+":");
+                }
+            }
+
+        }
+        return new ResponseJson(200, ret1+"-----"+ret2, 200);
+
+            /*return new ResponseJson(500, "发送短信失败，失败原因：" + result, 500);*/
+
+    }
 }

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

@@ -553,7 +553,7 @@ public class AwaitSendController {
                 rj.setResultMsg("出货失败，请检查该物流单号（"+postNum+"）和订单状态是否为已发货。");
                 return rj;
             }
-            //修改库存信息
+            /*//修改库存信息
             if(updateInventory(salesOrder.getSalesId())){
                 rj = ResponseJson.getSUCCESS();
                 rj.setResultMsg("物流单号（"+ postNum +"）出库成功。");
@@ -561,7 +561,7 @@ public class AwaitSendController {
             }else{
                 rj.setResultMsg("出货失败，请检查该物流单号（"+postNum+"）和订单状态是否为已发货,产品库存是否充足。");
                 return rj;
-            }
+            }*/
 
         }
         if(salesOrder == null){
@@ -577,13 +577,16 @@ public class AwaitSendController {
             return rj;
         }
         salesOrder.setSalesDeliver(2);
-        if(updateInventory(salesOrder.getSalesId())){
+        /*if(updateInventory(salesOrder.getSalesId())){*/
             Integer flag = salesOrderService.updateDeliver(salesOrder);
             if(flag < 1){
                 rj.setResultMsg("出货失败，请检查该物流单号（"+postNum+"）和订单状态,产品库存是否充足。");
                 return rj;
             }
-        }
+        /*}else{
+            rj.setResultMsg("出货失败，请检查该物流单号（"+postNum+"）和订单状态是否为已发货,产品库存是否充足。");
+            return rj;
+        }*/
         //查询出库的产品项
         List<SalesOrderItem> itemList = salesOrderService.selectSalesOrderItemList(salesOrder.getSalesId());
         rj = ResponseJson.getSUCCESS();
@@ -766,7 +769,7 @@ public class AwaitSendController {
         Integer flag = salesOrderService.updateDeliver(salesOrder);
 
         if(flag < 1){
-            rj.setResultMsg("出货失败，请检查该订单的发货状态。");
+            rj.setResultMsg("出货失败，请检查该订单的发货状态及产品库存是否充足。");
             return rj;
         }
         rj = ResponseJson.getSUCCESS();

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -170,7 +170,7 @@
                             待用户确认
                         </#if>
                         <#if detect.detectState == 31>
-                            <span class="c-red">待维修</span>
+                            <span class="c-red">待维修(${detect.completeCutTime?string("yyyy/MM/dd")}前完成)</span>
                         </#if>
                         <#if detect.detectState == 32>
                             <span class="c-success">维修完成</span>
@@ -182,7 +182,7 @@
                             待客服确认维修
                         </#if>
                         <#if detect.detectState == 35>
-                            <span class="c-red">待维修</span>
+                            <span class="c-red">待维修(${detect.completeCutTime?string("yyyy/MM/dd")}前完成)</span>
                         </#if>
                         <#if detect.detectState == 36>
                             <span class="c-success">维修完成</span>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventory_list.ftl

@@ -81,7 +81,7 @@
                 <th width="100">产品69码</th>
                 <th width="100">待发数量</th>
                 <th width="100">良品数量</th>
-                <th width="100">不良品数量</th>
+                <th width="100">维修机数量</th>
                 <th width="100">最近记录</th>
                 <th width="100">操作</th>
             </tr>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/update_inventory.ftl

@@ -48,11 +48,11 @@
                 <strong>质量类型</strong>
                 <div class="radio-box">
                     <input type="radio" id="tel-b1" name="qualityType" checked value="1">
-                    <label for="tel-b1">良品</label>
+                    <label for="tel-b1">正常机器</label>
                 </div>
                 <div class="radio-box">
                     <input type="radio" id="tel-b2" name="qualityType" value="2">
-                    <label for="tel-b2">不良品</label>
+                    <label for="tel-b2">维修机器</label>
                 </div>
             </div>
         </div>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/complete_signclosed.ftl

@@ -129,8 +129,20 @@
                     <input type="text" value="${complaintSignclosedInfo.signclosedSendTel!''}" class="input-text" placeholder="寄件方联系电话" id="signclosedSendTel" name="signclosedSendTel">
                 </div>
             </div>
-
-            <div class="row cl address_info" style="position: relative;">
+            <div class="row cl">
+                <label class="form-label col-3 col-sm-3"><span class="c-red">*</span>寄回区域：</label>
+                <div class="formControls col-8 col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" id="tel-s1" name="sendArea" checked value="1">
+                        <label for="tel-s1">有寄回区域</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-s2" name="sendArea" value="2">
+                        <label for="tel-s2">无寄回区域</label>
+                    </div>
+                </div>
+            </div>
+            <div class="row cl address_info" style="position: relative;" id="addrs">
                 <label class="form-label col-3 col-sm-3"></label>
                 <div class="formControls col-2 col-sm-2" style="">
                     <span class="select-box">
@@ -212,6 +224,13 @@
         });
     });
 
+    $("#tel-s1").click(function (){
+            $("#addrs").show();
+    });
+    $("#tel-s2").click(function (){
+            $("#addrs").hide();
+    });
+
     /***
      * 删除图片
      */
@@ -386,12 +405,20 @@
             }
         }
         //设置省市县
-        var provinces = $("#provinces").find("option:selected").val();
-        var city = $("#city").find("option:selected").val();
-        var area = $("#area").find("option:selected").val();
-        $("#signclosedAddrProvinces").val(provinces);
-        $("#signclosedAddrCity").val(city);
-        $("#signclosedAddrArea").val(area);
+        var sendArea = $('input[name="sendArea"]:checked').val();//是否有寄回区域
+        if(sendArea === "1"){
+            var provinces = $("#provinces").find("option:selected").val();
+            var city = $("#city").find("option:selected").val();
+            var area = $("#area").find("option:selected").val();
+            $("#signclosedAddrProvinces").val(provinces);
+            $("#signclosedAddrCity").val(city);
+            $("#signclosedAddrArea").val(area);
+        }else{
+            $("#signclosedAddrProvinces").val("");
+            $("#signclosedAddrCity").val("");
+            $("#signclosedAddrArea").val("");
+        }
+
 
         //选择产品
         var flag = false;

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -134,7 +134,7 @@
                             <#elseif signclosed.signclosedLogistics == "longbanwuliu">
                                 龙邦快递
                             </#if>-->
-                        ${signclosed.signclosedLogistics!}
+                        ${signclosed.signclosedLogisticsName!}
                             -
                         </#if>
                     ${signclosed.signclosedLogisticsNumber!}</td>

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

@@ -0,0 +1,153 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+    <meta http-equiv="Cache-Control" content="no-siteapp"/>
+    <#include "/base/add_base.ftl">
+
+    <style>
+        .tit{position: relative;text-align: left;font-size: 16px;padding-left: 10px;}
+        .tit:after{content: '';position: absolute;left: 0;top: 20%;height: 60%;width: 3px;background-color: #32a3d8;}
+        .tit-2{position: relative;text-align: left;font-size: 16px;padding-left: 10px;color: #50a2ea;}
+        .tit-2:after{content: '';position: absolute;left: 0;top: 45%;height: 6px;width: 6px;border-radius: 6px;background-color: #32a3d8;}
+        #province select{margin-right:10px; width:100px;height: 31px;-webkit-appearance:none !important;appearance:none;background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;padding-left:3px;padding-right: 25px;}
+        .ac_results li a {white-space: nowrap;text-decoration:none;display:block;color:#05a;padding:1px 3px}
+        .ac_results li {border:1px solid #fff}
+        .ac_results li a span {float:right}
+        .select-box{background: url(${path}/common/images/cm/select-1.png) right center no-repeat;background-size: auto 100%;}
+        .select-box select{-webkit-appearance:none !important;background-color: transparent; appearance:none;padding-right: 15px;}
+        .dalog-ask{position: absolute;left:60%;top:0;-webkit-transform: translateY(-30%);transform: translateY(-30%);display: none;background-color: #fff;z-index: 10;}
+        .tag{ width:300px; min-height:300px; border:1px solid #32a3d8; position:relative;background-color: #fff;line-height: 1.5;padding: 10px 12px;}
+        .tag em{display:block; border-width:15px; position:absolute; top:30%; left:-30px;border-style:solid dashed dashed; border-color:transparent  #32a3d8 transparent transparent;font-size:0; line-height:0;}
+        .time-line-list{list-style: none;width: 100%;margin-left: -20px;}
+        .time-line-list>li{position: relative;float: left; text-align: center;width: 100px;overflow: hidden;white-space: nowrap;word-break: break-all;padding: 2px 0;}
+        .time-line-list .number{display: inline-block; padding: 2px; background: #32a3d8;border: 2px solid #fff;box-shadow:0 0 0 1px #32a3d8;width: 20px;height: 20px;color: #fff;line-height: 20px;border-radius: 50%;}
+        .time-line-list>li:before{content:'';position: absolute;height: 1px;width: 30%;right:0;top: 15px; background-color: #32a3d8;}
+        .time-line-list>li:after{content: '';position: absolute;height: 1px;width: 30%;left: 0;top: 15px;background:#32a3d8;}
+        .time-line-list>li:first-child:after,.time-line-list>li:last-child:before{display: none;}
+        .time-line-list .arrow{border-width:7px; position:absolute; left:25%; top:9px;border-style:solid dashed dashed; border-color:transparent  transparent  transparent #32a3d8;font-size:0; line-height:0;}
+        .time-line-list>li:first-child .arrow{display: none;}
+        .table-bg th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .msg-phone{height: 35px;line-height: 35px;}
+        .col-sm-1{width: 150px;}
+
+        .all_down{text-decoration: underline;color: #f00;}
+    </style>
+    <title>添加订单 - 订单管理 - RST</title>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">/</span> 订单管理
+    <span class="c-gray en">/</span> 手动删除订单
+    <a class="btn radius r"
+       href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <a class="btn radius r"
+       href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
+</nav>
+<article class="page-container" style="padding: 10px;">
+    <div class="pd-20 cl">
+        <form action="" method="post" class="form form-horizontal" id="form-order-add"  onkeydown="if(event.keyCode==13)return false;">
+
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>id类型:</strong>
+                </div>
+                <div class="formControls col-5 col-sm-5">
+                    <div class="radio-box">
+                        <input type="radio" id="tel-666" name="type" checked value="1">
+                        <label for="tel-666">订单id</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-777" name="type" value="2">
+                        <label for="tel-777">批次号</label>
+                    </div>
+
+                    <div class="radio-box">
+                        <input type="radio" id="tel-888" name="type" value="3">
+                        <label for="tel-888">订单号</label>
+                    </div>
+
+                    <div class="radio-box">
+                        <input type="radio" id="tel-999" name="type" value="4">
+                        <label for="tel-999">交易号</label>
+                    </div>
+                </div>
+            </div>
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>ID:</strong>
+                </div>
+                <div class="formControls col-5 col-sm-5">
+                    <input type="text" class="input-text"  id="salesid" name="salesid">
+                </div>
+            </div>
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong></strong>
+                </div>
+                <div class="formControls col-5 col-sm-5">
+                    <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="" onclick="addInformationInfo();" name="">确认删除</button>
+                </div>
+
+            </div>
+            <div class="row cl">
+                <div class="formControls col-5 col-sm-5">
+                    <span id="spanid"></span>
+                </div>
+
+            </div>
+        </form>
+    </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">
+    /*添加收费信息*/
+    function addInformationInfo() {
+        var id = $("#salesid").val();
+        var type = parseInt($("input[name='type']:checked").val());
+        if(id == null || id == ""){
+            layer.msg("请输入ID!",{icon: 5,time:1000});
+            return;
+        }
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"id" : id,
+                "type" : type},
+            url: "${path}/admin/salesOrder/adminDetectOrder",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    layer.msg("添加成功!",{icon: 1,time:1000});
+                    $("#spanid").html(data.resultMsg);
+                } else {
+                    layer.msg("添加失败!",{icon: 5,time:1000});
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                window.parent.admin_result("添加失败!",5);
+            }
+        })
+    }
+
+</script>
+
+
+<script type="text/javascript" charset="utf-8" src="${path}/common/js/salesOrder/salesOrder.js"></script>
+
+
+</body>
+</html>