commit

app/admin/controller/user/Achievement.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller\user;
 
 use app\admin\controller\AuthController;
+use app\admin\model\user\Ach;
 use crmeb\services\{FormBuilder as Form, UtilService as Util, JsonService as Json};
 use crmeb\services\JsonService;
 use think\facade\Route as Url;
@@ -23,8 +24,9 @@ class Achievement extends AuthController
      *
      * @return \think\Response
      */
-    public function index()
+    public function index($type)
     {
+        $this->assign('type', $type);
         return $this->fetch();
     }
 
@@ -37,11 +39,33 @@ class Achievement extends AuthController
             ['limit', 20],
             ['name', ''],
             ['status', ''],
+            ['type', ''],
         ]);
 
         return Json::successlayui(model::list($where));
     }
 
+    public function details($id)
+    {
+
+        $this->assign('id', $id);
+        return $this->fetch();
+    }
+
+    public function details_list($id)
+    {
+        $where = Util::getMore([
+            ['page', 1],
+            ['limit', 20],
+        ]);
+        $list = Ach::where('a_id', $id)->page($where['page'], $where['limit'])->select();
+        $data['data'] = count($list) > 0 ? $list->toArray() : [];
+        $data['count'] = Ach::where('a_id', $id)->count();
+        return Json::successlayui($data);
+    }
+
+
+
     /**
      * 删除指定资源
      *

app/admin/model/user/Ach.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ *
+ * @author: xaboy<365615158@qq.com>
+ * @day: 2017/12/25
+ */
+
+namespace app\admin\model\user;
+
+use crmeb\basic\BaseModel;
+use crmeb\traits\ModelTrait;
+
+/**
+ * TODO 用户申请
+ * Class UserAddress
+ * @package app\models\user
+ */
+class Ach extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'ach';
+
+    use ModelTrait;
+
+    protected $autoWriteTimestamp = true;
+
+    public static function list($where)
+    {
+        $model = self::field('*')->order('id DESC');
+        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'],'%');
+        $data['count'] = $model->count();
+
+        if ($where['page'] && $where['limit']){
+            $model->page($where['page'], $where['limit']);
+        }else{
+            $model->page(20, 1);
+        }
+        $list = $model->select()->toArray();
+        $data['data'] = $list;
+        return $data;
+
+    }
+
+}

app/admin/model/user/Achievement.php

@@ -39,6 +39,7 @@ class Achievement extends BaseModel
         if ($where['name'])$model->where('name' , 'like', '%'.$where['name'],'%');
         $data['count'] = $model->count();
 
+        if ($where['type']) $model = $model->where('type', $where['type']);
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
         }else{

app/admin/view/user/achievement/details.php

@@ -0,0 +1,228 @@
+{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 class="layui-card-header">申请列表</div>-->
+<!--                <div class="layui-card-body">-->
+<!--                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">-->
+<!--                        <form class="layui-form layui-form-pane" action="">-->
+<!--                            <div class="layui-form-item">-->
+<!---->
+<!--                                <div class="layui-col-lg12">-->
+<!--                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>-->
+<!--                                    <div class="layui-input-inline">-->
+<!--                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入用户名称，UID">-->
+<!--                                    </div>-->
+<!--                                    <div class="layui-inline">-->
+<!--                                        <label class="layui-form-label" style="top: -4.5px">状态</label>-->
+<!--                                        <div class="layui-input-block">-->
+<!--                                            <select name="status">-->
+<!--                                                <option value="">全部</option>-->
+<!--                                                <option value="1">未通过</option>-->
+<!--                                                <option value="2">待审核</option>-->
+<!--                                                <option value="3">通过</option>-->
+<!--                                            </select>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!---->
+<!--                                    <div class="layui-inline">-->
+<!--                                        <div class="layui-input-inline">-->
+<!--                                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">-->
+<!--                                                <i class="layui-icon layui-icon-search"></i>搜索</button>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </form>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </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="layui-card-header">奖励列表</div>
+                <div class="layui-card-body">
+
+                    <div class="layui-btn-container" id="container-action">
+<!--                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:700,w:1100})">添加众筹</a>-->
+<!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+
+
+                    <script type="text/html" id="image">
+                        <img style="cursor: pointer" lay-event="open_image" src="{{d.image}}">
+                    </script>
+                    <script type="text/html" id="status">
+                        {{#  if(d.status == 0){ }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            待审核
+                        </button>
+                        {{#  } else if(d.status == 1) { }}
+                        <button type="button" name="suc" class="layui-btn-xs layui-btn" id="">
+                            通过
+                        </button>
+                        {{#  } else if(d.status == -1) { }}
+                        <button type="button" name="suc" class="layui-btn-disabled layui-btn-xs" id="">
+                            未通过
+                        </button>
+                        {{#  } }}
+                    </script>
+                    <script type="text/html" id="address">
+                        <div> {{d.province}}-{{d.city}}-{{d.district}}</div>
+                        <div> {{d.detail}}</div>
+                    </script>
+                    <script type="text/html" id="act">
+
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('details')}?id={{d.id}}',{h:900,w:900})">
+                            详情
+                        </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
+                            删除
+                        </button>
+
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    layList.form.render();
+    var id = {$id};
+    layList.tableList('List', "{:Url('details_list')}?id="+id, function () {
+        return [
+            {type: 'checkbox'},
+            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
+            {field: 'order_id', title: '订单号',  align: 'center'},
+            {field: 'uid', title: '购买用户uid', align: 'center'},
+            {field: 'price', title: '订单产生奖励', align: 'center'},
+            // {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
+        ];
+
+    });
+
+    //查询
+    layList.search('search',function(where){
+        layList.reload(where,true);
+    });
+
+    //点击事件绑定
+    layList.tool(function (event,data,obj) {
+        switch (event) {
+            case 'delete':
+                var url=layList.U({c:'user.achievement',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 'tg':
+                var url=layList.U({c:'user.userApply',a:'tg',q:{id:data.id,type:type}});
+                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 'btg':
+                var url=layList.U({c:'user.userApply',a:'btg',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}

app/admin/view/user/achievement/index.php

@@ -27,44 +27,44 @@
 <div class="layui-fluid">
     <div class="layui-row layui-col-space15" id="app">
         <!--搜索条件-->
-        <div class="layui-col-md12">
-            <div class="layui-card">
-                <div class="layui-card-header">申请列表</div>
-                <div class="layui-card-body">
-                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">
-                        <form class="layui-form layui-form-pane" action="">
-                            <div class="layui-form-item">
-
-                                <div class="layui-col-lg12">
-                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>
-                                    <div class="layui-input-inline">
-                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入用户名称，UID">
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label" style="top: -4.5px">状态</label>
-                                        <div class="layui-input-block">
-                                            <select name="status">
-                                                <option value="">全部</option>
-                                                <option value="1">未通过</option>
-                                                <option value="2">待审核</option>
-                                                <option value="3">通过</option>
-                                            </select>
-                                        </div>
-                                    </div>
-
-                                    <div class="layui-inline">
-                                        <div class="layui-input-inline">
-                                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">
-                                                <i class="layui-icon layui-icon-search"></i>搜索</button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
+<!--        <div class="layui-col-md12">-->
+<!--            <div class="layui-card">-->
+<!--                <div class="layui-card-header">申请列表</div>-->
+<!--                <div class="layui-card-body">-->
+<!--                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">-->
+<!--                        <form class="layui-form layui-form-pane" action="">-->
+<!--                            <div class="layui-form-item">-->
+<!---->
+<!--                                <div class="layui-col-lg12">-->
+<!--                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>-->
+<!--                                    <div class="layui-input-inline">-->
+<!--                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入用户名称，UID">-->
+<!--                                    </div>-->
+<!--                                    <div class="layui-inline">-->
+<!--                                        <label class="layui-form-label" style="top: -4.5px">状态</label>-->
+<!--                                        <div class="layui-input-block">-->
+<!--                                            <select name="status">-->
+<!--                                                <option value="">全部</option>-->
+<!--                                                <option value="1">未通过</option>-->
+<!--                                                <option value="2">待审核</option>-->
+<!--                                                <option value="3">通过</option>-->
+<!--                                            </select>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!---->
+<!--                                    <div class="layui-inline">-->
+<!--                                        <div class="layui-input-inline">-->
+<!--                                            <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">-->
+<!--                                                <i class="layui-icon layui-icon-search"></i>搜索</button>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </form>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
 
         <!-- 中间详细信息-->
         <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"
@@ -76,7 +76,7 @@
     <div class="layui-row layui-col-space15">
         <div class="layui-col-md12">
             <div class="layui-card">
-                <div class="layui-card-header">场次列表</div>
+                <div class="layui-card-header">奖励列表</div>
                 <div class="layui-card-body">
 
                     <div class="layui-btn-container" id="container-action">
@@ -109,6 +109,10 @@
                         <div> {{d.detail}}</div>
                     </script>
                     <script type="text/html" id="act">
+
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal" onclick="$eb.createModalFrame('编辑','{:Url('details')}?id={{d.id}}',{h:900,w:900})">
+                            详情
+                        </button>
                         <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='delete' id="">
                             删除
                         </button>
@@ -125,16 +129,30 @@
 {block name="script"}
 <script>
     layList.form.render();
-    layList.tableList('List', "{:Url('list')}", function () {
-        return [
-            {type: 'checkbox'},
-            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
-            {field: 'province', title: '省',  align: 'center'},
-            {field: 'number', title: '分红人数', align: 'center'},
-            {field: 'price', title: '奖金', align: 'center'},
-            {field: 'create_time', title: '时间', align: 'center'},
-            {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
-        ];
+    var type = {$type};
+    layList.tableList('List', "{:Url('list')}?type="+type, function () {
+        if (type == 1){
+            return [
+                {type: 'checkbox'},
+                {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
+                {field: 'province', title: '省',  align: 'center'},
+                {field: 'number', title: '分红人数', align: 'center'},
+                {field: 'price', title: '奖金', align: 'center'},
+                {field: 'create_time', title: '时间', align: 'center'},
+                {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
+            ];
+        }else {
+            return [
+                {type: 'checkbox'},
+                {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
+                {field: 'uid', title: '发放人UID',  align: 'center'},
+                {field: 'number', title: '分红人数', align: 'center'},
+                {field: 'price', title: '奖金', align: 'center'},
+                {field: 'create_time', title: '时间', align: 'center'},
+                {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
+            ];
+        }
+
     });
 
     //查询

app/models/store/StoreOrder.php

@@ -9,6 +9,7 @@ namespace app\models\store;
 
 use app\admin\model\system\ShippingTemplatesFree;
 use app\admin\model\system\ShippingTemplatesRegion;
+use app\admin\model\user\Ach;
 use app\admin\model\user\Achievement;
 use app\admin\model\user\UserProduct;
 use crmeb\basic\BaseModel;
@@ -803,12 +804,12 @@ class StoreOrder extends BaseModel
                 if ($user1){
                     User::where('uid', $user['spread_uid'])->inc('brokerage_price', $price1)->update();
                     $user1['brokerage_price'] += $price1;
-                    UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num);
+                    UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num).'订单号'.$order['order_id'];
                 }
                 if ($user2){
                     User::where('uid', $user1['spread_uid'])->inc('brokerage_price', $price3)->update();
                     $user2['brokerage_price'] += $price3;
-                    UserBill::income('间推奖励', $user2['uid'], 'now_money', 'jt_push', $price3, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].','.$str.'编号'.$item['product_id'].'数量'.$num);
+                    UserBill::income('间推奖励', $user2['uid'], 'now_money', 'jt_push', $price3, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].','.$str.'编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
                 }
             }
 
@@ -823,12 +824,12 @@ class StoreOrder extends BaseModel
                 if ($user1){
                     User::where('uid', $user['spread_uid'])->inc('brokerage_price', $price1)->update();
                     $user1['brokerage_price'] += $price1;
-                    UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num);
+                    UserBill::income('直推奖励', $user1['uid'], 'now_money', 'push', $price1, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
                 }
                 if ($user2){
                     User::where('uid', $user1['spread_uid'])->inc('brokerage_price', $price3)->update();
                     $user2['brokerage_price'] += $price3;
-                    UserBill::income('间推奖励', $user2['uid'], 'now_money', 'jt_push', $price3, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].','.$str.'编号'.$item['product_id'].'数量'.$num);
+                    UserBill::income('间推奖励', $user2['uid'], 'now_money', 'jt_push', $price3, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].','.$str.'编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
                 }
             }
         }elseif ($type ==3){
@@ -841,12 +842,12 @@ class StoreOrder extends BaseModel
                 if ($user1){
                     User::where('uid', $user['spread_uid'])->inc('brokerage_price', $price2)->update();
                     $user1['brokerage_price'] += $price2;
-                    UserBill::income('直推销售提成', $user1['uid'], 'now_money', 'sale', $price2, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num);
+                    UserBill::income('直推销售提成', $user1['uid'], 'now_money', 'sale', $price2, $user['uid'], $user1['brokerage_price'], '直推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
                 }
                 if ($user2){
                     User::where('uid', $user1['spread_uid'])->inc('brokerage_price', $price4)->update();
                     $user2['brokerage_price'] += $price4;
-                    UserBill::income('间推销售提成', $user2['uid'], 'now_money', 'zt_sale', $price4, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num);
+                    UserBill::income('间推销售提成', $user2['uid'], 'now_money', 'zt_sale', $price4, $user['uid'], $user2['brokerage_price'], '间推用户'.$user['uid'].','.$str.'商品编号'.$item['product_id'].'数量'.$num.'订单号'.$order['order_id']);
                 }
             }
         }
@@ -2259,14 +2260,22 @@ class StoreOrder extends BaseModel
         if (count($user_address) > 0){
             $eve = [];
             foreach ($user_address as $item){
-                $order = StoreOrder::where('user_address', 'like', '%'.$item.'%')->whereBetweenTime('add_time', $date1, $date2)->where('paid', 1)->select();
+                $order = StoreOrder::where('user_address', 'like', '%'.$item.'%')->where('purchase', '<', 2)->whereBetweenTime('add_time', $date1, $date2)->where('paid', 1)->select();
                 $price = 0;
+                $ach = [];
                 foreach ($order as $value){
                     $attr = StoreOrderCartInfo::where('oid', $value['id'])->select();
+                    $jl = 0;
                     foreach ($attr as $v){
                         $bonus = StoreProduct::where('id', $v['cart_info']['product_id'])->value('bonus');
                         $price += $bonus * $v['cart_info']['cart_num'];
+                        $jl += $bonus * $v['cart_info']['cart_num'];
                     }
+                    $ach[] = [
+                        'order_id' => $value['order_id'],
+                        'uid' => $value['uid'],
+                        'price' => $jl,
+                    ];
 
                 }
                 if ($price > 0){
@@ -2276,6 +2285,16 @@ class StoreOrder extends BaseModel
                         'price' => $price,
                     ];
 
+                    $res =  Achievement::create([
+                        'province' => $item,
+                        'number' => User::where('provinces', 1)->where('address', 'like', '%'.$item.'%')->count(),
+                        'price' => $price,
+                        'type' => 1,
+                    ]);
+                    foreach ($ach as $list){
+                        $list['a_id'] = $res['id'];
+                        Ach::create($list);
+                    }
                 }
             }
             if ($eve){
@@ -2287,7 +2306,6 @@ class StoreOrder extends BaseModel
                         User::where('uid', $v['uid'])->inc('brokerage_price', $jl)->update();
                         UserBill::income('业绩分红',$v['uid'], 'now_money', 'bonus', $jl, 0, $v['brokerage_price']+$jl, $item['province'].'业绩分红');
                     }
-                    Achievement::create($item);
                 }
             }
         }
@@ -2308,23 +2326,53 @@ class StoreOrder extends BaseModel
         $time = strtotime('-1 month');
         $date1 = mktime(0,0,0,date('m',$time),01,date('Y',$time));
         $date2 = mktime(23,59,59,date('m',$time),date('t',$time),date('Y',$time));
+        $now_month_first_date = strtotime(date('Y-m-1'));
+        $now_month_last_date  = strtotime(date('Y-m-d',strtotime(date('Y-m-1',strtotime('next month')).'-1 day')));
         foreach ($user as $item)
         {
-            $order = StoreOrder::where('uid', $item['uid'])->whereBetweenTime('add_time', $date1, $date2)->where('paid', 1)->select();
+            $order = StoreOrder::where('uid', $item['uid'])->where('purchase', '<', 2)->whereBetweenTime('add_time', $date1, $date2)->where('paid', 1)->select();
             if (count($order) > 0){
                 $price = 0;
+                $ach = [];
                 foreach ($order as $value){
                     $attr = StoreOrderCartInfo::where('oid', $value['id'])->select();
+                    $jl = 0;
                     foreach ($attr as $v){
                         $team = StoreProduct::where('id', $v['cart_info']['product_id'])->value('team');
                         $price += $team * $v['cart_info']['cart_num'];
+                        $jl += $team * $v['cart_info']['cart_num'];
                     }
+                    $ach[] = [
+                        'order_id' => $value['order_id'],
+                        'uid' => $value['uid'],
+                        'price' => $jl,
+                    ];
                 }
                 $uid = getParent($item['spread_uid'], $user->toArray());
                 if ($uid){
+                    $av = Achievement::where('uid', $uid[0])->whereBetweenTime('create_time', $now_month_first_date,$now_month_last_date)->find();
+                    if ($av){
+                        $av['price'] += $price;
+                        foreach ($ach as $list){
+                            $list['a_id'] = $av['id'];
+                            Ach::create($list);
+                        }
+                        $av->save();
+                    }else{
+                        $res =  Achievement::create([
+                            'uid' => $uid[0],
+                            'number' => 1,
+                            'price' => $price,
+                            'type' => 2,
+                        ]);
+                        foreach ($ach as $list){
+                            $list['a_id'] = $res['id'];
+                            Ach::create($list);
+                        }
+                    }
                     $details = User::where('uid', $uid[0])->find();
                     User::where('uid', $details['uid'])->inc('brokerage_price', $price)->update();
-                    UserBill::income('团队缉拿管理',$details['uid'], 'now_money', 'team', $price, 0, $details['brokerage_price']+$price, '团队奖励');
+                    UserBill::income('团队奖励管理',$details['uid'], 'now_money', 'team', $price, 0, $details['brokerage_price']+$price, '团队奖励');
                 }
             }
         }