diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
index 624a298..6b2d5d0 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java
@@ -349,10 +349,42 @@ public class ShopOrderController {
      * @return com.gaotao.common.utils.R
      **/
     @RequestMapping(value = "cancelShopOrderBun")
+    @ResponseBody
     public R cancelShopOrderBun(@RequestBody SearchScheduleData inData){
         shopOrderService.cancelShopOrderBun(inData);
         return R.ok()
                 .put("code", 200)
                 .put("msg", "操作成功!");
     }
+
+    /**
+     * TODO 关闭工单
+     * @author LR
+     * @date 2022/6/7 16:37
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "closeShopOrder")
+    @ResponseBody
+    public R closeShopOrder(@RequestBody SearchScheduleData inData){
+        shopOrderService.closeShopOrder(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
+    /**
+     * TODO 重新打开工单的操作
+     * @author LR
+     * @date 2022/6/7 16:49
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "openShopOrder")
+    public R openShopOrder(@RequestBody SearchScheduleData inData){
+        shopOrderService.openShopOrder(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
 }
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
index 6ae314d..efc8a72 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java
@@ -257,4 +257,81 @@ public class ShopOrderServiceImpl implements ShopOrderService {
         //处理返回的结果
         return resultList.get(0);
     }
+
+    @Override
+    @Transactional
+    public void closeShopOrder(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        String status = inData.getStatus();
+        boolean checkFlag = inData.isCheckFlag();
+        //关闭工单是否校验数量
+        String checkOrderQtyFlag = "Y";
+        if(!checkFlag){
+            checkOrderQtyFlag = "N";
+        }
+        //调用存储过程   执行取消订单的操作
+        Map<String, Object> resultMap = this.closeShopOrder(site, orderNo, status, checkOrderQtyFlag);
+        //判断是否检验成功
+        String resultCode = String.valueOf(resultMap.get("resultCode"));
+        if (!"200".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            throw new XJException(msg, Integer.parseInt(resultCode));
+        }
+    }
+
+    /**
+     * TODO 调用存储过程 执行关闭订单
+     * @author LR
+     * @date 2022/6/7 16:46
+     * @Param [site, orderNo, status, checkOrderQtyFlag]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> closeShopOrder(String site, String orderNo, String status, String checkOrderQtyFlag) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(status);
+        params.add(checkOrderQtyFlag);
+        //调用存储过程
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("closeShopOrder", params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
+
+    @Override
+    @Transactional
+    public void openShopOrder(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        String status = inData.getStatus();
+        //调用存储过程   执行取消订单的操作
+        Map<String, Object> resultMap = this.openShopOrder(site, orderNo, status);
+        //判断是否检验成功
+        String resultCode = String.valueOf(resultMap.get("resultCode"));
+        if (!"200".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            throw new XJException(msg, Integer.parseInt(resultCode));
+        }
+    }
+
+    /**
+     * TODO 调用存储过程  重新打开派工单
+     * @author LR
+     * @date 2022/6/7 16:51
+     * @Param [site, orderNo, status]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> openShopOrder(String site, String orderNo, String status) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(status);
+        //调用存储过程
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("openShopOrder", params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
 }
diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java b/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java
index 9541e8f..c785d7a 100644
--- a/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java
+++ b/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java
@@ -205,4 +205,22 @@ public interface ShopOrderService {
      * @return void
      **/
     void cancelShopOrderBun(SearchScheduleData inData);
+
+    /**
+     * TODO 关闭工单
+     * @author LR
+     * @date 2022/6/7 16:38
+     * @Param [inData]
+     * @return void
+     **/
+    void closeShopOrder(SearchScheduleData inData);
+
+    /**
+     * TODO 重新打开工单的操作
+     * @author LR
+     * @date 2022/6/7 16:50
+     * @Param [inData]
+     * @return void
+     **/
+    void openShopOrder(SearchScheduleData inData);
 }