钱包套餐绑定门店和后台套餐卡券部分

application/admin/controller/Package.php

@@ -22,7 +22,12 @@ class Package extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Package;
-        $this->view->assign("statusList", $this->model->getStatusList());
+        $listArr = [
+            'statusList' => $this->model->getStatusList(),
+            'typeList' => $this->model->getTypeList(),
+        ];
+        $this->view->assign($listArr);
+        $this->assignconfig($listArr);
     }
 
 

application/admin/controller/Packagegift.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 套餐卡券管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Packagegift extends Backend
+{
+
+    /**
+     * Packagegift模型对象
+     * @var \app\admin\model\Packagegift
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Packagegift;
+
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+    /**
+     * 查看
+     */
+    public function index()
+    {
+        //当前是否为关联查询
+        $this->relationSearch = true;
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if ($this->request->isAjax()) {
+            //如果发送的来源是Selectpage，则转发到Selectpage
+            if ($this->request->request('keyField')) {
+                return $this->selectpage();
+            }
+            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
+
+            $list = $this->model
+                    ->with(['package','coupons'])
+                    ->where($where)
+                    ->order($sort, $order)
+                    ->paginate($limit);
+
+            foreach ($list as $row) {
+                
+                $row->getRelation('package')->visible(['title']);
+				$row->getRelation('coupons')->visible(['name']);
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list->items());
+
+            return json($result);
+        }
+        return $this->view->fetch();
+    }
+
+}

application/admin/lang/zh-cn/package.php

@@ -2,6 +2,9 @@
 
 return [
     'Id'                => 'ID',
+    'Type'              => '类型',
+    'Type 1'            => '普通',
+    'Type 2'            => '卡券',
     'Company_id'        => '门店ID',
     'Title'             => '主标题',
     'Info'              => '副标题',

application/admin/lang/zh-cn/packagegift.php

@@ -0,0 +1,11 @@
+<?php
+
+return [
+    'Id'            => 'ID',
+    'Company_id'    => '门店ID',
+    'Package_id'    => '套餐ID',
+    'Coupon_id'     => '卡券ID',
+    'Number'        => '卡券数量',
+    'Package.title' => '主标题',
+    'Coupons.name'  => '卡券名称'
+];

application/admin/model/Package.php

@@ -25,7 +25,8 @@ class Package extends Model
 
     // 追加属性
     protected $append = [
-        'status_text'
+        'status_text',
+        'type_text',
     ];
     
 
@@ -51,8 +52,17 @@ class Package extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
+    public function getTypeList()
+    {
+        return ['1' =>__('Type 1'), '2' =>__('Type 2')];
+    }
 
-
+    public function getTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
+        $list = $this->getTypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
 
     public function company()
     {

application/admin/model/Packagegift.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Packagegift extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'package_gift';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    
+
+
+
+
+
+
+
+    public function package()
+    {
+        return $this->belongsTo('Package', 'package_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
+    public function coupons()
+    {
+        return $this->belongsTo('Coupons', 'coupon_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
+}

application/admin/validate/Packagegift.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Packagegift extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

application/admin/view/package/add.html

@@ -1,5 +1,14 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <select id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+                {foreach name="typeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/package/edit.html

@@ -1,5 +1,14 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <select id="c-type" data-rule="required" class="form-control selectpicker" name="row[type]">
+                {foreach name="typeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/packagegift/add.html

@@ -0,0 +1,33 @@
+<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Company_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-company_id" data-rule="required" data-source="company/index" data-field="title" class="form-control selectpage" name="row[company_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Package_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-package_id" data-rule="required" data-source="package/index" data-field="title" class="form-control selectpage" name="row[package_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Coupon_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-coupon_id" data-rule="required" data-source="coupon/index" class="form-control selectpage" name="row[coupon_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-number" data-rule="required" class="form-control" name="row[number]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/packagegift/edit.html

@@ -0,0 +1,28 @@
+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Package_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-package_id" data-rule="required" data-source="package/index" class="form-control selectpage" name="row[package_id]" type="text" value="{$row.package_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Coupon_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-coupon_id" data-rule="required" data-source="coupon/index" class="form-control selectpage" name="row[coupon_id]" type="text" value="{$row.coupon_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-number" data-rule="required" class="form-control" name="row[number]" type="number" value="{$row.number|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

application/admin/view/packagegift/index.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('packagegift/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('packagegift/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('packagegift/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('packagegift/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>-->
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('packagegift/edit')}"
+                           data-operate-del="{:$auth->check('packagegift/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/common/service/OrderService.php

@@ -185,6 +185,18 @@ class OrderService
             $package = Db::name('package')->where($packageWhere)->lock(true)->find();
             $userWhere['id'] = $userId;
             $user = Db::name('user')->where($userWhere)->find();
+            //绑定门店
+            $userService = new UserService();
+            $userParams = [
+                'user_id' => $userId,
+                'company_id' => $companyId,
+                'comefrom' => '平台引流',//来源
+            ];
+            $userBindRes = $userService->userWallet($userParams);
+            if (!$userBindRes['status']) {
+                Db::rollback();
+                return false;
+            }
             $userCarWhere['id'] = $carId;
             $userCar = Db::name('user_car')->where($userCarWhere)->find();
             //生成订单

application/common/service/UserService.php

@@ -64,7 +64,6 @@ class UserService
             'msg' => '操作成功',
             'data' => [],
         ];
-        Db::startTrans();
         try {
             $userId = isset($params['user_id']) ? $params['user_id'] : 0;
             $companyId = isset($params['company_id']) ? $params['company_id'] : 0;
@@ -93,9 +92,7 @@ class UserService
                     throw new Exception('生成钱包失败');
                 }
             }
-            Db::commit();
         } catch (Exception $e) {
-            Db::rollback();
             $result['status'] = 0;
             $result['msg'] = $e->getMessage();
         }

public/assets/js/backend/package.js

@@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
+                        {field: 'type', title: __('Type'), searchList: Config.typeList, formatter: Table.api.formatter.status},
 //                        {field: 'company_id', title: __('Company_id'), operate: false, visible:false},
                         {field: 'company.name', title: __('Company.name'), operate: 'LIKE'},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
@@ -41,10 +42,29 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'oldprice', title: __('Oldprice'), operate:'BETWEEN'},
                         {field: 'num', title: __('Num'), operate:'BETWEEN'},
                         {field: 'weigh', title: __('Weigh'), operate: false},
-                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"0":__('Status 0')}, formatter: Table.api.formatter.status},
+                        {field: 'status', title: __('Status'), searchList: Config.statusList, formatter: Table.api.formatter.status},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
+                            buttons:[
+                                {
+                                    name: 'package_gift',
+                                    text: '赠送列表',
+                                    title: '赠送列表',
+                                    classname: 'btn btn-xs btn-primary btn-dialog',
+                                    url:'packagegift/index/package_id/{ids}?dialog=1',
+                                    icon: 'fa fa-list',
+                                    target: '_self',
+                                    extend: 'data-area=["90%","90%"]',
+                                    hidden:function($row){
+                                        if($row.type == 2){
+                                            return false;
+                                        }
+                                        return true;
+                                    }
+                                },
+
+                            ]}
                     ]
                 ]
             });

public/assets/js/backend/packagegift.js

@@ -0,0 +1,55 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'packagegift/index' + location.search,
+                    add_url: 'packagegift/add',
+                    edit_url: 'packagegift/edit',
+                    del_url: 'packagegift/del',
+                    multi_url: 'packagegift/multi',
+                    import_url: 'packagegift/import',
+                    table: 'package_gift',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'package_id', title: __('Package_id')},
+                        {field: 'coupon_id', title: __('Coupon_id')},
+                        {field: 'number', title: __('Number')},
+                        {field: 'package.title', title: __('Package.title'), operate: 'LIKE'},
+                        {field: 'coupons.name', title: __('Coupons.name'), operate: 'LIKE'},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});