commit

app/admin/controller/user/Out.php

@@ -1,250 +1,3 @@
-<<<<<<< HEAD
-<?php
-
-namespace app\admin\controller\user;
-
-use app\admin\controller\AuthController;
-use app\admin\controller\Union;
-use app\admin\model\order\StoreOrder;
-use app\admin\model\User;
-use crmeb\services\{ExpressService,
-    FormBuilder,
-    JsonService,
-    MiniProgramService,
-    upload\Upload,
-    WechatService,
-    FormBuilder as Form,
-    CacheService,
-    UtilService as Util,
-    JsonService as Json
-};
-use app\admin\model\system\{SystemAdmin,
-    SystemAttachment as SystemAttachmentModel,
-    SystemAttachmentCategory as Category
-};
-use think\Db;
-use think\facade\Route as Url;
-use think\facade\Validate;
-use app\admin\model\user\Out as model;
-
-class Out extends AuthController
-{
-
-
-    public function index()
-    {
-
-        $this->assign('admin', $this->adminInfo);
-        return $this->fetch();
-    }
-
-
-    public function list()
-    {
-        $where = Util::getMore([
-            ['status', ''],
-            ['page', 1],
-            ['limit', 20],
-            ['auction'],
-            ['uid'],
-            ['null']
-        ]);
-
-        $data = model::list($where);
-        return Json::successlayui($data);
-    }
-
-    /**
-     * 显示创建资源表单页.
-     *
-     * @return \think\Response
-     */
-    public function create($id = 0)
-    {
-        $f = [];
-        $f[] = Form::input('name', '名称')->col(12);
-        $f[] = Form::textarea('info', '简介');
-        $f[] = Form::number('number', '达标额度')->col(12);
-        $f[] = Form::frameImages('pics', '轮播图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'pics')))->maxLength(5)->icon('image')->width('100%')->height('500px');
-        $f[] = Form::radio('status', '状态', 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
-        $form = Form::make_post_form('添加', $f, Url::buildUrl('save'));
-        $this->assign(compact('form'));
-        return $this->fetch('public/form-builder');
-    }
-
-
-    public function save()
-    {
-        $mode = new model;
-        $data = Util::postMore([
-            'name',
-            'info',
-            'number',
-            'status',
-            ['pics', []]
-        ]);
-        $validate = Validate::rule('name', 'require')->rule([
-            'name' => 'require',
-            'number' => 'require',
-        ]);
-        $validate->message([
-            'name.require' => '名称不能为空',
-            'number.require' => '达标额度不能为空',
-        ]);
-        $data['pics'] = implode(',', $data['pics']);
-        if (!$validate->check($data)) {
-            return Json::fail($validate->getError());
-        }
-        $res = $mode->save($data);
-        if ($res) {
-            return Json::success('添加成功!');
-        } else {
-            return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
-        }
-
-    }
-
-    /**
-     * 删除
-     * @param $id
-     * @return void
-     * @throws \Exception
-     */
-    public function delete($id)
-    {
-        if (!$id) Json::fail('删除失败');
-        $model = new model;
-
-        $res = $model->where('id', $id)->delete();
-        if ($res) {
-            return Json::success('删除成功!');
-        } else {
-            return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
-        }
-
-    }
-
-
-    public function set_status($id, $status)
-    {
-
-        if (empty($id)) return Json::fail('修改失败');
-
-        $res = model::update(['status' => $status, 'id' => $id]);
-        if ($res) {
-            return Json::success('修改成功!');
-        } else {
-            return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
-        }
-    }
-
-    public function edit($id)
-    {
-        if (!$id) Json::fail('数据不存在');
-        $data = model::find($id);
-        $f = [];
-        $f[] = Form::input('name', '名称', $data->getData('name'))->col(12);
-        $f[] = Form::textarea('info', '介绍', $data->getData('info'));
-        $f[] = Form::frameImages('pics', '轮播图', Url::buildUrl('admin/widget.images/index', array('fodder' => 'pics')), explode(',', $data->getData('pics')))->maxLength(5)->icon('image')->width('100%')->height('500px');
-        $f[] = Form::number('number', '达标额度', $data->getData('number'))->col(12);
-        $f[] = Form::radio('status', '状态', $data->getData('status'))->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
-
-
-        $form = Form::make_post_form('修改', $f, Url::buildUrl('update', compact('id')));
-        $this->assign(compact('form'));
-        return $this->fetch('public/form-builder');
-    }
-
-    public function update()
-    {
-        $data = Util::postMore([
-            'id',
-            'name',
-            'info',
-            'status',
-            'number',
-            ['pics', []]
-        ]);
-
-        $validate = Validate::rule('name', 'require')->rule([
-            'name' => 'require',
-            'number' => 'require',
-        ]);
-        $validate->message([
-            'name.require' => '名称不能为空',
-            'number.require' => '达标数量不能为空',
-
-        ]);
-        $data['pics'] = implode(',', $data['pics']);
-        if (!$validate->check($data)) {
-            return Json::fail($validate->getError());
-        }
-        $res = model::update($data);
-        if ($res) {
-            return Json::success('修改成功!');
-        } else {
-            return Json::fail(\app\admin\model\auction\Auction::getErrorInfo());
-        }
-
-
-    }
-
-    public function edit_content($id)
-    {
-        if (!$id) return $this->failed('数据不存在');
-        $seckill = model::get($id);
-        if (!$seckill) return Json::fail('数据不存在!');
-        $this->assign([
-            'content' => htmlspecialchars_decode($seckill['content']),
-            'field' => 'content',
-            'action' => Url::buildUrl('change_field', ['id' => $id, 'field' => 'content'])
-        ]);
-        return $this->fetch('public/edit_content');
-    }
-
-    public function change_field($id)
-    {
-        if (!$id) return $this->failed('数据不存在');
-        $seckill = model::get($id);
-        if (!$seckill) return Json::fail('数据不存在!');
-        $data['content'] = request()->post('content');
-        $res = model::edit($data, $id);
-        if ($res)
-            return Json::successful('添加成功');
-        else
-            return Json::fail('添加失败');
-    }
-
-
-    /**
-     * 显示创建资源表单页.
-     *
-     * @return \think\Response
-     */
-    public function user_push($uid = 0)
-    {
-        return $this->fetch();
-    }
-
-
-    public function user_push_list()
-    {
-
-        $where = Util::getMore([
-            ['status', ''],
-            ['page', 1],
-            ['limit', 20],
-            ['auction'],
-            ['uid'],
-            ['spread_uid']
-        ]);
-
-        $data = StoreOrder::list($where);
-
-        return Json::successlayui($data);
-    }
-
-=======
 <?php
 
 namespace app\admin\controller\user;
@@ -490,5 +243,4 @@ class Out extends AuthController
         return Json::successlayui($data);
     }
 
->>>>>>> 386b37d33e5ba817cba00df29efaefbd692e4dd1
 }

app/admin/model/user/UserPartake.php

@@ -1,85 +1,3 @@
-<<<<<<< HEAD
-<?php
-
-namespace app\admin\model\user;
-
-use app\admin\model\order\StoreOrder;
-use app\models\store\StoreProduct;
-use crmeb\services\SystemConfigService;
-use think\facade\Db;
-use crmeb\traits\ModelTrait;
-use crmeb\basic\BaseModel;
-
-/**
- * TODO 场馆model
- * Class Article
- * @package app\models\article
- */
-class UserPartake extends BaseModel
-{
-    /**
-     * 数据表主键
-     * @var string
-     */
-    protected $pk = 'id';
-
-    /**
-     * 模型名称
-     * @var string
-     */
-    protected $name = 'user_partake';
-    protected $autoWriteTimestamp = true;
-
-    use ModelTrait;
-
-    public static function list($where)
-    {
-        $model = self::alias('a')
-            ->field('a.*,b.nickname,c.name,c.number')
-            ->order('a.id DESC')
-            ->leftJoin('user b', 'b.uid = a.uid')
-            ->leftJoin('out c', 'c.id = a.out_id');
-
-        if ($where['name']) $model->where('b.nickname|a.uid', 'like', '%'.$where['name'].'%');
-        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['status'] == 4){
-            $model->where('a.status', -1);
-        }
-
-        $data['count'] = $model->count();
-        if ($where['page'] && $where['limit']){
-            $model->page($where['page'], $where['limit']);
-        }else{
-            $model->page(20, 1);
-        }
-
-
-        $list = $model->select();
-        $list = count($list) ? $list->toArray() : [];
-        foreach ($list as &$item)
-        {
-            $uids = User::where('spread_uid', $item['uid'])->column('uid');
-            if ($item['money'] == 0){
-                $item['money'] = StoreOrder::where('uid', 'in', $uids)
-                    ->where('paid', 1)
-                    ->where('is_participate', 0)
-                    ->sum('pay_price');
-            }
-        }
-        $data['data'] = $list;
-        return $data;
-
-    }
-
-=======
 <?php
 
 namespace app\admin\model\user;
@@ -159,6 +77,4 @@ class UserPartake extends BaseModel
         return $data;
 
     }
-
->>>>>>> 386b37d33e5ba817cba00df29efaefbd692e4dd1
 }

app/admin/view/user/out/user_push.php

@@ -1,182 +1,3 @@
-<<<<<<< HEAD
-{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="spread_uid" name="spread_uid" class="layui-input" placeholder="推广人">
-                                            </div>
-                                            <label class="layui-form-label" style="top: -5.5px;">消费人</label>
-                                            <div class="layui-input-inline">
-                                                <input type="text" id="uid" name="uid" class="layui-input" placeholder="消费人">
-                                            </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>
-                                </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">
-                    <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="is_participate">
-                        {{# if(d.is_participate == 0){ }}
-                        <button type="button" class="layui-btn layui-btn-primary layui-btn-xs" style="color: red">未结算</button>
-                        {{# } }}
-                        {{# if(d.is_participate == 1){ }}
-                        <button type="button" class="layui-btn layui-btn-primary layui-btn-xs">已结算</button>
-                        {{# } }}
-                    </script>
-                    <script type="text/html" id="act">
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal"
-                                onclick="$eb.createModalFrame('{{d.title}}-编辑','{:Url('edit')}?id={{d.id}}',{h:700,w:1100})">
-                            编辑
-                        </button>
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-normal"
-                                onclick="$eb.createModalFrame('{{d.title}}-编辑内容','{:Url('edit_content')}?id={{d.id}}')">
-                            编辑内容
-                        </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.tableList('List', "{:Url('user_push_list')}", function () {
-        return [
-            {type: 'checkbox'},
-            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
-            {field: 'spread_name', title: '推广人', align: 'center'},
-            {field: 'nickname', title: '消费人', align: 'center'},
-            {field: 'pay_price', title: '消费额度', align: 'center'},
-            {field: 'is_participate', title: '是否结算',templet: '#is_participate', align: 'center'},
-            // {field: 'status', title: '状态', templet: '#status', align: 'center'},
-            // {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
-        ];
-    });
-
-    //查询
-    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.out', 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: 'user.out', a: 'set_status', p: {status: 1, id: value}}), function (res) {
-                layList.msg(res.msg, function () {
-                    layList.reload();
-                });
-            });
-        } else {
-            layList.baseGet(layList.Url({c: 'user.out', a: 'set_status', p: {status: 0, id: value}}), function (res) {
-                layList.msg(res.msg, function () {
-                    layList.reload();
-                });
-            });
-        }
-    });
-</script>
-=======
 {extend name="public/container"}
 {block name="head_top"}
 
@@ -354,5 +175,4 @@
         }
     });
 </script>
->>>>>>> 386b37d33e5ba817cba00df29efaefbd692e4dd1
 {/block}

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

@@ -1,231 +1,3 @@
-<<<<<<< HEAD
-{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-inline">
-                                    <div class="layui-col-lg12">
-                                        <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>
-                                        <div class="layui-input-inline">
-                                            <input type="text" id="auction" name="name" class="layui-input" placeholder="请输入昵称">
-                                        </div>
-                                    </div>
-                                </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>
-                                            <option value="4">未完成</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>
-                        </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="status">
-                        {{# if(d.status == -1){ }}
-                        <button type="button" class="layui-btn layui-btn-primary layui-btn-xs" style="color: red">未完成</button>
-                        {{# } }}
-                        {{# if(d.status == 0){ }}
-                        <button type="button" class="layui-btn layui-btn-primary layui-btn-xs">正常</button>
-                        {{# } }}
-                        {{# if(d.status == 1){ }}
-                        <button type="button" class="layui-btn layui-btn-primary layui-btn-xs" style="color: #00b7ee">待核销</button>
-                        {{# } }}
-                        {{# if(d.status == 2){ }}
-                        <button type="button" class="layui-btn layui-btn-primary layui-btn-xs" style="color: yellowgreen">已核销</button>
-                        {{# } }}
-
-
-                    </script>
-                    <script type="text/html" id="act">
-                        {{# if(d.status == 0){ }}
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-warm" lay-event='hx' id="">
-                            核销
-                        </button>
-                        <button type="button" class="layui-btn layui-btn-xs layui-btn-warm" lay-event='wwc' id="">
-                            未完成
-                        </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();
-    layList.tableList('List', "{:Url('list')}", function () {
-        return [
-            {type: 'checkbox'},
-            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
-            {field: 'uid', title: 'UID', align: 'center'},
-            {field: 'nickname', title: '用户昵称', align: 'center'},
-            {field: 'name', title: '出局名称', align: 'center'},
-            {field: 'status', title: '状态', templet: '#status', align: 'center'},
-            {field: 'number', title: '达标额度', align: 'center'},
-            {field: 'money', title: '累计金额', align: 'center'},
-            {field: 'create_time', title: '参与时间', align: 'center'},
-            {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
-        ];
-    });
-
-    //查询
-    layList.search('search',function(where){
-        layList.reload(where,true);
-    });
-
-    //点击事件绑定
-    layList.tool(function (event,data,obj) {
-        switch (event) {
-            case 'hx':
-                var url=layList.U({c:'user.user_partake',a:'set_status',q:{id:data.id,status:2}});
-                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);
-                            location.reload();
-                        }else
-                            return Promise.reject(res.data.msg || '失败')
-                    }).catch(function(err){
-                        $eb.$swal('error',err);
-                    });
-                },code)
-                break;
-            case 'wwc':
-                var url=layList.U({c:'user.user_partake',a:'set_status',q:{id:data.id,status:-1}});
-                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);
-                            location.reload();
-                        }else
-                            return Promise.reject(res.data.msg || '失败')
-                    }).catch(function(err){
-                        $eb.$swal('error',err);
-                    });
-                },code)
-                break;
-            case 'delete':
-                var url=layList.U({c:'user.user_partake',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:'user.out',a:'set_status',p:{status:1,id:value}}),function (res) {
-                layList.msg(res.msg, function () {
-                    layList.reload();
-                });
-            });
-        }else{
-            layList.baseGet(layList.Url({c:'user.out',a:'set_status',p:{status:0,id:value}}),function (res) {
-                layList.msg(res.msg, function () {
-                    layList.reload();
-                });
-            });
-        }
-    });
-</script>
-=======
 {extend name="public/container"}
 {block name="head_top"}
 
@@ -452,5 +224,4 @@
         }
     });
 </script>
->>>>>>> 386b37d33e5ba817cba00df29efaefbd692e4dd1
 {/block}

app/api/controller/AlipayController.php

@@ -1,37 +1,3 @@
-<<<<<<< HEAD
-<?php
-
-namespace app\api\controller;
-
-use app\Request;
-use crmeb\repositories\PaymentRepositories;
-use crmeb\services\AlipayService;
-use crmeb\services\SystemConfigService;
-use crmeb\utils\Hook;
-
-class AlipayController
-{
-    public function Notify()
-    {
-        $alipay = SystemConfigService::more(['alipay_app_id', 'alipay_pub_key', 'alipay_private_key', 'alipay_key']);
-        $Pay = new AlipayService();
-        $Pay->setAlipayPublicKey($alipay['alipay_key']);
-        $result = $Pay->rsaCheck($_POST, $_POST['sign_type']);
-        if ($result === true && $_POST['trade_status'] == 'TRADE_SUCCESS') {
-            $out_trade_no = input('out_trade_no', '');
-            if (($count = strpos(input('out_trade_no'), '_')) !== false) {
-                $out_trade_no = substr(input('out_trade_no'), $count + 1);
-            }
-            parse_str(input('passback_params'), $attach);
-            (new Hook(PaymentRepositories::class, 'ali'))->listen($attach['attach'], $out_trade_no);
-            echo 'success';
-            exit();
-        } else {
-            echo 'error';
-            exit();
-        }
-    }
-=======
 <?php
 
 namespace app\api\controller;
@@ -64,5 +30,4 @@ class AlipayController
             exit();
         }
     }
->>>>>>> 386b37d33e5ba817cba00df29efaefbd692e4dd1
 }

app/api/controller/order/StoreOrderController.php

@@ -25,12 +25,7 @@ use app\models\system\SystemStore;
 use app\models\user\UserAddress;
 use app\models\user\UserLevel;
 use app\Request;
-use crmeb\services\{
-    CacheService,
-    ExpressService,
-    SystemConfigService,
-    UtilService
-};
+use crmeb\services\{CacheService, ExpressService, GmService, SystemConfigService, UtilService};
 
 /**
  * 订单类
@@ -364,7 +359,6 @@ class StoreOrderController
                 }
                 break;
             case 'ztpay':
-                $gm = new Gmdemo();
                 $data = [
                     'mechNo' => 123456,// 商户号
                     'inetNo' => $order['order_id'],//订单号
@@ -374,7 +368,7 @@ class StoreOrderController
                     'ccy' => 156,
                     'channelCode' => ''//渠道号
                 ];
-                $res = $gm->scanPaymentCode($data);
+                $res = GmService::scanPaymentCode($data);
                 halt($res);
 
             case 'offline':

app/api/controller/user/UserPartakeController.php

@@ -1,130 +1,3 @@
-<<<<<<< HEAD
-<?php
-
-namespace app\api\controller\user;
-
-use app\admin\model\order\StoreOrder;
-use app\models\system\SystemGroupData;
-use app\models\user\Out;
-use app\models\user\User;
-use app\models\user\UserPartake;
-use app\Request;
-use crmeb\services\GroupDataService;
-use crmeb\services\SystemConfigService;
-use crmeb\services\UtilService;
-use think\facade\Db;
-
-class UserPartakeController
-{
-    /**
-     * 出局奖励列表
-     * @return void
-     */
-    public function out_list(Request $request)
-    {
-        [$page, $limit] = UtilService::getMore([['page', 1], ['limit', 10]], $request, true);
-        $list = Out::where('status', 1)->where($page, $limit)->order('id DESC')->select()->toArray();
-        return app('json')->success($list);
-    }
-
-    /**
-     * 出局奖励列表
-     * @return void
-     */
-    public function out_detail($id, Request $request)
-    {
-        $list = Out::where('status', 1)->where('id', $id)->order('id DESC')->find();
-        $partake = UserPartake::where('uid', $request->uid())->where('status', 0)->find();
-        $list['partake'] = $partake;
-        $list = $list ? $list->toArray() : [];
-        return app('json')->success($list);
-    }
-
-    /**
-     * 参加
-     * @return void
-     */
-    public function participate_in(Request $request)
-    {
-        $data = UtilService::postMore([
-            'out_id'
-        ]);
-        Db::startTrans();
-        $user = User::where('uid', $request->uid())->find();
-        if ($user['level'] < 2) return app('json')->fail('等级为团队合伙人才能参与');
-
-        $out = Out::where('id', $data['out_id'])->find();
-        if (empty($out)) return app('json')->fail('参与项目不存在');
-        if ($out['status'] == 0) return app('json')->fail('参与项目已关闭');
-
-        $partake = UserPartake::where('uid', $request->uid())->where('status', 0)->find();
-        if ($partake) return app('json')->fail('当前已有参与中项目,无法参加');
-
-        $res = UserPartake::create([
-            'uid' => $request->uid(),
-            'out_id' => $data['out_id'],
-        ]);
-        if ($res) {
-            Db::commit();
-            return app('json')->success('参与成功');
-        } else {
-            Db::rollback();
-            return app('json')->fail('参与失败');
-        }
-
-    }
-
-
-    /**
-     * 参与记录
-     * @param Request $request
-     * @return mixed
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function partake(Request $request)
-    {
-        $where = UtilService::getMore([
-            ['page', 1],
-            ['limit', 20],
-        ]);
-
-        $data = UserPartake::alias('a')
-            ->field('a.*,c.name,c.number')
-            ->order('a.id DESC')
-            ->leftJoin('out c', 'c.id = a.out_id')
-            ->where('uid', $request->uid())
-            ->page($where['page'], $where['limit'])
-            ->select();
-        $data = count($data) ? $data->toArray() : [];
-        foreach ($data as &$item) {
-            if ($item['money'] == 0) {
-                $item['money'] = User::where('uid', $item['uid'])->find()['pay_price'];
-            }
-        }
-        return app('json')->success($data);
-
-    }
-
-    public function user_push_list(Request $request)
-    {
-
-        $where = UtilService::getMore([
-            ['page', 1],
-            ['limit', 20],
-            ['uid'],
-            ['spread_uid']
-
-        ]);
-        $where['spread_uid'] = $request->uid();
-
-        $data = StoreOrder::list($where);
-        return app('json')->success($data);
-    }
-
-
-=======
 <?php
 
 namespace app\api\controller\user;
@@ -249,6 +122,4 @@ class UserPartakeController
         return app('json')->success($data);
     }
 
-
->>>>>>> 386b37d33e5ba817cba00df29efaefbd692e4dd1
 }

app/models/user/UserPartake.php

@@ -1,54 +1,3 @@
-<<<<<<< HEAD
-<?php
-
-
-namespace app\models\user;
-
-
-use app\admin\model\order\StoreOrder;
-use app\admin\model\user\User;
-use think\Model;
-
-class UserPartake extends Model
-{
-    protected $name = 'user_partake';
-
-
-    protected $autoWriteTimestamp = true;
-
-    /**
-     * 参与累计金额
-     * @param $order
-     * @return void
-     */
-    public static function cumulative()
-    {
-        $user = User::select();
-        foreach ($user as $item){
-            $partake = UserPartake::where('uid', $item['uid'])->where('status', 0)->find();
-            if ($partake){
-                $uids = User::where('spread_uid', $item['uid'])->column('uid');
-                $money = StoreOrder::where('uid', 'in', $uids)
-                    ->where('paid', 1)
-                    ->where('is_participate', 0)
-                    ->sum('pay_price');
-                $out = Out::where('id', $partake['out_id'])->find();
-                if ($money >= $out['number']){
-                    User::where('uid', $item['uid'])->dec('pay_price', $money)->update();
-                    User::where('uid', $item['uid'])->inc('use_price', $money)->update();
-                    $partake['status'] = 1;
-                    $partake['money'] = $money;
-                    $partake->save();
-                    StoreOrder::where('uid', 'in', $uids)->where('paid', 1)->where('is_participate', 0)->update(['is_participate' => 1]);
-                }
-            }
-        }
-
-
-    }
-
-
-=======
 <?php
 
 
@@ -96,7 +45,4 @@ class UserPartake extends Model
 
 
     }
-
-
->>>>>>> 386b37d33e5ba817cba00df29efaefbd692e4dd1
 }

crmeb/repositories/PaymentRepositories.php

@@ -87,4 +87,19 @@ class PaymentRepositories
             return false;
         }
     }
+
+    /**
+     * 充值成功后
+     * @param string|null $order_id 订单id
+     * @return bool
+     */
+    public static function aliUserRecharge(string $order_id = null)
+    {
+        try {
+            if (UserRecharge::be(['order_id' => $order_id, 'paid' => 1])) return true;
+            return UserRecharge::rechargeSuccess($order_id);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 }