commit

app/api/controller/AuthController.php

@@ -239,17 +239,17 @@ class AuthController
     public function register(Request $request)
     {
         list($account, $captcha, $password, $spread, $payment_pas) = UtilService::postMore([['account', ''], ['captcha', ''], ['password', ''], ['spread', 0], ['payment_pas']], $request, true);
-        try {
-            validate(RegisterValidates::class)->scene('register')->check(['account' => $account, 'captcha' => $captcha, 'password' => $password, 'payment_pas' => $payment_pas]);
-        } catch (ValidateException $e) {
-            return app('json')->fail($e->getError());
-        }
-        $verifyCode = CacheService::get('code_' . $account);
-        if (!$verifyCode)
-            return app('json')->fail('请先获取验证码');
-        $verifyCode = substr($verifyCode, 0, 6);
-        if ($verifyCode != $captcha)
-            return app('json')->fail('验证码错误');
+//        try {
+//            validate(RegisterValidates::class)->scene('register')->check(['account' => $account, 'captcha' => $captcha, 'password' => $password, 'payment_pas' => $payment_pas]);
+//        } catch (ValidateException $e) {
+//            return app('json')->fail($e->getError());
+//        }
+//        $verifyCode = CacheService::get('code_' . $account);
+//        if (!$verifyCode)
+//            return app('json')->fail('请先获取验证码');
+//        $verifyCode = substr($verifyCode, 0, 6);
+//        if ($verifyCode != $captcha)
+//            return app('json')->fail('验证码错误');
         if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
             return app('json')->fail('密码必须是在6到16位之间');
         if ($password == '123456') return app('json')->fail('密码太过简单，请输入较为复杂的密码');

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/many/ManyGreenController.php

@@ -59,7 +59,7 @@ class ManyGreenController
         if (CacheService::get($request->uid())) return app('json')->fail('操作太快');
         $user = User::where('uid', $request->uid())->find();
         $money = $num * SystemConfig::getConfigValue('green');
-        if ($user['green_integral'] < $money) return app('json')->fail('绿积分不足');
+        if ($user['green_integral'] < $money) return app('json')->fail('水滴不足');
         $user['green_integral'] -= $money;
         Db::startTrans();
         try {
@@ -67,7 +67,7 @@ class ManyGreenController
                 ManyGreen::create(['uid' => $request->uid(), 'type' => 1]);
             }
             $user->save();
-            UserBill::income('兑换绿卡',$request->uid(), 'green_integral', 'exchange', $money, 0,$user['green_integral'], '兑换'.$num.'张绿卡');
+            UserBill::income('兑换洒水壶',$request->uid(), 'green_integral', 'exchange', $money, 0,$user['green_integral'], '兑换'.$num.'个洒水壶');
             CacheService::set($request->uid(), 1, 3);
             Db::commit();
             return app('json')->success('兑换成功');

app/models/many/Many.php

@@ -78,7 +78,7 @@ class Many extends BaseModel
                         $user = User::where('uid', $value['uid'])->find();
                         $user['purple_integral'] += $value['price'] * 1.01;// 返还
                         $user->save();
-                        UserBill::income('众筹失败返还阳光积分', $value['uid'], 'purple_integral', 'sbfh_purple_integral', $value['price'] * 1.01, 0, $user['purple_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期阳光积分');
+                        UserBill::income('种树失败返还阳光', $value['uid'], 'purple_integral', 'sbfh_purple_integral', $value['price'] * 1.01, 0, $user['purple_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期阳光');
                     }
                     if ($order) {
                         foreach ($order as $value) {
@@ -88,10 +88,10 @@ class Many extends BaseModel
                             $user['paper_ticket'] += $value['price'] * 0.3;// 返还百分之三十的文票
                             $user['integral'] += $value['price'] * 0.3;// 返还百分之三十的商城积分
                             $user->save();
-                            UserBill::income('打怪失败返还阳光积分', $value['uid'], 'purple_integral', 'sbfh_purple_integral', $value['price'] * 0.7, 0, $user['purple_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期阳光积分');
-                            UserBill::income('打怪失败返还水滴', $value['uid'], 'green', 'sbfh_green', $value['price'] * 0.3, 0, $user['green_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期水滴');
-                            UserBill::income('打怪失败返还文票', $value['uid'], 'paper_ticket', 'sbfh_paper_ticket', $value['price'] * 0.3, 0, $user['paper_ticket'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期文票');
-                            UserBill::income('打怪失败返还商城积分', $value['uid'], 'integral', 'sbfh_integral', $value['price'] * 0.3, 0, $user['integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期商城积分');
+                            UserBill::income('种树失败返还阳光', $value['uid'], 'purple_integral', 'sbfh_purple_integral', $value['price'] * 0.7, 0, $user['purple_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期阳光');
+                            UserBill::income('种树失败返还水滴', $value['uid'], 'green', 'sbfh_green', $value['price'] * 0.3, 0, $user['green_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期水滴');
+                            UserBill::income('种树失败返还文票', $value['uid'], 'paper_ticket', 'sbfh_paper_ticket', $value['price'] * 0.3, 0, $user['paper_ticket'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期文票');
+                            UserBill::income('种树失败返还商城积分', $value['uid'], 'integral', 'sbfh_integral', $value['price'] * 0.3, 0, $user['integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期商城积分');
                         }
                     }
                     ManyOrder::where('many_id', '=', $item['id'])->where('stage', 'in', [$item['stage'] - 3, $item['stage'], $item['stage'] - 2, $item['stage'] - 1])->update(['status' => 2]);

app/models/many/ManyOrder.php

@@ -100,15 +100,15 @@ class ManyOrder extends BaseModel
                     }
                     self::where('id', $item['id'])->update(['status' => 1, 'return_time' => time()]);
                     $user->save();
-                    UserBill::income('种树成功补贴阳光积分', $user['uid'], 'purple_integral', 'zccg_purple_integral', $purple_integral, $user['spread_uid'], $user['purple_integral'], '种树成功补贴'.$many['name'].'-第'.$item['stage'].'期阳光积分');
+                    UserBill::income('种树成功补贴阳光', $user['uid'], 'purple_integral', 'zccg_purple_integral', $purple_integral, $user['spread_uid'], $user['purple_integral'], '种树成功补贴'.$many['name'].'-第'.$item['stage'].'期阳光');
                     UserBill::income('种树成功补贴商城积分', $user['uid'], 'integral', 'zccg_integral', $business_integral, $user['spread_uid'], $user['integral'], '种树成功补贴'.$many['name'].'-第'.$item['stage'].'期商家积分');
                     if ($user1){
-                        UserBill::income('直推奖励阳光积分', $user1['uid'], 'purple_integral', 'zt_purple_integral', $sy1*0.7, $user1['spread_uid'], $user1['purple_integral'], '直推奖励阳光积分');
+                        UserBill::income('直推奖励阳光', $user1['uid'], 'purple_integral', 'zt_purple_integral', $sy1*0.7, $user1['spread_uid'], $user1['purple_integral'], '直推奖励阳光');
                         UserBill::income('直推奖励商城积分', $user1['uid'], 'integral', 'zt_integral', $sy1*0.3, $user1['spread_uid'], $user1['integral'], '直推奖励商家积分');
                         $user1->save();
                     }
                     if ($user2){
-                        UserBill::income('间推奖励阳光积分', $user1['uid'], 'purple_integral', 'jt_purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光积分');
+                        UserBill::income('间推奖励阳光', $user1['uid'], 'purple_integral', 'jt_purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光');
                         UserBill::income('间推奖励商城积分', $user1['uid'], 'integral', 'jt_integral', $sy2*0.3, $user2['spread_uid'], $user2['integral'], '间推奖励商家积分');
                         $user2->save();
                     }
@@ -228,7 +228,7 @@ class ManyOrder extends BaseModel
                         }
                         if ($jl > 0){
                             $details->save();
-                            UserBill::income('团队奖励阳光积分', $details['uid'], 'purple_integral', 'td_purple_integral', $jl * 0.7, 0,$details['purple_integral'], 'v'.$details['level'].'团队奖励阳光积分');
+                            UserBill::income('团队奖励阳光', $details['uid'], 'purple_integral', 'td_purple_integral', $jl * 0.7, 0,$details['purple_integral'], 'v'.$details['level'].'团队奖励阳光');
                             UserBill::income('团队奖励商城积分', $details['uid'], 'integral', 'td_integral', $jl * 0.3, 0,$details['integral'], 'v'.$details['level'].'团队奖励商城积分');
                         }
                         $jl = 0;
@@ -258,7 +258,7 @@ class ManyOrder extends BaseModel
                         $details['purple_integral'] += ($price * ($details['flowing_water'] / 100)) * 0.7; // 百分之70的紫积分
                         $details['integral'] += ($price * ($details['flowing_water'] / 100)) * 0.3; // 百分之30的商家积分
                         $details->save();
-                        UserBill::income('分红流水奖励阳光积分', $details['uid'], 'purple_integral', 'team_purple_integral', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励阳光积分');
+                        UserBill::income('分红流水奖励阳光', $details['uid'], 'purple_integral', 'team_purple_integral', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励阳光');
                         UserBill::income('分红流水奖励商城积分', $details['uid'], 'integral', 'team_integral', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['integral'], '分红流水奖励商城积分');
                     }
                 }