类型

application/admin/controller/product/Buying.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace app\admin\controller\product;
+
+use app\common\controller\Backend;
+
+/**
+ * 寄售求购
+ *
+ * @icon fa fa-circle-o
+ */
+class Buying extends Backend
+{
+
+    /**
+     * Buying模型对象
+     * @var \app\admin\model\product\Buying
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\common\model\ProductBuying();
+
+    }
+
+
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $ids = $this->request->param('ids');
+        $list = $this->model->with('users')
+            ->where($where)
+            //->where('synthesis_id', '=', $ids)
+            ->order($sort, $order)
+            ->paginate($limit);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
+
+}

application/admin/controller/product/Synthesis.php

@@ -5,6 +5,7 @@ namespace app\admin\controller\product;
 use app\common\controller\Backend;
 use Exception;
 use think\Db;
+use app\common\model\AnnouncementModel;
 use think\exception\DbException;
 use think\exception\PDOException;
 use think\exception\ValidateException;
@@ -90,6 +91,11 @@ class Synthesis extends Backend
                 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
                 $this->model->validateFailException()->validate($validate);
             }
+
+            //更新公告关联产品
+            AnnouncementModel::setAnnouncementByProduct($params['announcement_id'], [$params['product_id'], $params['material_one'], $params['material_two'], $params['material_three']]);
+
+            //添加
             $result = $this->model->allowField(true)->save($params);
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
@@ -138,6 +144,10 @@ class Synthesis extends Backend
                 $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
                 $row->validateFailException()->validate($validate);
             }
+
+            //更新公告关联产品
+            AnnouncementModel::setAnnouncementByProduct($params['announcement_id'], [$params['product_id'], $params['material_one'], $params['material_two'], $params['material_three']]);
+
             $result = $row->allowField(true)->save($params);
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {

application/admin/controller/user/Buying.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace app\admin\controller\user;
+
+use app\common\controller\Backend;
+
+/**
+ * 用户求购出售记录管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Buying extends Backend
+{
+
+    /**
+     * Buying模型对象
+     * @var \app\admin\model\user\Buying
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\common\model\UserBuying();
+        $this->assignconfig('ids', $this->request->param('ids'));
+    }
+
+
+
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $ids = $this->request->param('ids');
+        $list = $this->model->with('users,fromuser')
+            ->where($where)->where('buying_id', '=', $ids)
+            ->order($sort, $order)
+            ->paginate($limit);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
+   
+
+}

application/admin/controller/user/Synthesis.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace app\admin\controller\user;
+
+use app\common\controller\Backend;
+
+/**
+ * 用户合成记录管理
+ *
+ * @icon fa fa-circle-o
+ */
+class Synthesis extends Backend
+{
+
+    /**
+     * Synthesis模型对象
+     * @var \app\admin\model\user\Synthesis
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\common\model\UserSynthesis();
+        $this->assignconfig('ids', $this->request->param('ids'));
+
+    }   
+
+
+
+    public function index()
+    {
+        //设置过滤方法
+        $this->request->filter(['strip_tags', 'trim']);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $ids = $this->request->param('ids');
+        $list = $this->model->with('users')
+            ->where($where)->where('synthesis_id', '=', $ids)
+            ->order($sort, $order)
+            ->paginate($limit);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
+    }
+   
+
+
+}

application/admin/lang/zh-cn/product/buying.php

@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'User_id'     => '求购用户',
+    'Product_id'  => '产品',
+    'Price'       => '求购价格',
+    'Min_price'   => '最低求购价格',
+    'Stock'       => '求购数量',
+    'Num'         => '出售数量',
+    'Total_price' => '总价',
+    'Status'      => '状态',
+    'Create_time' => '创建时间',
+    'Update_time' => '更新时间'
+];

application/admin/lang/zh-cn/user/buying.php

@@ -0,0 +1,14 @@
+<?php
+
+return [
+    'Id'          => 'Id',
+    'User_id'     => '用户ID',
+    'Buying_id'   => '求购id',
+    'Order_id'    => '订单ID',
+    'From_id'     => '来源id',
+    'Amount'      => '售价',
+    'Fee'         => '服务费',
+    'Income'      => '收入',
+    'Create_time' => '添加时间',
+    'Update_time' => '更新时间'
+];

application/admin/lang/zh-cn/user/synthesis.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'User_id'      => '用户ID',
+    'Synthesis_id' => '合成标题Id',
+    'Num'          => '合成数量',
+    'Note'         => '备注',
+    'Create_time'  => '创建时间',
+    'Update_time'  => '更新时间'
+];

application/admin/validate/product/Buying.php

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

application/admin/validate/user/Buying.php

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

application/admin/validate/user/Synthesis.php

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

application/admin/view/general/announcement/add.html

@@ -18,7 +18,13 @@
         </div>
     </div>
  
-    
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('关联产品')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-source="product/lists/index" data-multiple="true" data-field="zh_name" class="form-control selectpage" name="row[product_id]" type="text" value="">
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Introduction')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/general/announcement/edit.html

@@ -17,6 +17,12 @@
             <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('关联产品')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-source="product/lists/index" data-multiple="true" data-field="zh_name" class="form-control selectpage" name="row[product_id]" type="text" value="{$row.product_id|htmlentities}">
+        </div>
+    </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Introduction')}:</label>

application/admin/view/product/buying/add.html

@@ -0,0 +1,70 @@
+<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">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Product_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-source="product/index" class="form-control selectpage" name="row[product_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Min_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-min_price" class="form-control" step="0.01" name="row[min_price]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Stock')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-stock" data-rule="required" class="form-control" name="row[stock]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-num" data-rule="required" class="form-control" name="row[num]" type="number" value="0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-total_price" data-rule="required" class="form-control" step="0.01" name="row[total_price]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="1">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </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/product/buying/edit.html

@@ -0,0 +1,70 @@
+<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">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Product_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-product_id" data-rule="required" data-source="product/index" class="form-control selectpage" name="row[product_id]" type="text" value="{$row.product_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-price" data-rule="required" class="form-control" step="0.01" name="row[price]" type="number" value="{$row.price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Min_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-min_price" class="form-control" step="0.01" name="row[min_price]" type="number" value="{$row.min_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Stock')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-stock" data-rule="required" class="form-control" name="row[stock]" type="number" value="{$row.stock|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-num" data-rule="required" class="form-control" name="row[num]" type="number" value="{$row.num|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-total_price" data-rule="required" class="form-control" step="0.01" name="row[total_price]" type="number" value="{$row.total_price|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
+        </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/product/buying/index.html

@@ -0,0 +1,19 @@
+<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>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/user/buying/add.html

@@ -0,0 +1,64 @@
+<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">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Buying_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-buying_id" data-rule="required" data-source="buying/index" class="form-control selectpage" name="row[buying_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_id" data-rule="required" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('From_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-from_id" data-rule="required" data-source="from/index" class="form-control selectpage" name="row[from_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-amount" data-rule="required" class="form-control" step="0.01" name="row[amount]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Fee')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-fee" data-rule="required" class="form-control" step="0.01" name="row[fee]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Income')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-income" data-rule="required" class="form-control" step="0.01" name="row[income]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:date('Y-m-d H:i:s')}">
+        </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/user/buying/edit.html

@@ -0,0 +1,64 @@
+<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">{:__('User_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Buying_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-buying_id" data-rule="required" data-source="buying/index" class="form-control selectpage" name="row[buying_id]" type="text" value="{$row.buying_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Order_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-order_id" data-rule="required" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="{$row.order_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('From_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-from_id" data-rule="required" data-source="from/index" class="form-control selectpage" name="row[from_id]" type="text" value="{$row.from_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Amount')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-amount" data-rule="required" class="form-control" step="0.01" name="row[amount]" type="number" value="{$row.amount|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Fee')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-fee" data-rule="required" class="form-control" step="0.01" name="row[fee]" type="number" value="{$row.fee|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Income')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-income" data-rule="required" class="form-control" step="0.01" name="row[income]" type="number" value="{$row.income|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Create_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-create_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[create_time]" type="text" value="{:$row.create_time?datetime($row.create_time):''}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Update_time')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-update_time" data-rule="required" min="0" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[update_time]" type="text" value="{:$row.update_time?datetime($row.update_time):''}">
+        </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/user/buying/index.html

@@ -0,0 +1,22 @@
+<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>
+             
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('user/buying/edit')}"
+                           data-operate-del="{:$auth->check('user/buying/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/admin/view/user/synthesis/index.html

@@ -0,0 +1,21 @@
+<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>
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('user/synthesis/edit')}"
+                           data-operate-del="{:$auth->check('user/synthesis/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

application/api/controller/Order.php

@@ -242,7 +242,7 @@ class Order extends Api
 
             //修改:类型状态
             $order_info->type_id= $productOrder::Transfer; 
-            $order_info->status = $productOrder::Cancelled;
+            $order_info->status = $productOrder::Closure;
             $order_info->save();
             // 提交事务
             Db::commit();

application/api/logic/UserLogic.php

@@ -127,7 +127,7 @@ class UserLogic
                   $where = ['a.type_id' => $productOrder::Transfer, 'a.status' => $productOrder::Closure];
                   break;
                   case 3:
-                  $where = ['a.type_id' => $productOrder::Popular, 'a.status' => $productOrder::Cancelled];
+                  $where = ['a.type_id' => $productOrder::Popular, 'a.status' => $productOrder::Closure];
                   break;
                   case 4:
                   $where = ['a.type_id' => $productOrder::Giveaway, 'a.status' => $productOrder::Closure];

application/common/model/AnnouncementModel.php

@@ -34,6 +34,18 @@ class AnnouncementModel  extends Model
         self::Banner            => '轮播图'
     ];
 
+
+    //更新产品
+    public static function setAnnouncementByProduct(int $announcement_id, array $product_arr)
+    {
+        $product_arr = array_filter($product_arr);
+        $row = self::get($announcement_id);
+        if($row) $product_arr = array_unique(array_merge($product_arr, explode(',', $row->product_id)));
+        $row->product_id = rtrim(implode(',', $product_arr), ',');
+        return $row->save();
+    }
+
+
     //1":__('公告'),"2":__('轮播图'),"3":__('茶说'),"4":__('合成公告'
     public static function getTypeList()
     {

application/common/model/ProductBuying.php

@@ -81,15 +81,29 @@ class ProductBuying extends Model
         return self::where('product_id', $productId)->where('status', self::Normal)->field('id,min_price')->order('id desc')->select();
     }
 
-       //获取订单列表
-       public static function getUserBuyingList(int $uid, string $lan, int $page)
-       {
-           return self::alias('a')->where('user_id', $uid)
-           ->join('product_list p', 'a.product_id = p.id')
-           ->field('a.*,p.' . $lan . '_name as name,p.thum')
-           ->order('id desc')
-           ->paginate($page);
-       }
+    //获取订单列表
+    public static function getUserBuyingList(int $uid, string $lan, int $page)
+    {
+        return self::alias('a')->where('user_id', $uid)
+                ->join('product_list p', 'a.product_id = p.id')
+                ->field('a.*,p.' . $lan . '_name as name,p.thum')
+                ->order('id desc')
+                ->paginate($page);
+    }
+
+
+    //用户
+    public function users()
+    {
+        return $this->hasOne('UserModel', 'id', 'user_id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+
+    //产品
+    public function productlists()
+    {
+        return $this->hasOne('ProductLists', 'id', 'product_id', [], 'LEFT')->setEagerlyType(0);
+    }
 
     public function getCreateTimeTextAttr($value, $data)
     {

application/common/model/ProductOrder.php

@@ -26,13 +26,11 @@ class ProductOrder extends Model
     ];
 
     //状态
-    const Ordered           = 0;
     const Paid              = 1;
     const Transferred       = 2;
     const Shipped           = 3;
-    const Cancelled         = 4;
-    const Closure           = 5;
-    const Freeze            = 6; //质押
+    const Closure           = 4;
+    const Freeze            = 5;
 
     //类型
     const Popular           = 0; //热销
@@ -48,11 +46,9 @@ class ProductOrder extends Model
     
     public $order_status = [
         '-1'                    => '全部',
-        self::Ordered           => '已下单',
         self::Paid              => '已付款',
         self::Transferred       => '已转让',
         self::Shipped           => '提货',
-        self::Cancelled         => '已取消',
         self::Closure           => '关闭',
         self::Freeze            => '质押',
     ];
@@ -197,8 +193,15 @@ class ProductOrder extends Model
             ['type_id'=>self::Giveaway, 'status'=> self::Closure, 'text' => __('已赠送')],
             ['type_id'=>self::Transfer, 'status'=> self::Closure, 'text' => __('已转让')], 
             ['type_id'=>self::Popular, 'status' => self::Shipped, 'text' => __('已提货')],
-            ['type_id'=>self::Transfer, 'status'=> self::Cancelled,'text' => __('已取消')],
+            ['type_id'=>self::Transfer, 'status'=> self::Closure,'text' => __('已取消')],
             ['type_id'=>self::Popular, 'status' => self::Freeze, 'text' => __('质押')],
+            ['type_id'=>self::Transfer, 'status' => self::Paid, 'text' => __('购买寄售')],
+            ['type_id'=>self::Airdrop, 'status' => self::Paid, 'text' => __('空投')],
+            ['type_id'=>self::Airdrop, 'status' => self::Closure, 'text' => __('空投关闭')],
+            ['type_id'=>self::Synthesi, 'status' => self::Paid, 'text' => __('合成')],
+            ['type_id'=>self::Synthesi, 'status' => self::Closure, 'text' => __('合成关闭')],
+            ['type_id'=>self::Buying, 'status' => self::Paid, 'text' => __('求购')],
+            ['type_id'=>self::Buying, 'status' => self::Closure, 'text' => __('求购关闭')],
         ];
     }
 

application/common/model/UserBuying.php

@@ -58,6 +58,29 @@ class UserBuying  extends Model
         return $income;
     }
 
+    //users
+    //用户
+    public function users()
+    {
+        return $this->hasOne('UserModel', 'id', 'user_id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+    public function fromuser()
+    {
+        return $this->hasOne('UserModel', 'id', 'from_id', [], 'LEFT')->setEagerlyType(0);
+    }
+    
+    //产品
+    public function productlists()
+    {
+        return $this->hasOne('ProductLists', 'id', 'product_id', [], 'LEFT')->setEagerlyType(0);
+    }
+
+    //订单
+    public function orders()
+    {
+        return $this->hasOne('ProductOrder', 'id', 'order_id', [], 'LEFT')->setEagerlyType(0);
+    }
     
     public function getCreateTimeTextAttr($value, $data)
     {

public/assets/js/backend/product/buying.js

@@ -0,0 +1,68 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'product/buying/index' + location.search,
+                    table: 'product_buying',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'user_id', title: __('User_id')},
+                        {field: 'product_id', title: __('Product_id')},
+                        {field: 'min_price', title: __('Min_price'), operate: false},
+                        {field: 'stock', title: __('Stock')},
+                        {field: 'num', title: __('Num'), operate: false},
+                        {field: 'total_price', title: __('Total_price'), operate:false},
+                        {field: 'status', title: __('Status')},
+                        {field: 'status', title: __('Status'), searchList: {0:__('关闭'),1 :__('正常'), 2:__('已出售')}, formatter: Table.api.formatter.status},
+                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'operate', title: __('Operate'),
+                            buttons:[
+                                {
+                                    classname: 'btn btn-xs btn-info btn-dialog',
+                                    name: '出售记录',
+                                    text: __('出售记录'),
+                                    title: __('出售记录'),
+                                    url: 'user/buying/index',
+                                    extend:'data-area=["90%","85%"]',
+                                    //refresh:true,
+                                },
+                              ],
+                            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;
+});

public/assets/js/backend/product/synthesis.js

@@ -39,8 +39,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'update_time', title: __('Update_time'), 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'),
+                            buttons:[
+                                {
+                                    classname: 'btn btn-xs btn-info btn-dialog',
+                                    name: '合成记录',
+                                    text: __('合成记录'),
+                                    title: __('合成记录'),
+                                    url: 'user/synthesis/index',
+                                    extend:'data-area=["90%","85%"]',
+                                    //refresh:true,
+                                },
+                              ],
+                            table: table, events: Table.api.events.operate, 
+                            formatter: Table.api.formatter.operate
+                        }
                     ]
                 ]
             });

public/assets/js/backend/user/buying.js

@@ -0,0 +1,57 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'user/buying/index' + location.search+'&ids='+Config.ids,
+                    table: 'user_buying',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        //users,formuser,productlists,orders
+                        {field: 'users.address', title: __('User_id')},
+                        {field: 'buying_id', title: __('Buying_id')},
+                        {field: 'order_id', title: __('Order_id')},
+                        {field: 'fromuser.address', title: __('From_id')},
+                        {field: 'amount', title: __('Amount'), operate:'BETWEEN'},
+                        {field: 'fee', title: __('Fee'), operate:'BETWEEN'},
+                        {field: 'income', title: __('Income'), operate:'BETWEEN'},
+                        {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), 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}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            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;
+});

public/assets/js/backend/user/synthesis.js

@@ -0,0 +1,54 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'user/synthesis/index' + location.search + "&ids=" + Config.ids,
+                    table: 'user_synthesis',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'users.address', title: __('User_id')},
+                        {field: 'num', title: __('Num')},
+                        {field: 'note', title: __('详情订单ID'), align: 'left', formatter:function (value, row, index) {
+                            //console.log(JSON.parse(value.replace(/"/g, '"')),"======");
+                            
+                            var note = Object.values(JSON.parse(value.replace(/"/g, '"')))
+                            var str = "";
+                            note.forEach(function(item,index){
+
+                                str += "<p>" + JSON.stringify(item[0].new_order) + "</p>";
+                            });
+
+                            return str;
+                        }
+                    },
+                 
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+  
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});