11

app/business/GoodsBusiness.php

@@ -20,54 +20,54 @@ class GoodsBusiness
             $payorderId = PayorderBusiness::orderAdd($param);
 
             $payorder = Db::table('wa_payorder')->where('id', $payorderId)->first();
+//
+//          if ($payorder->pay_type == 2) {
+//                $data = PayTwoBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
+//                Log::channel('payment')->info('桥头', $data);
+//                if (Arr::get($data, 'data.retCode') != 'SUCCESS') {
+//                    throw new \Exception('通道未开通!');
+//                }
+//                $arr = [
+//                    'type'       => 2,
+//                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
+//                    'payOrderId' => ''
+//                ];
+//            }elseif ($payorder->pay_type == 3) {
+//                $data = PayThreeBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
+//                Log::channel('payment')->info('林北', $data);
+//                if (Arr::get($data, 'data.code') != 1000) {
+//                    throw new \Exception('通道未开通!');
+//                }
+//                $arr = [
+//                    'type'       => 2,
+//                    'url'        => Arr::get($data, 'data.data.message.url'),
+//                    'payOrderId' => ''
+//                ];
+//            }elseif ($payorder->pay_type == 5) {
+//                $data = PayFiveBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
+//                Log::channel('payment')->info('鸿运', $data);
+//                if (Arr::get($data, 'data.retCode') != 'SUCCESS') {
+//                    throw new \Exception('通道未开通!');
+//                }
+//                $arr = [
+//                    'type'       => 2,
+//                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
+//                    'payOrderId' => ''
+//                ];
+//            } else {
+//                $arr = [
+//                    'type'       => 1,
+//                    'url'        => '',
+//                    'payOrderId' => ''
+//                ];
+//            }
 
-          if ($payorder->pay_type == 2) {
-                $data = PayTwoBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
-                Log::channel('payment')->info('桥头', $data);
-                if (Arr::get($data, 'data.retCode') != 'SUCCESS') {
-                    throw new \Exception('通道未开通!');
-                }
-                $arr = [
-                    'type'       => 2,
-                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
-                    'payOrderId' => ''
-                ];
-            }elseif ($payorder->pay_type == 3) {
-                $data = PayThreeBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
-                Log::channel('payment')->info('林北', $data);
-                if (Arr::get($data, 'data.code') != 1000) {
-                    throw new \Exception('通道未开通!');
-                }
                 $arr = [
                     'type'       => 2,
-                    'url'        => Arr::get($data, 'data.data.message.url'),
-                    'payOrderId' => ''
-                ];
-            }elseif ($payorder->pay_type == 5) {
-                $data = PayFiveBusiness::payment($payorder->order_no, $payorder->pay_characteristic, $payorder->money, Arr::get($param, 'url', ''));
-                Log::channel('payment')->info('鸿运', $data);
-                if (Arr::get($data, 'data.retCode') != 'SUCCESS') {
-                    throw new \Exception('通道未开通!');
-                }
-                $arr = [
-                    'type'       => 2,
-                    'url'        => Arr::get($data, 'data.payParams.payUrl'),
-                    'payOrderId' => ''
-                ];
-            } else {
-                $arr = [
-                    'type'       => 1,
-                    'url'        => '',
+                    'url'        => Arr::get($param, 'url', ''),
                     'payOrderId' => ''
                 ];
-            }
-
-//                $arr = [
-//                    'type'       => 2,
-//                    'url'        => Arr::get($param, 'url', ''),
-//                    'payOrderId' => ''
-//                ];
-//                PayorderBusiness::payorderSave(collect($payorder)->toArray());
+                PayorderBusiness::payorderSave(collect($payorder)->toArray());
 
         } catch (\Throwable $exception) {
             throw new \Exception($exception->getMessage());

app/business/PayorderBusiness.php

@@ -773,6 +773,30 @@ class PayorderBusiness
                     }
 
                 }
+            }elseif ($goodsData->type == 17) {
+                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, streamType52, moldType24, moldTypefild24, $data['id']);
+                }
+
+                if (!empty($goodsData->balance)) {
+                    StreamBusiness::addStream($data['user_id'], $goodsData->balance, streamType52, moldType25, moldTypefild25, $data['id']);
+                }
             }
 
             /** 新增消费数据 */

app/business/TaskBusiness.php

@@ -88,15 +88,15 @@ class TaskBusiness
                         StreamBusiness::delStream($usersData->id, $balance, streamType27, moldType3, moldTypefild3, $taskId);
                     }
                 }
-            }elseif ($cronTask->goods_type == 5) {
+            } elseif ($cronTask->goods_type == 5) {
                 /** @var  $usersData 查询会员信息 */
                 $usersData = Db::table('wa_users')->where('id', $cronTask->user_id)->first();
-                if($cronTask->dividend_time<time()){
+                if ($cronTask->dividend_time < time()) {
                     Db::table('wa_cron_task')->where('id', $taskId)->update([
-                        'is_finish'            => 2
+                        'is_finish' => 2
                     ]);
                     StreamBusiness::addStream($usersData->id, $cronTask->money, streamType42, moldType3, moldTypefild3, $taskId);
-                }else{
+                } else {
                     /** @var  $has 查询今天是否已经发奖 */
                     $has = Db::table('wa_stream')
                         ->where('user_id', $cronTask->user_id)
@@ -116,6 +116,36 @@ class TaskBusiness
                     }
                 }
 
+            } elseif ($cronTask->goods_type == 17) {
+                /** @var  $usersData 查询会员信息 */
+                $usersData = Db::table('wa_users')->where('id', $cronTask->user_id)->first();
+                if ($cronTask->dividend_time < time()) {
+                    Db::table('wa_cron_task')->where('id', $taskId)->update([
+                        'is_finish' => 2
+                    ]);
+                } else {
+                    /** @var  $has 查询今天是否已经发奖 */
+                    $has = Db::table('wa_stream')
+                        ->where('user_id', $cronTask->user_id)
+                        ->where('type', streamType52)
+                        ->where('mold', moldType24)
+                        ->whereBetween('add_time', [strtotime(date('Y-m-d') . ' 00:00:00'), strtotime(date('Y-m-d') . ' 23:59:59')])
+                        ->where('source_id', $taskId)
+                        ->exists();
+                    if (empty($has) && !empty($usersData)) {
+                        if(!empty($cronTask->bonus)){
+                            if($cronTask->event_time==0){
+                                StreamBusiness::addStream($usersData->id, $cronTask->bonus, streamType52, moldType24, moldTypefild24, $taskId);
+                            }elseif ($cronTask->event_time < time() && $cronTask->event_time > 0){
+                                $goodslist = Db::table('wa_goods')->where('id', $cronTask->goods_id)->first();
+                                StreamBusiness::addStream($usersData->id, $goodslist->bonus, streamType52, moldType24, moldTypefild24, $taskId);
+                            }elseif ($cronTask->event_time > time()){
+                                StreamBusiness::addStream($usersData->id, $cronTask->bonus, streamType52, moldType24, moldTypefild24, $taskId);
+                            }
+                        }
+                    }
+                }
+
             }
             Db::table('wa_cron_task')->where('id', $taskId)->update([
                 'day_dividend_time' => strtotime(date('Y-m-d', strtotime('+1 days')) . ' 00:10:00'),
@@ -180,14 +210,14 @@ class TaskBusiness
 
             if (empty($has) && !empty($usersData)) {
                 $goodslist = Db::table('wa_goods')->where('id', $cronTask->goods_id)->first();
-                if(!empty($goodslist->bonus)){
+                if (!empty($goodslist->bonus)) {
                     StreamBusiness::addStream($usersData->id, $goodslist->bonus, streamType37, moldType12, moldTypefild12, $taskId);
                 }
-                if($usersData->money_thirteen<$usersData->accumulate_thirteen){
-                    Db::table('wa_users')->where('id', $usersData->id)->update(['money_thirteen'=>$usersData->accumulate_thirteen]);
+                if ($usersData->money_thirteen < $usersData->accumulate_thirteen) {
+                    Db::table('wa_users')->where('id', $usersData->id)->update(['money_thirteen' => $usersData->accumulate_thirteen]);
                 }
-                if($usersData->money_fourteen<$usersData->accumulate_fourteen){
-                    Db::table('wa_users')->where('id', $usersData->id)->update(['money_fourteen'=>$usersData->accumulate_fourteen]);
+                if ($usersData->money_fourteen < $usersData->accumulate_fourteen) {
+                    Db::table('wa_users')->where('id', $usersData->id)->update(['money_fourteen' => $usersData->accumulate_fourteen]);
                 }
             }
             Db::table('wa_cron_task_four')->where('id', $taskId)->update([

app/functions.php

@@ -154,6 +154,12 @@ function moldType($value = '')
         ], [
             'value' => 23,
             'name'  => '总资产',
+        ], [
+            'value' => 24,
+            'name'  => '分红钱包',
+        ], [
+            'value' => 25,
+            'name'  => '共富基金钱包',
         ]
     ];
     if ($value) {
@@ -254,6 +260,14 @@ define('moldTypefild22', 'money_twenty_two');
 //总资产
 define('moldType23', 23);
 define('moldTypefild23', 'money_twenty_three');
+//分红钱包
+define('moldType24', 24);
+define('moldTypefild24', 'money_twenty_four');
+//共富基金钱包
+define('moldType25', 25);
+define('moldTypefild25', 'money_twenty_five');
+
+
 function moldTypefild($value = '')
 {
     $arr = [
@@ -329,6 +343,12 @@ function moldTypefild($value = '')
         ], [
             'value' => 23,
             'name'  => 'money_twenty_three',
+        ], [
+            'value' => 24,
+            'name'  => 'money_twenty_four',
+        ], [
+            'value' => 25,
+            'name'  => 'money_twenty_five',
         ]
     ];
     if ($value) {
@@ -437,6 +457,7 @@ define('streamType48', 48);
 define('streamType49', 49);
 define('streamType50', 50);
 define('streamType51', 51);
+define('streamType52', 52);
 function streamType($value = '')
 {
     $arr = [
@@ -643,6 +664,10 @@ function streamType($value = '')
         [
             'value' => 51,
             'name'  => '认证',
+        ],
+        [
+            'value' => 52,
+            '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 ==20 || $has->type ==21) {
+                            if ($has->type ==20 || $has->type ==21 || $has->type ==24) {
                                 Log::channel('issue')->info('下发申请,编码为:【' . $v . '】', [
                                     'id'              => $has->id,
                                     'money'           => $has->money,
@@ -350,7 +350,7 @@ class WithdrawController extends Crud
                                 ]);
                                 (new WithdrawladingRepositories())->jiujbatchdelivery($has->order_no, $has->money, $has->affiliated_bank, $has->account_holder, $has->card_number);
                                 $has->status  = 2;
-                                $has->is_true = 1;
+                                $has->is_true = 6;
                             } elseif ($has->type == 6) {
 
                                 $usercark = Db::table('wa_user_social_cark')->where('user_id', $has->user_id)->first();

process/Task.php

@@ -22,7 +22,7 @@ class Task
             $taskData=Db::table('wa_cron_task')
                 ->where('day_dividend_time','<=',time())
                 ->where('is_finish',1)
-                ->limit(300)
+                ->limit(600)
                 ->pluck('id')
                 ->toArray();
             foreach ($taskData as $k=>$v){