commit

app/admin/model/order/StoreOrder.php

@@ -68,6 +68,7 @@ class StoreOrder extends BaseModel
         } else {
             $model = $model->order('a.id desc');
         }
+        $model = $model->where('paid', 1);
         if (isset($where['excel']) && $where['excel'] == 1) {
             $data = ($data = $model->select()) && count($data) ? $data->toArray() : [];
         } else {

app/admin/model/user/User.php

@@ -6,6 +6,7 @@
 
 namespace app\admin\model\user;
 
+use app\admin\model\many\ManyOrder;
 use app\admin\model\order\StoreOrder;
 use app\admin\model\system\SystemUserLevel;
 use crmeb\traits\ModelTrait;
@@ -693,6 +694,7 @@ class User extends BaseModel
             $thisAddress :
             UserAddress::where('uid', $uid)->field($key_field)->find();
         $UserInfo = self::get($uid);
+        $uids = get_downline(self::select() , $UserInfo['spread_uid']);
         return [
             ['col' => 12, 'name' => '默认收货地址', 'value' => $thisAddress ? '收货人:' . $thisAddress['real_name'] . '邮编:' . $thisAddress['post_code'] . ' 收货人电话:' . $thisAddress['phone'] . ' 地址:' . $thisAddress['province'] . ' ' . $thisAddress['city'] . ' ' . $thisAddress['district'] . ' ' . $thisAddress['detail'] : ''],
 //            ['name'=>'微信OpenID','value'=>WechatUser::where('uid', $uid)->value('openid'),'col'=>8],
@@ -707,6 +709,11 @@ class User extends BaseModel
             ['name' => '账户余额', 'value' => $UserInfo['now_money']],
             ['name' => '佣金总收入', 'value' => UserBill::where('category', 'now_money')->where('type', 'brokerage')->where('uid', $uid)->sum('number')],
             ['name' => '提现总金额', 'value' => UserExtract::where('uid', $uid)->where('status', 1)->sum('extract_price')],
+            ['name' => '团队总业绩', 'value' => ManyOrder::where('uid', 'in', $uids)->where('status', '<', 2)->sum('price')],
+            ['name' => '团队待释放', 'value' => ManyOrder::where('uid', 'in', $uids)->where('status', 0)->where('is_return', 1)->sum('price')],
+            ['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')],
         ];
     }
 

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

@@ -93,10 +93,10 @@
                         <div class="ibox float-e-margins">
                             <div class="ibox-title">
                                 <span class="label label-danger pull-right">总</span>
-                                <h5>美好积分总额</h5>
+                                <h5>红积分</h5>
                             </div>
                             <div class="ibox-content">
-                                <h1 class="no-margins">{$data.brokerage_count}</h1>
+                                <h1 class="no-margins">{$data.white_integral}</h1>
                             </div>
                         </div>
                     </div>
@@ -134,17 +134,6 @@
                         </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/index/main.php

@@ -435,7 +435,7 @@
             },
             mounted:function () {
                 const self = this;
-                this.setChart(self.$refs.order_echart,'order_echart');//订单图表
+                // this.setChart(self.$refs.order_echart,'order_echart');//订单图表
                 this.setChart(self.$refs.user_echart,'user_echart');//用户图表
                 this.info();
                 this.getlist();

app/api/controller/many/ManyController.php

@@ -115,7 +115,7 @@ class ManyController
             if ($number >= $many['money']){
                 $many['suc'] = 1;// 众筹成功
                 $many['status'] = 0;// 众筹成功
-                ManyDiscipline::create(['many_id' => $many['id'], 'stage' => $many['stage'], 'status' => 1]);// 成功记录
+//                ManyDiscipline::create(['many_id' => $many['id'], 'stage' => $many['stage'], 'status' => 1]);// 成功记录
                 if ($many['stage'] >= 4){
                     // 期数如果大于等于4
                     $stage = $many['stage'] - 3;

app/models/many/Many.php

@@ -115,24 +115,26 @@ class Many extends BaseModel
      */
     public static function second()
     {
-        $many = self::where('second', '>', 0)->where('increase', '>', 0)->where('status', 1)->select();
+        $many = self::where('second', '>', 0)->where('increase', '>', 0)->where('status', 1)->lock(true)->select();
         if ($many){
             foreach ($many as &$item) {
                 if ($item['add_time'] < time()){
                     if ($item['increase_time']+$item['second'] < time()){
                         $number = $item['number'];
                         $item['number'] += $item['increase'];
-                        if ($item['number'] > $item['money']){
-                            $item['number'] = $number;
+                        if ($item['number'] >= $item['money']){
+                            $increase = $item['money'] - $number;
                             $item['number'] += $item['money'] - $item['number'];
-                            self::where('id', $item['id'])->update(['number' => $item['number'], 'increase_time' => time(), 'suc' => 1, 'status' => 0]);
+                            self::where('id', $item['id'])->update(['increase_time' => time(), 'suc' => 1, 'status' => 0]);
+                            self::where('id', $item['id'])->inc('number', $increase)->update();
                             if ($item['stage'] >= 4){
                                 // 期数如果大于等于4
                                 $stage = $item['stage'] - 3;
                                 ManyOrder::where('many_id', $item['id'])->where('stage', $stage)->update(['is_return' => 1]);// 成功后添加返还状态
                             }
                         }else{
-                            self::where('id', $item['id'])->update(['number' => $item['number'], 'increase_time' => time()]);
+                            self::where('id', $item['id'])->update(['increase_time' => time()]);
+                            self::where('id', $item['id'])->inc('number', $item['increase'])->update();
                         }
 
                     }

app/models/many/ManyOrder.php

@@ -81,7 +81,8 @@ class ManyOrder extends BaseModel
                     $user2 = [];
 
                     $purple_integral = round($item['price'] * 1.07, 2);// 奖励紫积分积分
-                    $business_integral = round($item['price'] * 0.0006, 2);// 奖励商家积分
+                    $business_integral = round(($item['price'] * 0.02), 2);// 奖励商家积分
+                    $paper_ticket = round($item['price'] * 0.01, 2);// 奖励文票
                     $user['purple_integral'] += $purple_integral;
                     $user['business_integral'] += $business_integral;
                     if ($user['spread_uid'] > 0){
@@ -102,22 +103,24 @@ class ManyOrder extends BaseModel
                     }
                     self::where('id', $item['id'])->update(['status' => 1, 'return_time' => time()]);
                     User::where('uid', $item['uid'])->inc('purple_integral', $purple_integral)->update();
-                    User::where('uid', $item['uid'])->inc('business_integral', $business_integral)->update();
+                    User::where('uid', $item['uid'])->inc('integral', $business_integral)->update();
+                    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'], 'business_integral', 'zccg_business_integral', $business_integral, $user['spread_uid'], $user['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'].'文票');
                     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'], '直推奖励美好积分');
+                        UserBill::income('直推奖励商城积分', $user1['uid'], 'integral', 'zt_integral', ($sy1 * 0.2), $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()]); // 通知消息
                         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();
+                        User::where('uid', $user['spread_uid'])->inc('integral', round(($sy1 * 0.2), 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'], '间推奖励美好积分');
+                        UserBill::income('间推奖励商城积分', $user2['uid'], 'integral', 'jt_integral', ($sy2 * 0.2 ), $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()]); // 通知消息
                         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();
+                        User::where('uid', $user1['spread_uid'])->inc('integral', round(($sy2 * 0.2 ), 2))->update();
                     }
                 }
             }
@@ -133,7 +136,7 @@ class ManyOrder extends BaseModel
      */
     public static function push()
     {
-        if (time() >= strtotime(date('Y-m-d 15:00:00')) and !Push::where('type', 1)->where('add_time', strtotime('today'))->find())
+        if (time() >= strtotime(date('Y-m-d 22:00:00')) and !Push::where('type', 1)->where('add_time', strtotime('today'))->find())
         {
             $user = User::select();
             foreach ($user as $k => $v)
@@ -244,9 +247,9 @@ class ManyOrder extends BaseModel
                                     }
                                     if ($jl > 0){
                                         User::where('uid', $value)->inc('purple_integral', $jl * 0.7)->update();
-                                        User::where('uid', $value)->inc('business_integral', $jl * 0.0006)->update();
+                                        User::where('uid', $value)->inc('integral', ($jl * 0.2))->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'], 'business_integral', 'td_business_integral', $jl * 0.0006, 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'].'励商城积分');
                                     }
                                     $jl = 0;
                                 }

app/models/store/StoreOrder.php

@@ -431,7 +431,7 @@ class StoreOrder extends BaseModel
                     'SurplusIntegral' => $SurplusIntegral,
                 ];
             }
-            $orderDate = StoreOrder::where('uid', $uid)->where('paid', 1)->where('pay_type', '<>', 'integral')->where('add_time', '>=', strtotime('2020-8-5'))->where('cumulative', '<', 2000)->find();
+            $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['order_id'] = self::getNewOrderId();
                 $orderDate['pay_price'] = $payPrice;

crmeb/repositories/PaymentRepositories.php

@@ -51,6 +51,7 @@ class PaymentRepositories
     public static function wechatProduct(string $order_id = null)
     {
         try {
+            if (StoreOrder::where('add_time', '<=',strtotime('2022-8-5'))->where('order_id', $order_id)->where('paid', 1)->find()) return true;
             if (StoreOrder::be(['re_order_id' => $order_id])) return true;
             return StoreOrder::paySuccess($order_id);
         } catch (\Exception $e) {