commit

app/admin/controller/finance/UserExtract.php

@@ -161,7 +161,7 @@ class UserExtract extends AuthController
                 'merReqNo' => time(), // 交易流水号
                 'amt' => $extract['extract_price']*100,//交易金额
                 'pubOrPri' => 0,//支付宝通道： 1 到卡 0 到户
-                'cardName' => $extract['alipay_code'],
+                'cardName' => $extract['real_name'],
                 'notifyUrl' => '',// 回调地址
                 'pan'  => $extract['alipay_code'], // 银行卡号
                 'orderTitle' => '提现', // 提款标题
@@ -173,7 +173,7 @@ class UserExtract extends AuthController
                 'merReqNo' => time(), // 交易流水号
                 'amt' => $extract['extract_price']*100,//交易金额
                 'pubOrPri' => 1,//支付宝通道： 1 到卡 0 到户
-                'cardName' => $extract['bank_code'],
+                'cardName' => $extract['bank_address'],
                 'notifyUrl' => '',// 回调地址
                 'pan'  => $extract['bank_code'], // 银行卡号
                 'orderTitle' => '提现', // 提款标题

app/api/controller/many/ManyController.php

@@ -98,7 +98,7 @@ class ManyController
                 if ($white > 0){
                     UserBill::expend('扣除红积分', $user['uid'], 'white_integral', 'bet_white_integral', $white, 0,0,'使用红积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
                 }
-                UserBill::expend('扣除紫积分', $user['uid'], 'purple_integral', 'bet_purple_integral', $data['price']-$white, 0,$user['purple_integral'],'使用紫积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
+                UserBill::expend('扣除阳光积分', $user['uid'], 'purple_integral', 'bet_purple_integral', $data['price']-$white, 0,$user['purple_integral'],'使用阳光积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
             }else{
                 $user['white_integral'] -= $data['price'];
                 UserBill::expend('扣除红积分', $user['uid'], 'white_integral', 'bet_white_integral', $data['price'], 0,$user['white_integral'],'使用红积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');

app/api/controller/user/UserController.php

@@ -713,9 +713,11 @@ class UserController
         if (count($userId) > 0){
             $count = count($userId);
             $userList = User::where('uid', 'in', $userId)
-                ->field('uid,nickname,avatar,add_time')
+                ->field('uid,nickname,avatar,add_time,spread_uid')
                 ->select();
             foreach ($userList as &$item){
+                $item['zt'] = 0;
+                if ($item['spread_uid'] == $request->uid()) $item['zt'] = 1;
                 $item['price'] =  ManyOrder::where('uid', $item['uid'])->where('status', 1)->sum('price');
             }
             $userPrice = ManyOrder::where('uid', 'in', $userId)->where('status', 1)->sum('price');