master_dev

application/models/Business/Order/RefundService.php

@@ -290,6 +290,7 @@ class RefundServiceModel extends \Business\AbstractModel
             if ($refund_array['seller_state'] == '2' && !$isGiveUp) {
                 $refund_array['return_type'] = '2';//退货类型:1为不用退货,2为需要退货
                 $refund_array['goods_state']=2;
+                $refund_array['refund_state']=ApiConst::refundStateProccess;
             } elseif ($refund_array['seller_state'] == '3') {
 
                 $refund_array['refund_state'] = ApiConst::refundStateComplete;//状态:1为处理中,2为待管理员处理,3为已完成
@@ -325,12 +326,11 @@ class RefundServiceModel extends \Business\AbstractModel
 //                            showDialog('refund_state_name',$reload,'error');
                             return false;
                         }
-                    }else{
-                        if(!in_array($payment_type,array(0,2))){
-                            $refund_array['refund_state']=ApiConst::refundStateProccess;
-                        }
                     }
                 }
+                if(in_array($payment_type,array(0,2))){
+                    $refund_array['refund_state']=ApiConst::refundStateProccess;
+                }
             }
             $refund_array['refund_amount']=$refundAmount;
             $state = $refundReturnDao->update($condition, $refund_array);
@@ -492,7 +492,7 @@ class RefundServiceModel extends \Business\AbstractModel
                     ErrorModel::throwException(CodeConfigModel::refundAddPointsLogError);
                 }
             }
-            $refund_array['refund_state'] = ApiConst::platProccess;    //状态:1为处理中,2为待管理员处理,3为已完成
+            $refund_array['refund_state'] = ApiConst::refundStateProccess;    //状态:1为处理中,2为待管理员处理,3为已完成
 
             $state = $refundReturnDao->editRefundReturn($whereRefund, $refund_array);
             if($state){ //退款记录成功
@@ -525,6 +525,8 @@ class RefundServiceModel extends \Business\AbstractModel
                                 $updateData = array('is_suc_refund'=>1,'gmt_update'=>TIMESTAMP);
                             }
                         }
+                    }else{
+                        $updateData = array('is_suc_refund'=>ApiConst::zero,'gmt_update'=>TIMESTAMP,'seller_state'=>$refund_array['seller_state'],'refund_state'=>ApiConst::refundStateProccess);
                     }
                     $res=$refundReturnDao->update(array('refund_id'=>$refund['refund_id']), $updateData);
                     if(!$res){