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

Merge branch 'develop'

Browse Source
This commit is contained in:
monanxiao 2023-03-24 11:12:58 +08:00
commit ff8afb42f9
3 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common.php
View File

@ -465,6 +465,7 @@ if (!function_exists('merchantConfig')) {
{
$request = request();
$make = app()->make(ConfigValueRepository::class);
if (is_array($key)) {
$_key = [];
$cacheData = [];
@ -487,6 +488,7 @@ if (!function_exists('merchantConfig')) {
$request->setCache($merId, $key, $data);
}
}
return $data;
}
}

3
app/common/model/system/merchant/Merchant.php
View File

@ -246,7 +246,8 @@ class Merchant extends BaseModel
public function getIssetCertificateAttr()
{
return count(merchantConfig($this->mer_id, 'mer_certificate') ?: []) > 0;
// return count(merchantConfig($this->mer_id, 'mer_certificate') ?: []) > 0; // 原来方法，临时注释
return merchantConfig($this->mer_id, 'mer_certificate');
}
public function searchMerIdsAttr($query, $value)

52
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -401,25 +401,43 @@ class StoreOrderRepository extends BaseRepository
}
// 来源检测，1 服务小组 2 普通商品
if($order->source == 1)
{
// 验证是否服务小组人员
if ($groupOrder->user->fa_supply_team_id) {
Queue::push(SupplyChainOrderBrokerAgeJob::class, [
'uid' => $groupOrder->user->uid,
'inc' => $order->pay_price, // 订单金额
'order_sn' => $order->order_sn, // 订单编号
'order_id' => $order->order_id, // 订单ID
'mer_id' => $order->mer_id, // 商户ID
'brokerage_price' => $order->supply_chain_price, // 订单佣金金额
]);
}
// if($order->source == 1)
// {
// // 验证是否服务小组人员
// if ($groupOrder->user->fa_supply_team_id) {
// Queue::push(SupplyChainOrderBrokerAgeJob::class, [
// 'uid' => $groupOrder->user->uid,
// 'inc' => $order->pay_price, // 订单金额
// 'order_sn' => $order->order_sn, // 订单编号
// 'order_id' => $order->order_id, // 订单ID
// 'mer_id' => $order->mer_id, // 商户ID
// 'brokerage_price' => $order->supply_chain_price, // 订单佣金金额
// ]);
// }
}else{
// }else{
if ($groupOrder->user->spread_uid) {
Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
}
// if ($groupOrder->user->spread_uid) {
// Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
// }
// }
/**
*
* 供应链服务分佣+分销推广同时分佣，每笔订单都进行分佣
*
*/
Queue::push(SupplyChainOrderBrokerAgeJob::class, [
'uid' => $groupOrder->user->uid,
'inc' => $order->pay_price, // 订单金额
'order_sn' => $order->order_sn, // 订单编号
'order_id' => $order->order_id, // 订单ID
'mer_id' => $order->mer_id, // 商户ID
'brokerage_price' => $order->supply_chain_price, // 订单佣金金额
]);
if ($groupOrder->user->spread_uid) {
Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
}
app()->make(UserRepository::class)->update($groupOrder->uid, [