version

application/models/Business/Order/OrderService.php

@@ -291,12 +291,15 @@ class OrderServiceModel extends \Business\AbstractModel
             $returnData['diliverymanId'] = ApiConst::zero;
             $returnData['deliveryman'] = new \stdClass();
         }
-        if(!in_array($this->order['paymentType'],ArrayConst::payTypeOnlines)){
-            $returnData['offlinePayway']=$storeDao->convertOfflinePayway($this->store['offlinePayway']);
+
+        if(CURRENTVERSION!=NameConst::versionDefault){
+            if(!in_array($this->order['paymentType'],ArrayConst::payTypeOnlines)){
+                $returnData['offlinePayway']=$storeDao->convertOfflinePayway($this->store['offlinePayway']);
+            }else{
+                $returnData['offlinePayway']=new \stdClass();
+            }
+
         }else{
-            $returnData['offlinePayway']=new \stdClass();
-        }
-        if(CURRENTVERSION!=NameConst::versionOne){
             $returnData['offlinePayway']='';
         }
 

application/models/DAO/Order/RefundReturn.php

@@ -389,7 +389,7 @@ class RefundReturnModel extends \DAO\AbstractModel
         $param['refundFee'] = $orderInfo['refund_amount'];//退款金额
         $param['storeId'] = $orderInfo['store_id'];
         $param['buyerId'] = $orderInfo['buyer_id'];
-        if (CURRENTVERSION == \Our\NameConst::versionOne && in_array(intval($orderInfo['payment_type']), array(ApiConst::wxAppPayType, ApiConst::wxProgram))) {
+        if (CURRENTVERSION != \Our\NameConst::versionDefault && in_array(intval($orderInfo['payment_type']), array(ApiConst::wxAppPayType, ApiConst::wxProgram))) {
             $mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']);
             if ($mchIdArray['errorCode'] > 0) {
                 $this->errorMessage = '微信支付商户错误或者签名错误';
@@ -444,7 +444,7 @@ class RefundReturnModel extends \DAO\AbstractModel
         $param['refundFee'] = $orderInfo['orderAmount'];//全额退款
         $param['storeId'] = $orderInfo['storeId'];
         $param['buyerId'] = $orderInfo['buyerId'];
-        if (CURRENTVERSION == \Our\NameConst::versionOne && in_array(intval($orderInfo['paymentType']), array(\Our\ApiConst::wxAppPayType, \Our\ApiConst::wxProgram))) {
+        if (CURRENTVERSION != \Our\NameConst::versionDefault && in_array(intval($orderInfo['paymentType']), array(\Our\ApiConst::wxAppPayType, \Our\ApiConst::wxProgram))) {
             $mchIdArray = \DAO\StoreModel::getInstance()->getStoreWxMchId($param['storeId']);
             if ($mchIdArray['errorCode'] > 0) {
                 $this->errorMessage = '微信支付商户错误或者签名错误';