三方定时拉取订单赠送养老金，积分，贡献值

app/common/repositories/store/order/StoreOrderRepository.php

@@ -3129,10 +3129,13 @@ class StoreOrderRepository extends BaseRepository
 
     public function yugu_rebate_gong_fu($order){
 
+
         $order_sn = $order["order_sn"];
+        log::info("进入添加养老金{$order['order_sn']}");
         $tongji=Db::name("user_bill")->where("order_sn",$order_sn)->count();
         if($tongji){
             //第三方订单状态修改
+            log::info("tongji");
             try {
                 if(isset($order['table']) && !empty($order['table'])){
                     $table = $order['table'];
@@ -3152,29 +3155,31 @@ class StoreOrderRepository extends BaseRepository
 
         /***************可以返的佣金*****************/
         //商户养老金比例
-        $yanglao= systemConfig('yanglaojin_admin');
+//        $yanglao= systemConfig('yanglaojin_admin');
         //平台若有养老金配置 则开始分配养老金
-        if ($yanglao){
-            //养老金
+//        if ($yanglao){
+//
+//        }
+        //养老金
 //            $oldagefee=$this->decimal2($order["extension_one"]* $yanglao * 0.01);
-            //y养老金最新调整 =佣金的*50%*5%
-            $oldagefee=$this ->decimal2($order['total_price']*0.5*0.05);
 
-            //当前已扣会费总额
+        //y养老金最新调整 =佣金的*50%*5%
+        $oldagefee=decimal2($order['total_price']*0.5*0.05);
+        log::info("++{$order['total_price']}+养老金===={$oldagefee}");
+        //当前已扣会费总额
 //            $oldagefee = $oldagefee-$dues;
-            $mark = "消费获得养老金".$oldagefee;
+        $mark = "消费获得养老金".$oldagefee;
 
-            //end会费
-            //sat存养老金
-            $title = "养老金 ";
-            $commission_type = 5;
-            if ($oldagefee >= 0.01) {
-                $this->add_bill($title, $oldagefee, $order["uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], 0, 0, $order["type_shop"]);
-            }else {
-                Db::name('log')->insert(['data'=>'订单号：'.$order_sn.'付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
-            }
-            //end存养老金
+        //end会费
+        //sat存养老金
+        $title = "养老金 ";
+        $commission_type = 5;
+        if ($oldagefee >= 0.01) {
+            $this->add_bill($title, $oldagefee, $order["uid"], $mark, $commission_type, $order_sn, $order_id, $order["mer_id"], 0, 0, $order["type_shop"]);
+        }else {
+            Db::name('log')->insert(['data'=>'订单号：'.$order_sn.'付款额度较低或 商家、平台设置的返佣比例较低，养老金低于0.01无法入库 特此记录！']);
         }
+        //end存养老金
 
 //
     }
@@ -3679,19 +3684,20 @@ class StoreOrderRepository extends BaseRepository
      */
     public function add_bill($title, $number, $uid, $mark, $commission_type, $order_sn, $order_id = 0, $mer_id = 0, $source = 0, $status = 1, $type_shop = 0)
     {
+        log::info("====进入add——bill");
 //        $old_number=Db::name("user")->where("uid",$uid)->value("brokerage_price");
         if ($uid == 0 || $number == 0) {
             return;
         }
 //        Log::info("user_bill_log");
-        if ($commission_type != 5) {
-            $promoter_rate_technology = systemConfig('promoter_rate_technology');
-            if (floatval($promoter_rate_technology)) {
-                $number = $number - ($number * $promoter_rate_technology / 100);
-                // var_dump(=$number-$number*$promoter_rate_technology)
-                $mark .= ",扣除技术服务费" . $promoter_rate_technology . "%";
-            }
-        }
+//        if ($commission_type != 5) {
+//            $promoter_rate_technology = systemConfig('promoter_rate_technology');
+//            if (floatval($promoter_rate_technology)) {
+//                $number = $number - ($number * $promoter_rate_technology / 100);
+//                // var_dump(=$number-$number*$promoter_rate_technology)
+//                $mark .= ",扣除技术服务费" . $promoter_rate_technology . "%";
+//            }
+//        }
 
 
 //        $number=round($number,2);
@@ -3715,17 +3721,18 @@ class StoreOrderRepository extends BaseRepository
             "source"          => $source,
             "type_shop"       => $type_shop
         ];
+        log::info("开始添加user——bills");
         Db::name("user_bill")->insert($data);
 
-        if ($type_shop == 0) {
-            if ($commission_type == 5) {
-                Db::name("user")->where("uid", $uid)->inc('annuity', $number)->update();
-                Db::name("user")->where("uid", $uid)->inc('annuity_num', 1)->update();
-            } else {
-                Db::name("user")->where("uid", $uid)->inc('brokerage_price', $number)->update();
-
-            }
-        }
+//        if ($type_shop == 0) {
+//            if ($commission_type == 5) {
+//                Db::name("user")->where("uid", $uid)->inc('annuity', $number)->update();
+//                Db::name("user")->where("uid", $uid)->inc('annuity_num', 1)->update();
+//            } else {
+//                Db::name("user")->where("uid", $uid)->inc('brokerage_price', $number)->update();
+//
+//            }
+//        }
 
     }
 

app/common/repositories/user/UserThirdRepository.php

@@ -19,6 +19,7 @@ use app\common\repositories\store\product\ProductRepository;
 use app\model\common\TbOrderModel;
 use think\exception\ValidateException;
 use think\facade\Log;
+use think\test\queue\LoopBreakerException;
 use function GuzzleHttp\Psr7\str;
 
 use think\facade\Db;
@@ -196,7 +197,7 @@ class UserThirdRepository extends BaseRepository
     public function yuguOrder($order_id, $commission, $pid, $order_sn, $type, $table)
     {
         //配置信息
-        $config = $this->config();
+//        $config = $this->config();
         //用户pid信息
 //        if ($type == 6) {//京东联盟改成京推推
 //            $user['uid'] = intval($pid - pow(10, 5));
@@ -230,10 +231,10 @@ class UserThirdRepository extends BaseRepository
                 "type_shop"=>$type,
                 "table"=>$table
             ];
-            return $order;
-//            var_dump($order,$pid);exit;
+
             $StoreOrderRepository = app()->make(StoreOrderRepository::class);
 //            $StoreOrderRepository->yugu_rebate($order);
+            log::info("===待进入养老金22222222222");
             $StoreOrderRepository->yugu_rebate_gong_fu($order);
 
 
@@ -617,47 +618,82 @@ class UserThirdRepository extends BaseRepository
             return false;
         }
         Db::name('log')->insert(['data' => "type_shop:{$type_shop}, $order_sn, $order_sn, 赠送积分, $price"]);
-        Db::startTrans();
+
         try {
             //更新用户积分
+
             $user = Db::name('user')->where('uid', $user_id)->find();
             $inc_score = decimal2($price*0.5);//pv=佣金的50%=积分=贡献值
             $user_score = $user['score'];
-            $ins_data['uid'] = $user_id;
-            $ins_data['reward_socre'] = $inc_score;
-            $ins_data['addtime'] = time();
-            $ins_data['status'] = -1;
-            $ins_data['order_type'] = $type_shop;
-            $ins_data['order_id'] = $order_sn;
-            $ins_data['mark'] = "购买三方商品赠送积分";
-            $ins_data['desc'] = '';
-            $ins_data['surplus'] = $user_score + $inc_score;
-            $ins_data['type'] = 1;
-            $ins_data['pm'] = 1;
-            $ins_data['source_type'] =3;
+            $surplus=$user_score + $inc_score;
+            $surplusgongxian=$user['contribute'] + $inc_score;
+
+            $data = [
+                "uid"           =>  $user_id,
+                "reward_socre"  =>  $inc_score,
+                "addtime"       =>  time(),
+                "status"        =>  -1,
+                "order_type"    =>  $type_shop,
+                "order_id"      =>  $order_sn,
+                "mark"          =>  "购买三方商品赠送积分",
+                "surplus"       =>  $surplus,
+                "pm"            =>  1,
+                "source_type"   =>  3
+                ];
+            log::info("准备开始添加积分，贡献");
+            Db::name("user_sign_score")->insert($data);//添加积分记录
+
+            log::info("准备开始添加积分");
+//            $ins_data['uid'] = $user_id;
+//            $ins_data['reward_socre'] = $inc_score;
+//            $ins_data['addtime'] = time();
+//            $ins_data['status'] = -1;
+//            $ins_data['order_type'] = $type_shop;
+//            $ins_data['order_id'] = $order_sn;
+//            $ins_data['mark'] = "购买三方商品赠送积分";
+//            $ins_data['desc'] = '';
+//            $ins_data['surplus'] = $user_score + $inc_score;
+//            $ins_data['type'] = 1;
+//            $ins_data['pm'] = 1;
+//            $ins_data['source_type'] =3;
 
 
             //更新贡献值
-            $gongxian_data['uid'] = $user_id;
-            $gongxian_data['number'] = $inc_score;
-            $gongxian_data['addtime'] = time();
-            $gongxian_data['status'] = -1;
-            $gongxian_data['order_type'] = $type_shop;
-            $gongxian_data['order_id'] = $order_sn;
-            $gongxian_data['mark'] = "购买三方商品赠送贡献值";
-            $gongxian_data['desc'] = '';
-            $gongxian_data['surplus'] = $user_score + $inc_score;
-            $gongxian_data['type'] = 1;
-            $gongxian_data['pm'] = 1;
-            $gongxian_data['source_type'] =3;
-
-            Db::name('user_sign_score')->insertGetId($ins_data);//添加积分记录
-            Db::name('user_sign_gongxian')->insertGetId($gongxian_data);//添加贡献记录
+            $gongxian_data = [
+                "uid"           =>$user_id,
+                "number"  =>    $inc_score,
+                "addtime"       =>time(),
+                "status"        =>-1,
+                "order_type"    =>$type_shop,
+                "order_id"      =>$order_sn,
+                "mark"          =>"购买三方商品赠送贡献值",
+                "desc"          =>'',
+                "surplus"       =>$surplusgongxian,
+                "type"          =>1
+            ];
+
+//            $gongxian_data['uid'] = $user_id;
+//            $gongxian_data['number'] = $inc_score;
+//            $gongxian_data['addtime'] = time();
+//            $gongxian_data['status'] = -1;
+//            $gongxian_data['order_type'] = $type_shop;
+//            $gongxian_data['order_id'] = $order_sn;
+//            $gongxian_data['mark'] = "购买三方商品赠送贡献值";
+//            $gongxian_data['desc'] = '';
+//            $gongxian_data['surplus'] = $user_score + $inc_score;
+//            $gongxian_data['type'] = 1;
+//            $gongxian_data['pm'] = 1;
+//            $gongxian_data['source_type'] =3;
+
+
+            Db::name("user_sign_gongxian")->insert($gongxian_data);//添加贡献记录
+            log::info("===添加完积分和养老金");
+
 
 //
 //            Db::name('user')->where('uid', $user_id)->inc('score', $inc_score)->update();
 //            Db::name('user')->where('uid', $user_id)->inc('contribute', $inc_score)->update();
-            Db::commit();
+
 
 //            $now_score= Db::name('user')->where('uid',$user_id)->value('now_score_estimate');
 //            $now_score_no= Db::name('user')->where('uid',$user_id)->value('now_score');
@@ -693,8 +729,7 @@ class UserThirdRepository extends BaseRepository
 //            Db::name('integral_log')->insert($insertDta);
 //            Db::name('user_bill')->insert($billData);
 
-        }  catch (\Exception $e) {
-            Db::rollback();
+        }  catch (Exception $e) {
             return app("json")->fail($e->getMessage());
         }
     }

app/controller/api/store/product/DaTaoKe.php

@@ -215,7 +215,7 @@ class DaTaoKe
     public function getOrder()
     {
         try {
-            $startTime = date("Y-m-d H:i:00", strtotime("-20 minutes"));
+            $startTime = date("Y-m-d H:i:00", strtotime("-50 minutes"));
             $endTime = date("Y-m-d H:i:00");
             $url = 'https://openapi.dataoke.com/api/tb-service/get-order-details';
             $queryTypes = [1, 2, 3];//1：按照订单淘客创建时间查询，2:按照订单淘客付款时间查询，3:按照订单淘客结算时间查询
@@ -367,30 +367,34 @@ class DaTaoKe
     {
         $orderThird = app()->make(UserThirdRepository::class);
         foreach ($formatLists as $k => $order) {
+            log::info("=++++==taobaoorder=====+++");
             if (empty($order)) continue;
             //判断数据库有无此订单
             $localOrder = TbOrderModel::getInstance()->getOne(['order_sn' => $order['order_sn']]);
             if (empty($localOrder)) {
                 //订单写入数据库,bill_end_time再格式化订单的时候已经加入,所以写入订单的时候就不需要在计算了
                 $localOrder = TbOrderModel::create($order);
+                    //预估养老金
+                log::info("===待进入养老金");
+                $orderThird->yuguOrder(
+                    $localOrder['order_tb_id'],
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    5,
+                    'order_tb');
+                //预估积分
+                log::info("===待进入积分");
+                $orderThird->yuguJifen(
+                    $localOrder['commission'],
+                    $localOrder['uid'],
+                    $localOrder['order_sn'],
+                    5
+                );
             } else {
                 $localOrder->save($order);//更新订单信息
             }
-            //预估养老金
-            $orderThird->yuguOrder(
-                $localOrder['order_tb_id'],
-                $localOrder['commission'],
-                $localOrder['uid'],
-                $localOrder['order_sn'],
-                5,
-                'order_tb');
-            //预估积分
-            $orderThird->yuguJifen(
-                $localOrder['commission'],
-                $localOrder['uid'],
-                $localOrder['order_sn'],
-                5
-            );
+
         }
 
     }

app/controller/api/store/product/TaoKe.php

@@ -30,8 +30,10 @@ class TaoKe extends BaseController
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->clientId = '37d1fa73af80497ba17bc39ed832310d';
-        $this->clientSecret = '0654e9101c6cb9d1cd7379e91f596027b3d4d5d7';
+//        $this->clientId = '37d1fa73af80497ba17bc39ed832310d';
+//        $this->clientSecret = '0654e9101c6cb9d1cd7379e91f596027b3d4d5d7';
+        $this->clientId = 'e87a7f3bea3d4866be1ebcd6297c236f';
+        $this->clientSecret = 'bc906432b1db7f2c417fa4e7f258d3b29374d464';
         $this->userThird = app()->make(UserThirdRepository::class);
     }