橙汁先生 il y a 1 an
Parent
commit
2bf671e716

+ 9 - 8
app/controller/api/store/merchant/Taskorder.php

@@ -563,13 +563,13 @@ class Taskorder extends BaseController
563 563
 
564 564
         // $store_product_datas = Db::name('old_user_of_goods_old')->select();
565 565
 
566
-        $week_record = 45500 + 1400;
567
-
566
+        $week_record = 45500 + 1400 + 60000; //20250218
568 567
 
568
+        return;
569 569
 
570 570
 
571 571
         $stock_comm = round($week_record * 0.05 ,2);
572
-
572
+        //var_dump($week_record);return;
573 573
 
574 574
         // $team_small_big_amount = $this->getbig_samll_datas(17);//下标0是大部门,下标1是小部门
575 575
         // var_dump($team_small_big_amount);return;
@@ -826,10 +826,11 @@ class Taskorder extends BaseController
826 826
                 $all_award = $my_weight_money + $my_mix_money;
827 827
 
828 828
                 # code...
829
-                // $res = Db::name("user")->where("id",$v)->inc("total_amount_old",$all_award)->save();
830
-
831
-                //Db::name("user")->where("uid",$v)->inc("amount_old",$all_award)->save();//不用冻结金额和提现额度来限制佣金发放
829
+                $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$all_award)->save();
832 830
 
831
+                Db::name("user")->where("uid",$v)->inc("amount_old",$all_award)->save();//不用冻结金额和提现额度来限制佣金发放
832
+                Db::name("user")->where("uid",$v)->inc("brokerage_price",$all_award)->save();
833
+                //Db::name("user")->where("uid",$v)->inc("amount_old",$all_award)->save();
833 834
                 //$this->releaseTobeAmount1($v,$all_award,$output);//根据冻结金和提现额度来计算佣金的发放
834 835
 
835 836
                 //if($res) {
@@ -851,7 +852,7 @@ class Taskorder extends BaseController
851 852
                 Db::name("old_user_weekaward")->insert($week_data);
852 853
 
853 854
 
854
-                // $this->bill_user_log111111($v,"合伙人分佣",$all_award,"合伙人分佣明细入账");//联创分佣明细2.0系统
855
+                $this->bill_user_log111111($v,"合伙人分佣",$all_award,"合伙人分佣明细入账");//联创分佣明细2.0系统
855 856
 
856 857
                 //}
857 858
             }
@@ -883,7 +884,7 @@ class Taskorder extends BaseController
883 884
         $con_data = Db::name('user')->where("uid",$uid)->find();
884 885
         //如果是会员专区就即刻到账
885 886
 
886
-        Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
887
+        // Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
887 888
 
888 889
 
889 890
         $bill = [

Fichier diff supprimé car celui-ci est trop grand
+ 1786 - 0
app/controller/api/store/merchant/Taskorderguquan.php


+ 58 - 6
app/controller/api/store/merchant/Taskorderlianc.php

@@ -287,22 +287,22 @@ class Taskorderlianc extends BaseController
287 287
 
288 288
 
289 289
 
290
-
290
+        return;
291 291
 
292 292
 
293 293
 
294 294
 
295 295
 
296 296
 //测试结束 以下是联创逻辑
297
-        return;
297
+        //return;
298 298
 
299 299
 
300
-        $week_record = 45500;
300
+        $week_record = 45500 + 1400 + 60000;
301 301
 
302 302
         $originator_award = round(($week_record * 0.05),2);
303 303
 
304 304
 
305
-        return;
305
+        //return;
306 306
 
307 307
         $list = Db::name("user")->where("originator_id_old",">",0)->where("status",1)->field("uid,originator_id_old")->select()->toArray();
308 308
         $sum_money = Db::name("old_user_lianc")->sum("number");
@@ -350,15 +350,15 @@ class Taskorderlianc extends BaseController
350 350
             foreach ($value['people'] as $k =>$v) {
351 351
                 # code...
352 352
                 $award = $value['people_award'];
353
-                //var_dump("uid:".$v." amount:".$award);
354 353
 
354
+                Db::name("user")->where("uid",$v)->inc("brokerage_price",$award)->save();
355 355
                 $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$award)->save();
356 356
                 Db::name("user")->where("uid",$v)->inc("amount_old",$award)->save();//不用冻结金额和提现额度来限制佣金发放
357 357
 
358 358
                 //$this->releaseTobeAmount($v,$award,$output);根据冻结金和提现额度来计算佣金的发放
359 359
 
360 360
                 if($res) {
361
-                    $this->bill_user_log($v,"联创分佣",$award,"联创分佣明细入账");//联创分佣明细2.0系统
361
+                    //$this->bill_user_log($v,"联创分佣",$award,"联创分佣明细入账");//联创分佣明细2.0系统
362 362
 
363 363
                     $$count  = $count +1;
364 364
                     $this->change_user_log($v,'amount_old',1,$award,"relation_profits","联创分红入账"."-".$value['title']);
@@ -372,6 +372,15 @@ class Taskorderlianc extends BaseController
372 372
                     $week_data['all_amount'] =  $distribution_money;
373 373
                     $week_data['create_time'] = time();
374 374
                     Db::name("old_user_originator")->insert($week_data);
375
+
376
+                    $userdatassss = db::name("old_user_jbp")->where("id",$v)->find();
377
+                    $datas_log = [
378
+                        'note'=>"名称:".  $userdatassss['nick_name']  . " 用户:".  $v . " 新增联创佣金:" . $award,
379
+                        'create_time'=>date('Y-m-d H:i:s')
380
+                    ];
381
+                    $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
382
+                    $this->bill_user_log111111($v,"联创分佣", $award,"联创明细入账");//股权分佣明细2.0系统
383
+
375 384
                 }else {
376 385
                     // ..
377 386
                 }
@@ -383,6 +392,49 @@ class Taskorderlianc extends BaseController
383 392
 
384 393
     }
385 394
 
395
+    //添加平台分佣2.0系统收益明细日志(养老金金额)
396
+    public function bill_user_log111111($uid,$name,$num,$mark){
397
+
398
+        $con_data = Db::name('user')->where("uid",$uid)->find();
399
+        //如果是会员专区就即刻到账
400
+
401
+        // Db::name('user')->where("uid",$con_data['uid'])->update(['brokerage_price'=> $con_data['brokerage_price'] + $num]);
402
+
403
+
404
+        $bill = [
405
+            'uid'=>$uid,
406
+            'link_id'=>0,//关联订单id
407
+            'pm'=>1,//0:支出,1:获得
408
+            'title'=>$name,//账单标题
409
+            'category'=>'now_money',//明细种类
410
+            'type'=>'commission',//明细类型
411
+            'number'=>$num,//明细数字
412
+            'balance'=>0,//剩余
413
+            'mark'=>$mark,//备注
414
+            'create_time'=>date('Y-m-d H:i:s'),//添加时间
415
+            'status'=>1,//0待确定,1有效,-1无效
416
+            'commission_type'=>8,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
417
+            //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
418
+            //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
419
+            'order_sn'=>0,//订单号
420
+            'tripartite'=>0,//
421
+            'type_shop'=>0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
422
+            'mer_id'=>0,//商户id
423
+            'source'=>0,//1线下 0线上
424
+            'order_type'=>1,//1自营  2 第三方  订单类型
425
+            'is_red_brokerage'=>0,//1红积分对冲佣金 0正常佣金
426
+            'gzc'=>3,//养老金是否已进入公证处log表0:未进入。1:已进入
427
+            'take_time'=>'',//结算时间
428
+            'district_id'=>'',//
429
+            'street_id'=>'',//
430
+            'month'=>'',//月份
431
+
432
+
433
+        ];
434
+
435
+        Db::name('user_bill')->insert($bill);
436
+    }
437
+
386 438
 
387 439
     //上周
388 440
     public function getWeekStartEnd()

+ 26 - 5
app/controller/api/user/User.php

@@ -200,7 +200,7 @@ class User extends BaseController
200 200
         $uid = $this->request->uid();
201 201
         $data = [
202 202
             "name"=>"VR转账",
203
-            "url"=>'https://show.hxxfb.com/?uid=' .$uid,
203
+            "url"=>'https://show.gdjbp.com/?uid=' .$uid,
204 204
         ];
205 205
         return app('json')->success($data);
206 206
     }
@@ -239,6 +239,9 @@ class User extends BaseController
239 239
 //            $dateObj=DB::name('user_sign_hongbao')->where('uid', $user->uid)->select();
240 240
             //已经入账贡献值
241 241
             $data['total_source']=$user->contribute;
242
+            //我的团队贡献值
243
+            $data['team_gongxian_num']=$user->contribute;
244
+
242 245
             //为生贡献值
243 246
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');;
244 247
             log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
@@ -1361,11 +1364,27 @@ class User extends BaseController
1361 1364
 
1362 1365
 
1363 1366
         //$teamid =  $this->request->param('teamid');//测试ID
1364
-        $teamid = 17;
1367
+        //$teamid = 17;
1368
+
1369
+        if($teamid = 592){
1370
+            $teamid = 17;
1371
+        }
1372
+
1373
+        //根据用户找jbp1.0的节点人数组
1374
+        $userdatas = Db::name('user')->where("uid",$teamid)->find();
1375
+        //判断用户上级是否在1.0中注册过
1376
+        if(!empty($userdatas['spread_uid'])){
1377
+            if($userdatas['spread_uid'] >= 611){
1378
+                $spreaddatas = Db::name('user')->where("uid",$userdatas['spread_uid'])->find();
1379
+            }
1380
+        }
1381
+
1382
+
1383
+        //根据用户找jbp1.0的节点人数组 end
1365 1384
 
1366 1385
         $datas_jbp = Db::name('old_user_jbp')->where("id",$teamid)->find();//查询旧系统是否有当前会员
1367 1386
         $type = $this->request->param('type',0);//1:大部门,0:小部门,2:直推
1368
-// 初始化最终返回的数据
1387
+        // 初始化最终返回的数据
1369 1388
         $data = [
1370 1389
             'team_list' => [],
1371 1390
             'fans_num' => 0, // 粉丝数
@@ -1377,7 +1396,7 @@ class User extends BaseController
1377 1396
             'person_nums_pv' => 0, // 个人联盟PV
1378 1397
         ];
1379 1398
 
1380
-// 如果在旧系统中有数据
1399
+        // 如果在旧系统中有数据
1381 1400
         if (!empty($datas_jbp)) {
1382 1401
             $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
1383 1402
             $tes = $this->teamPeople($teamid, $type); // 1:团队, 2:个人
@@ -2605,6 +2624,8 @@ class User extends BaseController
2605 2624
         $today_signintime = strtotime(date('Y-m-d', time()));
2606 2625
         $today_signin_info = Db::name('user_sign_score')->where(array('uid' => $uid))->whereDay('signin_time')->find();
2607 2626
 
2627
+        return app('json')->fail('今天已经签到过了xx');
2628
+
2608 2629
         if (!empty($today_signin_info)) {
2609 2630
             return app('json')->fail('今天已经签到过了');
2610 2631
         } else {
@@ -3225,7 +3246,7 @@ class User extends BaseController
3225 3246
             ->sum('number');
3226 3247
 
3227 3248
         //最终 总收益是 = 佣金余额 + 已提现 + 已转VR
3228
-        $data['sum_amount'] = $data['sum_amount'] + $data['brokerage_price']  + $data['transition_vr_amount'];
3249
+        $data['sum_amount'] = $data['sum_amount'] + $data['transition_vr_amount'];
3229 3250
 
3230 3251
 
3231 3252
         return app('json')->success($data);

+ 4 - 2
route/api.php

@@ -744,6 +744,9 @@ Route::group('api/', function () {
744 744
             Route::get('/product1/lst1', 'Taskorder/lst1');
745 745
             //联创
746 746
             Route::get('/product1/lst2', 'Taskorderlianc/lst2');
747
+            //股权分红
748
+            Route::get('/product1/lst6', 'Taskorderguquan/lst6');
749
+
747 750
             //获取用户名(VR)
748 751
             Route::post('/product1/lst3', 'Taskordervr/lst3');
749 752
             //转VR
@@ -1051,8 +1054,7 @@ Route::group('api/', function () {
1051 1054
     //话费充值回调通知
1052 1055
     Route::post('huafei/notify', 'api.store.service.Huafei/notify');
1053 1056
 
1054
-    //订单数据补充
1055
-    Route::post('order/buchong', 'api.notify/buchong');
1057
+
1056 1058
 
1057 1059
     //城市代码
1058 1060
     Route::get('su/city', 'api.store.product.Su/cityCode');