refund

application/models/Business/Order/OrderService.php

@@ -883,7 +883,8 @@ class OrderServiceModel extends \Business\AbstractModel
 //                    }
 //                }
                 $orderInfo['refundOrderNo']=$refundSn;
-                if($refundReturnDao->refundMoney($orderInfo)){
+                $refundRes=$refundReturnDao->refundMoney($orderInfo);
+                if($refundRes){
                     $where['order_id']=$orderInfo['orderId'];
                     //$orderGoodsUpdateData['refund_state_name']='退款成功';
                     $orderGoodsUpdateData['is_refund']=1;
@@ -894,6 +895,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     echo $refundReturnDao->errorMessage."orderId:".$orderId;
                     return false;
                 }
+                $orderDao->update(array('order_id' =>$orderInfo['orderId']),array('order_note'=>$refundReturnDao->errorMessage));
 
 
             }
@@ -1073,10 +1075,12 @@ class OrderServiceModel extends \Business\AbstractModel
                     if ($order['paymentTime'] > ApiConst::zero && in_array($order['paymentType'], ArrayConst::orderPayTypeOnlines)) {
                         $isRefunMoney= $this->changeOrderStateCancelUnconditional($order);
                         if(!$isRefunMoney){
+
                             $orderDao->db->doRollback();
                             continue;
                         }
                     }
+
                     array_push($orderIds,$order['orderId']);
                     $this->updateOrderGoodsStoregeByOrderIds($orderIds);
                     array_push($newOrders,$order);
@@ -1085,6 +1089,7 @@ class OrderServiceModel extends \Business\AbstractModel
                     $orderDao->deleteOrderCache($order['buyerId'],(string)$order['orderId'],$order['storeId'],true);
                     $storeDao->deleteStoreCache($order['storeId'],$order['orderId']);
                     $push=\Our\Push::getInstance();
+                    echo json_encode($order);
                     $pushData=array('storeId'=>$order['storeId'],
                         'type'=>ApiConst::messageWaitReceive,
                         'waitReceiveCount'=>ApiConst::reduceOne,

application/models/DAO/Order/RefundReturn.php

@@ -474,6 +474,7 @@ class RefundReturnModel extends \DAO\AbstractModel
         $param['refundFee'] = $orderInfo['orderAmount'];//全额退款
         $param['storeId'] = $orderInfo['storeId'];
         $param['buyerId'] = $orderInfo['buyerId'];
+
         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) {
@@ -488,6 +489,10 @@ class RefundReturnModel extends \DAO\AbstractModel
             $refund_return = $wxpay->refund($param);
             $this->errorMessage = "微信返回:" . json_encode($refund_return);
             if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
+                if($refund_return['err_code_des']=='订单已全额退款' || $refund_return['err_code_des']=='订单已Q68额退款'){
+                    $this->errorMessage = date('Y-m-d') . $refund_return['err_code_des'] . $orderInfo['orderId'] . "\r\n";
+                    return true;
+                }
                 $this->errorMessage = date('Y-m-d') . '微信退款操作执行失败！' . $orderInfo['orderId'] . "\r\n";
                 return false;
             }
@@ -505,7 +510,13 @@ class RefundReturnModel extends \DAO\AbstractModel
         } else if (intval($orderInfo['paymentType']) == ApiConst::wxProgram) {
             $wxpay = \Payment\WxLitePay::getInstance();
             $refund_return = $wxpay->refund($param);
+            $this->errorMessage = "微信返回:" . json_encode($refund_return)."\r\n";
+            echo json_encode($param)."\r\n";
             if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
+                if($refund_return['err_code_des']=='订单已全额退款' || $refund_return['err_code_des']=='订单已Q68额退款'){
+                    $this->errorMessage = date('Y-m-d') . $refund_return['err_code_des'] . $orderInfo['orderId'] . "\r\n";
+                    return true;
+                }
                 $this->errorMessage = date('Y-m-d') . '微信退款操作执行失败！' . $orderInfo['orderId'] . "\r\n";
                 return false;
             }