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

application/models/Business/Order/RefundService.php

@@ -209,7 +209,7 @@ class RefundServiceModel extends \Business\AbstractModel
      * 退货审核页
      *
      */
-    public function returnGoods($storeId,$refundId,$sellerState,$sellerMessage,$isGiveUp=ApiConst::zero) {
+    public function returnGoods($storeId,$refundId,$sellerState,$refundAmount,$sellerMessage,$isGiveUp=ApiConst::zero) {
         $refundReturnDao = \DAO\Order\RefundReturnModel::getInstance(DbNameConst::masterDBConnectName);
         $orderDao=\DAO\Order\OrderModel::getInstance(DbNameConst::masterDBConnectName);
         $orderGoodsDao=\DAO\Order\OrderGoodsModel::getInstance(DbNameConst::masterDBConnectName);
@@ -282,12 +282,14 @@ class RefundServiceModel extends \Business\AbstractModel
                 $refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货
                 $refund_array['goods_state']=2;
             } elseif ($refund_array['seller_state'] == '3') {
+
                 $refund_array['refund_state'] = '3';//状态:1为处理中,2为待管理员处理,3为已完成
             } else {
                 $refund_array['seller_state'] = '2';
                 $refund_array['refund_state'] = '2';
                 $refund_array['return_type'] = '1';//选择弃货
             }
+            $refund_array['refund_amount']=$refundAmount;
             $state = $refundReturnDao->update($condition, $refund_array);
             if ($state) {
                 $sellerLogDao=\DAO\SellerLogModel::getInstance(DbNameConst::masterDBConnectName);
@@ -350,7 +352,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,$seller_state,$text,$isGiveUp)){
+            if($this->returnGoods($storeId,$refundId,$refund['sellerState'],$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']));