pc

application/models/Business/Order/RefundService.php

@@ -346,7 +346,7 @@ class RefundServiceModel extends \Business\AbstractModel
      * @param $refundAmount 退款金额
      * @param string $text 退款消息
      */
-    public function refund($storeId, $sellerId, $sellerName, $refundId,$sellerState, $refundAmount = 0, $text = '', $seller_state = 2,$isGiveUp=ApiConst::zero)
+    public function refund($storeId, $sellerId, $sellerName, $refundId, $refundAmount = 0, $text = '', $seller_state = 2,$isGiveUp=ApiConst::zero)
     {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDao = \DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
@@ -356,7 +356,7 @@ class RefundServiceModel extends \Business\AbstractModel
         $whereRefund['refund_id']= $refundId;
         $refund = $refundReturnDao->find($whereRefund);
         if($refund['refund_type']==ApiConst::refundTypeGoods){
-            if($this->returnGoods($storeId,$refundId,$sellerState,$refundAmount,$text,$isGiveUp)){
+            if($this->returnGoods($storeId,$refundId,$seller_state,$refundAmount,$text,$isGiveUp)){
                 $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']));

application/modules/Client/controllers/Shopkeeper.php

@@ -260,7 +260,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         $refundAmount = floatval($this->req['data']['refundAmount']);
         $text = trim($this->req['data']['text']);
         $isGiveUp=$this->req['data']['isGiveUp']?$this->req['data']['isGiveUp']:\Our\ApiConst::zero;
-        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId, \Our\ApiConst::refundSellerAgree,$refundAmount, $text,\Our\ApiConst::refundSellerAgree,$isGiveUp);
+        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId,$refundAmount, $text,\Our\ApiConst::refundSellerAgree,$isGiveUp);
         if($res){
             $this->success('操作成功');
         }
@@ -278,7 +278,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
         }
         $refundService=\Business\Order\RefundServiceModel::getInstance();
         $text = trim($this->req['data']['text']);
-        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId,0, $text, 3);
+        $res = $refundService->refund($this->storeId, $this->sellerId, $this->sellerName, $refundId,\Our\ApiConst::zero,$text,\Our\ApiConst::refundSellerRefuse);
         $this->success($res);
     }