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

Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

Browse Source
This commit is contained in:
mkm 2024-06-27 09:51:20 +08:00
commit 8c9608f5da
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,14 @@ class PayNotifyLogic extends BaseLogic
self::descStock($order['id']);
}
self::afterPay($order);
if ($extra && $extra['store_id']) {
$params = [
'verify_code' => $order['verify_code'],
'store_id' => $extra['store_id'],
'staff_id' => $extra['staff_id']
];
OrderLogic::writeOff($params);
}
// Redis::send('push-platform-print', ['id' => $order['id']], 60);
// PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
}
@ -186,6 +194,7 @@ class PayNotifyLogic extends BaseLogic
// self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS);
// }
// self::addUserSing($order);
self::afterPay($order);
if ($extra && $extra['store_id']) {
$params = [
'verify_code' => $order['verify_code'],
@ -199,7 +208,7 @@ class PayNotifyLogic extends BaseLogic
// self::descStock($order['id']);
// }
self::afterPay($order);
// Redis::send('push-platform-print', ['id' => $order['id']], 60);
// PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);
}
@ -357,7 +366,6 @@ class PayNotifyLogic extends BaseLogic
//日志记录
$model = new StoreCashFinanceFlow();
$model->store_id = $order['store_id'] ?? 0;
$model->store_id = $order['store_id'] ?? 0;
$model->cash_price = $order->pay_price;
$model->receivable = $order->pay_price;
$model->remark = '退款';

17
app/store/controller/store_order/StoreOrderController.php
View File

@ -174,6 +174,13 @@ class StoreOrderController extends BaseAdminController
$order = OrderLogic::createOrder($cartId, $addressId, $user, $params);
if ($order != false) {
switch ($pay_type) {
case PayEnum::BALANCE_PAY:
//余额支付
PayNotifyLogic::handle('balancePay', $order['order_id'],[
'store_id' => $this->request->adminInfo['store_id'],
'staff_id' => $this->request->adminInfo['admin_id']
]);
return $this->success('余额支付成功');
case PayEnum::PURCHASE_FUNDS:
//采购款支付
PayNotifyLogic::handle('purchase_funds', $order['order_id'], [
@ -248,9 +255,17 @@ class StoreOrderController extends BaseAdminController
return $this->fail('订单不存在或已支付');
}
switch ($pay_type) {
case PayEnum::BALANCE_PAY:
//余额支付
PayNotifyLogic::handle('balancePay', $order['order_id'],[
'store_id' => $this->request->adminInfo['store_id'],
'staff_id' => $this->request->adminInfo['admin_id']
]);
return $this->success('余额支付成功');
case PayEnum::PURCHASE_FUNDS:
//采购款支付
PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $order['uid']]);
PayNotifyLogic::handle('purchase_funds', $order['order_id'], ['uid' => $order['uid'],'store_id' => $this->request->adminInfo['store_id'],
'staff_id' => $this->request->adminInfo['admin_id']]);
return $this->success('采购款支付成功', ['id' => $order['id']]);
case PayEnum::CASH_PAY:
//现金支付