10分钟取消订单付款成功恢复订单问题

application/library/Order/OrderConfirmUtil.php

@@ -950,7 +950,7 @@ class OrderConfirmUtil {
             $orderPayRedis->tableDel($paySn);
         }
 
-        $orderCon = array('pay_sn'=>$paySn,'order_state'=>\Our\ApiConst::orderStateWaitPay);
+        $orderCon = array('pay_sn'=>$paySn,'order_state'=>array('in',array(\Our\ApiConst::orderStateWaitPay,ApiConst::orderStateCancel)));
         $orderList = $orderModel->getListByCon($orderCon,'order_id,coupon_id,buyer_id,store_id,order_sn');
         if(!$orderList){
             $errorCode = \Error\CodeConfigModel::noOrderListForPay;
@@ -961,6 +961,7 @@ class OrderConfirmUtil {
         $updateOrder['order_state'] = \Our\ApiConst::orderStateWaitConfirm;
         $updateOrder['is_receive_payment'] = TIMESTAMP;
         $updateOrder['payment_time'] = (isset($data['payment_time'])? strtotime($data['payment_time']) : TIMESTAMP);
+        $updateOrder['finnshed_time'] = \Our\ApiConst::zero;
         $updateOrder['payment_type'] = $this->getOrderPaymentType($data['pay_type']);
         $orderUpdateResult = $orderModel->update($orderCon,$updateOrder);
         if(!$orderUpdateResult){

application/models/DAO/Order/RefundReturn.php

@@ -390,7 +390,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
             }
         }else if(intval($orderInfo['paymentType']) == ApiConst::wxProgram){
             $wxpay = \Payment\WxPay::getInstance();
-            $refund_return = $wxpay->refund($param);
+            $refund_return = $wxpay->refundWxProgram($param);
             $this->errorMessage= "微信小程序返回:".json_encode($refund_return);
             if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
                 $this->errorMessage=date('Y-m-d').'微信退款操作执行失败！'.$orderInfo['orderId']."\r\n";