liugc 11 месяцев назад
Родитель
Сommit
696a91410f

+ 2 - 2
app/adminapi/controller/external/DouyinOrderController.php

@@ -107,8 +107,8 @@ class DouyinOrderController extends BaseAdminController
     public function refundExamine()
     {
         $params = $this->request->post();
-        $result = DouYinService::refundExamine($params);
-        return $this->data($result);
+        $result = DouyinOrderLogic::refundExamine($params);
+        return $this->success('操作成功', [], 1, 1);
     }
 
 }

+ 19 - 0
app/adminapi/logic/external/DouyinOrderLogic.php

@@ -15,6 +15,7 @@
 namespace app\adminapi\logic\external;
 
 
+use app\api\service\DouYinService;
 use app\common\model\external\DouyinOrder;
 use app\common\logic\BaseLogic;
 use think\facade\Db;
@@ -137,4 +138,22 @@ class DouyinOrderLogic extends BaseLogic
     {
         return DouyinOrder::findOrEmpty($params['id'])->toArray();
     }
+
+    public static function refundExamine($params)
+    {
+        try {
+            $params['is_examine_ok'] = 'pass';
+            DouYinService::refundExamine($params);
+            return true;
+        } catch (\Exception $e) {
+            self::setError($e->getMessage());
+            return false;
+        }
+
+    }
+
+
+
+
+
 }

+ 4 - 3
app/api/service/DouYinService.php

@@ -302,13 +302,14 @@ class DouYinService
     {
         Db::startTrans();
         try {
-            // $params['order_number']  user_id
-            $order = DouyinOrder::with(['goods','serviceWork'])->where('order_number', $params['order_number'])->where('user_id', $params['user_id'])->findOrEmpty();
+            // $params['order_number']
+            $order = DouyinOrder::with(['goods','serviceWork'])->where('order_number', $params['order_number'])->findOrEmpty();
             if($order->isEmpty()){
                 throw new \Exception('订单不存在');
             }
             $orderInfo = $order->toArray();
-            $douyinRefundOrder = DouyinRefundOrder::where('refund_number', $params['refund_number'])->findOrEmpty();
+            //$refund_number = $params['refund_number']??'';
+            $douyinRefundOrder = DouyinRefundOrder::where('order_number', $params['order_number'])->order('id', 'desc')->findOrEmpty();
             if($params['is_examine_ok'] === 'pass'){
                 $douyinRefundOrder->refund_status = 2;
                 RechargeOrder::where('work_id', $orderInfo['work_id'])->update([