diff --git a/common/forms/LedgerForm.php b/common/forms/LedgerForm.php index 1dbca0a..f17d791 100644 --- a/common/forms/LedgerForm.php +++ b/common/forms/LedgerForm.php @@ -467,7 +467,7 @@ class LedgerForm extends BaseModel $productOrder->is_settled = 1; $productOrder->saveOrFail(); - $productOrderItems = ProductOrderItems::find()->where(['product_order_id' => $productOrder->id])->asArray()->all(); + $productOrderItems = ProductOrderItems::find()->with(['drug.supplier'])->where(['product_order_id' => $productOrder->id])->asArray()->all(); $Reconciliation = new Reconciliation(); foreach($productOrderItems as $v){ $item = clone $Reconciliation; @@ -487,12 +487,12 @@ class LedgerForm extends BaseModel /******************************************** 供应商 ********************************************** */ - $storeTotal = Ledger::find()->where(['order_id' => $this->order_id, 'user_id' => $v->drug->source, 'user_type' => 3, 'order_type' => 1, 'fee_type' => 1])->sum('money'); // 该订单供应商分佣总金额 + $storeTotal = Ledger::find()->where(['order_id' => $this->order_id, 'user_id' => $v['drug']['source'], 'user_type' => 3, 'order_type' => 1, 'fee_type' => 1])->sum('money'); // 该订单供应商分佣总金额 $storeTotal = round($storeTotal, 6);//4舍5入 //增加供应商分佣 $log = clone $model; $log->order_id = $this->order_id; - $log->user_id = $v->drug->source; + $log->user_id = $v['drug']['source']; $log->user_type = 3;// 供应商 $log->order_type = 1; //产品订单 $log->fee_type = 1; //药品费用