Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/models/DAO/Order/RefundReturn.php

@@ -82,10 +82,10 @@ class RefundReturnModel extends \DAO\AbstractModel {
             $this->errorCode=CodeConfigModel::isNotExpressType;
             $isReturn=FALSE;
         }
-        if($refundReturn['addressId']>ApiConst::zero){
-            $this->errorCode=CodeConfigModel::isNotExpressType;
-            $isReturn=FALSE;
-        }
+//        if($refundReturn['addressId']>ApiConst::zero){
+//            $this->errorCode=CodeConfigModel::isNotExpressType;
+//            $isReturn=FALSE;
+//        }
         return $isReturn;
     }
     /**
@@ -187,7 +187,8 @@ class RefundReturnModel extends \DAO\AbstractModel {
      * @return array
      */
     public function isPlatformIn($refundInfo){
-           if(($refundInfo['isPlatformIn']==ApiConst::platNotIn&&$refundInfo['sellerState']==ApiConst::refundSellerRefuse) || $refundInfo['buyerRefundAmount']>$refundInfo['refundAmount']){
+
+           if(($refundInfo['isPlatformIn']==ApiConst::platNotIn && $refundInfo['sellerState']==ApiConst::refundSellerRefuse) || $refundInfo['buyerRefundAmount']>$refundInfo['refundAmount']){
                 return TRUE;
            }else{
                return FALSE;