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:
wucongxing8150 2024-05-09 18:21:46 +08:00
commit 973b1bb63c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Command/AddUserCouponExpiredQueueCommand.php
View File

@ -114,6 +114,8 @@ class AddUserCouponExpiredQueueCommand extends HyperfCommand
$this->line($e->getMessage()); $this->line($e->getMessage());
} }
} }
$this->line('全部结束');
} }
/** /**

2
app/Command/MoveOrderCommand.php
View File

@ -316,7 +316,7 @@ class MoveOrderCommand extends HyperfCommand
$data['amount_total'] = $order_product['amount_total']; $data['amount_total'] = $order_product['amount_total'];
$data['coupon_amount_total'] = $order_product['coupon_amount_total']; $data['coupon_amount_total'] = $order_product['coupon_amount_total'];
$data['payment_amount_total'] = $order_product['payment_amount_total']; $data['payment_amount_total'] = $order_product['payment_amount_total'];
if ($order_inquiry['order_product_status'] == 5){ if ($order_product['order_product_status'] == 5){
$data['cancel_status'] = 1; $data['cancel_status'] = 1;
} }
$data['cancel_time'] = $order_product['cancel_time']; $data['cancel_time'] = $order_product['cancel_time'];