Merge branch 'master_dev' of http://git.shenbd.com/api-project-dev/api.shenbd.com

application/models/Business/Order/RefundService.php

@@ -168,6 +168,9 @@ class RefundServiceModel extends \Business\AbstractModel
                         }
                     }
                     $refundUpdate = array('gmt_update' => TIMESTAMP, 'refund_state' => 3);
+                    if($refund['is_suc_refund']!=ApiConst::refundSuccess){
+                        $refundUpdate['refund_state']=ApiConst::refundStateProccess;
+                    }
                     $res = $refundReturnDao->update(array('refund_id' => $refund['refund_id']), $refundUpdate);
                     if (!$res) {
                         ErrorModel::throwException(CodeConfigModel::refundWriteError);

application/models/DAO/Order/RefundReturn.php

@@ -212,8 +212,37 @@ class RefundReturnModel extends \DAO\AbstractModel
 
     public function getStatusExtent($returnRefund, $isSeller = false)
     {
+//        //  if($returnRefund['refundState']!=ApiConst::refundCompleted){
+//        if ($returnRefund['sellerState'] == ApiConst::refundSellerAgree) {
+//            if ($returnRefund['refundState'] == ApiConst::refundCompleted) {
+//                return OrderConst::complete;
+//            }
+//            if ($returnRefund['refundType'] == ApiConst::refundTypeMoney) {
+//                return OrderConst::sellerAgree;
+//            }
+//            if ($returnRefund['refundType'] == ApiConst::refundTypeGoods) {
+//                if ($returnRefund['isSucRefund'] == ApiConst::refundSuccess) {
+//                    return OrderConst::alreadyReufndMoney;
+//                }
+//                if ($returnRefund['goodsState'] == ApiConst::goodsStateUnRecieve) {
+//                    return OrderConst::goodsStateUnRecieve;
+//                }
+//                if ($returnRefund['goodsState'] == ApiConst::goodsStateRecieved) {
+//                    return OrderConst::goodsStateRecieved;
+//                }
+//                if ($returnRefund['returnType'] == ApiConst::returnTypeNotReturn) {
+//                    return OrderConst::sellerAgreeReturn;
+//                }
+//                if ($returnRefund['returnType'] == ApiConst::returnTypeMustReturn) {
+//                    return OrderConst::waitSellerRecieve;
+//                }
+//            }
+//        }
         //  if($returnRefund['refundState']!=ApiConst::refundCompleted){
         if ($returnRefund['sellerState'] == ApiConst::refundSellerAgree) {
+            if ($returnRefund['refundState'] == ApiConst::refundCompleted) {
+                return OrderConst::complete;
+            }
             if ($returnRefund['isSucRefund'] == ApiConst::refundSuccess) {
                 return OrderConst::alreadyReufndMoney;
             }