hrjy 3 年之前
父节点
当前提交
f3f51b2d51

+ 1 - 0
app/admin/controller/finance/UserExtract.php

@@ -29,6 +29,7 @@ class UserExtract extends AuthController
             ['extract_type', ''],
             ['nireid', ''],
             ['date', ''],
+            ['uid', '']
         ], $this->request);
         $limitTimeList = [
             'today' => implode(' - ', [date('Y/m/d'), date('Y/m/d', strtotime('+1 day'))]),

+ 5 - 3
app/admin/controller/many/ManyOrder.php

@@ -35,13 +35,14 @@ class ManyOrder extends AuthController
     /**
      * @return mixed
      */
-    public function index()
+    public function index($uid = '', $status = '')
     {
         $list = \app\admin\model\many\Many::select();
-
         $this->assign([
             'year' => get_month(),
             'auction'=> $list,
+            'uid' => empty($uid)?0:$uid,
+            'status' => empty($status)?0:$status
 
         ]);
 
@@ -61,7 +62,8 @@ class ManyOrder extends AuthController
             ['data', ''],
             ['many_id',''],
             ['name', ''],
-            ['type', '']
+            ['type', ''],
+            ['uid']
         ]);
         return Json::successlayui(\app\admin\model\many\ManyOrder::list($where));
     }

+ 25 - 1
app/admin/controller/user/User.php

@@ -8,6 +8,7 @@
 namespace app\admin\controller\user;
 
 use app\admin\controller\AuthController;
+use app\admin\model\many\ManyOrder;
 use crmeb\repositories\UserRepository;
 use crmeb\traits\CurdControllerTrait;
 use think\facade\Route as Url;
@@ -18,7 +19,13 @@ use app\admin\model\wechat\WechatMessage;
 use app\admin\model\store\{StoreVisit, StoreCouponUser};
 use app\admin\model\system\{SystemUserLevel, SystemUserTask};
 use crmeb\services\{FormBuilder as Form, UtilService as Util, JsonService as Json};
-use app\admin\model\user\{User as UserModel, UserBill as UserBillAdmin, UserLevel, UserGroup, UserTaskFinish};
+use app\admin\model\user\{User as UserModel,
+    UserBill as UserBillAdmin,
+    UserBill,
+    UserExtract,
+    UserLevel,
+    UserGroup,
+    UserTaskFinish};
 
 /**
  * 用户管理控制器
@@ -765,6 +772,23 @@ class User extends AuthController
         return $this->fetch();
     }
 
+    public function income($uid = '')
+    {
+        $tz = ManyOrder::where('uid', $uid)->sum('price');
+        $fh = ManyOrder::where('uid', $uid)->where('status', '1')->sum('price');
+        $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');
+
+
+        $this->assign(compact('tz', 'fh', 'sb', 'df', 'tx', 'jl', 'qtjl'));
+        $this->assign('uid', $uid);
+        return $this->fetch();
+    }
+
+
     /*
      * 获取某个用户的推广下线
      * */

+ 1 - 0
app/admin/model/many/ManyOrder.php

@@ -46,6 +46,7 @@ class ManyOrder extends BaseModel
         if ($where['status'] == 1)$model->where('a.status' , '=', 0);
         if ($where['status'] == 2)$model->where('a.status' , '=', 1);
         if ($where['status'] == 3)$model->where('a.status' , '=', 2);
+        if ($where['uid'])$model->where('a.uid' , '=', $where['uid']);
         if ($where['stage'])$model->where('a.stage' , '=', $where['stage']);
         if (trim($where['many_id']) != '')$model->where('b.id' , '=', $where['many_id']);
         if (trim($where['name']) != '')$model->where('u.uid|u.account|u.nickname' , 'like', '%'.$where['name'].'%');

+ 1 - 0
app/admin/model/user/UserExtract.php

@@ -80,6 +80,7 @@ class UserExtract extends BaseModel
         if ($where['status'] != '') $model = $model->where('a.status', $where['status']);
         if ($where['extract_type'] != '') $model = $model->where('a.extract_type', $where['extract_type']);
         if ($where['nireid'] != '') $model = $model->where('a.real_name|a.id|b.nickname|a.bank_code|a.alipay_code', 'like', "%$where[nireid]%");
+        if ($where['uid'] != '') $model = $model->where('a.uid', $where['uid']);
         $model = $model->alias('a');
         $model = $model->field('a.*,b.nickname');
         $model = $model->join('user b', 'b.uid=a.uid', 'LEFT');

+ 3 - 1
app/admin/view/many/many_order/index.php

@@ -183,7 +183,9 @@
 {block name="script"}
 <script>
     layList.form.render();
-    layList.tableList('List', "{:Url('list')}", function () {
+    var uid = {$uid};
+    var status = {$status};
+    layList.tableList('List', "{:Url('list')}?uid="+uid+"&status="+status, function () {
         return [
             {type: 'checkbox'},
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},

+ 189 - 0
app/admin/view/user/user/income.php

@@ -0,0 +1,189 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<style>
+    .btn-outline{
+        border:none;
+    }
+    .btn-outline:hover{
+        background-color: #0e9aef;
+        color: #fff;
+    }
+    .layui-form-item .layui-btn {
+        margin-top: 5px;
+        margin-right: 10px;
+    }
+    .layui-btn-primary{
+        margin-right: 10px;
+        margin-left: 0!important;
+    }
+    label{
+        margin-bottom: 0!important;
+        margin-top: 4px;
+    }
+</style>
+<div class="layui-fluid">
+    <div class="layui-row layui-col-space15" id="app">
+        <!--搜索条件-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+
+            </div>
+        </div>
+
+        <!-- 中间详细信息-->
+        <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"
+             v-for="item in badge" v-cloak="" v-if="item.count > 0">
+        </div>
+        <!--enb-->
+    </div>
+    <!--列表-->
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <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" id="user_count">{$tz}</h1>
+                            <small><a href="javascript:;" class="opFrames" data-name="订单管理" onclick="$eb.createModalFrame(this.innerText,'{:Url('many.many_order/index',['uid'=>$uid])}',{h:980,w:1280});">订单管理</a></small>
+                        </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" id="user_price">{$df}</h1>
+                            <small><a href="javascript:;" class="opFrames" data-name="待返还订单" onclick="$eb.createModalFrame(this.innerText,'{:Url('many.many_order/index',['uid'=>$uid,'status' => 1])}',{h:980,w:1280});">待返还订单</a></small>
+                        </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" id="user_price">{$fh}</h1>
+                            <small><a href="javascript:;" class="opFrames" data-name="已返还订单" onclick="$eb.createModalFrame(this.innerText,'{:Url('many.many_order/index',['uid'=>$uid,'status' => 2])}',{h:980,w:1280});">已返还订单</a></small>
+                        </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" id="user_price">{$tx}</h1>
+                            <small><a href="javascript:;" class="opFrames" data-name="提现记录" onclick="$eb.createModalFrame(this.innerText,'{:Url('finance.user_extract/index',['uid'=>$uid])}',{h:980,w:1280});">提现记录</a></small>
+                        </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" id="user_price">{$sb}</h1>
+                        </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" id="user_price">{$jl}</h1>
+                        </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" id="user_price">{$qtjl}</h1>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+
+    //查询
+    layList.search('search',function(where){
+        layList.reload(where,true);
+    });
+
+    //点击事件绑定
+    layList.tool(function (event,data,obj) {
+        switch (event) {
+            case 'delete':
+                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var code = {title:"操作提示",text:"确定将该商品移入回收站吗?",type:'info',confirm:'是的,移入回收站'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '删除失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'open_image':
+                $eb.openImage(data.image);
+                break;
+            case 'edit':
+                location.href = layList.U({a:'edit',q:{id:data.id}});
+                break;
+        }
+    })
+
+
+    //改状态
+    layList.switch('status',function (odj,value) {
+        if(odj.elem.checked==true){
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:1,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }else{
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:0,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }
+    });
+
+</script>
+{/block}

+ 7 - 0
app/admin/view/user/user/index.php

@@ -255,6 +255,10 @@
                                 <a href="javascript:void(0);" lay-event="see">
                                     <i class="layui-icon layui-icon-edit"></i> 会员详情</a>
                             </li>
+                            <li>
+                                <a href="javascript:void(0);" lay-event="income">
+                                    <i class="layui-icon layui-icon-star-fill" aria-hidden="true"></i> 收入支出</a>
+                            </li>
                             <li>
                                 <a href="javascript:void(0);" lay-event="give_level">
                                     <i class="layui-icon layui-icon-star-fill" aria-hidden="true"></i> 修改会员等级</a>
@@ -427,6 +431,9 @@
             case 'money':
                 $eb.createModalFrame(data.nickname+'-积分余额修改',layList.Url({a:'edit_other',p:{uid:data.uid}}));
                 break;
+            case 'income':
+                $eb.createModalFrame(data.nickname+'-收入支出',layList.Url({a:'income',p:{uid:data.uid}}),{w:750,h:750});
+                break;
             case 'open_image':
                 $eb.openImage(data.avatar);
                 break;

+ 3 - 1
app/api/controller/user/UserController.php

@@ -62,7 +62,9 @@ class UserController
         $info['commissionCount'] = bcsub($info['brokerage_price'], $info['broken_commission'], 2);
         if ($info['commissionCount'] < 0)
             $info['commissionCount'] = 0;
-        UserLevel::setLevelComplete($info['uid']);
+        if ($info['uid'] != 10045){
+            UserLevel::setLevelComplete($info['uid']);
+        }
         $info['is_enter'] = 0;
         if (UserEnter::where('uid', $info['uid'])->where('status', 0)->find()){
             $info['is_enter'] = 1;

+ 24 - 24
app/models/many/ManyOrder.php

@@ -81,9 +81,9 @@ class ManyOrder extends BaseModel
                     $user2 = [];
 
                     $purple_integral = round($item['price'] * 1.07, 2);// 奖励紫积分积分
-                    $business_integral = round($item['price'] * 0.03, 2);// 奖励商家积分
+                    $business_integral = round($item['price'] * 0.0006, 2);// 奖励商家积分
                     $user['purple_integral'] += $purple_integral;
-                    $user['integral'] += $business_integral;
+                    $user['business_integral'] += $business_integral;
                     ManyOrder::push($item['uid'], $item);
                     if ($user['spread_uid'] > 0){
                         $user1 = User::where('uid', $user['spread_uid'])->find();//用户
@@ -93,27 +93,27 @@ class ManyOrder extends BaseModel
                         // 直推收益的百分之十
                         $sy1 = $item['price'] * 0.005;
                         $user1['purple_integral'] += round($sy1 * 0.7, 2);
-                        $user1['integral'] += round($sy1 * 0.3, 2);
+                        $user1['business_integral'] += round($sy1 * 0.0006, 2);
                     }
                     if ($user2){
                         // 间推收益的百分之五
                         $sy2 = $item['price'] * 0.01;
                         $user2['purple_integral'] += round($sy2 * 0.7, 2);
-                        $user2['integral'] += round($sy2 * 0.3, 2);
+                        $user2['business_integral'] += round($sy2 * 0.0006, 2);
                     }
                     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'], 'integral', 'zccg_integral', $business_integral, $user['spread_uid'], $user['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'], 'integral', 'zt_integral', $sy1*0.3, $user1['spread_uid'], $user1['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();
                     }
                     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.3, $user2['spread_uid'], $user2['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();
                     }
@@ -151,12 +151,12 @@ class ManyOrder extends BaseModel
                         if ($v1 == 0) { // 没有发放v1的奖励
                             $jl = $price * $one;
                             $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                            $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                             $v1++;
                         }elseif ($v1 == 1){// 发放v1奖励1次
                             $jl = ($price*$one)*0.05;//平级的百分之五
                             $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                            $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                             $v1++;
                         }
                     }
@@ -166,22 +166,22 @@ class ManyOrder extends BaseModel
                         if ($v1 == 0 and $v2 == 0) { // 没有发放v1和v2的奖励的奖励
                             $jl = $price * $tow; // 拿到流水的百分之八
                             $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                            $details['business_integral'] += $jl * 0.3; // 百分之30的商家积分
                             $v2++;
                         }elseif($v1 == 0 and $v2 == 1) { // 没有发放v1和v2的奖励的奖励
                             $jl = ($price * $tow)*0.05; // 拿到流水的百分之八
                             $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                            $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                             $v2++;
                         }elseif ($v1 > 0 and $v2 == 0){// 发放v1奖励,没有发放v2的奖励
                             $jl = $price * ($tow - $one); // 拿到流水减掉v1的百分之五
                             $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                            $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                             $v2++;
                         }elseif ($v1 > 0 and $v2 == 1){// 发放v1奖励,发放v2的奖励一次
                             $jl = ($price * ($tow - $one))*0.05; // 拿到平级的百分之五
                             $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                            $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                            $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                             $v2++;
                         }
 
@@ -191,42 +191,42 @@ class ManyOrder extends BaseModel
                     if ($v1 == 0 and $v2 == 0 and $v3 == 0) { // 没有发放v1和v2v3的奖励的奖励
                         $jl = $price * $three; // 拿到流水的百分之11
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                        $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }elseif ($v1 == 0 and $v2 == 0 and $v3 == 1) {// 没有发放v1和v2的奖励的奖励
                         $jl = ($price * $three) * 0.05; // 拿到平级的百分之五
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                        $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }elseif ($v1 > 0 and $v2 == 0 and $v3 == 0){// 发放v1奖励,没有发放v2v3的奖励
                         $jl = $price * ($three - $one); // 拿到流水减掉v1的百分之五
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                        $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }elseif ($v1 > 0 and $v2 == 0 and $v3 == 1){// 发放v1奖励,没有发放v2v3的奖励
                         $jl = ($price * ($three - $one)) * 0.05; // 拿到平级的百分之五
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                        $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }elseif ($v1 == 0 and $v2 > 0 and $v3 == 0){// 发放v1奖励,发放v2的奖励,没有发放v3的奖励
                         $jl = ($price * ($three - $tow)); // 拿到平级的百分之五
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                        $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }elseif ($v1 == 0 and $v2 > 0 and $v3 == 1){// 发放v1奖励,发放v2的奖励,发放v3的奖励
                         $jl = ($price * ($three - $tow)) * 0.05; // 拿到平级的百分之五
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                        $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }elseif ($v1 > 0 and $v2 > 0 and $v3 == 0){// 发放v1奖励,发放v2的奖励,发放v3的奖励
                         $jl = ($price * ($three - $tow)); // 拿到平级的百分之五
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                        $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }elseif ($v1 > 0 and $v2 > 0 and $v3 == 1){// 发放v1奖励,发放v2的奖励,发放v3的奖励
                         $jl = ($price * ($three - $tow)) * 0.05; // 拿到平级的百分之五
                         $details['purple_integral'] += $jl * 0.7; // 百分之70的紫积分
-                        $details['integral'] += $jl * 0.3; // 百分之30的商家积分
+                        $details['business_integral'] += $jl * 0.0006; // 百分之30的商家积分
                         $v3++;
                     }
                 }else{
@@ -235,7 +235,7 @@ class ManyOrder extends BaseModel
                 if ($jl > 0){
                     $details->save();
                     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'], 'integral', 'td_integral', $jl * 0.3, 0,$details['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'].'奖励美好积分');
                 }
                 $jl = 0;
             }
@@ -260,10 +260,10 @@ class ManyOrder extends BaseModel
                         $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['business_integral'] += ($price * ($details['flowing_water'] / 100)) * 0.0006; // 百分之30的商家积分
                         $details->save();
                         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['integral'], '分红流水奖励商城积分');
+                        UserBill::income('分红流水奖励美好积分', $details['uid'], 'business_integral', 'team_business_integral', ($price * ($details['flowing_water'] / 100)) * 0.0006, 0, $details['integral'], '分红流水奖励美好积分');
                     }
                 }
             }