Ver Fonte

本金概念说错了,其实是消费总额

lizhen_gitee há 1 ano atrás
pai
commit
58e5f3b0c1

+ 12 - 8
application/admin/controller/user/User.php

@@ -193,11 +193,15 @@ class User extends Backend
             $user_lixi[$user1['user_id']] = $user1['sum_lixi'];
         }
 
-        //用户本金
-        $user_benjin = [];
-        $benjin_sum = Db::name('user_score_log')->field('user_id,sum(change_value) as sum_benjin')->where('log_type',5)->group('user_id')->select();
-        foreach($benjin_sum as $user2){
-            $user_benjin[$user2['user_id']] = $user2['sum_benjin'];
+        //用户消费额
+        $user_pay = [];
+        $order_map = [
+            'status'  => 1,
+            'have_paid' => ['gt',0],
+        ];
+        $user_order = Db::name('unishop_order')->field('user_id,sum(order_price) as sum_order_price')->where($order_map)->group('user_id')->select();
+        foreach($user_order as $order){
+            $user_pay[$order['user_id']] = $order['sum_order_price'];
         }
 
         //用户积分额,这里不用user表,使用钱包表,是因为有部分用户提现走人了或根本没入金,钱包表能缩小范围。同时过滤掉封号用户
@@ -208,9 +212,9 @@ class User extends Backend
         $special_user = [];
         foreach($user_score as $user_id => $score){
             $lixi   = isset($user_lixi[$user_id]) ? $user_lixi[$user_id] : 0;
-            $benjin = isset($user_benjin[$user_id]) ? $user_benjin[$user_id] : 0;
+            $order_price = isset($user_pay[$user_id]) ? $user_pay[$user_id] : 0;
 
-            if($lixi > ($benjin*2)){
+            if($lixi > ($order_price*2)){
                 $special_user[] = $user_id;
             }
         }
@@ -233,7 +237,7 @@ class User extends Backend
         foreach($user_list as $key => &$val){
             $user_id = $val['id'];
             $val['sum_lixi'] = isset($user_lixi[$user_id]) ? $user_lixi[$user_id] : 0;
-            $val['sum_benjin'] = isset($user_benjin[$user_id]) ? $user_benjin[$user_id] : 0;
+            $val['sum_order_price'] = isset($user_pay[$user_id]) ? $user_pay[$user_id] : 0;
             $val['special'] = in_array($user_id,$special_user) ? '是' : '否';
             $val['tendaysago'] = date('Y-m-d H:i:s',$hualuo_tendays_ago);
 

+ 9 - 3
application/common/library/Auth.php

@@ -574,10 +574,16 @@ class Auth
         $xili_sum = Db::name('user_score_log')->where('user_id',$this->id)->where('log_type','IN',[3,50])->sum('change_value');
         $xili_sum = $xili_sum ?: 0;
 
-        $benjin = Db::name('user_score_log')->where('user_id',$this->id)->where('log_type',5)->sum('change_value');
-        $benjin = $benjin ?: 0;
+        //消费总额
+        $map = [
+            'user_id' => $this->id,
+            'status'  => 1,
+            'have_paid' => ['gt',0],
+        ];
+        $order_price_sum = Db::name('unishop_order')->where($map)->sum('order_price');
+        $order_price_sum = $order_price_sum ?: 0;
 
-        if($xili_sum > ($benjin*2) ){
+        if($xili_sum > ($order_price_sum*2) ){
             return true;
         }
          return false;

+ 1 - 1
public/assets/js/backend/user/user.js

@@ -172,7 +172,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'intro_uid', title: __('Intro_uid')},
                         {field: 'sum_lixi', title: '利息总和(每10日利息+返佣)'},
                         {field: 'bd_1', title: ''},
-                        {field: 'sum_benjin', title: '本金总和'},
+                        {field: 'sum_order_price', title: '订单支付总和'},
                         {field: 'bd_3', title: ''},
                         {field: 'special', title: '是否超2倍'},
 //                        {field: 'intro_ids', title: __('Intro_ids')},