针对订单提供作废操作

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

@@ -969,6 +969,24 @@ public class AdminSalesOrderController {
     }
 
     /**
+     * 作废订单
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping("/invalidationOrder")
+    @RequiresPermissions("salesOrder:confirm:salesOrder")
+    public ResponseJson invalidationOrder(HttpServletRequest request,
+                                          @RequestParam("salesId") Integer salesId) throws Exception {
+        SalesOrder so = new SalesOrder();
+        so.setSalesId(salesId);
+        so.setSalesStatus(3);
+        Integer res = salesOrderService.updateOrderInfo(so);
+        return res <= 0 ? ResponseJson.getFAILURE() : ResponseJson.getSUCCESS();
+    }
+
+    /**
      * 分配快递方式
      * @param request
      * @return

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

@@ -13,11 +13,8 @@ import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.utils.OrderUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.AddrUtil;
-import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.UUIDGenerator;
-import com.iamberry.wechat.tools.payUtil.StringUtil;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,7 +68,8 @@ public class AwaitSendController {
                                            @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) {
-        // 分页获取订单信息
+        // 分页获取订单信息（仓库只能查询已确认的订单）
+        salesOrder.setSalesStatus(1);
         PagedResult<SalesOrder> pagedResult = salesOrderService.listAwaitSendSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
@@ -133,6 +131,8 @@ public class AwaitSendController {
         } else {
             salesOrder.setSalesIds(orders);
         }
+        // 查询确认的订单
+        salesOrder.setSalesStatus(1);
         PagedResult<SalesOrder> pagedResult = salesOrderService.listSalesOrderPage(1, 1000, salesOrder, false);
         // 查询订单项
         if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {

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

@@ -54,10 +54,11 @@
                     <option value ="1" <#if salesOrder.salesShippingStatus??><#if salesOrder.salesShippingStatus == 1 >selected="selected"</#if></#if>>已发货</option>
                 </select>
                 <select class="select" name="salesStatus" id="salesStatus" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;">
-                    <option value ="">确认状态</option>
+                    <option value ="">订单状态</option>
                     <option value ="0" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 0 >selected="selected"</#if></#if>>未确认</option>
                     <option value ="1" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 1 >selected="selected"</#if></#if>>确认</option>
                     <option value ="2" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 2 >selected="selected"</#if></#if>>挂起</option>
+                    <option value ="3" <#if salesOrder.salesStatus??><#if salesOrder.salesStatus == 3 >selected="selected"</#if></#if>>作废</option>
                 </select>
 
                 <select class="select" name="salesStoreId" id="salesStoreId" style="height: 30px;width: 120px;margin: 0px;margin-bottom: 10px;"">
@@ -222,6 +223,12 @@
                         <a style="text-decoration:none" href="javascript:void(0);" title="分配物流" onclick="distribution_express(${order.salesId!''})">
                             <font color=#06c>分配物流</font>
                         </a><br/>
+
+                        <#if order.salesStatus != 3>
+                            <a style="text-decoration:none" href="javascript:void(0);" title="确认订单" onclick="invalidation_order(${order.salesId!''})">
+                                <font color=#06c>作废订单</font>
+                            </a><br/>
+                        </#if>
                     </td>
                 </tr>
                 </#list>
@@ -240,7 +247,6 @@
                 <button onClick="downloadOrderPage();" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" type="button" title="下载订单">下载订单</button>
             </div>
         </#if>
-
     </div>
 </div>
 
@@ -636,6 +642,31 @@
                 }
             });
         }
+
+        /**
+         * 作废订单
+         */
+        function invalidation_order(salesId) {
+            $.ajax({
+                type:'POST',
+                url: '${path}/admin/salesOrder/invalidationOrder',
+                data:{
+                    "salesId" : salesId
+                },
+                dataType: 'json',
+                success:function(res) {
+                    if(res.resultCode == 200 && res.returnCode == 200){
+                        location.reload();
+                    }else{
+                        layer.alert("确认订单异常！", function(index){
+                            layer.close(index);
+                        });
+                        layer.close(index);
+                    }
+                    return false;
+                }
+            });
+        }
     </script>
 </body>
 </html>