Home Explore Help
Sign In
dever2-product
/
api
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

edit

rabin 1 year ago
parent
fa224c3dc2
commit
e21de55ff8
35 changed files with 373 additions and 45 deletions
Unified View Show Diff Stats
  1. 2 2
      package/manage/index.html
  2. 1 1
      package/manage/static/css/213.89045697.css
  3. 1 1
      package/manage/static/css/954.f9a62230.css
  4. 1 1
      package/manage/static/css/app.d065fbce.css
  5. 0 1
      package/manage/static/css/vab-chunk-c6f52c3a.fc344e71.css
  6. 0 1
      package/manage/static/css/vab-plugins.f6f5c03c.css
  7. 1 1
      package/manage/static/js/213.570b0890.js
  8. 1 1
      package/manage/static/js/592.41e25131.js
  9. 1 1
      package/manage/static/js/954.c66c2e29.js
  10. 1 1
      package/manage/static/js/962.faf0c7f7.js
  11. 0 1
      package/manage/static/js/app.d37e3e36.js
  12. 1 1
      package/manage/static/js/vab-chunk-0b9a05e8.3a2acba3.js
  13. 1 1
      package/manage/static/js/vab-chunk-54e012b3.6818ec02.js
  14. 1 1
      package/manage/static/js/vab-chunk-844ca20f.8fd468cb.js
  15. 1 1
      package/manage/static/js/vab-chunk-b3a4eaa1.509e2c01.js
  16. 0 5
      package/manage/static/js/vab-chunk-c6f52c3a.b7fd5864.js
  17. 5 0
      package/manage/static/js/vab-chunk-c6f52c3a.c279937d.js
  18. 0 5
      package/manage/static/js/vab-plugins.3042c666.js
  19. 5 0
      package/manage/static/js/vab-plugins.8f46493d.js
  20. 36 0
      src/dai/channel/lib/Manage.php
  21. 9 0
      src/dai/channel/table/card.php
  22. 8 0
      src/dai/channel/table/card_upload.php
  23. 23 2
      src/dai/channel/table/manage/card.php
  24. 4 0
      src/dai/channel/table/manage/card_upload.php
  25. 120 2
      src/dai/seller/api/Manage.php
  26. 95 4
      src/dai/seller/lib/Manage.php
  27. 2 1
      src/dai/seller/lib/Order.php
  28. 1 1
      src/dai/seller/table/manage/order_list.php
  29. 1 1
      src/dai/seller/table/manage/order_log_list.php
  30. 2 2
      src/dai/seller/table/manage/order_push.php
  31. 7 2
      src/dai/seller/table/manage/seller_order_list.php
  32. 1 1
      src/dai/seller/table/manage/seller_order_log_list.php
  33. 2 2
      src/dai/seller/table/manage/seller_order_push.php
  34. 1 1
      src/dai/seller/table/order.php
  35. 38 0
      src/dai/seller/table/order_km.php

+ 2 - 2
package/manage/index.html
View File 

@@ -1,5 +1,5 @@
 
-<!doctype html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"/><meta content="IE=edge" http-equiv="X-UA-Compatible"/><meta content="webkit" name="renderer"/><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" name="viewport"/><link href="favicon.ico" rel="icon"/><title>Dever Manage</title><meta content="Dever,PHP,PHP框架,轻量,微服务,组件化,接口,低代码,后台,自定义后台,开发,快速开发,AI,人工智能,文档,轻应用,应用,时空之翼,神秘城" name="keywords"/><meta content="rabin@shemic.com" name="author"/><link href="static/css/loading.css?random=2024-01-18 11:46:05-shemic" rel="stylesheet"/><script>document.write(
 
+<!doctype html><html lang="zh-cmn-Hans"><head><meta charset="utf-8"/><meta content="IE=edge" http-equiv="X-UA-Compatible"/><meta content="webkit" name="renderer"/><meta content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no" name="viewport"/><link href="favicon.ico" rel="icon"/><title>Dever Manage</title><meta content="Dever,PHP,PHP框架,轻量,微服务,组件化,接口,低代码,后台,自定义后台,开发,快速开发,AI,人工智能,文档,轻应用,应用,时空之翼,神秘城" name="keywords"/><meta content="rabin@shemic.com" name="author"/><link href="static/css/loading.css?random=2024-01-18 17:26:05-shemic" rel="stylesheet"/><script>document.write(
 
         "<script type='text/javascript' src='config.js?" +
 
         "<script type='text/javascript' src='config.js?" +
 
           Math.random() +
 
           Math.random() +
 
           "'><\/script>"
 
           "'><\/script>"
 
-      )</script><script defer="defer" src="static/js/app.9cabc5eb.js"></script><script defer="defer" src="static/js/213.577ada00.js"></script><link href="static/css/app.d065fbce.css" rel="stylesheet"><link href="static/css/213.89045697.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="first-loading-wrp"><div class="loading-wrp"><span class="dot dot-spin"><i></i> <i></i> <i></i> <i></i></span></div><h1>Dever Manage</h1></div></div></body></html>
 
+      )</script><script defer="defer" src="static/js/app.d37e3e36.js"></script><script defer="defer" src="static/js/213.570b0890.js"></script><link href="static/css/app.d065fbce.css" rel="stylesheet"><link href="static/css/213.89045697.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="first-loading-wrp"><div class="loading-wrp"><span class="dot dot-spin"><i></i> <i></i> <i></i> <i></i></span></div><h1>Dever Manage</h1></div></div></body></html>

File diff suppressed because it is too large
+ 1 - 1
package/manage/static/css/213.89045697.css


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/css/954.f9a62230.css


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/css/app.d065fbce.css


File diff suppressed because it is too large
+ 0 - 1
package/manage/static/css/vab-chunk-c6f52c3a.fc344e71.css


File diff suppressed because it is too large
+ 0 - 1
package/manage/static/css/vab-plugins.f6f5c03c.css


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/js/213.570b0890.js


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/js/592.41e25131.js


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/js/954.c66c2e29.js


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/js/962.faf0c7f7.js


File diff suppressed because it is too large
+ 0 - 1
package/manage/static/js/app.d37e3e36.js


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/js/vab-chunk-0b9a05e8.3a2acba3.js


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/js/vab-chunk-54e012b3.6818ec02.js


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/js/vab-chunk-844ca20f.8fd468cb.js


File diff suppressed because it is too large
+ 1 - 1
package/manage/static/js/vab-chunk-b3a4eaa1.509e2c01.js


File diff suppressed because it is too large
+ 0 - 5
package/manage/static/js/vab-chunk-c6f52c3a.b7fd5864.js


File diff suppressed because it is too large
+ 5 - 0
package/manage/static/js/vab-chunk-c6f52c3a.c279937d.js


File diff suppressed because it is too large
+ 0 - 5
package/manage/static/js/vab-plugins.3042c666.js


File diff suppressed because it is too large
+ 5 - 0
package/manage/static/js/vab-plugins.8f46493d.js


+ 36 - 0
src/dai/channel/lib/Manage.php
View File 

@@ -31,6 +31,7 @@ class Manage extends Auth
 
                         if (!$sku) {

                         if (!$sku) {

                             continue;

                             continue;

                         }

                         }

+                        $update['seller_id'] = $data['seller_id'];

                         $update['goods_id'] = $goods[1];

                         $update['goods_id'] = $goods[1];

                         $update['sku_id'] = $sku['id'];

                         $update['sku_id'] = $sku['id'];

                         $update['channel_id'] = $data['channel_id'];

                         $update['channel_id'] = $data['channel_id'];

@@ -44,4 +45,39 @@ class Manage extends Auth
 
         }

         }

         return $data;

         return $data;

     }

     }

+

+    # 展示卡密统计

+    public function showCardStat($where)

+    {

+        $db = Dever::db('card', 'channel');

+        $total = $db->count($where);

+

+        $where['use_status'] = 2;

+        $yi = $db->count($where);

+

+        $where['use_status'] = 1;

+        $wei = $db->count($where);

+        return array

+        (

+            array

+            (

+                # 一共24

+                'span' => '8',

+                'name' => '总数量',

+                'value' => $total,

+            ),

+            array

+            (

+                'span' => '8',

+                'name' => '已用数量',

+                'value' => $yi,

+            ),

+            array

+            (

+                'span' => '8',

+                'name' => '剩余可用数量',

+                'value' => $wei,

+            ),

+        );

+    }

 }
 
 }

+ 9 - 0
src/dai/channel/table/card.php
View File 

@@ -10,6 +10,14 @@ return array
 
             'type'      => 'int(11)',

             'type'      => 'int(11)',

         ),

         ),

 

 

+        'seller_id' => array

+        (

+            'name'      => '分配商户',

+            'type'      => 'int(11)',

+            'default'   => '-1',

+            'value'     => 'Dever::load("seller/manage")->getList()',

+        ),

+

         'number' => array

         'number' => array

         (

         (

             'name'      => '卡号',

             'name'      => '卡号',

@@ -74,5 +82,6 @@ return array
 
     (

     (

         'search' => 'channel_id,goods_id,sku_id',

         'search' => 'channel_id,goods_id,sku_id',

         'order_id' => 'order_id',

         'order_id' => 'order_id',

+        'seller_id' => 'seller_id',

     ),

     ),

 );
 
 );

+ 8 - 0
src/dai/channel/table/card_upload.php
View File 

@@ -10,6 +10,14 @@ return array
 
             'type'      => 'int(11)',

             'type'      => 'int(11)',

         ),

         ),

 

 

+        'seller_id' => array

+        (

+            'name'      => '分配商户',

+            'type'      => 'int(11)',

+            'default'   => '-1',

+            'value'     => 'Dever::load("seller/manage")->getList()',

+        ),

+

         'goods' => array

         'goods' => array

         (

         (

             'name'      => '商品分类+商品id',

             'name'      => '商品分类+商品id',

+ 23 - 2
src/dai/channel/table/manage/card.php
View File 

@@ -4,10 +4,16 @@ return array
 
 (

 (

     'list' => array

     'list' => array

     (

     (

+        'stat' => 'channel/manage.showCardStat',

         'where' => array('channel_id' => $channel_id),

         'where' => array('channel_id' => $channel_id),

         'field'      => array

         'field'      => array

         (

         (

             'id',

             'id',

+            'seller_id' => array

+            (

+                'name' => '商户',

+                'show' => '{seller_id} > 0 ? Dever::db("info", "seller")->find({seller_id})["name"] : "无"',

+            ),

             'goods' => array

             'goods' => array

             (

             (

                 'name' => '商品',

                 'name' => '商品',

@@ -46,6 +52,10 @@ return array
 
         'search' => array

         'search' => array

         (

         (

             'channel_id' => 'hidden',

             'channel_id' => 'hidden',

+            'seller_id' => array

+            (

+                'name' => '选择商户',

+            ),

             'sku_id' => array

             'sku_id' => array

             (

             (

                 'name' => '商品',

                 'name' => '商品',

@@ -68,6 +78,10 @@ return array
 
         'check' => 'number',

         'check' => 'number',

         'field'    => array

         'field'    => array

         (

         (

+            'seller_id' => array

+            (

+                'desc' => '请选择要分配卡密的商户，上传后将自动分配给这个商户，如未选择，则为通用卡密，任何商户都可以购买',

+            ),

             'channel_id' => array

             'channel_id' => array

             (

             (

                 'type' => 'hidden',

                 'type' => 'hidden',

@@ -93,9 +107,16 @@ return array
 
             (

             (

                 'name' => '规格',

                 'name' => '规格',

                 'type' => 'select',

                 'type' => 'select',

+                'rules' => true,

+            ),

+            'number' => array

+            (

+                'rules' => true,

+            ),

+            'pwd' => array

+            (

+                'rules' => true,

             ),

             ),

-            'number',

-            'pwd',

         ),

         ),

     ),

     ),

 );
 
 );

+ 4 - 0
src/dai/channel/table/manage/card_upload.php
View File 

@@ -9,6 +9,10 @@ return array
 
             (

             (

                 'type' => 'hidden',

                 'type' => 'hidden',

             ),

             ),

+            'seller_id' => array

+            (

+                'desc' => '请选择要分配卡密的商户，上传后将自动分配给这个商户，如未选择，则为通用卡密，任何商户都可以购买',

+            ),

             'goods' => array

             'goods' => array

             (

             (

                 # 数据来源

                 # 数据来源

+ 120 - 2
src/dai/seller/api/Manage.php
View File 

@@ -15,6 +15,18 @@ class Manage extends Auth
 
         return Dever::load('manage', 'seller')->showOrderExpand($data);

         return Dever::load('manage', 'seller')->showOrderExpand($data);

     }

     }

 

 

+    public function showOrderExpandKm($value = false)

+    {

+        $data = Dever::db('order', 'seller')->find($value);

+        return Dever::load('manage', 'seller')->showOrderExpandKm($data);

+    }

+

+    public function showOrderLogExpandKm($value = false)

+    {

+        $data = Dever::db('order_log', 'seller')->find($value);

+        return Dever::load('manage', 'seller')->showOrderExpandKm($data);

+    }

+

     # 补发回调

     # 补发回调

     public function sendCallBack()

     public function sendCallBack()

     {

     {

@@ -51,7 +63,7 @@ class Manage extends Auth
 
         if (!$value) {

         if (!$value) {

             return $result;

             return $result;

         }

         }

-        $channel = Dever::db('channel', 'seller')->select(array('seller_id' => $value));

+        $channel = Dever::db('channel', 'seller')->select(array('seller_id' => $value, 'status' => 1));

         if ($channel) {

         if ($channel) {

             $option = $setCate = $setGoods = array();

             $option = $setCate = $setGoods = array();

             $i = 0;

             $i = 0;

@@ -71,7 +83,8 @@ class Manage extends Auth
 
                         }

                         }

                     }

                     }

                     if (!isset($setGoods[$goods['id']])) {

                     if (!isset($setGoods[$goods['id']])) {

-                        $option[$setCate[$goods['cate_id']]]['children'][] = $goods;

+                        $v['name'] = $goods['name'];

+                        $option[$setCate[$goods['cate_id']]]['children'][] = $v;

                         $setGoods[$goods['id']] = 1;

                         $setGoods[$goods['id']] = 1;

                     }

                     }

                 }

                 }

@@ -80,4 +93,109 @@ class Manage extends Auth
 
         }

         }

         return $result;

         return $result;

     }

     }

+

+    public function getSku($value)

+    {

+        if (is_array($value)) {

+            $value = end($value);

+        }

+        $result = array();

+        $result['sku_id']['value'] = '';

+        if (!$value) {

+            $result['sku_id']['option'] = array();

+            return $result;

+        }

+        $channel = Dever::db('channel', 'seller')->find($value);

+        $channel_sku = Dever::db('channel', 'seller')->select(array('seller_id' => $channel['seller_id'], 'goods_id' => $channel['goods_id'], 'status' => 1));

+        if ($channel_sku) {

+            $sku = array();

+            foreach ($channel_sku as $k => $v) {

+                if ($v['sku_id']) {

+                    $v['sku_id'] = explode(',', $v['sku_id']);

+                    foreach ($v['sku_id'] as $v1) {

+                        $sku[$v1] = $v1;

+                    }

+                }

+            }

+        }

+        $result['goods_id']['value'] = $channel['goods_id'];

+

+        $where = array('info_id' => $channel['goods_id']);

+        if (isset($sku) && $sku) {

+            $where['id'] = array('in', implode(',', $sku));

+        }

+        $sku = Dever::db('info_sku', 'goods')->select($where);

+        if ($sku) {

+            $option = array();

+            foreach ($sku as $k => $v) {

+                if ($v['key'] != -1) {

+                    $spec = Dever::db('info_spec_value', 'goods')->find(array('id' => array('in', $v['key'])), array('col' => 'id,group_concat(value) as name', 'group' => 'info_id'));

+                    if ($spec) {

+                        $spec['id'] = $v['id'];

+                        $result['sku_id']['value'] = $v['id'];

+                        $option[] = $spec;

+                    }

+                } else {

+                    $result['sku_id']['value'] = $v['id'];

+                    $option[0] = array

+                    (

+                        'id' => $v['id'],

+                        'name' => '无',

+                    );

+                }

+            }

+            $result['sku_id']['option'] = $option;

+            //$result['sku_id']['desc'] = '222';

+        }

+        

+        return $result;

+    }

+

+    # 提取卡密

+    public function tqKm()

+    {

+        $value = Dever::input('value');

+        $id = Dever::input('order_id');

+        $order = Dever::db('order', 'seller')->find($id);

+

+        $code = Dever::load('manage', 'seller')->kmPwd($order['id'], $order['cdate']);

+        if ($code != $value) {

+            Dever::error('密码错误');

+        }

+

+        $result = array();

+        $result['msg'] = '提取成功';

+        $result['url'] = Dever::url('seller/manage.tqKmAct', array('order_id' => $order['id'], 'value' => $value));

+        return $result;

+    }

+

+    # 提取卡密

+    public function tqKmAct()

+    {

+        $value = Dever::input('value');

+        $id = Dever::input('order_id');

+        $order = Dever::db('order', 'seller')->select($id);

+        if (!$order) {

+            Dever::error('订单不存在');

+        }

+

+        $code = Dever::load('manage', 'seller')->kmPwd($order[0]['id'], $order[0]['cdate']);

+        if ($code != $value) {

+            Dever::error('密码错误');

+        }

+

+        $order = Dever::db('order', 'seller')->select($id);

+        $data = Dever::load('manage', 'seller')->outKm(array('body' => $order));

+

+        # 增加提取日志

+        $log['seller_id'] = $order[0]['seller_id'];

+        $log['order_id'] = $id;

+        $log['admin_id'] = $this->uid;

+        $log['system_id'] = $this->system['id'];

+        $log['admin_name'] = $this->user['name'];

+

+        Dever::db('order_km', 'seller')->insert($log);

+

+        Dever::load('export', 'excel')->act($data['body'], $data['head'], '导出卡密');

+    }

 }
 
 }

+ 95 - 4
src/dai/seller/lib/Manage.php
View File 

@@ -10,6 +10,18 @@ class Manage extends Auth
 
         return Dever::db('info', 'seller')->select(array('status' => 1));

         return Dever::db('info', 'seller')->select(array('status' => 1));

     }

     }

 

 

+    # 获取卡密可以分配的商户列表

+    public function getList()

+    {

+        $data[0] = array

+        (

+            'id' => -1,

+            'name' => '--通用卡密--',

+        );

+        $data = array_merge($data, $this->getInfo());

+        return $data;

+    }

+

     # 为商户生成appkey

     # 为商户生成appkey

     public function createAppKey($data)

     public function createAppKey($data)

     {

     {

@@ -49,8 +61,8 @@ class Manage extends Auth
 
         if (!$data['data']) {

         if (!$data['data']) {

             Dever::error('未输入充值数据');

             Dever::error('未输入充值数据');

         }

         }

-        $goods = explode(',', $data['goods']);

+        //$goods = explode(',', $data['goods']);

-        $goods_id = end($goods);

+        $goods_id = $data['goods_id'];

         $sku_id = $data['sku_id'];

         $sku_id = $data['sku_id'];

         $seller_id = $data['seller_id'];

         $seller_id = $data['seller_id'];

         $seller = Dever::db('info', 'seller')->find($seller_id);

         $seller = Dever::db('info', 'seller')->find($seller_id);

@@ -184,6 +196,15 @@ class Manage extends Auth
 
         return $result;

         return $result;

     }

     }

 

 

+    # 展示订单账号

+    public function showOrderAccount($account)

+    {

+        if (strstr($account, 'km_')) {

+            return '<a>提取卡密</a>';

+        }

+        return $account;

+    }

+

 

 

     # 展示订单金额

     # 展示订单金额

     public function showOrderCash($cate_id, $goods_id, $sku_id, $cash, $price, $num)

     public function showOrderCash($cate_id, $goods_id, $sku_id, $cash, $price, $num)

@@ -327,6 +348,22 @@ class Manage extends Auth
 
         $value = $this->showOrderStatus($data['status']);

         $value = $this->showOrderStatus($data['status']);

         $goods = $this->showOrderCash($data['cate_id'], $data['goods_id'], $data['sku_id'], $data['cash'], $data['price'], $data['num']);

         $goods = $this->showOrderCash($data['cate_id'], $data['goods_id'], $data['sku_id'], $data['cash'], $data['price'], $data['num']);

         $result['type'] = 'desc';

         $result['type'] = 'desc';

+        if (strstr($data['account'], 'km_')) {

+            $code = $this->kmPwd($data['id'], $data['cdate']);

+            $result['content'][] = array

+            (

+                'title' => '卡密信息',

+                'border' => true,

+                'direction' => 'horizontal',

+                'size' => 'small',

+                'column' => 1,

+                'content' => array

+                (

+                    array('提取密码', '<font style="color:red">' . $code . '</font>'),

+                ), 

+            );

+        }

+        

         $result['content'][] = array

         $result['content'][] = array

         (

         (

             'title' => '商户发起请求',

             'title' => '商户发起请求',

@@ -412,20 +449,74 @@ class Manage extends Auth
 
         return $result;

         return $result;

     }

     }

 

 

+    # 展示订单卡密扩展信息

+    public function showOrderExpandKm($data)

+    {

+        if ($data && strstr($data['account'], 'km_')) {

+            $result['type'] = 'desc';

+            $result['content'][] = array

+            (

+                'title' => '提取卡密',

+                'border' => true,

+                'direction' => 'horizontal',

+                'size' => 'small',

+                'column' => 1,

+                'content' => array

+                (

+                    array('提取密码', array

+                    (

+                        'input' => '请输入密码',

+                        'value' => '',

+                        'button' => '提取',

+                        'remote' => Dever::url('seller/manage.tqKm', array('order_id' => $data['id'])),

+                    )),

+                ), 

+            );

+            $log = Dever::db('order_km', 'seller')->select(array('order_id' => $data['id']));

+            $content = array();

+            if ($log) {

+                foreach ($log as $v) {

+                    $content[] = array(date('Y-m-d H:i:s', $v['cdate']), '操作人：' . $v['admin_name']);

+                }

+            }

+            $result['content'][] = array

+            (

+                'title' => '提取记录',

+                'border' => true,

+                'direction' => 'horizontal',

+                'size' => 'small',

+                'column' => 1,

+                'content' => $content,

+            );

+        } else {

+            $result['type'] = 'string';

+            $result['content'] = '暂无信息';

+        }

+        

+        return $result;

+    }

+

     # 导出卡密

     # 导出卡密

     public function outKm($data)

     public function outKm($data)

     {

     {

         $result = array();

         $result = array();

-        $result['head'] = array('订单id', '订单号', '面值', '卡号', '密码');

+        $result['head'] = array('订单id', '订单号', '面值', '卡号', '密码', '导出时间');

         $result['body'] = array();

         $result['body'] = array();

         foreach ($data['body'] as $k => $v) {

         foreach ($data['body'] as $k => $v) {

             $card = Dever::db('card', 'channel')->select(array('order_id' => $v['id']));

             $card = Dever::db('card', 'channel')->select(array('order_id' => $v['id']));

             if ($card) {

             if ($card) {

                 foreach ($card as $k1 => $v1) {

                 foreach ($card as $k1 => $v1) {

-                    $result['body'][] = array($v['id'], $v['order_num'], $v['cash'], $v1['number'], $v1['pwd']);

+                    $result['body'][] = array($v['id'], $v['order_num'], $v['cash'], $v1['number'], $v1['pwd'], date('Y-m-d H:i:s'));

                 }

                 }

             }

             }

         }

         }

         return $result;

         return $result;

     }

     }

+

+    # 生成卡密密码

+    public function kmPwd($id, $cdate)

+    {

+        $num = $id * $cdate * 10000000;

+        return \Dever\Helper\Str::idtostr($num);

+    }

 }
 
 }

+ 2 - 1
src/dai/seller/lib/Order.php
View File 

@@ -99,12 +99,13 @@ class Order
 
             $result = Dever::load('func/api', 'connect')->run(1, $info['cate_id'], $channel, $param);

             $result = Dever::load('func/api', 'connect')->run(1, $info['cate_id'], $channel, $param);

         } elseif ($channel['type'] == 2) {

         } elseif ($channel['type'] == 2) {

             # 获取卡密并占用

             # 获取卡密并占用

+            $param['seller_id'] = array('in', '-1,' . $info['seller_id']);

             $param['channel_id'] = $channel['id'];

             $param['channel_id'] = $channel['id'];

             $param['goods_id'] = $info['goods_id'];

             $param['goods_id'] = $info['goods_id'];

             $param['sku_id'] = $info['sku_id'];

             $param['sku_id'] = $info['sku_id'];

             $param['status'] = 1;

             $param['status'] = 1;

             $param['use_status'] = 1;

             $param['use_status'] = 1;

-            $card = Dever::db('card', 'channel')->select($param, array('limit' => '0, ' . $info['num']), true);

+            $card = Dever::db('card', 'channel')->select($param, array('order' => 'seller_id desc','limit' => '0, ' . $info['num']), true);

             $total = count($card);

             $total = count($card);

             if ($total < $info['num']) {

             if ($total < $info['num']) {

                 return $this->notify($info, '卡密剩余数量不足', $update);

                 return $this->notify($info, '卡密剩余数量不足', $update);

+ 1 - 1
src/dai/seller/table/manage/order_list.php
View File 

@@ -79,7 +79,7 @@ return array
 
         'export' => array

         'export' => array

         (

         (

             'out' => '导出',

             'out' => '导出',

-            'seller/manage.outKm' => '导出卡密',

+            //'seller/manage.outKm' => '导出卡密',

         ),

         ),

         'search' => array

         'search' => array

         (

         (

+ 1 - 1
src/dai/seller/table/manage/order_log_list.php
View File 

@@ -73,7 +73,7 @@ return array
 
         'export' => array

         'export' => array

         (

         (

             'out' => '导出',

             'out' => '导出',

-            'seller/manage.outKm' => '导出卡密',

+            //'seller/manage.outKm' => '导出卡密',

         ),

         ),

         'search' => array

         'search' => array

         (

         (

+ 2 - 2
src/dai/seller/table/manage/order_push.php
View File 

@@ -19,14 +19,14 @@ return array
 
                 # 仅显示最后一级

                 # 仅显示最后一级

                 //'all' => false,

                 //'all' => false,

                 //'option'    => 'Dever::call("goods/manage.getGoods")',

                 //'option'    => 'Dever::call("goods/manage.getGoods")',

-                'remote' => 'goods/manage.getSku',

+                'remote' => 'seller/manage.getSku',

                 # 无需默认值

                 # 无需默认值

                 'remote_default' => false,

                 'remote_default' => false,

                 'rules' => true,

                 'rules' => true,

             ),

             ),

             'goods_id' => array

             'goods_id' => array

             (

             (

-                'name' => '规格',

+                'name' => '商品',

                 'type' => 'hidden',

                 'type' => 'hidden',

                 'rules' => true,

                 'rules' => true,

             ),

             ),

+ 7 - 2
src/dai/seller/table/manage/seller_order_list.php
View File 

@@ -18,7 +18,12 @@ return array
 
                 'width' => '230',

                 'width' => '230',

                 'show' => '"{order_num}" ? "{order_num}" : "-"',

                 'show' => '"{order_num}" ? "{order_num}" : "-"',

             ),

             ),

-            'account',

+            'account' => array

+            (

+                'show' => 'Dever::load("manage", "seller")->showOrderAccount("{account}")',

+                'type' => 'show',

+                'remote' => 'seller/manage.showOrderExpandKm',

+            ),

             /*

             /*

             'cash' => array

             'cash' => array

             (

             (

@@ -76,7 +81,7 @@ return array
 
         ),

         ),

         'export' => array

         'export' => array

         (

         (

-            'seller/manage.outKm' => '导出卡密',

+            //'seller/manage.outKm' => '导出卡密',

             //'out' => '导出',

             //'out' => '导出',

             //'manage/common.out' => '自定义导出',

             //'manage/common.out' => '自定义导出',

         ),

         ),

+ 1 - 1
src/dai/seller/table/manage/seller_order_log_list.php
View File 

@@ -74,7 +74,7 @@ return array
 
         ),

         ),

         'export' => array

         'export' => array

         (

         (

-            'seller/manage.outKm' => '导出卡密',

+            //'seller/manage.outKm' => '导出卡密',

             //'out' => '导出',

             //'out' => '导出',

             //'manage/common.out' => '自定义导出',

             //'manage/common.out' => '自定义导出',

         ),

         ),

+ 2 - 2
src/dai/seller/table/manage/seller_order_push.php
View File 

@@ -27,14 +27,14 @@ return array
 
                 # 仅显示最后一级

                 # 仅显示最后一级

                 //'all' => false,

                 //'all' => false,

                 //'option'    => 'Dever::call("goods/manage.getGoods")',

                 //'option'    => 'Dever::call("goods/manage.getGoods")',

-                'remote' => 'goods/manage.getSku',

+                'remote' => 'seller/manage.getSku',

                 # 无需默认值

                 # 无需默认值

                 'remote_default' => false,

                 'remote_default' => false,

                 'rules' => true,

                 'rules' => true,

             ),

             ),

             'goods_id' => array

             'goods_id' => array

             (

             (

-                'name' => '规格',

+                'name' => '商品',

                 'type' => 'hidden',

                 'type' => 'hidden',

                 'rules' => true,

                 'rules' => true,

             ),

             ),

+ 1 - 1
src/dai/seller/table/order.php
View File 

@@ -15,7 +15,7 @@ return array
 
 

 

         'account' => array

         'account' => array

         (

         (

-            'name'      => '充值账号',

+            'name'      => '账号',

             'type'      => 'varchar(100)',

             'type'      => 'varchar(100)',

         ),

         ),

+ 38 - 0
src/dai/seller/table/order_km.php
View File 

@@ -0,0 +1,38 @@
 
+<?php

+return array

+(

+    'name' => '订单卡密提取记录表',

+    'struct' => array

+    (

+        'seller_id' => array

+        (

+            'name'      => '商户',

+            'type'      => 'int(11)',

+            'value'     => 'seller/info',

+        ),

+

+        'order_id' => array

+        (

+            'name'      => '订单',

+            'type'      => 'int(11)',

+        ),

+

+        'admin_id' => array

+        (

+            'name'      => '管理员id',

+            'type'      => 'int(11)',

+        ),

+

+        'system_id' => array

+        (

+            'name'      => '系统id',

+            'type'      => 'int(11)',

+        ),

+

+        'admin_name' => array

+        (

+            'name'      => '管理员名称',

+            'type'      => 'varchar(100)',

+        ),

+    ),

+);

Some files were not shown because too many files changed in this diff