From a62ebe0d1b9ea896cdba7bd4ec6e1d0d142b3b84 Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期二, 18 七月 2023 09:48:40 +0800
Subject: [PATCH] no message

---
 application/api/logic/ActivityInfo.php |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/application/api/logic/ActivityInfo.php b/application/api/logic/ActivityInfo.php
index 8107ec0..12e25b4 100644
--- a/application/api/logic/ActivityInfo.php
+++ b/application/api/logic/ActivityInfo.php
@@ -4,6 +4,8 @@
 use app\common\logic\Basic as BasicLogic;
 use think\console\output\descriptor\Console;
 use think\Db;
+use app\common\model\User as ModelUser;
+use app\api\logic\SettlementRecord as LogicSettlementRecord;
 class ActivityInfo extends BasicLogic
 {
 
@@ -159,9 +161,11 @@
             $rewardRule=json_decode($act['act_json']);
             foreach($cusList as $cus)
             {//寰幆鍙備笌娲诲姩鐨勪細鍛�
-                $yqCount=Db::query('select count(1) as count from t_user where invitation_id=? and invite_bind_time>=? and invite_bind_time<=?',[$cus['user_id'],$cus['create_time'],$actEndTime]);
+                $tradeId=$act['id'].'u'.$cus['user_id'];
+                $yqCount=Db::query('select count(1) as count from t_user where invitation_id=? and status=? and invite_bind_time>=? and invite_bind_time<=?',[$cus['user_id'],'normal',$cus['create_time'],$actEndTime]);
                 if(empty($yqCount))
                 {
+                    Db::execute('update t_recruit_act set settlement_status=?,settlement_time=?,act_count=0,act_award=0 where id=?',[1, date("Y-m-d H:i:s",  time()),$tradeId]);
                     continue;
                 }
                 //璁$畻搴斿緱閲戦
@@ -176,20 +180,23 @@
                 }
                 if($price<=0)
                 {
+                    Db::execute('update t_recruit_act set settlement_status=?,settlement_time=?,act_count=?,act_award=0 where id=?',[1, date("Y-m-d H:i:s",  time()),$yqCount[0]['count'],$tradeId]);
                     continue;
                 }
-
-                $tradeId=$act['id'].'u'.$cus['user_id'];
                 //鎻掑叆鑱氭帹瀹㈢殑璁㈠崟
                 $tradeHas=Db::query('select id from t_jtk_union_order_commission where trade_parent_id=?',[$tradeId]);
                 if(!empty($tradeHas))
                 {//宸茬粡鏈夎鍗�
                     continue;
                 }
-                $tradeRes=Db::execute('insert into t_jtk_union_order_commission (trade_parent_id,trade_id,member_id,buy_member_id,is_own,alipay_total_price,pub_share_pre_fee,item_title,item_id,is_settle,tb_paid_time,create_time,update_time)values(?,?,?,?,1,?,?,?,?,?,?,?,?)',[$tradeId,$tradeId,$cus['user_id'],$cus['user_id'],$price,$price,$act['act_name'].'-娲诲姩濂栧姳',$act['id'],0,time(),time(),time()]);
+                //璁$畻璁㈠崟鏀剁泭
+                $title = $act['act_name'].'-娲诲姩濂栧姳缁撶畻';
+                ModelUser::money('inc',$price,$cus['user_id'],$title);
+                LogicSettlementRecord::writeLog('jtk',$price,$cus['user_id'],$title);
+                $tradeRes=Db::execute('insert into t_jtk_union_order_commission (trade_parent_id,trade_id,member_id,buy_member_id,is_own,alipay_total_price,pub_share_pre_fee,item_title,item_id,is_settle,tb_paid_time,create_time,update_time,tk_status,tk_earning_time,pub_share_fee)values(?,?,?,?,1,?,?,?,?,?,?,?,?,?,?,?)',[$tradeId,$tradeId,$cus['user_id'],$cus['user_id'],$price,$price,$act['act_name'].'-娲诲姩濂栧姳',$act['id'],1,date("Y-m-d H:i:s",  time()),time(),time(),3,time(),$price]);
                 if($tradeRes==1)
                 {//淇敼璁$畻鐘舵��
-                    Db::execute('update t_recruit_act set settlement_status=?,settlement_time=? where id=?',[1, date("Y-m-d H:i:s",  time()),$tradeId]);
+                    Db::execute('update t_recruit_act set settlement_status=?,settlement_time=?,act_count=?,act_award=? where id=?',[1, date("Y-m-d H:i:s",  time()),$yqCount[0]['count'],$price,$tradeId]);
                 }
             }
             $this->run_UpdateActCount($act['id'],2);

--
Gitblit v1.9.3