Commit 125b3068 authored by chenchuanwen's avatar chenchuanwen

programliterefund

parent d702c0d8
...@@ -61,9 +61,9 @@ class WxLitePay extends \Payment\TencentPay{ ...@@ -61,9 +61,9 @@ class WxLitePay extends \Payment\TencentPay{
public function refund($param){ public function refund($param){
if($param['subMchId']){ if($param['subMchId']){
$this->refundService($param); return $this->refundService($param);
}else{ }else{
$this->refundCommon($param); return $this->refundCommon($param);
} }
} }
......
...@@ -455,7 +455,7 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -455,7 +455,7 @@ class OrderServiceModel extends \Business\AbstractModel
$storeDao=\DAO\StoreModel::getInstance(); $storeDao=\DAO\StoreModel::getInstance();
//判断订单目前状态是否允许取消 //判断订单目前状态是否允许取消
$isAllowCancel = $orderDao->isAllowCancel($order); $isAllowCancel = $orderDao->isAllowCancel($order);
//$isAllowCance = true; $isAllowCancel = true;
if ($isAllowCancel) { if ($isAllowCancel) {
$orderDao->db->doTransaction(); $orderDao->db->doTransaction();
$res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf); $res = $orderDao->updateStatusByOrderId($orderId, ApiConst::orderStateCancel,false,ApiConst::cancelOrderBySelf);
......
...@@ -505,7 +505,6 @@ class RefundReturnModel extends \DAO\AbstractModel ...@@ -505,7 +505,6 @@ class RefundReturnModel extends \DAO\AbstractModel
} else if (intval($orderInfo['paymentType']) == ApiConst::wxProgram) { } else if (intval($orderInfo['paymentType']) == ApiConst::wxProgram) {
$wxpay = \Payment\WxLitePay::getInstance(); $wxpay = \Payment\WxLitePay::getInstance();
$refund_return = $wxpay->refund($param); $refund_return = $wxpay->refund($param);
if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) { if (!($refund_return['return_code'] == 'SUCCESS' && $refund_return['result_code'] == 'SUCCESS')) {
$this->errorMessage = date('Y-m-d') . '微信退款操作执行失败!' . $orderInfo['orderId'] . "\r\n"; $this->errorMessage = date('Y-m-d') . '微信退款操作执行失败!' . $orderInfo['orderId'] . "\r\n";
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment