Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/models/Business/Order/RefundService.php

@@ -83,8 +83,8 @@ class RefundServiceModel extends \Business\AbstractModel
      * @param $receiveTime
      */
     public function setReceiveTime($storeId, $refundId, $receiveTime) {
-        $dtime = strtotime($receiveTime);
-        if($receiveTime<TIMESTAMP){
+        $receiveTime = strtotime($receiveTime);
+        if($receiveTime < TIMESTAMP){
             ErrorModel::throwException(CodeConfigModel::commonError);
         }
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
@@ -109,7 +109,7 @@ class RefundServiceModel extends \Business\AbstractModel
      * @param $returnId
      * @param int $goodsState
      */
-    public function receive($storeId, $returnId, $goodsState= 4)
+    public function receive($storeId, $sellerId, $sellerName, $returnId, $goodsState= 4)
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
@@ -134,13 +134,17 @@ class RefundServiceModel extends \Business\AbstractModel
         }
         $refundReturnDao->db->doTransaction();
         $state = $refundReturnDao->editRefundReturn($whereRefund, $refund_array);
+
         if($state){ //退款记录成功
-//            $this->recordSellerLog('退货确认收货，退货编号：'.$return['refund_sn']);
+            //记录操作日志
+            $sellerLogDAO = \DAO\SellerLogModel::getInstance();
+            $sellerLogDAO->record('退货确认收货，退货编号：'.$refund['refund_sn'], array('seller_id'=>$sellerId, 'seller_name'=>$sellerName, 'store_id'=>$storeId));
+
             if($refund_array['goods_state'] == 4) { //同意
                 // add by ky start
                 //检测该店铺是否开启直接退款功能
                 $storeDAO = \DAO\StoreModel::getInstance();
-                $is_direct_refund = $storeDAO->getInfoById($storeId, 'is_direct_refund', true);
+                $is_direct_refund = $storeDAO->getInfoById($storeId, 'is_direct_refund', 'is_direct_refund');
                 if($is_direct_refund==1) {   //支持直接退款
                     //获取订单
                     $order_id = $refund['order_id'];
@@ -174,8 +178,9 @@ class RefundServiceModel extends \Business\AbstractModel
                     }
                 }
             }
+            \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
             $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
-            $orderDao->deleteOrderCache($refund['buyer_id'],$refund['order_id'],$refund['store_id']);
+            $orderDao->deleteOrderCache($refund['buyer_id'], $refund['order_id'], $refund['store_id']);
             $refundReturnDao->db->doCommit();
             return true;
         }
@@ -191,7 +196,7 @@ class RefundServiceModel extends \Business\AbstractModel
      * @param $refundAmount 退款金额
      * @param string $text 退款消息
      */
-    public function refund($storeId, $refundId, $refundAmount = 0, $text = '', $seller_state = 2)
+    public function refund($storeId, $sellerId, $sellerName, $refundId, $refundAmount = 0, $text = '', $seller_state = 2)
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
@@ -236,6 +241,10 @@ class RefundServiceModel extends \Business\AbstractModel
                 return false;
             }
             //$this->recordSellerLog('退款处理，退款编号：'.$refund['refund_sn']);    //待确认
+            //记录操作日志
+            $sellerLogDAO = \DAO\SellerLogModel::getInstance();
+            $sellerLogDAO->record('拒绝退款处理，退款编号：'.$refund['refund_sn'], array('seller_id'=>$sellerId, 'seller_name'=>$sellerName, 'store_id'=>$storeId));
+
             $refundReturnDao->deleteRefundCache($refund['buyer_id'], $refund['refund_id']);
             $orderDao->deleteOrderCache($refund['buyer_id'],$refund['order_id'],$refund['store_id']);
             \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
@@ -259,7 +268,9 @@ class RefundServiceModel extends \Business\AbstractModel
 
         $state = $refundReturnDao->editRefundReturn($whereRefund, $refund_array);
         if($state){ //退款记录成功
-            //$this->recordSellerLog('退款处理，退款编号：'.$refund['refund_sn']);    //待确认
+            //记录操作日志
+            $sellerLogDAO = \DAO\SellerLogModel::getInstance();
+            $sellerLogDAO->record('同意退款处理，退款编号：'.$refund['refund_sn'], array('seller_id'=>$sellerId, 'seller_name'=>$sellerName, 'store_id'=>$storeId));
 
             // add by ky start
             //检测该店铺是否开启直接退款功能

application/models/DAO/SellerLog.php

+<?php
+
+namespace DAO;
+/**
+ * 卖家操作日志
+ * Class SellerLogModel
+ * @package DAO
+ */
+class SellerLogModel extends \DAO\AbstractModel {
+
+
+    private $logField = 'log_content as logContent , log_time as logTime';
+    /**
+     * 表名
+     *
+     * @var string
+     */
+    protected $_tableName = 'han_seller_log';
+
+    /**
+     * 主键
+     *
+     * @var string
+     */
+    protected $_primaryKey = 'log_id';
+    public function init(){
+
+    }
+
+    public function insert($param){
+        $param['log_time'] =TIMESTAMP;
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        return $this->db->insert($this->_tableName)->rows($param)->execute();
+    }
+
+    /**
+     * 记录操作日志
+     * @param $content
+     * @param int $state
+     * @param array $seller
+     * @return mixed
+     */
+    public function record($content, $seller = array(), $state = 1){
+        $seller_info = array();
+        $seller_info['log_content'] = $content;
+        $seller_info['log_time'] = TIMESTAMP;
+        $seller_info['log_seller_id'] = $seller['seller_id'];
+        $seller_info['log_seller_name'] = $seller['seller_name'];
+        $seller_info['log_store_id'] = $seller['store_id'];
+        $seller_info['log_seller_ip'] = $_SERVER['REMOTE_ADDR'];
+        $seller_info['log_url'] = $_SERVER['REQUEST_URI'];
+        $seller_info['log_state'] = $state;
+        return $this->insert($seller_info);
+    }
+
+    public function getList($where){
+        $this->setDb($this->dbName);
+        if(is_array($where)){
+            $where=$this->db->getSqlWhereByArray($where);
+        }
+        $result = $this->db->select($this->logField)->from($this->_tableName)->where($where)->fetchAll();
+        return $result;
+    }
+
+
+    /**
+     * 类实例
+     *
+     * @var \DAO\UserModel
+     */
+    private static $_instance = null;
+
+    /**
+     * 获取类实例
+     *
+     * @return \DAO\UserModel
+     */
+    public static function getInstance($dbName=\Our\DbNameConst::salveDBConnectName) {
+        if (!(self::$_instance instanceof self)) {
+            self::$_instance = new self($dbName);
+        }
+
+        return self::$_instance;
+    }
+
+}

application/modules/Client/controllers/Shopkeeper.php

@@ -259,7 +259,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $refundService=\Business\Order\RefundServiceModel::getInstance();
         $refundAmount = floatval($this->req['data']['refundAmount']);
         $text = trim($this->req['data']['text']);
-        $res = $refundService->refund($this->storeId, $refundId,$refundAmount, $text);
+        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId, $refundAmount, $text);
         $this->success($res);
     }
 
@@ -273,7 +273,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         }
         $refundService=\Business\Order\RefundServiceModel::getInstance();
         $text = trim($this->req['data']['text']);
-        $res = $refundService->refund($this->storeId, $refundId,0, $text, 3);
+        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId,0, $text, 3);
         $this->success($res);
     }
 
@@ -288,7 +288,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         }
         $refundService=\Business\Order\RefundServiceModel::getInstance();
         $goodsState= intval($this->req['data']['goodsState']);
-        $res = $refundService->receive($this->storeId, $refundId, $goodsState);
+        $res = $refundService->receive($this->storeId, $this->sellerId, $this->sellerName, $refundId, $goodsState);
         $this->success($res);
 
     }

conf/application.ini

@@ -472,8 +472,8 @@ password.key='~!@#$`1234qwertasdfgzxcvb'
 
 ;redis.database.params.password = "test"
 ;推送配置
-push.clientHost="ws://192.168.80.18:9502"
-push.host="192.168.80.18"
+push.clientHost="ws://127.0.0.1:9502"
+push.host="127.0.0.1"
 push.port="9503"
 push.open=1
 push.user.service.id=293