pc

application/library/Our/OrderConst.php

@@ -37,9 +37,13 @@ class OrderConst {
     const sellerRefuse="卖家不同意退款";
     const waitVerify="待商家确认";
     const sellerAgree="卖家同意退款";
+    const sellerAgreeReturn="卖家同意退款,货无需回收";
+    const alreadyReufndMoney="已退款";
     const sellerRefuseGoods="商家已拒绝";
-    const sellerAgreeGoods="已退款";
+   // const sellerAgreeGoods="已退款";
     const waitSellerRecieve='待收货';
+    const goodsStateUnRecieve='未收到货';
+    const goodsStateRecieved='已收货';
     //订单列表描述信息
     const unpayMessage="10分钟后未付款自动取消订单";
     const payCancelMessage="付款后10分钟可取消订单";

application/models/Business/Order/RefundService.php

@@ -443,7 +443,7 @@ class RefundServiceModel extends \Business\AbstractModel
             $orderCommons = $orderCommonDao->getAllByOrderIds($orderIds, $orderCommonDao->orderCommonField);
             $orderCommons=$orderDao->convertOrder($orderCommons,'orderId');
             foreach ($refundMerge as &$value) {
-                $value['stateName'] = $refundReturnDao->getRefundTextStatus($value);
+                $value['stateName'] = $refundReturnDao->getRefundTextStatus($value,true);
                 /*$value['blId'] = isset($value['blId']) ? (!is_null($value['blId']) ? $value['blId'] : ApiConst::zero) : ApiConst::zero;
                 $value['canPlatformIn'] = $refundReturnDao->isPlatformIn($value) ? ApiConst::one : ApiConst::zero;
                 $value['canSendShippingType'] = $refundReturnDao->checkIsAddReturnShipping($value) ? ApiConst::one : ApiConst::zero;*/

application/models/DAO/Order/RefundReturn.php

@@ -163,26 +163,36 @@ class RefundReturnModel extends \DAO\AbstractModel {
         return $this->getAll($where,$field);
     }
 
-    public function getStatusExtent($returnRefund){
+    public function getStatusExtent($returnRefund,$isSeller=false){
       //  if($returnRefund['refundState']!=ApiConst::refundCompleted){
             if($returnRefund['sellerState']==ApiConst::refundSellerAgree){
                 if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
-                    return OrderConst::refoundSuccess;
+                    return OrderConst::alreadyReufndMoney;
                 }
                 if($returnRefund['refundType']==ApiConst::refundTypeMoney){
                     return OrderConst::sellerAgree;
                 }
                 if($returnRefund['refundType']==ApiConst::refundTypeGoods){
                     if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
-                        return OrderConst::sellerAgreeGoods;
-                    }else{
+                        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['sellerState']==ApiConst::refundSellerRefuse){
                 if($returnRefund['isSucRefund']==ApiConst::refundSuccess){
-                    return OrderConst::refoundSuccess;
+                    return OrderConst::alreadyReufndMoney;
                 }
                 if($returnRefund['platformState']==ApiConst::platAgree){
                     return OrderConst::platFormAgree;
@@ -204,15 +214,15 @@ class RefundReturnModel extends \DAO\AbstractModel {
 //        }else{
 //                return OrderConst::refoundSuccess;
 //        }
-
+        return '';
 
     }
-    public function getRefundTextStatus($refundReturn){
+    public function getRefundTextStatus($refundReturn,$isSeller=false){
         $refundText='';
         switch($refundReturn['sellerState']){
             case ApiConst::refundSellerVerify:$refundText=OrderConst::waitVerify;break;
-            case ApiConst::refundSellerAgree:$refundText=$this->getStatusExtent($refundReturn);break;
-            case ApiConst::refundSellerRefuse:$refundText=$this->getStatusExtent($refundReturn);break;
+            default: $refundText=$this->getStatusExtent($refundReturn,$isSeller);break;
+
         }
 
         return $refundText;