充值订单

application/admin/controller/Recharorder.php

@@ -53,7 +53,7 @@ class Recharorder extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['user'])
+                    ->with(['user','video'])
                     ->where(['hu_rechar_order.status' => 1])
                     ->where($where)
                     ->order($sort, $order)
@@ -62,6 +62,7 @@ class Recharorder extends Backend
             foreach ($list as $row) {
                 
                 $row->getRelation('user')->visible(['nickname','mobile']);
+				$row->getRelation('video')->visible(['title','image']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -1,30 +1,37 @@
 <?php
 
 return [
-    'Id'              => '主键ID',
-    'User_id'         => '用户ID',
-    'Order_no'        => '订单编号',
-    'Money'           => '金额',
-    'Purpose'         => '充值用途',
-    'Purpose 1'       => '支付订单',
-    'Purpose 2'       => '充值',
-    'Purpose 3'       => '开通会员',
-    'Pay_type'        => '充值方式',
-    'Pay_type wechat' => '微信',
-    'Pay_type alipay' => '支付宝',
-    'Relation_id'     => '订单ID/充值ID/会员ID',
-    'Refund_no'       => '退款单号',
-    'Transaction_id'  => '微信交易凭证',
-    'Status'          => '订单状态',
-    'Status 0'        => '未付款',
-    'Status 1'        => '支付成功',
-    'Status 2'        => '支付失败',
-    'Pay_status'      => '回调状态',
-    'Pay_status 1'   => '支付订单回调失败',
-    'Pay_status 2'    => '充值回调失败',
-    'Pay_status 3'    => '开通会员回调失败',
-    'Createtime'      => '创建时间',
-    'Updatetime'      => '更新时间',
-    'User.nickname'   => '姓名',
-    'User.mobile'     => '手机号'
+    'Id'                => '主键ID',
+    'User_id'           => '用户ID',
+    'Order_no'          => '订单编号',
+    'Money'             => '金额',
+    'Purpose'           => '充值用途',
+    'Purpose 1'         => '支付订单',
+    'Purpose 2'         => '充值',
+    'Purpose 3'         => '开通会员',
+    'Pay_type'          => '充值方式',
+    'Pay_type wechat'   => '微信',
+    'Pay_type alipay'   => '支付宝',
+    'Pay_type zhuowang' => '卓望三方',
+    'Relation_id'       => '订单ID/充值ID/会员ID',
+    'Refund_no'         => '退款单号',
+    'Transaction_id'    => '微信交易凭证',
+    'Status'            => '订单状态',
+    'Status 0'          => '未付款',
+    'Status 1'          => '支付成功',
+    'Status 2'          => '支付失败',
+    'Pay_status'        => '回调状态',
+    'Pay_status 1'      => '支付订单回调失败',
+    'Pay_status 2'      => '充值回调失败',
+    'Pay_status 3'      => '开通会员回调失败',
+    'Createtime'        => '创建时间',
+    'Updatetime'        => '更新时间',
+    'Diversionfst'      => '位置等导流标识',
+    'Diversioncsk'      => '内容等导流标识',
+    'Trace_id'          => '大数据推荐内容有trace_id',
+    'Video_id'          => '订购媒资的媒资movie_id',
+    'User.nickname'     => '姓名',
+    'User.mobile'       => '手机号',
+    'Video.title'       => '标题',
+    'Video.image'       => '主图'
 ];

application/admin/model/Recharorder.php

@@ -78,4 +78,10 @@ class Recharorder extends Model
     {
         return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
+
+
+    public function video()
+    {
+        return $this->belongsTo('Video', 'video_id', 'id', [], 'LEFT')->setEagerlyType(0);
+    }
 }

application/admin/view/recharorder/add.html

@@ -15,7 +15,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="text" value="0.00">
+            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">
@@ -72,12 +72,36 @@
             
             <div class="radio">
             {foreach name="payStatusList" item="vo"}
-            <label for="row[pay_status]-{$key}"><input id="row[pay_status]-{$key}" name="row[pay_status]" type="radio" value="{$key}" {in name="key" value=" 1"}checked{/in} /> {$vo}</label> 
+            <label for="row[pay_status]-{$key}"><input id="row[pay_status]-{$key}" name="row[pay_status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label> 
             {/foreach}
             </div>
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Diversionfst')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-diversionfst" class="form-control" name="row[diversionfst]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Diversioncsk')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-diversioncsk" class="form-control" name="row[diversioncsk]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Trace_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-trace_id" data-rule="required" data-source="trace/index" class="form-control selectpage" name="row[trace_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-video_id" data-rule="required" data-source="video/index" class="form-control selectpage" name="row[video_id]" type="text" value="">
+        </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">

application/admin/view/recharorder/edit.html

@@ -15,7 +15,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" name="row[money]" type="text" value="{$row.money|htmlentities}">
+            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -78,6 +78,30 @@
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Diversionfst')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-diversionfst" class="form-control" name="row[diversionfst]" type="text" value="{$row.diversionfst|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Diversioncsk')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-diversioncsk" class="form-control" name="row[diversioncsk]" type="text" value="{$row.diversioncsk|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Trace_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-trace_id" data-rule="required" data-source="trace/index" class="form-control selectpage" name="row[trace_id]" type="text" value="{$row.trace_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-video_id" data-rule="required" data-source="video/index" class="form-control selectpage" name="row[video_id]" type="text" value="{$row.video_id|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">

application/api/controller/Pay.php

@@ -310,7 +310,7 @@ class Pay extends Api
         $rechar_order['diversionfst'] = $diversionfst;
         $rechar_order['diversioncsk'] = $diversioncsk;
         $rechar_order['trace_id']     = $trace_id;
-        $rechar_order['contentid']    = $contentid;
+        $rechar_order['video_id']     = $contentid;
 
         //开始事务
         $result = Db::name('rechar_order')->insertGetId($rechar_order);

public/assets/js/backend/recharorder.js

@@ -32,7 +32,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
                         {field: 'order_no', title: __('Order_no'), operate: 'LIKE'},
-                        {field: 'money', title: __('Money'), operate: 'LIKE'},
+                        {field: 'money', title: __('Money'), operate:'BETWEEN'},
                         {field: 'purpose', title: __('Purpose'), searchList: {"1":__('Purpose 1'),"2":__('Purpose 2'),"3":__('Purpose 3')}, formatter: Table.api.formatter.normal, operate: false},
                         {field: 'pay_type', title: __('Pay_type'), operate: false},
                         {field: 'relation_id', title: __('订单ID')},
@@ -44,7 +44,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         },
                         {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: 'diversionfst', title: __('Diversionfst'), operate: 'LIKE'},
+//                        {field: 'diversioncsk', title: __('Diversioncsk'), operate: 'LIKE'},
+//                        {field: 'trace_id', title: __('Trace_id'), operate: 'LIKE'},
+                        {field: 'video_id', title: __('Video_id')},
+
+                        {field: 'video.title', title: __('Video.title'), operate: 'LIKE'},
+                        {field: 'video.image', title: __('Video.image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });