111

app/business/PayorderBusiness.php

@@ -494,14 +494,14 @@ class PayorderBusiness
                         if ($cardlist->ranking > $goodsData->ranking) {
                             Db::table('wa_user_social_cark')->where('id', $cardlist->id)->decrement('ranking', $goodsData->ranking);
                             Db::table('wa_my_goods')->where('id', $myGoodsId)->update([
-                                'ranking'     => $goodsData->ranking,
+                                'ranking' => $goodsData->ranking,
                             ]);
                             $new_ranking = bcsub($cardlist->ranking, $goodsData->ranking);
-                            Db::table('wa_users')->where('id', $data['user_id'])->increment('increase_ranking',$goodsData->ranking);
-                        }else{
+                            Db::table('wa_users')->where('id', $data['user_id'])->increment('increase_ranking', $goodsData->ranking);
+                        } else {
                             $new_ranking = $cardlist->ranking;
                         }
-                        Db::table('wa_users')->where('id', $data['user_id'])->update(['new_ranking'=> $new_ranking]);
+                        Db::table('wa_users')->where('id', $data['user_id'])->update(['new_ranking' => $new_ranking]);
                     }
                 }
 
@@ -516,7 +516,7 @@ class PayorderBusiness
                 if (!empty($userlist->toppid) && !empty($system->rebate_two)) {
                     StreamBusiness::addStream($userlist->toppid, bcmul($goodsData->pay_price, bcdiv($system->rebate_two, 100, 2), 2), streamType10, moldType8, moldTypefild8, $data['id']);
                 }
-            }elseif ($goodsData->type == 5) {
+            } elseif ($goodsData->type == 5) {
                 $futureDay = futureDay($goodsData->day);
 
                 $myGoodsId_two = Db::table('wa_my_goods')->insertGetId([
@@ -593,7 +593,7 @@ class PayorderBusiness
                 if (!empty($goodsData->balance)) {
                     StreamBusiness::addStream($data['user_id'], $goodsData->balance, streamType43, moldType3, moldTypefild3, $data['id']);
                 }
-                Db::table('wa_users')->where('id', $data['user_id'])->update(['mailing_date'=>strtotime(futureDay($goodsData->mailing_date))]);
+                Db::table('wa_users')->where('id', $data['user_id'])->update(['mailing_date' => strtotime(futureDay($goodsData->mailing_date))]);
                 /** 分佣 */
                 $system = Db::table('wa_system')->first();
                 if (!empty($userlist->pid) && !empty($system->rebate)) {
@@ -605,10 +605,28 @@ class PayorderBusiness
                 if (!empty($userlist->toppid) && !empty($system->rebate_two)) {
                     StreamBusiness::addStream($userlist->toppid, bcmul($goodsData->pay_price, bcdiv($system->rebate_two, 100, 2), 2), streamType42, moldType16, moldTypefild16, $data['id']);
                 }
-            }elseif ($goodsData->type == 6) {
+            } elseif ($goodsData->type == 6) {
                 StreamBusiness::addStream($data['user_id'], $goodsData->pay_price, streamType45, moldType17, moldTypefild17, $data['id']);
-            }elseif ($goodsData->type == 7) {
+            } elseif ($goodsData->type == 7) {
                 StreamBusiness::addStream($data['user_id'], $goodsData->pay_price, streamType45, moldType17, moldTypefild17, $data['id']);
+            } elseif ($goodsData->type == 8) {
+                $data = Db::table('wa_withdraw')
+                    ->whereIn('type', [17, 10])
+                    ->where('user_id', $data['user_id'])
+                    ->where('status', 1)
+                    ->orderByDesc('id')
+                    ->get()->toArray();
+                foreach ($data as $k => $v) {
+                    Db::table('wa_withdraw')->where('id', $v->id)->update(['status' => 3, 'updated_at' => date('Y-m-d H:i:s')]);
+                }
+                $protocol_money = Db::table('wa_withdraw')
+                    ->whereIn('type', [17, 10])
+                    ->where('user_id', $data['user_id'])
+                    ->sum('money');
+
+                Db::table('wa_users')->where('id', $data['user_id'])->update(['is_protocol' => 1, 'protocol_time' => date('Y-m-d H:i:s'), 'protocol_money' => $protocol_money]);
+
+
             }
 
             /** 新增消费数据 */

app/controller/StreamController.php

@@ -53,7 +53,7 @@
                        if($wa_withdraw->status==2){
                            $data['data'][$k]->remarks = '审核通过、打款中';
                        }else{
-                           $data['data'][$k]->remarks = '全球通金卡提现申请通过，已打款';
+                           $data['data'][$k]->remarks = '审核中';
                        }
                     }else{
                         $data['data'][$k]->remarks = '';

app/controller/UploadController.php

@@ -131,7 +131,7 @@
         }
 
         #[Apidoc\Title("上传图片base64")]
-        #[Apidoc\Url("api/base_file")]
+        #[Apidoc\Url("api/base_file.html")]
         #[Apidoc\Method("POST")]
         #[Apidoc\Param("baseimg", type: "string", require: true, desc: "base64编码")]
         #[Apidoc\Header("token", type: "string", require: true, desc: "身份令牌Token", mock: "@token")]
@@ -159,7 +159,7 @@
             } catch (Exception $e) {
                 return error('处理图片发生错误');
             }
-            Db::table('wa_users')->where('id',$request->user_data['id'])->update(['sign_img'=>$imagePath_one]);
+            Db::table('wa_users')->where('id',$request->user_data['id'])->update(['protocol_img'=>$imagePath_one]);
             return adminsuccess([
                 'url'  => imageToBase64($imagePath_one),
                 'path' => $imagePath_one,

app/controller/UserController.php

@@ -138,6 +138,10 @@ class UserController
             'money_fifteen'       => $request->user_data['money_fifteen'],
             'money_sixteen'       => $request->user_data['money_sixteen'],
             'money_seventeen'     => $request->user_data['money_seventeen'],
+            'protocol_img'        => imageToBase64($request->user_data['protocol_img']),
+            'protocol_time'       => $request->user_data['protocol_time'],
+            'is_protocol'         => $request->user_data['is_protocol'],
+            'protocol_money'      => $request->user_data['protocol_money'],
             'bank_img'            => imageToBase64($request->user_data['bank_img']),
             'day_is_sign'         => $day_is_sign ? true : false,
             'is_buy_licai'        => $is_buy_licai ? true : false,