pc

application/models/Business/Order/RefundService.php

@@ -218,6 +218,13 @@ class RefundServiceModel extends \Business\AbstractModel
             $refund_array['seller_state'] =$sellerState;//卖家处理状态:1为待审核,2为同意,3为不同意
             $refund_array['seller_message'] =$sellerMessage;
             //如果卖家不同意退款回写is_refund
+            if($return['refund_type']==ApiConst::refundTypeGoods && !$isGiveUp){
+                $waitRefundReceiveCount=ApiConst::one;
+                $refundCount=ApiConst::zero;
+            }else{
+                $waitRefundReceiveCount=ApiConst::zero;
+                $refundCount=ApiConst::reduceOne;
+            }
             if ($refund_array['seller_state'] != '2'){
                 $orderGoodsUpdateData['is_refund']=ApiConst::zero;
                 $orderGoodsUpdateData['refund_state_name']=DescribeConst::sellerRefuseReturn;
@@ -227,13 +234,7 @@ class RefundServiceModel extends \Business\AbstractModel
                 if(!$result){
                     ErrorModel::throwException(CodeConfigModel::updateIsRefundFail);
                 }
-                if($return['refund_type']==ApiConst::refundTypeGoods && !$isGiveUp){
-                    $waitRefundReceiveCount=ApiConst::one;
-                    $refundCount=ApiConst::zero;
-                }else{
-                    $waitRefundReceiveCount=ApiConst::zero;
-                    $refundCount=ApiConst::reduceOne;
-                }
+
                 $push=\Our\Push::getInstance();
                 $pushData=array('storeId'=>$order_info['storeId'],
                     'type'=>ApiConst::messageRefund,
@@ -285,8 +286,8 @@ class RefundServiceModel extends \Business\AbstractModel
                     'waitGetCount'=>ApiConst::zero,
                     'orderCount'=>ApiConst::zero,
                     'waitRefundProccessCount'=>ApiConst::reduceOne,
-                    'waitRefundReceiveCount'=>zero,
-                    'refundCount'=>ApiConst::reduceOne,
+                    'waitRefundReceiveCount'=>$waitRefundReceiveCount,
+                    'refundCount'=>$refundCount,
                     'alertCount'=>ApiConst::zero,
                     'params'=>array('c'=>'shopkeeper',
                         'm'=>'orderDetail',