diff --git a/app/common.php b/app/common.php index bdf5265a..d2e2494a 100644 --- a/app/common.php +++ b/app/common.php @@ -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; } } diff --git a/app/common/model/system/merchant/Merchant.php b/app/common/model/system/merchant/Merchant.php index f9314245..bdf1ecbc 100644 --- a/app/common/model/system/merchant/Merchant.php +++ b/app/common/model/system/merchant/Merchant.php @@ -245,8 +245,9 @@ 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) diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index dd5a5305..c2851c07 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -401,27 +401,45 @@ 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]); + // } + // } + + /** + * + * 供应链服务分佣+分销推广同时分佣,每笔订单都进行分佣 + * + */ + 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]); + } - 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, [ 'pay_count' => Db::raw('pay_count+' . count($groupOrder->orderList)), 'pay_price' => Db::raw('pay_price+' . $groupOrder->pay_price),