商户后台-订单列表-增加手动确认收货关单功能

app/common/repositories/store/order/StoreOrderRepository.php

@@ -5360,10 +5360,13 @@ class StoreOrderRepository extends BaseRepository
      */
     public function carryOrder($id, $merId, $serviceId, $order_id)
     {
-        $order = $this->dao->getWhere(['order_id' => $order_id, 'status' => 1, 'mer_id' => $merId]);
+        $order = $this->dao->getWhere(['order_id' => $order_id, 'mer_id' => $merId]);
         if (!$order)
             throw new ValidateException('订单不存在或已支付~');
-        if ($order->verify_code != $id)
+        if (!in_array($order->status, [0, 1])) {
+            throw new ValidateException('订单状态错误');
+        }
+        if ($id != null && $order->verify_code != $id)
             throw new ValidateException('提货码错误~');
         if (!$order->paid)
             throw new ValidateException('订单未支付');

app/controller/merchant/store/order/Order.php

@@ -264,17 +264,16 @@ class Order extends BaseController
 
     /**
      * 手动操作订单为 已自提 关单
-     * @param $id
      * @return mixed
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function take()
+    public function carryByWithoutCode()
     {
-        $order_id= input('order_id');
-        $this->repository->takeOrder($order_id);
-        return app('json')->success('确认收货成功');
+        $order_id = input('order_id');
+        $this->repository->carryOrder(null, $this->request->merId(), 0, $order_id);
+        return app('json')->success('订单核销成功');
     }
 
     /**

route/merchant.php

@@ -460,6 +460,7 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
             Route::post('remark/:id', 'Order/remark')->name('merchantStoreOrderRemark');
             Route::post('verify/:code', 'Order/verify')->name('merchantStoreOrderVerify');
             Route::post('carry/:code', 'Order/carry')->name('merchantStoreOrderCarry');
+            Route::post('carryByWithoutCode', 'Order/carryByWithoutCode')->name('carryByWithoutCode');// 奖励统计-导出
             Route::post('delete/:id', 'Order/delete')->name('merchantStoreOrderDelete');
             Route::get('reconciliation/lst', 'Reconciliation/lst')->name('sysMerchantReconciliationLst');
             Route::get('reconciliation/mark/:id/form', 'Reconciliation/markForm')->name('merchantReconciliationMarkForm');
@@ -476,7 +477,6 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
             Route::get('order_red_list', 'Order/order_red_list')->name('orderRedList');// 养老金打款凭证 列表
             Route::get('reward_list', 'Order/reward_list')->name('orderRedList');// 奖励统计
             Route::get('reward_excel', 'Order/reward_excel')->name('reward_excel');// 奖励统计-导出
-            Route::post('take', 'Order/take')->name('take');// 奖励统计-导出
         })->prefix('merchant.store.order.');
 
         //退款订单