达达跑腿订单取消bug修复

app-ghs/controllers/DeliveryController.php

@@ -643,8 +643,11 @@ class DeliveryController extends BaseController
         Yii::info('达达回调：' . json_encode($post, JSON_UNESCAPED_UNICODE), 'dada-callback');
 
         $handler = new \common\components\delivery\platform\dada\CallBackHandler();
-        $handler->handle($post);
-
+        $ret = $handler->handle($post);
+        if($ret){
+            Yii::info('达达回调业务成功处理', 'dada-callback');
+        }
+        
         return $this->asJson(['status' => 'ok']);
     }
 

common/components/delivery/platform/dada/CallBackHandler.php

@@ -35,7 +35,6 @@ class CallBackHandler
 
             // 处理订单状态变更
             return $this->processOrderCallback($data);
-
         } catch (\Exception $e) {
             Yii::error('达达回调处理异常: ' . $e->getMessage() . ' | ' . $e->getTraceAsString(), 'dada-callback');
             return false;

common/components/delivery/services/adapter/DadaAdapter.php

@@ -417,7 +417,7 @@ class DadaAdapter extends Dada implements Adapter
             ];
         }
 
-        if ($params['order_cancel_code'] == 10000 && empty($params['cancel_reason'])) {
+        if ($params['order_cancel_code'] == 10000 && empty($params['order_cancel_reason'])) {
             return [
                 'code' => -1,
                 'msg' => '当取消原因ID为其他时，取消原因必填'
@@ -430,8 +430,8 @@ class DadaAdapter extends Dada implements Adapter
             'cancel_reason_id' => (int)$params['order_cancel_code'],
         ];
 
-        if (!empty($params['cancel_reason'])) {
-            $apiData['cancel_reason'] = $params['cancel_reason'];
+        if (!empty($params['order_cancel_reason'])) {
+            $apiData['cancel_reason'] = $params['order_cancel_reason'];
         }
 
         $body = json_encode($apiData, JSON_UNESCAPED_UNICODE);