Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -174,6 +174,13 @@ public interface SalesOrderService {
     Integer delOrder(String orderId);
 
     /**
+     * 删除销售订单
+     * @param id
+     * @return
+     */
+    Integer delSalesOrder(Integer id);
+
+    /**
      * 修改订单项数量
      */
     Integer updateOrderItem(SalesOrderItem salesOrderItem);

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

@@ -770,6 +770,15 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
+    @Transactional
+    public Integer delSalesOrder(Integer id) {
+        // 检查客诉是否使用订单，如果有使用订单，无法删除
+        salesOrderMapper.delOrderItem(id);
+        salesOrderMapper.delSalesOrder(id);
+        return 1;
+    }
+
+    @Override
     public Integer updateOrderItem(SalesOrderItem salesOrderItem) {
         return salesOrderMapper.updateOrderItem(salesOrderItem);
     }

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

@@ -124,6 +124,14 @@ public interface SalesOrderMapper {
      * 删除订单根据Efast订单号
      */
     Integer delOrder(String orderId);
+
+    /**
+     * 删除销售订单
+     * @param id
+     * @return
+     */
+    Integer delSalesOrder(Integer id);
+
     /**
      * 修改订单项数量
      */

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

@@ -904,6 +904,11 @@
     WHERE sales_orderId = #{salesOrderId}
   </delete>
 
+  <delete id="delSalesOrder" parameterType="Integer">
+    DELETE FROM tb_rst_sales_order_info
+    WHERE sales_id = #{salesOrderId}
+  </delete>
+
   <update id="updateOrderItem" parameterType="SalesOrderItem">
     UPDATE tb_rst_sales_order_item
     set

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -241,12 +241,12 @@ public class ApprovalController {
                 if(taskMap == null){
                     return  ResponseJson.getFAILURE();
                 }
-                if(taskMap.get("status") == 1){//没有下一个审批人，修改审批任务状态为已审批通过
+                if((Integer) taskMap.get("status") == 1){//没有下一个审批人，修改审批任务状态为已审批通过
                     info.setApprovalStatus(2);
                     if(approvalOrderService.updateApprovalInfo(info) < 1){
                         return  ResponseJson.getFAILURE();
                     }
-                }else if(taskMap.get("status") == 0){//还有下一个审批人，需要增加审批历史任务
+                }else if((Integer) taskMap.get("status") == 0){//还有下一个审批人，需要增加审批历史任务
                     if(taskMap.get("users") == null){
                         return  ResponseJson.getFAILURE();
                     }

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

@@ -1087,4 +1087,17 @@ public class AdminSalesOrderController {
         Integer res = storeInfoService.addStoreInfo(storeInfo);
         return res <= 0 ? ResponseJson.getFAILURE() : ResponseJson.getSUCCESS();
     }
+
+    /**
+     * 删除订单
+     * @param id
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/delSalesOrder")
+    @RequiresPermissions("salesOrder:select:salesOrder")
+    public ResponseJson delSalesOrder(@RequestParam("id") Integer id) {
+        Integer res = salesOrderService.delSalesOrder(id);
+        return res <= 0 ? ResponseJson.getFAILURE() : ResponseJson.getSUCCESS();
+    }
 }

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

@@ -194,30 +194,35 @@
                         ${(order.salesCreateTime?string("HH:mm:ss"))!''}
                     </td>
                     <td>
-                        <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="sales_order_detail(${order.salesId!''})">
-                            <font color=#06c>详情</font>
-                        </a><br/>
+                        <a style="text-decoration:none" href="javascript:void(0);" title="订单详情" alt="订单详情" onclick="sales_order_detail(${order.salesId!''})">
+                            <i class="Hui-iconfont">&#xe695;</i>
+                        </a>
+                        <a style="text-decoration:none" href="javascript:void(0);" title="修改订单" alt="修改订单" onclick="sales_order_update(${order.salesId!''})">
+                            <i class="Hui-iconfont">&#xe6df;</i>
+                        </a>
 
                         <#if order.salesStatus == 0>
-                            <a style="text-decoration:none" href="javascript:void(0);" title="修改" onclick="sales_order_update(${order.salesId!''})">
-                                <font color=#06c>修改</font>
-                            </a><br/>
-                        </#if>
-                        <#if order.salesStatus == 0>
-                            <a style="text-decoration:none" href="javascript:void(0);" title="确认订单" onclick="confirm_one(${order.salesId!''})">
-                                <font color=#06c>确认订单</font>
-                            </a><br/>
+                            <a style="text-decoration:none" href="javascript:void(0);" title="确认订单" alt="确认订单" onclick="confirm_one(${order.salesId!''})">
+                                <i class="Hui-iconfont">&#xe615;</i>
+                            </a>
+                        <#elseif order.salesStatus == 1>
+                            <a style="text-decoration:none" href="javascript:void(0);" title="分配物流" onclick="distribution_express(${order.salesId!''})">
+                                <i class="Hui-iconfont">&#xe669;</i>
+                            </a>
+                            <#if order.salesShippingStatus != 1>
+                                <a style="text-decoration:none" href="javascript:void(0);" title="手动发货" onclick="distribution_postFirm('手动发货','${path}/admin/await_send/to_manual_delivery?salesId=${order.salesId}','570','450');">
+                                    <i class="Hui-iconfont">&#xe642;</i>
+                                </a>
+                            </#if>
                         </#if>
-
-                        <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/>
+                            <a style="text-decoration:none" href="javascript:void(0);" title="作废订单" onclick="invalidation_order(${order.salesId!''})">
+                                <i class="Hui-iconfont">&#xe631;</i>
+                            </a>
                         </#if>
+                        <a style="text-decoration:none" href="javascript:void(0);" title="删除订单" onclick="delSalesOrder(${order.salesId!''})">
+                            <i class="Hui-iconfont">&#xe609;</i>
+                        </a><br/>
                     </td>
                 </tr>
                 </#list>
@@ -259,6 +264,11 @@
         window.location.href= "${path}/admin/salesOrder/select_sales_order?salesId="+orderSaleId;
     }
 
+    /*手动发货*/
+    function distribution_postFirm(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+
     /**
      *跳转到修改页面
      * @param employee
@@ -636,24 +646,52 @@
          * 作废订单
          */
         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.confirm('是否确认作废（作废后重新确认即可恢复）',function(index){
+                $.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);
-                        });
-                        layer.close(index);
+                        }
+                        return false;
                     }
-                    return false;
-                }
+                });
+            });
+        }
+        /**
+         * 删除订单
+         */
+        function delSalesOrder(salesId) {
+            layer.confirm('是否确认删除，删除后无法恢复？',function(index){
+                $.ajax({
+                    type:'POST',
+                    url: '${path}/admin/salesOrder/delSalesOrder',
+                    data:{
+                        "id" : 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>