From 34e9c8f788fa4b2bd0ec5f5c4400bf61d79837cd Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Wed, 21 Feb 2024 11:01:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=97=B6=20-=20=E4=BD=99=E9=A2=9D=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=9C=AA=E6=88=90=E5=8A=9F=E5=8F=91=E6=94=BE=E9=82=80?= =?UTF-8?q?=E8=AF=B7=E4=BB=A3=E7=90=86=E4=BA=BA=E5=91=98=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketing/AgentApplyRepository.php | 15 ++++++++------- .../marketing/AgentBrokerageRepository.php | 2 ++ .../repositories/marketing/AgentRepository.php | 5 +++-- .../exchangeQuota/OrderPaySuccessEvent.php | 13 +++++++++++-- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/app/common/repositories/marketing/AgentApplyRepository.php b/app/common/repositories/marketing/AgentApplyRepository.php index ca73563..a9f1bc0 100644 --- a/app/common/repositories/marketing/AgentApplyRepository.php +++ b/app/common/repositories/marketing/AgentApplyRepository.php @@ -4,6 +4,7 @@ namespace app\common\repositories\marketing; use app\common\dao\marketing\AgentApplyDao; use app\common\model\marketing\Agent; +use app\common\model\marketing\AgentApply; use app\common\model\user\User; use app\common\repositories\BaseRepository; use app\common\repositories\store\order\StoreOrderCreateRepository; @@ -104,8 +105,9 @@ class AgentApplyRepository extends BaseRepository{ case 9: $payMoney = $config['field_personnel_money'] ?? 0;break; case 10: $payMoney = $config['external_personnel_money'] ?? 0;break; } + // 生成申请信息 + $applyInfoId = AgentApply::insertGetId($applyInfo); // 判断：是否需要支付 需要支付生成订单并且获取支付信息 - $orderId = 0;// 默认 无需支付、无订单信息 if((float)$payMoney > 0){ $userInfo = $params['user_info'] ?? []; $payInfo['money'] = (float)$payMoney; @@ -118,18 +120,17 @@ class AgentApplyRepository extends BaseRepository{ ->make(StoreOrderCreateRepository::class) ->onlinePayment($payType,$payInfo,$userInfo, 32); }); - $payResult = app() - ->make(StoreOrderRepository::class) - ->pay($payInfo['pay_type'],$userInfo,$groupOrder,$payInfo['return_url'],$params['is_app']); // 子订单只存在一个 直接查询即可 $orderId = app()->make(StoreOrderRepository::class) ->getSearch([]) ->where('group_order_id',$groupOrder->group_order_id) ->value('order_id'); + AgentApply::update(['order_id'=>$orderId],['id'=>$applyInfoId]); + $payResult = app() + ->make(StoreOrderRepository::class) + ->pay($payInfo['pay_type'],$userInfo,$groupOrder,$payInfo['return_url'],$params['is_app']); + } - // 生成申请信息 - $applyInfo['order_id'] = $orderId; - $this->dao->create($applyInfo); } return $payResult; diff --git a/app/common/repositories/marketing/AgentBrokerageRepository.php b/app/common/repositories/marketing/AgentBrokerageRepository.php index 76eef8a..b009782 100644 --- a/app/common/repositories/marketing/AgentBrokerageRepository.php +++ b/app/common/repositories/marketing/AgentBrokerageRepository.php @@ -5,6 +5,7 @@ namespace app\common\repositories\marketing; use app\common\dao\marketing\AgentBrokerageDao; use app\common\model\marketing\AgentBrokerage; use app\common\repositories\BaseRepository; +use think\exception\ValidateException; use think\facade\Db; use think\facade\Log; @@ -108,6 +109,7 @@ class AgentBrokerageRepository extends BaseRepository{ $config = app()->make(AgentRepository::class)->getConfig(); // 获取申请信息 $applyInfo = app()->make(AgentApplyRepository::class)->getSearchModel(['order_id'=>$orderId])->findOrEmpty()->toArray(); + if(!$applyInfo) throw new ValidateException('信息不存在！'); // 获取全部上级 $upAllList = app()->make(AgentRepository::class)->getAllUp($applyInfo['pid']); $upAllList = array_column($upAllList, null, 'agent_type'); diff --git a/app/common/repositories/marketing/AgentRepository.php b/app/common/repositories/marketing/AgentRepository.php index 8af09a2..bb5ab7a 100644 --- a/app/common/repositories/marketing/AgentRepository.php +++ b/app/common/repositories/marketing/AgentRepository.php @@ -380,9 +380,10 @@ class AgentRepository extends BaseRepository{ * @param array $data * @return array|mixed */ - public function getAllUp($pid,$data = []){ + public function getAllUp($pid,array $data = []){ $info = $this->getSingleInfo($pid); - if($info['pid'] > 0) $data = $this->getAllUp($info['pid'], $data); + $infoPid = $info['pid'] ?? 0; + if($infoPid > 0) $data = $this->getAllUp($infoPid, $data); else $data[] = $info; diff --git a/app/listener/exchangeQuota/OrderPaySuccessEvent.php b/app/listener/exchangeQuota/OrderPaySuccessEvent.php index 163857e..b7b26a4 100644 --- a/app/listener/exchangeQuota/OrderPaySuccessEvent.php +++ b/app/listener/exchangeQuota/OrderPaySuccessEvent.php @@ -43,7 +43,16 @@ class OrderPaySuccessEvent{ 'group_order_id' => $groupOrder->group_order_id, 'msg' => $e->getMessage() ]; - Log::info('支付成功 - 赠送酒卡额度 - 错误： '.var_export($data,1)); + if($groupOrder->activity_type == 30){ + // 在线支付订单 + Log::info('支付成功 - 赠送酒水卡积分 - 错误： '.var_export($data,1)); + }else if($groupOrder->activity_type == 31){ + Log::info('支付成功 - 兑换商品补差价处理 - 错误： '.var_export($data,1)); + }else if($groupOrder->activity_type == 32){ + Log::info('支付成功 - 邀请代理人员奖励及免审核 - 错误： '.var_export($data,1)); + }else{ + Log::info('支付成功 - 赠送酒卡额度 - 错误： '.var_export($data,1)); + } } } // 支付成功 - 赠送酒卡额度 @@ -160,7 +169,7 @@ class OrderPaySuccessEvent{ return true; } - // 支付成功 - 代理申请入驻支付成功 + // 支付成功 - 邀请代理人员奖励及免审核 public function agentPaySuccessHandle($groupOrder){ foreach($groupOrder->orderList as $orderInfo){ app()->make(AgentBrokerageRepository::class)->inviteAgentGive((int)$orderInfo->order_id);