commit

app/admin/controller/user/User.php

@@ -779,8 +779,8 @@ class User extends AuthController
         $sb = ManyOrder::where('uid', $uid)->where('status', '2')->sum('price');
         $df = ManyOrder::where('uid', $uid)->where('status', '0')->sum('price');
         $tx = UserExtract::where('uid', $uid)->where('status', 1)->sum('extract_price');
-        $jl = UserBill::where('uid', $uid)->where('category', 'purple_integral')->where('type', 'zccg_purple_integral')->sum('number');
-        $qtjl = UserBill::where('uid', $uid)->where('category', 'purple_integral')->where('type', 'in','zt_purple_integral,jt_purple_integral,td_purple_integral,team_purple_integral')->sum('number');
+        $jl = UserBill::where('uid', $uid)->where('category', 'purple_integral')->where('pm', 1)->sum('number');
+        $qtjl = UserBill::where('uid', $uid)->where('category', 'purple_integral')->where('pm', 0)->sum('number');
 
 
         $this->assign(compact('tz', 'fh', 'sb', 'df', 'tx', 'jl', 'qtjl'));

app/admin/model/user/UserExtract.php

@@ -66,6 +66,8 @@ class UserExtract extends BaseModel
         $data['user_int'] = floatval(\app\models\user\User::sum('purple_integral'));
         //打怪金额
         $data['dfh'] = ManyOrder::where('status', 0)->sum('price');
+        //红积分
+        $data['white_integral'] = floatval(\app\models\user\User::sum('white_integral'));
         return compact('data');
     }
 

app/admin/view/finance/user_extract/index.php

@@ -134,6 +134,17 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-sm-3 ui-sortable">
+                    <div class="ibox float-e-margins">
+                        <div class="ibox-title">
+                            <span class="label label-danger pull-right">总</span>
+                            <h5>红积分</h5>
+                        </div>
+                        <div class="ibox-content">
+                            <h1 class="no-margins">{$data.white_integral}</h1>
+                        </div>
+                    </div>
+                </div>
                 <div class="table-responsive">
                     <table class="table table-striped  table-bordered">
                         <thead>

app/admin/view/user/user/income.php

@@ -105,8 +105,8 @@
                 <div class="col-sm-3 ui-sortable">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <span class="label label-danger pull-right">已返还奖励</span>
-                            <h5>已返还奖励</h5>
+                            <span class="label label-danger pull-right">阳光收入奖励</span>
+                            <h5>阳光收入奖励</h5>
                         </div>
                         <div class="ibox-content">
                             <h1 class="no-margins" id="user_price">{$jl}</h1>
@@ -116,8 +116,8 @@
                 <div class="col-sm-3 ui-sortable">
                     <div class="ibox float-e-margins">
                         <div class="ibox-title">
-                            <span class="label label-danger pull-right">其他奖励</span>
-                            <h5>其他奖励</h5>
+                            <span class="label label-danger pull-right">阳光支出</span>
+                            <h5>阳光支出</h5>
                         </div>
                         <div class="ibox-content">
                             <h1 class="no-margins" id="user_price">{$qtjl}</h1>

app/models/many/Many.php

@@ -78,19 +78,19 @@ class Many extends BaseModel
                 if ($many_order) {
                     foreach ($many_order as $value) {
                         $user = User::where('uid', $value['uid'])->find();
-                        $user['purple_integral'] += $value['price'] * 1.01;// 返还
+                        $user['white_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'], 'white_integral', 'sbfh_white_integral', $value['price'] * 1.01, 0, $user['white_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期红积分');
                     }
                     if ($order) {
                         foreach ($order as $value) {
                             $user = User::where('uid', $value['uid'])->find();
-                            $user['purple_integral'] += $value['price'] * 0.7;// 返还紫积分
+                            $user['white_integral'] += $value['price'] * 0.7;// 返还紫积分
                             $user['green_integral'] += $value['price'] * 0.3;// 返还绿积分
                             $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'], 'white_integral', 'sbfh_white_integral', $value['price'] * 0.7, 0, $user['white_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

@@ -102,20 +102,23 @@ class ManyOrder extends BaseModel
                         $user2['business_integral'] += round($sy2 * 0.0006, 2);
                     }
                     self::where('id', $item['id'])->update(['status' => 1, 'return_time' => time()]);
-                    $user->save();
+                    User::where('uid', $item['uid'])->inc('purple_integral', $purple_integral)->update();
+                    User::where('uid', $item['uid'])->inc('business_integral', $business_integral)->update();
                     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'], 'business_integral', 'zccg_business_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'], 'business_integral', 'zt_business_integral', $sy1*0.0006, $user1['spread_uid'], $user1['integral'], '直推奖励美好积分');
                         UserNotice::create(['uid' => $user1['uid'], 'type' => 3, 'title' => '直推佣金', 'content' => $user['phone'].'在'.date('Y-m-d H:i:s', time()).'成功打怪,恭喜你获得直推'.round($sy1 * 0.7, 2).'阳光积分', 'add_time' => time()]); // 通知消息
-                        $user1->save();
+                        User::where('uid', $user['spread_uid'])->inc('purple_integral', round($sy1 * 0.7, 2))->update();
+                        User::where('uid', $user['spread_uid'])->inc('business_integral', round($sy1 * 0.0006, 2))->update();
                     }
                     if ($user2){
                         UserBill::income('间推奖励阳光积分', $user2['uid'], 'purple_integral', 'jt_purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光积分');
                         UserBill::income('间推奖励美好积分', $user2['uid'], 'business_integral', 'jt_business_integral', $sy2*0.0006, $user2['spread_uid'], $user2['integral'], '间推奖励美好积分');
                         UserNotice::create(['uid' => $user2['uid'], 'type' => 3, 'title' => '间推佣金', 'content' => $user['phone'].'在'.date('Y-m-d H:i:s', time()).'成功打怪,恭喜你获得间推'.round($sy2 * 0.7, 2).'阳光积分', 'add_time' => time()]); // 通知消息
-                        $user2->save();
+                        User::where('uid', $user1['spread_uid'])->inc('purple_integral', round($sy2 * 0.7, 2))->update();
+                        User::where('uid', $user1['spread_uid'])->inc('business_integral', round($sy2 * 0.0006, 2))->update();
                     }
                 }
             }
@@ -154,7 +157,7 @@ class ManyOrder extends BaseModel
                             $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                             $v1++;
                         }elseif ($v1 == 1){// 发放v1奖励1次
-                            $jl = ($price*$one)*0.003;//平级的百分之五
+                            $jl = ($price*$one)*0.03;//平级的百分之五
                             $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
                             $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                             $v1++;
@@ -204,7 +207,7 @@ class ManyOrder extends BaseModel
                         $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }elseif ($v1 > 0 and $v2 == 0 and $v3 == 1){// 发放v1奖励，没有发放v2v3的奖励
-                        $jl = ($price * ($three - $one)) * 0.03; // 拿到平级的百分之五
+                        $jl = ($price * ($three - $one)) * 0.05; // 拿到平级的百分之五
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
                         $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
@@ -233,7 +236,8 @@ class ManyOrder extends BaseModel
                     $jl = 0;
                 }
                 if ($jl > 0){
-                    $details->save();
+                    User::where('uid', $value)->inc('purple_integral', $jl * 0.7)->update();
+                    User::where('uid', $value)->inc('business_integral', $jl * 0.0006)->update();
                     UserBill::income('团队奖励阳光积分', $details['uid'], 'purple_integral', 'td_purple_integral', $jl * 0.7, 0,$details['purple_integral'], '打怪胜利补贴'.$many['name'].'-第'.$order['stage'].'期团队v'.$details['level'].'奖励阳光积分');
                     UserBill::income('团队奖励美好积分', $details['uid'], 'business_integral', 'td_business_integral', $jl * 0.0006, 0,$details['integral'], '打怪胜利补贴'.$many['name'].'-第'.$order['stage'].'期期团队v'.$details['level'].'奖励美好积分');
                 }