订单中心开发

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

@@ -790,6 +790,8 @@
         WHERE
           sales_shipping_status = 0
         AND
+          sales_status = 1
+        AND
           sales_id = #{salesId}
     </update>
 

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

@@ -47,6 +47,9 @@
     <a class="btn radius r"
        style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <a class="btn radius r"
+       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       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">

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

@@ -18,11 +18,13 @@
 <div class="page-container">
     <div class="text-c">
         <form action="${path}/admin/await_send/listAwaitSendOrder" method="POST" id="search-form">
-            <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">
-                <option value="">请选择发货状态</option>
+            <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">-->
+                <option value="">发货状态</option>
                 <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 1>selected="selected"</#if></#if> value="1">待发货</option>
+                <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 11>selected="selected"</#if></#if> value="11">已通知配货</option>
                 <option <#if (req.salesShippingStatus)??><#if req.salesShippingStatus == 2>selected="selected"</#if></#if> value="2">已发货</option>
             </select>
+
             <input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesOrderId)!}" placeholder="订单编号" id="salesOrderId" name="salesOrderId">
             <input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesDealCode)!}" placeholder="交易号" id="salesDealCode" name="salesDealCode">
             <input type="text" class="input-text" style="width:150px;margin-bottom: 3px;" value="${(req.salesAddressName)!}" placeholder="收件人姓名" id="salesAddressName" name="salesAddressName">
@@ -55,7 +57,7 @@
             <#list page.dataList as o>
             <tr class="text-c">
                 <td>
-                    <#if o.salesShippingStatus == 1>
+                    <#if o.salesShippingStatus == 11>
                         <input type="checkbox" value="${(o.salesId)!}" class="salesid-input">
                     </#if>
                 </td>
@@ -73,9 +75,9 @@
                     </#if>
                 </td>
                 <td>
-                    <#if o.salesShippingStatus == 1>
-                        <span style="color: red;">待发货</span>
-                    <#else>
+                    <#if o.salesShippingStatus == 11>
+                        <span style="color: red;">通知配货</span>
+                    <#elseif o.salesShippingStatus == 1>
                         <p>已发货(${(o.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!"暂无发货时间"})</p>
                         <p class="label radius"><a href="#">${(o.salesPostFirm)!}-${(o.salesPostNum)!}</a></p>
                     </#if>
@@ -84,7 +86,7 @@
                 <td>${(o.salesAdminRemark)!}</td>
                 <td>${(o.salesCreateTime?string("yyyy-MM-dd"))!}</td>
                 <td class="td-manage">
-                    <#if o.salesShippingStatus == 1>
+                    <#if o.salesShippingStatus == 11>
                         <a title="打单发货" href="javascript:window.location.href='${path}/admin/await_send/printOrderUI?orderId=${o.salesId}'" class="ml-5" style="text-decoration:none">打单发货</a>
                     <#else>
                         <a title="重新打单" href="javascript:re_print_order('${(o.salesOrderId)!}')" class="ml-5" style="text-decoration:none">重新打单</a>

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

@@ -32,7 +32,6 @@
 </nav>
 
 <!--  录入订单 -->
-
 <div class="page-container">
     <div class="text-c" id="form-download">
         <form action="${path}/admin/salesOrder/list_order_page" method="post">
@@ -97,7 +96,7 @@
             <thead>
             <tr class="text-c">
                 <th width="16"><input type="checkbox" ></th>
-                <th width="60">订单类型</th>
+                <th width="50">订单类型</th>
                 <th width="60">订单号</th>
                 <th width="70">交易号</th>
                 <th width="72">批次号</th>
@@ -105,8 +104,8 @@
                 <th width="70">收货人电话</th>
                 <th width="100">收货地址</th>
                 <th width="50">是否发货</th>
-                <th width="60">物流公司</th>
-                <th width="60">物流单号</th>
+                <th width="60">订单状态</th>
+                <th width="60">物流信息</th>
                 <#--<th width="50">订单金额</th>
                 <th width="50">支付金额</th>
                 <th width="50">是否付款</th>-->
@@ -162,13 +161,26 @@
                             未发货
                         <#elseif order.salesShippingStatus == 1>
                             已发货
-                        <#elseif order.salesShippingStatus == 1>
+                        <#elseif order.salesShippingStatus == 3>
                             备货中
+                        <#elseif order.salesShippingStatus == 4>
+                            收货
                         <#elseif order.salesShippingStatus == 11>
                             已通知配货
                         </#if>
                     </td>
                     <td>
+                        <#if order.salesStatus == 0>
+                            未确认
+                        <#elseif order.salesStatus == 1>
+                            确认
+                        <#elseif order.salesStatus == 2>
+                            挂起
+                        <#elseif order.salesStatus == 3>
+                            作废
+                        </#if>
+                    </td>
+                    <td>
                         <#if order.salesPostFirm??>
                             <#if order.salesPostFirm == 'sto'>
                                 申通快递
@@ -206,8 +218,9 @@
                                 德邦物流
                             </#if>
                         </#if>
+                    <br>
+                    ${order.salesPostNum!''}
                     </td>
-                    <td>${order.salesPostNum!''}</td>
                     <#--<td>${order.salesAmount/100!''}</td>
                     <td>${order.salesPayMoney/100!''}</td>
                     <td>
@@ -236,15 +249,17 @@
                 </tr>
                 </#list>
             <#else>
-            <tr><td colspan="13" class="td-manage text-c" >暂时没有客诉信息，请添加！</td></tr>
+            <tr><td colspan="15" class="td-manage text-c" >暂时没有客诉信息，请添加！</td></tr>
             </#if>
             </tbody>
         </table>
 
-        <div style="float: left;margin-top: 20px;">
-            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="noticeDistribution()">通知配货</button>
-            <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="confirmOrder()">确认订单</button>
-        </div>
+        <#if identity != 2>
+            <div style="float: left;margin-top: 20px;">
+                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="noticeDistribution()">通知配货</button>
+                <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="" onclick="confirmOrder()">确认订单</button>
+            </div>
+        </#if>
 
     </div>
 </div>

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

@@ -47,6 +47,9 @@
     <a class="btn radius r"
        style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <a class="btn radius r"
+       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       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">
@@ -104,8 +107,8 @@
             <div class="row cl" id="salesCustomer" style="<#if admin.adminDept != 3 && admin.adminDept != 1><#if !order.salesCustomerId?? >display: none;</#if></#if>">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2" style="color: #c00;">
-                    <span id="salesCustomerIdHtml">已经选择客诉记录：${order.salesCustomerId}</span>
-                    <input type="hidden" id="salesCustomerId" name="salesCustomerId" value="${order.salesCustomerId}">
+                    <span id="salesCustomerIdHtml">已经选择客诉记录：${order.salesCustomerId!''}</span>
+                    <input type="hidden" id="salesCustomerId" name="salesCustomerId" value="${order.salesCustomerId!''}">
                 </div>
             </div>