commit

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,7 +88,7 @@ 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'], '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'] . '期商城积分');

app/models/many/ManyOrder.php

@@ -100,16 +100,16 @@ 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', 'zccg_purple_integral', $sy1*0.7, $user1['spread_uid'], $user1['purple_integral'], '直推奖励紫积分');
-                        UserBill::income('直推奖励商城积分', $user1['uid'], 'integral', 'zccg_integral', $sy1*0.3, $user1['spread_uid'], $user1['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', 'purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励紫积分');
-                        UserBill::income('间推奖励商城积分', $user1['uid'], 'integral', 'zccg_integral', $sy2*0.3, $user2['spread_uid'], $user2['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();
                     }
                 }
@@ -130,7 +130,7 @@ class ManyOrder extends BaseModel
             $user = User::select();
             foreach ($user as $item)
             {
-                $price = ManyOrder::whereBetweenTime('return_time', strtotime('yesterday'), strtotime('today'))->where('uid', $item['uid'])->sum('price');// 昨天众筹成功返还的金额流水
+                $price = ManyOrder::whereBetweenTime('return_time', strtotime('yesterday'), strtotime('today'))->where('status', 1)->where('uid', $item['uid'])->sum('price');// 昨天众筹成功返还的金额流水
                 if ($item['spread_uid'] > 0 and $price > 0){
                     $spread = getParent($item['uid']);// 找到所有上级
                     $v1 = 0;
@@ -228,8 +228,8 @@ class ManyOrder extends BaseModel
                         }
                         if ($jl > 0){
                             $details->save();
-                            UserBill::income('团队奖励紫积分', $details['uid'], 'purple_integral', 'team', $jl * 0.7, 0,$details['purple_integral'], 'v'.$details['level'].'团队奖励紫积分');
-                            UserBill::income('团队奖励商城积分', $details['uid'], 'business_integral', 'team', $jl * 0.3, 0,$details['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;
                     }
@@ -251,15 +251,15 @@ class ManyOrder extends BaseModel
             $user = User::where('flowing_water', '>', 0)->select();
             if ($user) {
                 foreach ($user as $item) {
-                    $price = ManyOrder::whereBetweenTime('return_time', strtotime('yesterday'), strtotime('today'))->sum('price');// 昨天众筹成功返还的流水
+                    $price = ManyOrder::whereBetweenTime('return_time', strtotime('yesterday'), strtotime('today'))->where('status', 1)->sum('price');// 昨天众筹成功返还的流水
                     if ($price > 0){
                         $details = User::where('uid', $item['uid'])->find();
 
                         $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', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励紫积分');
-                        UserBill::income('分红流水奖励商城积分', $details['uid'], 'business_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['business_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['business_integral'], '分红流水奖励商城积分');
                     }
                 }
             }

app/models/user/User.php

@@ -760,17 +760,17 @@ class User extends BaseModel
                         if ($item['area'] == '') {//市代理
                             $purple_integral = ($order_price * 0.005) * 0.7;
                             $business_integral = ($order_price * 0.005) * 0.3;
-                            $details['purple_integral'] = ($order_price * 0.005) * 0.7;
-                            $details['business_integral'] = ($order_price * 0.005) * 0.3;
+                            $details['purple_integral'] += ($order_price * 0.005) * 0.7;
+                            $details['integral'] += ($order_price * 0.005) * 0.3;
                         } else {//区代理
                             $purple_integral = ($order_price * 0.01) * 0.7;
                             $business_integral = ($order_price * 0.01) * 0.3;
-                            $details['purple_integral'] = $purple_integral;
-                            $details['business_integral'] = $business_integral;
+                            $details['purple_integral'] += $purple_integral;
+                            $details['integral'] += $business_integral;
                         }
                         $details->save();
-                        UserBill::income('代理奖励紫积分', $details['uid'], 'purple_integral', 'team', $purple_integral, 0, $details['purple_integral'], $address . '代理奖励紫积分');
-                        UserBill::income('代理奖励商家积分', $details['uid'], 'business_integral', 'team', $business_integral, 0, $details['business_integral'], $address . '代理奖励商家积分');
+                        UserBill::income('代理奖励阳光积分', $details['uid'], 'purple_integral', 'dl_purple_integral', $purple_integral, 0, $details['purple_integral'], $address . '代理奖励阳光积分');
+                        UserBill::income('代理奖励商城积分', $details['uid'], 'integral', 'dl_integral', $business_integral, 0, $details['integral'], $address . '代理奖励商城积分');
 
                     }
                 }

app/models/user/UserExtract.php

@@ -64,9 +64,9 @@ class UserExtract extends BaseModel
         $js = '';
         $bl = '';
         if ($data['type'] == 1){
-            if ($data['money'] > $userInfo['purple_integral']) return self::setErrorInfo('紫积分不足');
+            if ($data['money'] > $userInfo['purple_integral']) return self::setErrorInfo('阳光积分不足');
             $extractPrice = $userInfo['purple_integral'];
-            $js = '紫积分';
+            $js = '阳光积分';
             $bl = 'purple_integral';
         }elseif ($data['type'] == 2){
             if ($userInfo['is_merchant'] == 0) return self::setErrorInfo('你不是商户,无法提现');