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-15 11:13:57 +08:00
commit e960f06837
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/api/controller/order/OrderController.php
View File

@ -183,10 +183,11 @@ class OrderController extends BaseApiController
$user=User::where('id',$this->userId)->find(); $user=User::where('id',$this->userId)->find();
$order = OrderLogic::createOrder($cartId, $addressId, $user, $params); $order = OrderLogic::createOrder($cartId, $addressId, $user, $params);
if($order['pay_price'] <= 0){
$pay_type = 3;
}
if ($order != false) { if ($order != false) {
if($order['pay_price'] <= 0){
$pay_type = 3;
}
switch ($pay_type) { switch ($pay_type) {
case PayEnum::PURCHASE_FUNDS: case PayEnum::PURCHASE_FUNDS:
//采购款支付 //采购款支付

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

@ -111,7 +111,7 @@ class PayNotifyLogic extends BaseLogic
$user->save(); $user->save();
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
$capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order['pay_price']); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price']);
self::afterPay($order); self::afterPay($order);
Redis::send('push-platform-print', ['id' => $order['id']], 60); Redis::send('push-platform-print', ['id' => $order['id']], 60);
PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']); PushService::push('store_merchant_' . $order['store_id'], $order['store_id'], ['type' => 'store_merchant', 'msg' => '您有一笔新的订单']);