gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
wucongxing 2023-05-19 14:16:01 +08:00
commit 4b791f4aa5
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Command/ReportPreProductOrderCommand.php
View File

@ -70,7 +70,7 @@ class ReportPreProductOrderCommand extends HyperfCommand
$this->saveOrderProductPeportPreStatus($item['order_product_id'],2,"超出最大上报次数"); $this->saveOrderProductPeportPreStatus($item['order_product_id'],2,"超出最大上报次数");
// 修改失败时药品订单数据 // 修改失败时药品订单数据
$this->savePreFailedOrderStatus($item['order_product_id'],"复核失败"); $this->savePreFailedOrderStatus($item['order_product_id'],"药房处方复核失败，平台会在24小时内进行退款处理");
// 退款 // 退款
$OrderProductService = new OrderProductService(); $OrderProductService = new OrderProductService();

25
app/Services/PatientOrderService.php
View File

@ -1008,19 +1008,24 @@ class PatientOrderService extends BaseService
return fail(HttpEnumCode::HTTP_ERROR, "存在库存不足商品", $not_enough_product_ids); return fail(HttpEnumCode::HTTP_ERROR, "存在库存不足商品", $not_enough_product_ids);
} }
// 获取运费金额 $app_env = config('app_env','prod');
$Prescription = new Prescription(); if ($app_env != "dev"){
// 获取运费金额
$Prescription = new Prescription();
$result = $Prescription->getLogisticsFee(); $result = $Prescription->getLogisticsFee();
if ($amount_total >= $result['drugCost']){ if ($amount_total >= $result['drugCost']){
$logistics_fee = 0; $logistics_fee = 0;
}else{ }else{
$logistics_fee = $result['freight']; $logistics_fee = $result['freight'];
}
// 实际支付金额
$payment_amount_total = $amount_total + $logistics_fee;
} }
// 实际支付金额 if ($app_env == "dev"){
$payment_amount_total = $amount_total + $logistics_fee; $logistics_fee = 0;
if (env("APP_ENV") == "dev"){
$payment_amount_total = 0.01; $payment_amount_total = 0.01;
} }