commit

app/admin/model/user/User.php

@@ -714,6 +714,7 @@ class User extends BaseModel
             ['name' => '团队待成功', 'value' => ManyOrder::where('uid', 'in', $uids)->where('status', 0)->where('is_return', 0)->sum('price')],
             ['name' => '团队已释放', 'value' => ManyOrder::where('uid', 'in', $uids)->where('status', 1)->sum('price')],
             ['name' => '个人业绩', 'value' => ManyOrder::where('uid', $uid)->sum('price')],
+            ['name' => '团队人数', 'value' => count($uids)],
         ];
     }
 
@@ -764,7 +765,7 @@ class User extends BaseModel
             ->where('type', 'in', 'system_add,pay_product,extract,pay_product_refund,system_sub')
             ->count();
         $coupon_count = StoreCouponUser::where('uid', $uid)->count();
-        $spread_count = self::where('spread_uid', $uid)->count();
+        $spread_count = count(get_downline_dow(self::select(), $uid));
         return compact('order_count', 'integral_count', 'sign_count', 'balanceChang_count', 'coupon_count', 'spread_count');
     }
 
@@ -1163,7 +1164,8 @@ class User extends BaseModel
 
     public static function getSpreadList($uid, $page, $limit)
     {
-        $list = self::where('spread_uid', $uid)->field('uid,nickname,now_money,integral,add_time')
+        $uid = get_downline_dow(self::select(), $uid);
+        $list = self::where('uid','in',$uid)->field('uid,nickname,now_money,integral,white_integral,purple_integral,add_time')
             ->order('uid desc')->page((int)$page, (int)$limit)->select();
         count($list) && $list = $list->toArray();
         foreach ($list as &$item) {

app/admin/view/user/user/see.php

@@ -247,6 +247,8 @@
                                         <th>昵称</th>
                                         <th>余额</th>
                                         <th>积分</th>
+                                        <th>红积分</th>
+                                        <th>阳光积分</th>
                                         <th>加入时间</th>
                                     </tr>
                                     </thead>
@@ -260,10 +262,12 @@
                                         </td>
                                         <td>{{item.now_money}}</td>
                                         <td>{{item.integral}}</td>
+                                        <td>{{item.white_integral}}</td>
+                                        <td>{{item.purple_integral}}</td>
                                         <td>{{item.add_time}}</td>
                                     </tr>
-                                    <tr v-show="balanceChangList.length<=0" style="text-align: center">
-                                        <td colspan="4">暂无数据</td>
+                                    <tr v-show="SpreadList.length<=0" style="text-align: center">
+                                        <td colspan="6">暂无数据</td>
                                     </tr>
                                     </tbody>
                                 </table>
@@ -285,7 +289,7 @@
         new Vue({
             el: "#content",
             data: {
-                limit:10,
+                limit:20,
                 uid:$uid,
                 orderList:[],
                 integralList:[],

app/models/many/ManyOrder.php

@@ -107,20 +107,24 @@ class ManyOrder extends BaseModel
                     User::where('uid', $item['uid'])->inc('paper_ticket', $paper_ticket)->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'], 'integral', 'zccg_integral', $business_integral, $user['spread_uid'], $user['integral'], '种植胜利补贴'.$many['name'].'-第'.$item['stage'].'商城积分');
-                    UserBill::income('种植胜利补贴文票', $user['uid'], 'paper_ticket', 'zccg_paper_ticket', $paper_ticket, $user['spread_uid'], $user['integral'], '种植胜利补贴'.$many['name'].'-第'.$item['stage'].'文票');
+                    UserBill::income('种植胜利补贴文票', $user['uid'], 'paper_ticket', 'zccg_paper_ticket', $paper_ticket, $user['spread_uid'], $user['paper_ticket'], '种植胜利补贴'.$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'], 'integral', 'zt_integral', ($sy1 * 0.2), $user1['spread_uid'], $user1['integral'], '直推奖励商城积分');
+                        UserBill::income('直推奖励文票', $user1['uid'], 'paper_ticket', 'zt_paper_ticket', ($sy1 * 0.1), $user1['spread_uid'], $user1['paper_ticket'], '直推奖励文票');
                         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()]); // 通知消息
                         User::where('uid', $user['spread_uid'])->inc('purple_integral', round($sy1 * 0.7, 2))->update();
                         User::where('uid', $user['spread_uid'])->inc('integral', round(($sy1 * 0.2), 2))->update();
+                        User::where('uid', $user['spread_uid'])->inc('paper_ticket', round(($sy1 * 0.1), 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'], 'integral', 'jt_integral', ($sy2 * 0.2 ), $user2['spread_uid'], $user2['integral'], '间推奖励商城积分');
+                        UserBill::income('间推奖励文票', $user2['uid'], 'paper_ticket', 'jt_paper_ticket', ($sy2 * 0.1 ), $user2['spread_uid'], $user2['paper_ticket'], '间推奖励文票');
                         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()]); // 通知消息
                         User::where('uid', $user1['spread_uid'])->inc('purple_integral', round($sy2 * 0.7, 2))->update();
                         User::where('uid', $user1['spread_uid'])->inc('integral', round(($sy2 * 0.2 ), 2))->update();
+                        User::where('uid', $user1['spread_uid'])->inc('paper_ticket', round(($sy2 * 0.1 ), 2))->update();
                     }
                 }
             }
@@ -248,8 +252,10 @@ class ManyOrder extends BaseModel
                                     if ($jl > 0){
                                         User::where('uid', $value)->inc('purple_integral', $jl * 0.7)->update();
                                         User::where('uid', $value)->inc('integral', ($jl * 0.2))->update();
+                                        User::where('uid', $value)->inc('paper_ticket', ($jl * 0.1))->update();
                                         UserBill::income('团队奖励阳光积分', $details['uid'], 'purple_integral', 'td_purple_integral', $jl * 0.7, 0,$details['purple_integral'], '打怪胜利补贴'.$item['name'].'-第'.$item['stage'].'期团队v'.$details['level'].'奖励阳光积分');
-                                        UserBill::income('团队奖励商城积分', $details['uid'], 'integral', 'td_integral', ($jl * 0.2), 0,$details['integral'], '打怪胜利补贴'.$item['name'].'-第'.$item['stage'].'期期团队v'.$details['level'].'励商城积分');
+                                        UserBill::income('团队奖励商城积分', $details['uid'], 'integral', 'td_integral', ($jl * 0.2), 0,$details['integral'], '打怪胜利补贴'.$item['name'].'-第'.$item['stage'].'期期团队v'.$details['level'].'奖励商城积分');
+                                        UserBill::income('团队奖励文票', $details['uid'], 'paper_ticket', 'td_paper_ticket', ($jl * 0.1), 0,$details['paper_ticket'], '打怪胜利补贴'.$item['name'].'-第'.$item['stage'].'期期团队v'.$details['level'].'奖励文票');
                                     }
                                     $jl = 0;
                                 }

app/models/store/StoreOrder.php

@@ -431,8 +431,8 @@ class StoreOrder extends BaseModel
                     'SurplusIntegral' => $SurplusIntegral,
                 ];
             }
-            $orderDate = StoreOrder::where('uid', $uid)->where('paid', 1)->where('pay_type', '<>', 'integral')->where('add_time', '>=', strtotime('2022-8-5'))->where('cumulative', '<', 2000)->find();
-            if ($payPrice < 2000 and $orderDate){
+            $orderDate = StoreOrder::where('uid', $uid)->where('paid', 1)->where('pay_type', '<>', 'integral')->where('add_time', '>=', strtotime('2022-8-5 12:24:00'))->where('cumulative', '<', 2000)->where('use_integral', '=', 0)->find();
+            if ($payPrice < 2000 and $orderDate and $payIntegral == 0){
                 $orderDate['order_id'] = self::getNewOrderId();
                 $orderDate['pay_price'] = $payPrice;
                 $orderDate['gain_integral'] = $gainIntegral;