pc

application/library/Payment/WxPay.php

@@ -90,6 +90,32 @@ class WxPay extends \Payment\TencentPay
         $this->checkSign($values);
         return $values;
     }
+    public function refundWxProgram($param)
+    {
+        $total_fee = intval($param['totalFee']);
+        $refund_fee = intval($param['refundFee']);
+        if(APP_ENV == 'develop'||APP_ENV == 'test'||APP_ENV == 'pre' || APP_ENV=='ccwdevelop'){
+            $this->parameters['total_fee'] = 1;
+            $this->parameters['refund_fee'] = 1;
+        } else {
+            $this->parameters['total_fee'] = $total_fee;
+            $this->parameters['refund_fee'] = $refund_fee;
+        }
+        $this->parameters['out_refund_no'] = $param['refundOrderNo'];
+        $this->parameters['out_trade_no'] = $param['outTradeNo'];
+        $this->parameters['op_user_id'] = $this->mch_id;
+        $this->parameters['nonce_str'] = $this->createNoncestr(32);
+        $this->parameters['appid'] = \Our\PayConst::wxLiteAppId;
+        $this->parameters['mch_id'] = \Our\PayConst::wxPayMchId;
+        $xml = $this->createXml();
+        $response = $this->postXmlSSLCurl($xml, $this->refundUrl, 6);
+        $values = $this->xmlToArray($response);
+        if ($values['return_code'] != 'SUCCESS') {
+            return $values;
+        }
+        $this->checkSign($values);
+        return $values;
+    }
 
     /**
      * 类实例

application/models/Business/Order/OrderService.php

@@ -503,7 +503,6 @@ class OrderServiceModel extends \Business\AbstractModel
 
     public $baseDir;
 
-    //订单任务脚本关闭订单
     //订单任务脚本关闭订单
     public function cancelOrderTask()
     {

application/models/DAO/Order/Order.php

@@ -771,7 +771,7 @@ class OrderModel extends \DAO\AbstractModel
     //删除订单详情缓存
     public function deleteFindByOrderIdCache($orderId)
     {
-        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'findByOrderId'), array($orderId),array($orderId));
+        return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'findByOrderId'), array(),array($orderId));
     }
 
     //删除订单列表缓存

application/models/DAO/Order/RefundReturn.php

@@ -273,21 +273,30 @@ 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')) {
-                $this->errorMessage='微信退款操作执行失败！'.$orderInfo['orderId']."\r\n";
+                $this->errorMessage=date('Y-m-d').'微信退款操作执行失败！'.$orderInfo['orderId']."\r\n";
                 return false;
             }
         } else if (intval($orderInfo['paymentType']) == ApiConst::alipay) {
-            $aliPay=\Payment\Alipay::getInstance();
+            $aliPay = \Payment\Alipay::getInstance();
             $return = $aliPay->refund($param);
-            $this->errorMessage="支付宝返回:".json_encode($return);
+            $this->errorMessage = "支付宝返回:" . json_encode($return);
             $resultCode = $return->code;
-            if(!empty($resultCode)&&$resultCode ==ApiConst::alipayRefundSuccess ){
+            if (!empty($resultCode) && $resultCode == ApiConst::alipayRefundSuccess) {
                 return true;
             } else {
-                $this->errorMessage= '支付宝退款操作执行失败:'.$orderInfo['orderId']."\r\n";
+                $this->errorMessage = date('Y-m-d') . '支付宝退款操作执行失败:' . $orderInfo['orderId'] . "\r\n";
+                return false;
+            }
+        }else if(intval($orderInfo['paymentType']) == ApiConst::wxProgram){
+            $wxpay = \Payment\WxPay::getInstance();
+            $refund_return = $wxpay->refund($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";
                 return false;
             }
         }
+        return true;
     }
     /**
      * 增加退款退货

scripts/crontab/order/close.php

@@ -81,7 +81,7 @@ class cliOrderClose extends basecli
         }
         $this->autoCloseOrder();
 
-        echo '定单关闭消息发送成功'."\r\n";
+        echo date('Y-m-d H:i:s',TIMESTAMP).'定单关闭消息成功'."\r\n";
     }
 }