mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat: 添加或删除一个新的特性(API);' (#43) from dev into main

Browse Source 
Reviewed-on: #43
This commit is contained in:
mkm 2024-07-20 10:20:17 +08:00
commit 6aa46b3a3d
2 changed files with 4 additions and 1372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1368
app/api/controller/LiuController.php
View File

File diff suppressed because it is too large Load Diff

8
app/common/logic/PayNotifyLogic.php
View File

@ -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(); $order = StoreOrder::where('order_id', $orderSn)->findOrEmpty();
@ -503,11 +503,11 @@ class PayNotifyLogic extends BaseLogic
self::descStock($order['id']); self::descStock($order['id']);
} }
if ($extra && $extra['store_id'] && $order['reservation'] !=1) { if ($order && $order['store_id'] && $order['reservation'] !=1) {
$params = [ $params = [
'verify_code' => $order['verify_code'], 'verify_code' => $order['verify_code'],
'store_id' => $extra['store_id'], 'store_id' => $order['store_id'],
'staff_id' => $extra['staff_id'] 'staff_id' => $order['staff_id']
]; ];
OrderLogic::writeOff($params); OrderLogic::writeOff($params);
} }