驳回

app-ghs/controllers/RefundController.php

@@ -38,6 +38,7 @@ class RefundController extends BaseController
         }
     }
 
+    //驳回 ssh 20230813
     public function actionReject()
     {
         $post = Yii::$app->request->post();
@@ -255,6 +256,11 @@ class RefundController extends BaseController
             $adminName = $shopAdmin['name'] ?? '';
             $post['shopAdminName'] = $adminName;
             $respond = OrderService::refund($id, $post);
+
+            $refundId = $respond->id;
+            $refundInfo = RefundOrderClass::getById($refundId, true);
+            RefundOrderService::passRefund($refundInfo);
+
             $transaction->commit();
             util::success($respond);
         } catch (\Exception $exception) {

biz-hd/cg/services/CgRefundService.php

@@ -67,8 +67,7 @@ class CgRefundService extends BaseService
         if (empty($order)) {
             util::fail('没有订单信息');
         }
-        $hdRemark = $cgData['hdRemark'] ?? '';
-        $remark = '';
+        $remark = $cgData['remark']??'';
         $price = $cgData['price'] ?? 0;
         $refundType = $cgData['refundType'] ?? 1;
         $imgList = $cgData['imgList'] ?? '';
@@ -106,7 +105,6 @@ class CgRefundService extends BaseService
         }
 
         $orderData = [
-            'hdRemark' => $hdRemark,
             'remark' => $remark,
             'price' => $price,
             'refundType' => $refundType,
@@ -163,7 +161,6 @@ class CgRefundService extends BaseService
         $data['refundType'] = $refundType;
         $data['refundPrice'] = $refundPrice;
         $data['remark'] = $post['remark'] ?? '';
-        $data['hdRemark'] = $post['hdRemark'] ?? '';
         $data['imgList'] = $post['imgList'] ?? '';
         $data['status'] = CgRefundClass::STATUS_UN_COMPLETE;