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

商户余额支付，冻结订单金额

Browse Source
This commit is contained in:
luofei 2024-03-11 10:09:36 +08:00
parent 16fead435b
commit 528635aeb7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/common/model/store/order/StoreGroupOrder.php
View File

@ -26,6 +26,7 @@ class StoreGroupOrder extends BaseModel
const PAY_TYPE_ROUTINE = 2; //小程序支付 const PAY_TYPE_ROUTINE = 2; //小程序支付
const PAY_TYPE_H5 = 3; //H5支付 const PAY_TYPE_H5 = 3; //H5支付
const PAY_TYPE_CREDIT_BUY = 8; //信用购 先货后款 const PAY_TYPE_CREDIT_BUY = 8; //信用购 先货后款
const PAY_TYPE_MER_BALANCE = 9; //商户余额支付
const ON_LINE_PRODUCT = 9; //线上铺货 const ON_LINE_PRODUCT = 9; //线上铺货
const ENTITY_PRODUCT = 10; //实体铺货 const ENTITY_PRODUCT = 10; //实体铺货
const ON_CREDIT_PRODUCT = 11; //赊账进货 const ON_CREDIT_PRODUCT = 11; //赊账进货

2
app/common/repositories/system/merchant/MerchantRepository.php
View File

@ -509,7 +509,7 @@ class MerchantRepository extends BaseRepository
{ {
if ($money <= 0) return; if ($money <= 0) return;
$payType = StoreOrder::getInstance()->where('order_id', $orderId)->value('pay_type'); $payType = StoreOrder::getInstance()->where('order_id', $orderId)->value('pay_type');
if (systemConfig('mer_lock_time') ||in_array($payType,[StoreGroupOrder::PAY_TYPE_BALANCE,StoreGroupOrder::PAY_TYPE_WECHAT,StoreGroupOrder::PAY_TYPE_CREDIT_BUY])) { if (systemConfig('mer_lock_time') ||in_array($payType,[StoreGroupOrder::PAY_TYPE_BALANCE, StoreGroupOrder::PAY_TYPE_MER_BALANCE, StoreGroupOrder::PAY_TYPE_WECHAT,StoreGroupOrder::PAY_TYPE_CREDIT_BUY])) {
app()->make(UserBillRepository::class)->incBill($merId, 'mer_lock_money', $orderType, [ app()->make(UserBillRepository::class)->incBill($merId, 'mer_lock_money', $orderType, [
'link_id' => ($orderType === 'order' ? 1 : 2) . $orderId, 'link_id' => ($orderType === 'order' ? 1 : 2) . $orderId,
'mer_id' => $merId, 'mer_id' => $merId,