pc

application/models/Business/Order/RefundService.php

@@ -233,15 +233,16 @@ class RefundServiceModel extends \Business\AbstractModel
             $refund_array['seller_time'] = TIMESTAMP;
             $refund_array['seller_state'] =$sellerState;//卖家处理状态:1为待审核,2为同意,3为不同意
             $refund_array['seller_message'] =$sellerMessage;
-            //如果卖家不同意退款回写is_refund
-            if($return['refund_type']==ApiConst::refundTypeGoods && !$isGiveUp){
+
+            if($return['refund_type']==ApiConst::refundTypeGoods && !$isGiveUp && $sellerState==ApiConst::refundSellerAgree){
                 $waitRefundReceiveCount=ApiConst::one;
                 $refundCount=ApiConst::zero;
             }else{
                 $waitRefundReceiveCount=ApiConst::zero;
                 $refundCount=ApiConst::reduceOne;
             }
-            if ($refund_array['seller_state'] != '2'){
+            //如果卖家不同意退款回写is_refund
+            if ($sellerState != '2'){
                 $orderGoodsUpdateData['is_refund']=ApiConst::zero;
                 $orderGoodsUpdateData['refund_state_name']=DescribeConst::sellerRefuseReturn;
                 $orderGoodsUpdateData['gmt_update']=TIMESTAMP;
@@ -482,6 +483,21 @@ class RefundServiceModel extends \Business\AbstractModel
                 \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(),  array(&$refundReturnDao, 'getList'), array(), array($refund['store_id']));
                 $storeDao->deleteStoreCache($refund['store_id'],$refund['order_id']);
                 $storeDao->deleteStoreRefundCache($refund['store_id'],$refund['order_id']);
+                $push=\Our\Push::getInstance();
+                $pushData=array('storeId'=>$order_info['storeId'],
+                    'type'=>ApiConst::messageRefund,
+                    'waitReceiveCount'=>ApiConst::zero,
+                    'waitDeliveryCount'=>ApiConst::zero,
+                    'waitGetCount'=>ApiConst::zero,
+                    'orderCount'=>ApiConst::zero,
+                    'waitRefundProccessCount'=>ApiConst::reduceOne,
+                    'waitRefundReceiveCount'=>ApiConst::zero,
+                    'refundCount'=>ApiConst::zero,
+                    'alertCount'=>ApiConst::zero,
+                    'params'=>array('c'=>'shopkeeper',
+                        'm'=>'orderDetail',
+                        'refundId'=>$refund['refund_id']));
+                $push->addOneToClient($pushData);
                 return true;
             }
             $refundReturnDao->db->doRollback();