update

data/model/merchant.model.php

@@ -25,6 +25,7 @@ class merchantModel extends Model
     public function getPdlog($condition, $pagesize = '', $field = '*', $order = '', $limit = '')
     {
         $pdlog = $this->table('pd_log')->field($field)->where($condition)->page($pagesize)->order($order)->limit($limit)->select();
+        if (empty($pdlog)) return array();
         foreach ($pdlog as $key=>$value){
             if (isset($value['lg_add_time'])) {
                 $pdlog[$key]['lg_add_time'] = date('Y-m-d H:i:s', $value['lg_add_time']);
@@ -41,4 +42,21 @@ class merchantModel extends Model
         }
         return $pdlog;
     }
+    public function addRechargeApply($params){
+        return $this->table('recharge_apply')->insert($params);
+    }
+    public function getRechargeApply($condition, $pagesize = '', $field = '*', $order = '', $limit = '')
+    {
+        $list = $this->table('recharge_apply')->field($field)->where($condition)->page($pagesize)->order($order)->limit($limit)->select();
+        if (empty($list)) return array();
+        $check_status = ['申请中','已通过','已驳回'];
+        foreach ($list as $key=>$value){
+            if (isset($value['add_time'])) {
+                $list[$key]['add_time'] = date('Y-m-d H:i:s', $value['add_time']);
+            }
+            $list[$key]['status_text'] = $check_status[$value['status']-1];
+            $list[$key]['voucher_path'] = UPLOAD_SITE_URL.'/'.ATTACH_RECHARGE.DS.$value['voucher'];
+        }
+        return $list;
+    }
 }

data/model/refill_order.model.php

@@ -35,20 +35,44 @@ class refill_orderModel extends Model
     }
 
     private function merchant_order_format($orders){
-        $notify_state = ['充值成功','充值失败'];
         foreach ($orders as $key => $order) {
             if (isset($order['order_time'])) {
                 $orders[$key]['order_time'] = date('Y-m-d H:i:s', $order['order_time']);
             }
-            if (isset($order['mch_notify_times'])) {
-                $orders[$key]['mch_notify_times'] = date('Y-m-d H:i:s', $order['mch_notify_times']);
+            if (isset($order['notify_time'])) {
+                $orders[$key]['notify_time'] = date('Y-m-d H:i:s', $order['notify_time']);
             }
-            $orders[$key]['mch_notify_state'] = $notify_state[$order['mch_notify_state']-2];
+            $orders[$key]['order_state_text'] = $this->_orderState($order['state']);
             $orders[$key]['card_type_name'] = $this->scard_type($order['card_type']);
         }
         return $orders;
     }
 
+    /**
+     * 取得订单状态文字输出形式
+     *
+     * @param int $order_state 订单数组
+     * @return string
+     */
+    private function _orderState($order_state)
+    {
+        switch ($order_state) {
+            case ORDER_STATE_CANCEL:
+                $order_state_text = '已取消';
+                break;
+            case ORDER_STATE_NEW:
+                $order_state_text = '待付款';
+                break;
+            case ORDER_STATE_PAY:
+                $order_state_text = '已支付';
+                break;
+            case ORDER_STATE_SUCCESS:
+                $order_state_text = '已完成';
+                break;
+        }
+        return $order_state_text;
+    }
+
     private function scard_type(int $card_type){
         if($card_type == 1) { //
             return '中石油';
@@ -56,8 +80,14 @@ class refill_orderModel extends Model
         elseif ($card_type == 2) { //中石化
             return '中石化';
         }
-        elseif($card_type == 3) { //手机卡
-            return '手机卡';
+        elseif($card_type == 4) { //手机卡
+            return '中国移动';
+        }
+        elseif($card_type == 5) { //手机卡
+            return '中国联通';
+        }
+        elseif($card_type == 6) { //手机卡
+            return '中国电信';
         }
         else {
             return 'unknown';

global.php

@@ -63,6 +63,7 @@ define('ATTACH_MOBILE','mobile');
 define('ATTACH_CIRCLE','circle');
 define('ATTACH_CMS','cms');
 define('ATTACH_LIVE','live');
+define('ATTACH_RECHARGE','recharge');
 define('ATTACH_MALBUM', ATTACH_PATH.'/member');
 define('ATTACH_MQRCODE',ATTACH_PATH.'/qrcode');
 define('ATTACH_MINI_QRCODE',ATTACH_PATH.'/mqrcode');

mobile/control/merchant_info.php

@@ -66,6 +66,18 @@ class merchant_infoControl extends merchant_baseControl
             return self::outerr(errcode::ErrOperation, "系统错误.");
         }
     }
+    public function setkeyOp(){
+        if (!isset($_POST['secure_key'])){
+            return self::outerr(errcode::ErrParamter , "参数错误" );
+        }
+        $model_merchant = Model('merchant');
+        $ret = $model_merchant->editMerchant(array('secure_key'=>$_POST['secure_key']), array('mchid' => $_SESSION['merchant_login_id']));
+        if($ret){
+            return self::outsuccess([]);
+        }else{
+            return self::outerr(errcode::ErrOperation, "系统错误.");
+        }
+    }
     public function modifypwOp()
     {
         if (trim($_POST['new_pw']) !== trim($_POST['new_pw2'])){

mobile/control/merchant_recharge.php

@@ -0,0 +1,62 @@
+<?php
+require_once(BASE_ROOT_PATH . '/mobile/control/merchant_base.php');
+
+class merchant_rechargeControl extends merchant_baseControl
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function indexOp(){
+        $model_merchant = Model('merchant');
+        $condition = array();
+        $condition['mch_id'] = $_SESSION['mch_id'];
+        if($_GET['start_time'] && $_GET['end_time']){
+            $condition['add_time'] = ['between', [$_GET['start_time'], $_GET['end_time']]];
+        }
+        $list = $model_merchant->getRechargeApply($condition,$this->page,'*','apply_id desc',10);
+        $result['data'] = $list;
+        $result['total'] = $model_merchant->gettotalpage();
+        return self::outsuccess($result);
+    }
+
+    public function addOp(){
+        $params = $_POST;
+        if($params['amount'] == '' || $params['amount'] < 0){
+            return self::outerr(errcode::ErrParamter , "充值金额错误" );
+        }
+        if(!isset($params['bank_username']) || empty($params['bank_username'])){
+            return self::outerr(errcode::ErrParamter , "开户人姓名有误" );
+        }
+        if(!isset($params['bank_name']) || empty($params['bank_name'])){
+            return self::outerr(errcode::ErrParamter , "银行名称有误" );
+        }
+        if(!isset($params['voucher']) || empty($params['voucher'])){
+            return self::outerr(errcode::ErrParamter , "凭证名称有误" );
+        }
+        $params['mch_id'] = $_SESSION['merchant_login_id'];
+        $params['member_id'] = $_SESSION['member_id'];
+        $model_merchant = Model('merchant');
+        $ret = $model_merchant->addRechargeApply($params);
+        if($ret){
+            return self::outsuccess([]);
+        }else{
+            return self::outerr(errcode::ErrOperation, "系统错误.");
+        }
+    }
+    public function voucheruploadOp(){
+        if (!empty($_FILES['voucher']['name'])) {
+            $upload = new UploadFile();
+            $upload->set('default_dir',ATTACH_RECHARGE);
+            $result = $upload->upfile('voucher');
+            if ($result) {
+                $result['voucher'] = $upload->file_name;
+                $result['voucher_url'] = UPLOAD_SITE_URL.'/'.ATTACH_RECHARGE.DS.$upload->file_name;
+                return self::outsuccess($result);
+            }else {
+                return self::outerr(errcode::ErrParamter , "凭证有误:{$upload->error}" );
+            }
+        }
+    }
+}