Wesmiler

app/Services/Common/OrderService.php

@@ -471,7 +471,12 @@ class OrderService extends BaseService
             'update_time' => time()
         ];
 
+        DB::beginTransaction();
         $result = $this->model->where('id', $id)->update($updateData);
+        if(!$result){
+            DB::rollBack();
+            return ['code' => 1, 'msg' => '操作失败'];
+        }
 
         // 调用小程序发货信息同步接口
         $msg = '发货成功';
@@ -505,20 +510,20 @@ class OrderService extends BaseService
             $errcode = isset($result['errcode'])?$result['errcode'] : -1;
             $errmsg = isset($result['errmsg']) && $result['errmsg']?$result['errmsg'] : '请求失败';
             if($errcode != 0){
-                $msg = '发货成功，但上传发货信息到小程序失败：'.$errmsg;
+                DB::rollBack();
+                $msg = '发货失败，上传发货信息到小程序失败：'.$errmsg;
+                return ['code' => 1, 'msg' => $msg];
             }else {
                 $msg = '发货成功，上传发货信息到小程序成功';
             }
         }
 
-        if ($result) {
-            ActionLogModel::setTitle("订单发货");
-            ActionLogModel::record();
-            RedisService::keyDel("caches:orders:*");
-            return ['code' => 0, 'msg' => $msg];
-        }
 
-        return ['code' => 1, 'msg' => '操作失败'];
+        DB::commit();
+        ActionLogModel::setTitle("订单发货");
+        ActionLogModel::record();
+        RedisService::keyDel("caches:orders:*");
+        return ['code' => 0, 'msg' => $msg];
     }
 
     /**