From 8beb1129df56bb96ee7babc52d708cdd17ebcafd Mon Sep 17 00:00:00 2001
From: liqi <qiqiqiyoucili@163.com>
Date: Tue, 11 Mar 2025 13:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eapi=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=A4=84=E6=96=B9=E7=94=9F=E6=88=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/base/DataController.php     |  5 +--
 .../models/forms/ProductOrderSubmitForm.php   |  9 ++++-
 .../v1/controllers/PrescriptionController.php | 36 -------------------
 3 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/admin/controllers/base/DataController.php b/admin/controllers/base/DataController.php
index 8e60a60..11c1cea 100644
--- a/admin/controllers/base/DataController.php
+++ b/admin/controllers/base/DataController.php
@@ -230,10 +230,7 @@ class DataController extends BaseAdminController
 //            ['prescription', 'required'],
 //            ['product_order', 'required'],
 //        ]);
-//        return [
-//            gettype($prescription),
-//            $prescription
-//        ];
+
 //        $productOrder = $param['product_order'];
         //触发处方自动失效事件
 //        $prescriptionEvent = new PrescriptionEvent();
diff --git a/member/models/forms/ProductOrderSubmitForm.php b/member/models/forms/ProductOrderSubmitForm.php
index 74010b2..7f3e9a7 100644
--- a/member/models/forms/ProductOrderSubmitForm.php
+++ b/member/models/forms/ProductOrderSubmitForm.php
@@ -29,7 +29,8 @@ class ProductOrderSubmitForm extends BaseModel
 
     public function getPayData($post)
     {
-        $ProductOrder = ProductOrder::find()->where([
+        // category
+        $ProductOrder = ProductOrder::find()->with(['prescription'])->where([
             'id'    => $post['order_id'],
             'user_id'   => \Yii::$app->user->identity->getId(),
         ])->one();
@@ -128,6 +129,12 @@ class ProductOrderSubmitForm extends BaseModel
         $paymentProductOrder->order_no =  $productOrder['order_no'];
         $paymentProductOrder->pay_order_no = $pay_order_no;
         $paymentProductOrder->amount   = $productOrder['total_pay_price'];
+        if ($productOrder->prescription->category?? 1 === 2) {
+            if ($productOrder->delivery_method === 0) {
+                $paymentProductOrder->amount   = $productOrder['trans_expenses'];
+            }
+        }
+
         $paymentProductOrder->saveOrFail();
 
         if(bccomp($total_fee,0,2) <= 0){ //无需支付
diff --git a/service/modules/v1/controllers/PrescriptionController.php b/service/modules/v1/controllers/PrescriptionController.php
index c602c2c..0b7be98 100644
--- a/service/modules/v1/controllers/PrescriptionController.php
+++ b/service/modules/v1/controllers/PrescriptionController.php
@@ -58,7 +58,6 @@ class PrescriptionController extends BaseAppController
 {
     // public $optional = ['process-rule-list', 'process-note-list'];
 
-    public $optional = ['notify-order-generation'];
     public function beforeAction($action){
         $ret = parent::beforeAction($action);
 
@@ -699,41 +698,6 @@ class PrescriptionController extends BaseAppController
         }
     }
 
-    public function actionNotifyOrderGeneration()
-    {
-        $param = \Yii::$app->request->post();
-        $this->requestValidate($param, [
-            ['prescription', 'required'],
-            ['product_order', 'required'],
-        ]);
-        $prescription = $param['prescription'];
-        $productOrder = $param['product_order'];
-        //触发处方自动失效事件
-        $prescriptionEvent = new PrescriptionEvent();
-        $prescriptionEvent->prescription = $prescription;
-        $prescriptionEvent->sender = $this;
-        \Yii::$app->trigger(Prescription::AUTO_EXPIRE, $prescriptionEvent);
-
-
-        //触发订单创建事件
-        $event = new ProductOrderEvent();
-        $event->order = $productOrder;
-        $event->sender = $this;
-        \Yii::$app->trigger(ProductOrder::EVENT_CREATED, $event);
-
-        //处方开具待支付订阅消息通知
-        \Yii::$app->queue->push(new PrescriptionCreated([
-            'orderId' => $prescription['id'],
-        ]));
-
-
-        //处方生成短信通知药师审方
-        \Yii::$app->queue->push(new WaitApprovalMessageJob([
-            'orderId' => $prescription['id'],
-        ]));
-        return ['ok'];
-    }
-
     /**
      * 中药剂数列表
      */