feat: 添加或删除一个新的特性(API);
fix: 修复一个错误; refactor: 重写/重构代码,但未改变任何API行为; style: 添加空格、格式化、缺失的分号等; test: 添加缺失的测试或修正现有的测试; docs: 更新文档如readme; build: 更新依赖、项目版本; ops: 影响基础设施、部署、备份、恢复等操作性组件; chore: 修改.gitignore等; 请根据以上信息生成规范的用中文conventional commit message,谨慎选择最能说明更改的Commit type,请控制你的输出在一行内,你的回复中应该仅有一条commit message。 Your reply format:
This commit is contained in:
parent
05f77fe9d2
commit
dbb0775d3e
File diff suppressed because it is too large
Load Diff
@ -475,7 +475,7 @@ class PayNotifyLogic extends BaseLogic
|
||||
/**
|
||||
* 现金支付
|
||||
*/
|
||||
public static function cash_pay($orderSn,$extra =[])
|
||||
public static function cash_pay($orderSn)
|
||||
{
|
||||
$order = StoreOrder::where('order_id', $orderSn)->findOrEmpty();
|
||||
|
||||
@ -503,11 +503,11 @@ class PayNotifyLogic extends BaseLogic
|
||||
self::descStock($order['id']);
|
||||
}
|
||||
|
||||
if ($extra && $extra['store_id'] && $order['reservation'] !=1) {
|
||||
if ($order && $order['store_id'] && $order['reservation'] !=1) {
|
||||
$params = [
|
||||
'verify_code' => $order['verify_code'],
|
||||
'store_id' => $extra['store_id'],
|
||||
'staff_id' => $extra['staff_id']
|
||||
'store_id' => $order['store_id'],
|
||||
'staff_id' => $order['staff_id']
|
||||
];
|
||||
OrderLogic::writeOff($params);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user