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-14 08:53:12 +08:00
commit b7ed8c9370
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -388,16 +388,16 @@ class StoreOrderRepository extends BaseRepository
if ($groupOrder->user->spread_uid) { if ($groupOrder->user->spread_uid) {
// 来源检测，1 服务小组 2 普通商品 // 来源检测，1 服务小组 2 普通商品
if($order->source == 2) if($order->source == 1)
{ {
\think\facade\Log::record('供应链佣金--开始'); \think\facade\Log::record('供应链佣金--开始');
Queue::push(SupplyChainOrderBrokerAgeJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]); Queue::push(SupplyChainOrderBrokerAgeJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]);
\think\facade\Log::record('供应链佣金---结束'); \think\facade\Log::record('供应链佣金---结束');
}else{
Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]);
Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
} }
Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_pay_num', 'inc' => 1]);
Queue::push(UserBrokerageLevelJob::class, ['uid' => $groupOrder->user->spread_uid, 'type' => 'spread_money', 'inc' => $groupOrder->pay_price]);
} }
app()->make(UserRepository::class)->update($groupOrder->uid, [ app()->make(UserRepository::class)->update($groupOrder->uid, [
'pay_count' => Db::raw('pay_count+' . count($groupOrder->orderList)), 'pay_count' => Db::raw('pay_count+' . count($groupOrder->orderList)),

6
app/controller/api/store/order/StoreCart.php
View File

@ -104,9 +104,9 @@ class StoreCart extends BaseController
break; break;
case 99: //小组代购 case 99: //小组代购
$result = app()->make(ProductRepository::class)->cartCheck($data,$this->request->userInfo()); $result = app()->make(ProductRepository::class)->cartCheck($data,$this->request->userInfo());
$data['source'] = $data['product_type']; [$source, $sourceId, $pid] = explode(':', $this->request->param('source', '0'), 3) + ['', '', ''];
$data['source_id'] = $data['group_buying_id']; $data['source'] = (in_array($source, [0, 1]) && $pid == $data['product_id']) ? $source : 0;
$data['product_id'] = $result['product']['product_id']; if ($data['source'] > 0) $data['source_id'] = intval($sourceId);
break; break;
} }

8
app/controller/api/store/order/StoreCartDg.php
View File

@ -70,7 +70,6 @@ class StoreCartDg extends BaseController
public function create(validate $validate) public function create(validate $validate)
{ {
$data = $this->checkParams($validate); $data = $this->checkParams($validate);
if(!in_array($data['product_type'],[0,1,2,3,4,99])) return app('json')->fail('商品类型错误'); if(!in_array($data['product_type'],[0,1,2,3,4,99])) return app('json')->fail('商品类型错误');
if ($data['cart_num'] <= 0) return app('json')->fail('购买数量有误'); if ($data['cart_num'] <= 0) return app('json')->fail('购买数量有误');
$user = $this->request->userInfo(); $user = $this->request->userInfo();
@ -107,14 +106,13 @@ class StoreCartDg extends BaseController
break; break;
case 99: //小组代购 case 99: //小组代购
$result = app()->make(ProductDgRepository::class)->cartCheck($data,$this->request->userInfo()); $result = app()->make(ProductDgRepository::class)->cartCheck($data,$this->request->userInfo());
$data['source'] = $data['product_type']; [$source, $sourceId, $pid] = explode(':', $this->request->param('source', '0'), 3) + ['', '', ''];
$data['source_id'] = $data['group_buying_id']; $data['source'] = (in_array($source, [0, 1]) && $pid == $data['product_id']) ? $source : 0;
$data['product_id'] = $result['product']['product_id']; if ($data['source'] > 0) $data['source_id'] = intval($sourceId);
break; break;
} }
unset($data['group_buying_id']); unset($data['group_buying_id']);
if ($cart = $result['cart']) { if ($cart = $result['cart']) {
//更新购物车 //更新购物车
$cart_id = $cart['cart_id']; $cart_id = $cart['cart_id'];

9
crmeb/jobs/SupplyChainOrderBrokerAgeJob.php
View File

@ -30,8 +30,6 @@ class SupplyChainOrderBrokerAgeJob implements JobInterface
{ {
try { try {
$user = app()->make(UserRepository::class)->get($data['uid']); $user = app()->make(UserRepository::class)->get($data['uid']);
// 供应链服务小组一级返还给服务小组
if ($user) { if ($user) {
$flag = true; $flag = true;
if ($data['type'] == 'spread_money') { if ($data['type'] == 'spread_money') {
@ -45,10 +43,9 @@ class SupplyChainOrderBrokerAgeJob implements JobInterface
$user->save(); $user->save();
} }
} }
if ($user && $user->is_promoter) {
// 执行供应链佣金分账 app()->make(UserBrokerageRepository::class)->inc($user, $data['type'], $data['inc']);
app()->make(UserBrokerageRepository::class)->inc($user, $data['type'], $data['inc']); }
} catch (\Exception $e) { } catch (\Exception $e) {
Log::info('分销等级同步失败: ' . var_export($data, 1) . $e->getMessage()); Log::info('分销等级同步失败: ' . var_export($data, 1) . $e->getMessage());
} }