shish 4 年 前
コミット
364780e9dd
1 ファイル変更12 行追加6 行削除
  1. 12 6
      app-ghs/controllers/OrderController.php

+ 12 - 6
app-ghs/controllers/OrderController.php

@@ -751,11 +751,17 @@ class OrderController extends BaseController
     //延期支付 ssh 2021.1.19
     public function actionDebt()
     {
-        $get = Yii::$app->request->get();
-        $id = $get['id'] ?? 0;
-        $info = OrderService::getOrderInfo($id);
-        OrderClass::valid($info, $this->shopId);
-        OrderClass::debt($info, $this->shop);
+        $id = Yii::$app->request->get('id');
+        $order = OrderClass::getById($id, true);
+        OrderClass::valid($order, $this->shopId);
+        $payWay = dict::getDict('payWay', 'debtPay');
+        $cgId = $order->purchaseId ?? 0;
+        $cg = PurchaseClass::getById($cgId, true);
+        if (empty($cg)) {
+            util::fail('没有找到采购单');
+        }
+        PurchaseService::payAfter($cg, $payWay);
+        OrderService::payAfter($order, $payWay);
         util::complete();
     }
 
@@ -1191,7 +1197,7 @@ class OrderController extends BaseController
         $order = OrderClass::getById($id, true);
         OrderClass::valid($order, $this->shopId);
         OrderService::expire($order, true);
-        util::complete();
+        util::complete('已取消');
     }
 
     //获取收款语音播报地址 shish 20211231