rabin 7 mesiacov pred
rodič
commit
ff5e406868

+ 1 - 1
src/dai/channel/table/manage/card.php

@@ -20,7 +20,7 @@ return array
             'goods' => array
             (
                 'name' => '商品',
-                'show' => 'Dever::load("manage", "goods")->showGoodsInfo("{goods}", "{goods_id}", "{sku_id}")',
+                'show' => 'Dever::load("manage", "goods")->showGoodsInfo("{goods_id}", "{sku_id}")',
             ),
             'number' => array
             (

+ 1 - 1
src/dai/seller/api/Manage.php

@@ -255,7 +255,7 @@ class Manage extends Auth
         $mail->SMTPAuth = true;
         $mail->Username = $config['email_user'];
         $mail->Password = $config['email_pass'];
-        $mail->setFrom($config['email_user'], 'API充值系统');
+        $mail->setFrom($config['email_user'], 'kaibihe');
         $mail->addAddress($email, $username);
         $mail->Subject = "=?utf-8?B?" . base64_encode($title) . "?=";
         $mail->Body = $content;

+ 3 - 2
src/dai/seller/lib/Manage.php

@@ -544,13 +544,14 @@ class Manage extends Auth
     public function outKm($data)
     {
         $result = array();
-        $result['head'] = array('订单id', '订单号', '面值', '卡号', '密码', '导出时间');
+        $result['head'] = array('订单id', '订单号', '商品', '面值', '卡号', '密码', '导出时间');
         $result['body'] = array();
         foreach ($data['body'] as $k => $v) {
+            $goods_name = Dever::load("manage", "goods")->showGoodsInfo($v['goods_id'], $v['sku_id']);
             $card = Dever::db('card', 'channel')->select(array('order_id' => $v['id']));
             if ($card) {
                 foreach ($card as $k1 => $v1) {
-                    $result['body'][] = array($v['id'], $v['order_num'], $v['cash'], $v1['number'], $v1['pwd'], date('Y-m-d H:i:s'));
+                    $result['body'][] = array($v['id'], $v['order_num'], $goods_name, $v['cash'], $v1['number'], $v1['pwd'], date('Y-m-d H:i:s'));
                 }
             }
         }

+ 2 - 2
src/yuan/goods/lib/Manage.php

@@ -119,8 +119,8 @@ class Manage extends Auth
         return $cate;
     }
 
-    # 展示订单金额
-    public function showGoodsInfo($goods, $goods_id, $sku_id)
+    # 展示商品名称
+    public function showGoodsInfo($goods_id, $sku_id)
     {
         $goods = Dever::db('info', 'goods')->find($goods_id);
         $sku = Dever::db('info_sku', 'goods')->find($sku_id);