111

app/business/PayorderBusiness.php

@@ -742,6 +742,37 @@ class PayorderBusiness
 
                 }
 
+            }elseif ($goodsData->type == 16) {
+                if (!empty($goodsData->bonus)) {
+                    Db::table('wa_cron_task')->insert([
+                        'user_id'           => $data['user_id'],
+                        'goods_id'          => $goodsData->id,
+                        'order_id'          => $data['id'],
+                        'money'             => $data['money'],
+                        'bonus'             => $goodsData->bonus,
+                        'rebate'            => $goodsData->rebate,
+                        'rebate_one'        => $goodsData->rebate_one,
+                        'rebate_two'        => $goodsData->rebate_two,
+                        'goods_type'        => $goodsData->type,
+                        'day_dividend_time' => strtotime(date('Y-m-d', strtotime('+1 days')) . ' 00:10:00'),
+                        'dividend_time'     => strtotime($futureDay),
+                        'created_at'        => $thisDay,
+                        'updated_at'        => $thisDay,
+                        'my_good_id'        => $myGoodsId,
+                    ]);
+                    StreamBusiness::addStream($data['user_id'], $goodsData->bonus, streamType51, moldType20, moldTypefild20, $data['id']);
+
+                    if (!empty($userlist->pid) && !empty($goodsData->rebate)) {
+                        StreamBusiness::addStream($userlist->pid, $goodsData->rebate, streamType51, moldType21, moldTypefild21, $data['id']);
+                    }
+                    if (!empty($userlist->ppid) && !empty($goodsData->rebate_one)) {
+                        StreamBusiness::addStream($userlist->ppid, $goodsData->rebate_one, streamType51, moldType21, moldTypefild21, $data['id']);
+                    }
+                    if (!empty($userlist->toppid) && !empty($goodsData->rebate_two)) {
+                        StreamBusiness::addStream($userlist->toppid, $goodsData->rebate_two, streamType51, moldType21, moldTypefild21, $data['id']);
+                    }
+
+                }
             }
 
             /** 新增消费数据 */

app/business/WithdrawBusiness.php

@@ -94,6 +94,25 @@ class WithdrawBusiness
                 if (10 > $param['money']) {
                     throw new \Exception('最小提现金额:10元');
                 }
+            } elseif ($param['mold'] == 20) {
+                if (10 > $param['money']) {
+                    throw new \Exception('最小提现金额:10元');
+                }
+            } elseif ($param['mold'] == 21) {
+                if (10 > $param['money']) {
+                    throw new \Exception('最小提现金额:10元');
+                }
+            }elseif ($param['mold'] == 22) {
+                if (10 > $param['money']) {
+                    throw new \Exception('最小提现金额:10元');
+                }
+            }elseif ($param['mold'] == 23) {
+                if($param['user_data']['new_is_num']<3){
+                    throw new \Exception('邀请三人即可提现');
+                }
+                if (10 > $param['money']) {
+                    throw new \Exception('最小提现金额:10元');
+                }
             } else {
                 throw new \Exception('提现功能暂未开放!');
             }
@@ -254,7 +273,7 @@ class WithdrawBusiness
                         }
 
                     }
-                })
+                })->where('money','>',0)
                 ->where('user_id', $param['user_data']['id'])
                 ->orderByDesc('id')
                 ->paginate(Arr::get($param, 'limit', 10), ['*'], 'page', Arr::get($param, 'page'))

app/controller/UserController.php

@@ -220,77 +220,32 @@ class UserController
             'mining_count'        => $mining_count,
             'user_identity'       => UserIdentityBusiness::data(['uid' => $request->user_data['id']]),
             'bank_card'           => BankCardBusiness::data(['uid' => $request->user_data['id']]),
+            'money_twenty'        => $request->user_data['money_twenty'],
+            'money_twenty_one'    => $request->user_data['money_twenty_one'],
+            'money_twenty_two'    => $request->user_data['money_twenty_two'],
+            'money_twenty_three'  => $request->user_data['money_twenty_three'],
+            'new_is_num'          => $request->user_data['new_is_num'],
         ];
         $usersdata = Db::table('wa_users')->where('id', $request->user_data['id'])->first();
 
-        $has47 = Db::table('wa_stream')
-            ->where('user_id', $request->user_data['id'])
-            ->where('type', streamType47)
-            ->exists();
-        if (empty($has47)) {
-            if ($usersdata->money_five > 100000) {
-                StreamBusiness::delStream($request->user_data['id'], 100000, streamType47, moldType5, moldTypefild5);
-                StreamBusiness::addStream($request->user_data['id'], 20000000, streamType47, moldType18, moldTypefild18);
-            } else {
-                StreamBusiness::delStream($request->user_data['id'], $usersdata->money_five, streamType47, moldType5, moldTypefild5);
-                StreamBusiness::addStream($request->user_data['id'], 20000000, streamType47, moldType18, moldTypefild18);
-            }
+        if(!empty($request->user_data['money_one'])){
+            Db::table('wa_users')->where('id', $request->user_data['id'])->increment('money_twenty_three',$request->user_data['money_one']);
+            Db::table('wa_users')->where('id', $request->user_data['id'])->update(['money_one'=>0]);
         }
-
-
-//        //银行卡余额 强制 兑换
-//        if (!empty($usersdata->money_two) && $usersdata->money_two > 0) {
-//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_two, streamType40, moldType10, moldTypefild10);
-//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_two, streamType40, moldType3, moldTypefild3);
-//        }
-        //USD强制 兑换
-        if (!empty($usersdata->money) && $usersdata->money > 0) {
-            StreamBusiness::addStream($request->user_data['id'], $usersdata->money, streamType40, moldType10, moldTypefild10);
-            StreamBusiness::delStream($request->user_data['id'], $usersdata->money, streamType40, moldType1, moldTypefild1);
+        if(!empty($request->user_data['money_sixteen'])){
+            Db::table('wa_users')->where('id', $request->user_data['id'])->increment('money_twenty_three',$request->user_data['money_sixteen']);
+            Db::table('wa_users')->where('id', $request->user_data['id'])->update(['money_sixteen'=>0]);
         }
-
-        //消费体验金 强制 兑换
-        if (!empty($usersdata->money_six) && $usersdata->money_six > 0) {
-            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_six, streamType40, moldType17, moldTypefild17);
-            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_six, streamType40, moldType6, moldTypefild6);
-        }
-        //理财每日利息强制 兑换
-        if (!empty($usersdata->money_seven) && $usersdata->money_seven > 0) {
-            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_seven, streamType40, moldType17, moldTypefild17);
-            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_seven, streamType40, moldType7, moldTypefild7);
-        }
-        //团队佣金强制 兑换
-        if (!empty($usersdata->money_eight) && $usersdata->money_eight > 0) {
-            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_eight, streamType40, moldType17, moldTypefild17);
-            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_eight, streamType40, moldType8, moldTypefild8);
-        }
-        //U团队补贴强制 兑换
-        if (!empty($usersdata->money_nine) && $usersdata->money_nine > 0) {
-            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_nine, streamType40, moldType17, moldTypefild17);
-            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_nine, streamType40, moldType9, moldTypefild9);
-        }
-        //大使收益钱包强制 兑换
-        if (!empty($usersdata->money_eleven) && $usersdata->money_eleven > 0) {
-            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_eleven, streamType40, moldType17, moldTypefild17);
-            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_eleven, streamType40, moldType11, moldTypefild11);
+        if(!empty($request->user_data['money_seventeen'])){
+            Db::table('wa_users')->where('id', $request->user_data['id'])->increment('money_twenty_three',$request->user_data['money_seventeen']);
+            Db::table('wa_users')->where('id', $request->user_data['id'])->update(['money_seventeen'=>0]);
         }
-        if (!empty($usersdata->money_twelve) && $usersdata->money_twelve > 0) {
-            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_twelve, streamType40, moldType17, moldTypefild17);
-            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_twelve, streamType40, moldType12, moldTypefild12);
-        }
-        if (!empty($usersdata->money_fifteen) && $usersdata->money_fifteen > 0) {
-            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_fifteen, streamType40, moldType17, moldTypefild17);
-            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_fifteen, streamType40, moldType15, moldTypefild15);
+        if(!empty($request->user_data['money_nineteen'])){
+            Db::table('wa_users')->where('id', $request->user_data['id'])->increment('money_twenty_three',$request->user_data['money_nineteen']);
+            Db::table('wa_users')->where('id', $request->user_data['id'])->update(['money_nineteen'=>0]);
         }
 
-        $has = Db::table('wa_stream')
-            ->where('user_id', $request->user_data['id'])
-            ->whereBetween('add_time', [strtotime(date('Y-m-d') . ' 00:00:00'), strtotime(date('Y-m-d') . ' 23:59:59')])
-            ->where('type', streamType41)
-            ->exists();
-        if (empty($has)) {
-            StreamBusiness::addStream($request->user_data['id'], 3000, streamType41, moldType10, moldTypefild10);
-        }
+
         $has1 = Db::table('wa_stream')
             ->where('user_id', $request->user_data['id'])
             ->where('type', streamType46)
@@ -312,13 +267,67 @@ class UserController
                 StreamBusiness::addStream($v->user_id, $v->money, streamType4, moldType3, moldTypefild3, $v->id);
             }
         }
-        $has1 = Db::table('wa_stream')
-            ->where('user_id', $request->user_data['id'])
-            ->where('type', streamType50)
-            ->exists();
-        if (empty($has1)) {
-            StreamBusiness::addStream($request->user_data['id'], 10000000, streamType50, moldType18, moldTypefild18);
-        }
+
+//        $has47 = Db::table('wa_stream')
+//            ->where('user_id', $request->user_data['id'])
+//            ->where('type', streamType47)
+//            ->exists();
+//        if (empty($has47)) {
+//            if ($usersdata->money_five > 100000) {
+//                StreamBusiness::delStream($request->user_data['id'], 100000, streamType47, moldType5, moldTypefild5);
+//                StreamBusiness::addStream($request->user_data['id'], 20000000, streamType47, moldType18, moldTypefild18);
+//            } else {
+//                StreamBusiness::delStream($request->user_data['id'], $usersdata->money_five, streamType47, moldType5, moldTypefild5);
+//                StreamBusiness::addStream($request->user_data['id'], 20000000, streamType47, moldType18, moldTypefild18);
+//            }
+//        }
+
+
+//        //银行卡余额 强制 兑换
+//        if (!empty($usersdata->money_two) && $usersdata->money_two > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_two, streamType40, moldType10, moldTypefild10);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_two, streamType40, moldType3, moldTypefild3);
+//        }
+//        //USD强制 兑换
+//        if (!empty($usersdata->money) && $usersdata->money > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money, streamType40, moldType10, moldTypefild10);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money, streamType40, moldType1, moldTypefild1);
+//        }
+
+//        //消费体验金 强制 兑换
+//        if (!empty($usersdata->money_six) && $usersdata->money_six > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_six, streamType40, moldType17, moldTypefild17);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_six, streamType40, moldType6, moldTypefild6);
+//        }
+//        //理财每日利息强制 兑换
+//        if (!empty($usersdata->money_seven) && $usersdata->money_seven > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_seven, streamType40, moldType17, moldTypefild17);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_seven, streamType40, moldType7, moldTypefild7);
+//        }
+//        //团队佣金强制 兑换
+//        if (!empty($usersdata->money_eight) && $usersdata->money_eight > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_eight, streamType40, moldType17, moldTypefild17);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_eight, streamType40, moldType8, moldTypefild8);
+//        }
+//        //U团队补贴强制 兑换
+//        if (!empty($usersdata->money_nine) && $usersdata->money_nine > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_nine, streamType40, moldType17, moldTypefild17);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_nine, streamType40, moldType9, moldTypefild9);
+//        }
+//        //大使收益钱包强制 兑换
+//        if (!empty($usersdata->money_eleven) && $usersdata->money_eleven > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_eleven, streamType40, moldType17, moldTypefild17);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_eleven, streamType40, moldType11, moldTypefild11);
+//        }
+//        if (!empty($usersdata->money_twelve) && $usersdata->money_twelve > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_twelve, streamType40, moldType17, moldTypefild17);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_twelve, streamType40, moldType12, moldTypefild12);
+//        }
+//        if (!empty($usersdata->money_fifteen) && $usersdata->money_fifteen > 0) {
+//            StreamBusiness::addStream($request->user_data['id'], $usersdata->money_fifteen, streamType40, moldType17, moldTypefild17);
+//            StreamBusiness::delStream($request->user_data['id'], $usersdata->money_fifteen, streamType40, moldType15, moldTypefild15);
+//        }
+
 
 
         return success($arr);
@@ -338,75 +347,75 @@ class UserController
     public function signlist(Request $request)
     {
         $system = Db::table('wa_system')->first();
-        $arr[]  = date('Y-m-d', strtotime('monday this week'));
-        $arr[]  = date('Y-m-d', strtotime('monday this week +1 day'));
-        $arr[]  = date('Y-m-d', strtotime('monday this week +2 day'));
-        $arr[]  = date('Y-m-d', strtotime('monday this week +3 day'));
-        $arr[]  = date('Y-m-d', strtotime('monday this week +4 day'));
-        $arr[]  = date('Y-m-d', strtotime('monday this week +5 day'));
-        $arr[]  = date('Y-m-d', strtotime('sunday this week'));
-        $array  = [];
-        foreach ($arr as $k => $v) {
-            $array[] = [
-                'day' => date('d', strtotime($v)),
-                'has' => Db::table('wa_stream')
-                    ->where('user_id', $request->user_data['id'])
-                    ->where('type', streamType2)
-                    ->whereBetween('add_time', [strtotime($v . ' 00:00:00'), strtotime($v . ' 23:59:59')])->exists()
-            ];
-        }
-        $signcount = Db::table('wa_stream')->where('type', streamType2)->where('user_id', $request->user_data['id'])->count();
-        $is_sign   = Db::table('wa_stream')
-            ->where('user_id', $request->user_data['id'])
-            ->where('type', streamType2)
-            ->whereBetween('add_time', [strtotime(date('Y-m-d') . ' 00:00:00'), strtotime(date('Y-m-d') . ' 23:59:59')])
-            ->exists();
-        return success([
-            'list'                => $array,
-            'signcount'           => $signcount,
-            'continuity'          => $request->user_data['continuity'],
-            'money'               => $system->realname_reward,
-            'original_sign_award' => $system->sign_award,
-            'is_sign'             => $is_sign,
-        ]);
-
-//        $param              = $request->param_data;
-//        $param['user_data'] = $request->user_data;
-//        $month_num          = date('t');
-//        $res                = [];
-//        //查询当前用户当月签到记录
-//        $this_month_sign = Db::table('wa_stream')
-//            ->where('type', streamType2)
-//            ->where('user_id', $param['user_data']['id'])
-//            ->whereRaw("DATE_FORMAT(created_at,'%Y-%m')=?", date('Y-m'))
-//            ->get();
-//        for ($i = 1; $i <= $month_num; $i++) {
-//            $date       = $i > 9 ? date('Y-m-') . $i : date('Y-m-') . '0' . $i;
-//            $check_sign = collect($this_month_sign)
-//                ->where('created_at', '>=', $date . ' 00:00:00')
-//                ->where('created_at', '<=', $date . ' 23:59:59')
-//                ->exists();
-//            $res[]      = [
-//                'day' => $i,
-//                'has' => $check_sign,
+//        $arr[]  = date('Y-m-d', strtotime('monday this week'));
+//        $arr[]  = date('Y-m-d', strtotime('monday this week +1 day'));
+//        $arr[]  = date('Y-m-d', strtotime('monday this week +2 day'));
+//        $arr[]  = date('Y-m-d', strtotime('monday this week +3 day'));
+//        $arr[]  = date('Y-m-d', strtotime('monday this week +4 day'));
+//        $arr[]  = date('Y-m-d', strtotime('monday this week +5 day'));
+//        $arr[]  = date('Y-m-d', strtotime('sunday this week'));
+//        $array  = [];
+//        foreach ($arr as $k => $v) {
+//            $array[] = [
+//                'day' => date('d', strtotime($v)),
+//                'has' => Db::table('wa_stream')
+//                    ->where('user_id', $request->user_data['id'])
+//                    ->where('type', streamType2)
+//                    ->whereBetween('add_time', [strtotime($v . ' 00:00:00'), strtotime($v . ' 23:59:59')])->exists()
 //            ];
 //        }
-//        $signcount = Db::table('wa_stream')
-//            ->where('type', streamType2)
-//            ->where('user_id', $request->user_data['id'])
-//            ->count();
+//        $signcount = Db::table('wa_stream')->where('type', streamType2)->where('user_id', $request->user_data['id'])->count();
 //        $is_sign   = Db::table('wa_stream')
 //            ->where('user_id', $request->user_data['id'])
 //            ->where('type', streamType2)
 //            ->whereBetween('add_time', [strtotime(date('Y-m-d') . ' 00:00:00'), strtotime(date('Y-m-d') . ' 23:59:59')])
 //            ->exists();
 //        return success([
-//            'list'       => $res,
-//            'signcount'  => $signcount,
-//            'continuity' => $request->user_data['continuity'],
-//            'is_sign'    => $is_sign,
+//            'list'                => $array,
+//            'signcount'           => $signcount,
+//            'continuity'          => $request->user_data['continuity'],
+//            'money'               => $system->realname_reward,
+//            'original_sign_award' => $system->sign_award,
+//            'is_sign'             => $is_sign,
 //        ]);
 
+        $param              = $request->param_data;
+        $param['user_data'] = $request->user_data;
+        $month_num          = date('t');
+        $res                = [];
+        //查询当前用户当月签到记录
+        $this_month_sign = Db::table('wa_stream')
+            ->where('type', streamType2)
+            ->where('user_id', $param['user_data']['id'])
+            ->whereRaw("DATE_FORMAT(created_at,'%Y-%m')=?", date('Y-m'))
+            ->get();
+        for ($i = 1; $i <= $month_num; $i++) {
+            $date       = $i > 9 ? date('Y-m-') . $i : date('Y-m-') . '0' . $i;
+            $check_sign = collect($this_month_sign)
+                ->where('created_at', '>=', $date . ' 00:00:00')
+                ->where('created_at', '<=', $date . ' 23:59:59')
+                ->exists();
+            $res[]      = [
+                'day' => $i,
+                'has' => $check_sign,
+            ];
+        }
+        $signcount = Db::table('wa_stream')
+            ->where('type', streamType2)
+            ->where('user_id', $request->user_data['id'])
+            ->count();
+        $is_sign   = Db::table('wa_stream')
+            ->where('user_id', $request->user_data['id'])
+            ->where('type', streamType2)
+            ->whereBetween('add_time', [strtotime(date('Y-m-d') . ' 00:00:00'), strtotime(date('Y-m-d') . ' 23:59:59')])
+            ->exists();
+        return success([
+            'list'       => $res,
+            'signcount'  => $signcount,
+            'continuity' => $request->user_data['continuity'],
+            'is_sign'    => $is_sign,
+        ]);
+
     }
 
     #[Apidoc\Title("签到")]
@@ -440,21 +449,18 @@ class UserController
             }
 
             $system = Db::table('wa_system')->first();
-            if (!empty($system->sign_award)) {
-                StreamBusiness::addStream($request->user_data['id'], $system->sign_award, streamType2, moldType1, moldTypefild1);
-            }
-            if (!empty($system->realname_reward)) {
-                StreamBusiness::addStream($request->user_data['id'], $system->realname_reward, streamType2, moldType5, moldTypefild5);
+
+            $start_time = strtotime(date('Y-01-23',time()));
+            $end_time = strtotime(date('Y-03-04',time()));
+            $time = time();
+            if (!empty($system->sign_award) && $time>=$start_time && $time<=$end_time) {
+                StreamBusiness::addStream($request->user_data['id'], $system->sign_award, streamType2, moldType22, moldTypefild22);
             }
+
             Db::table('wa_users')->where(['id' => $request->user_data['id']])->update(['continuity' => $continuity]);
 
             $signcount = Db::table('wa_stream')->where('type', streamType2)->where('user_id', $request->user_data['id'])->count();
 
-            $userdata = Db::table('wa_users')->where(['id' => $request->user_data['id']])->first();
-            if ($continuity >= 3 && $request->user_data['is_boost'] == 1 && $userdata->is_effective == 0 && !empty($request->user_data['pid'])) {
-                Db::table('wa_users')->where('id', $request->user_data['pid'])->increment('effective_is_num', 1);
-                Db::table('wa_users')->where(['id' => $request->user_data['id']])->update(['is_effective' => 1]);
-            }
 
         } catch (\Throwable $exception) {
             Db::rollBack();

app/functions.php

@@ -142,6 +142,18 @@ function moldType($value = '')
         ], [
             'value' => 19,
             'name'  => '退还钱包',
+        ], [
+            'value' => 20,
+            'name'  => '定向补贴',
+        ], [
+            'value' => 21,
+            'name'  => '佣金钱包',
+        ], [
+            'value' => 22,
+            'name'  => '新春现金红包',
+        ], [
+            'value' => 23,
+            'name'  => '总资产',
         ]
     ];
     if ($value) {
@@ -230,6 +242,18 @@ define('moldTypefild18', 'money_eighteen');
 //退还钱包
 define('moldType19', 19);
 define('moldTypefild19', 'money_nineteen');
+//定向补贴
+define('moldType20', 20);
+define('moldTypefild20', 'money_twenty');
+//佣金钱包
+define('moldType21', 21);
+define('moldTypefild21', 'money_twenty_one');
+//新春现金红包
+define('moldType22', 22);
+define('moldTypefild22', 'money_twenty_two');
+//总资产
+define('moldType23', 23);
+define('moldTypefild23', 'money_twenty_three');
 function moldTypefild($value = '')
 {
     $arr = [
@@ -293,6 +317,18 @@ function moldTypefild($value = '')
         ], [
             'value' => 19,
             'name'  => 'money_nineteen',
+        ], [
+            'value' => 20,
+            'name'  => 'money_twenty',
+        ], [
+            'value' => 21,
+            'name'  => 'money_twenty_one',
+        ], [
+            'value' => 22,
+            'name'  => 'money_twenty_two',
+        ], [
+            'value' => 23,
+            'name'  => 'money_twenty_three',
         ]
     ];
     if ($value) {
@@ -400,6 +436,7 @@ define('streamType47', 47);
 define('streamType48', 48);
 define('streamType49', 49);
 define('streamType50', 50);
+define('streamType51', 51);
 function streamType($value = '')
 {
     $arr = [
@@ -602,6 +639,10 @@ function streamType($value = '')
         [
             'value' => 50,
             'name'  => '平台赠送',
+        ],
+        [
+            'value' => 51,
+            'name'  => '认证',
         ]
     ];
     if ($value) {

plugin/admin/app/controller/WithdrawController.php

@@ -339,7 +339,7 @@ class WithdrawController extends Crud
                                 'orderNo'         => $has->order_no,
                             ]);
                         }  else {
-                            if ($has->type ==999) {
+                            if ($has->type ==20 || $has->type ==21) {
                                 Log::channel('issue')->info('下发申请,编码为:【' . $v . '】', [
                                     'id'              => $has->id,
                                     'money'           => $has->money,

plugin/admin/app/view/user/index.html

@@ -219,6 +219,26 @@
 						title: "USD",align: "center",
 						field: "money",
 						sort: true,
+                        width: 150
+					},{
+						title: "定向补贴",align: "center",
+						field: "money_twenty",
+						sort: true,
+                        width: 150
+					},{
+						title: "佣金钱包",align: "center",
+						field: "money_twenty_one",
+						sort: true,
+                        width: 150
+					},{
+						title: "新春现金红包",align: "center",
+						field: "money_twenty_two",
+						sort: true,
+                        width: 150
+					},{
+						title: "总资产",align: "center",
+						field: "money_twenty_three",
+						sort: true,
                         width: 150
 					},{
 						title: "卡内余额",align: "center",

plugin/admin/app/view/user/subordinate.html

@@ -152,6 +152,26 @@
                         field: "money",
                         sort: true,
                         width: 150
+                    },{
+                        title: "定向补贴",align: "center",
+                        field: "money_twenty",
+                        sort: true,
+                        width: 150
+                    },{
+                        title: "佣金钱包",align: "center",
+                        field: "money_twenty_one",
+                        sort: true,
+                        width: 150
+                    },{
+                        title: "新春现金红包",align: "center",
+                        field: "money_twenty_two",
+                        sort: true,
+                        width: 150
+                    },{
+                        title: "总资产",align: "center",
+                        field: "money_twenty_three",
+                        sort: true,
+                        width: 150
                     },{
                         title: "基金分红钱包",align: "center",
                         field: "money_one",

plugin/admin/app/view/withdraw/index.html

@@ -13,7 +13,7 @@
     <div class="layui-tab" lay-filter="demo">
         <ul class="layui-tab-title">
             <li class="layui-this" lay-id="1">USD</li>
-            <li lay-id="2">基金分红钱包</li>
+<!--            <li lay-id="2">基金分红钱包</li>-->
             <li lay-id="3">卡余额</li>
             <li lay-id="5">wroldcion币</li>
             <li lay-id="6">矿机分红钱包</li>
@@ -24,10 +24,12 @@
             <li lay-id="12">减贫财富钱包</li>
             <li lay-id="15">分红钱包</li>
             <li lay-id="10">全球通金卡</li>
-            <li lay-id="16">团队致富佣金</li>
-            <li lay-id="17">收益钱包</li>
+<!--            <li lay-id="16">团队致富佣金</li>-->
+<!--            <li lay-id="17">收益钱包</li>-->
             <li lay-id="18">卡内余额</li>
-            <li lay-id="19">退还钱包</li>
+<!--            <li lay-id="19">退还钱包</li>-->
+            <li lay-id="20">定向补贴</li>
+            <li lay-id="21">佣金钱包</li>
 
         </ul>
 
@@ -214,8 +216,8 @@
             model: {"icon": "hidden", "label": {"type": "text"}},
             clickClose: true,
             radio: true,
-            data: [{value: 1, name: 'USD'}, {value: 2, name: '基金分红钱包'}, {value: 17, name: '收益钱包'}, {value: 3, name: '卡余额'}, {value: 15, name: '分红钱包'}, {value: 16, name: '团队致富佣金'},
-                {value: 5, name: 'wroldcion币'}, {value: 6, name: '矿机分红钱包'}, {value: 19, name: '退还钱包'}, {value: 18, name: '卡内余额'}, {value: 7, name: '理财每日利息'}, {value: 8, name: '团队佣金'}, {value: 9, name: '团队补贴'}, {value: 10, name: '已解冻余额'}, {value: 11, name: '大使收益钱包'}, {value: 12, name: '减贫财富钱包'}],
+            data: [{value: 1, name: 'USD'}, {value: 2, name: '基金分红钱包'}, {value: 22, name: '新春现金红包'}, {value: 3, name: '卡余额'}, {value: 15, name: '分红钱包'}, {value: 23, name: '总资产'},
+                {value: 5, name: 'wroldcion币'}, {value: 6, name: '矿机分红钱包'}, {value: 20, name: '定向补贴'}, {value: 21, name: '佣金钱包'}, {value: 19, name: '退还钱包'}, {value: 18, name: '卡内余额'}, {value: 7, name: '理财每日利息'}, {value: 8, name: '团队佣金'}, {value: 9, name: '团队补贴'}, {value: 10, name: '已解冻余额'}, {value: 11, name: '大使收益钱包'}, {value: 12, name: '减贫财富钱包'}],
         })
     });
     // 字段 提交时间 created_at
@@ -362,7 +364,7 @@
         let apiResults = {};//[{value:1,name:'待审核'},{value:2,name:'审核通过'},{value:3,name:'驳回'}],
         apiResults["status"] = {1: "待审核", 2: "打款中", 3: "审核通过", 4: "驳回"};
         apiResults["new_state"] = {0: "待支付", 1: "打款中", 2: "已到账"};
-        apiResults["type"] = {1: "USD", 2: "基金分红钱包",3:"卡余额",17:"收益钱包",19:"退还钱包",18:"卡内余额",5:"wroldcion币",15:"分红钱包",16:"团队致富佣金",6:"矿机分红钱包",7:"理财每日利息",8:"团队佣金",9:"团队补贴",10:"已解冻余额",11:"大使收益钱包",12:"减贫财富钱包"};
+        apiResults["type"] = {1: "USD", 2: "基金分红钱包",3:"卡余额",22:"新春现金红包",20:"定向补贴",21:"佣金钱包",19:"退还钱包",18:"卡内余额",5:"wroldcion币",15:"分红钱包",23:"总资产",6:"矿机分红钱包",7:"理财每日利息",8:"团队佣金",9:"团队补贴",10:"已解冻余额",11:"大使收益钱包",12:"减贫财富钱包"};
         // 编辑或删除行事件
         table.on("tool(data-table)", function (obj) {
             if (obj.event === "remove") {