Commit 5ac6914c authored by liuyuzhen's avatar liuyuzhen

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

parent 62e0635e
...@@ -932,13 +932,13 @@ class OrderConfirmUtil { ...@@ -932,13 +932,13 @@ class OrderConfirmUtil {
$orderPayModel = \DAO\Order\OrderPayModel::getInstance($dbName); $orderPayModel = \DAO\Order\OrderPayModel::getInstance($dbName);
$orderModel->db->doTransaction(); $orderModel->db->doTransaction();
$paySn = $data['paySn']; $paySn = $data['paySn'];
\Our\Log::getInstance()->write($paySn,'data/log/applog'); \Our\Log::getInstance()->write($paySn,'/data/log/applog');
if(!$paySn){ if(!$paySn){
$errorCode = \Error\CodeConfigModel::emptyPaySnForOrder; $errorCode = \Error\CodeConfigModel::emptyPaySnForOrder;
return array('flag'=>\Our\ApiConst::zero,'errorCode'=>$errorCode,'data'=>$data); return array('flag'=>\Our\ApiConst::zero,'errorCode'=>$errorCode,'data'=>$data);
} }
$oldOrderPay = $orderPayModel->find(array('pay_sn'=>$paySn)); $oldOrderPay = $orderPayModel->find(array('pay_sn'=>$paySn));
\Our\Log::getInstance()->write(json_encode($oldOrderPay,true),'data/log/applog'); \Our\Log::getInstance()->write(json_encode($oldOrderPay,true),'/data/log/applog');
if($oldOrderPay['api_pay_state']==\Our\ApiConst::one){ if($oldOrderPay['api_pay_state']==\Our\ApiConst::one){
return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode); return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);
} }
......
...@@ -41,6 +41,7 @@ class PaymentServiceModel extends \Business\AbstractModel{ ...@@ -41,6 +41,7 @@ class PaymentServiceModel extends \Business\AbstractModel{
* app微信支付回调 * app微信支付回调
*/ */
public function updateOrderToPayed($channel = \Our\NameConst::wxAppChannel){ public function updateOrderToPayed($channel = \Our\NameConst::wxAppChannel){
\Our\Log::getInstance()->write('test','/data/log/applog');
if($channel == \Our\NameConst::wxLiteChannel){ if($channel == \Our\NameConst::wxLiteChannel){
$wxpay = \Payment\WxLitePay::getInstance(); $wxpay = \Payment\WxLitePay::getInstance();
$param['pay_type'] = \Our\ApiConst::wxLitePayType; $param['pay_type'] = \Our\ApiConst::wxLitePayType;
...@@ -52,14 +53,14 @@ class PaymentServiceModel extends \Business\AbstractModel{ ...@@ -52,14 +53,14 @@ class PaymentServiceModel extends \Business\AbstractModel{
$param['pay_type'] = \Our\ApiConst::wxAppPayType; $param['pay_type'] = \Our\ApiConst::wxAppPayType;
} }
$callbackInfo = $wxpay->getNotifyInfo(); $callbackInfo = $wxpay->getNotifyInfo();
\Our\Log::getInstance()->write(json_encode($callbackInfo,true),'data/log/applog'); \Our\Log::getInstance()->write(serialize($callbackInfo),'/data/log/applog');
if($callbackInfo) { if($callbackInfo) {
//验证成功 //验证成功
$param['paySn'] = $callbackInfo['out_trade_no']; $param['paySn'] = $callbackInfo['out_trade_no'];
$orderConfirmUtil = \Order\OrderConfirmUtil::getInstance(); $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
$return = $orderConfirmUtil->updateOrderToPayed($param); $return = $orderConfirmUtil->updateOrderToPayed($param);
if($return['flag']) { if($return['flag']) {
\Our\Log::getInstance()->write($callbackInfo['returnXml'],'data/log/applog'); \Our\Log::getInstance()->write($callbackInfo['returnXml'],'/data/log/applog');
echo $callbackInfo['returnXml']; echo $callbackInfo['returnXml'];
die; die;
} }
......
...@@ -231,7 +231,7 @@ class OrderModel extends \DAO\AbstractModel ...@@ -231,7 +231,7 @@ class OrderModel extends \DAO\AbstractModel
$this->setDb(\Our\DbNameConst::masterDBConnectName); $this->setDb(\Our\DbNameConst::masterDBConnectName);
$data['gmt_update']=TIMESTAMP; $data['gmt_update']=TIMESTAMP;
$result = $this->db->update($this->_tableName)->where($where)->rows($data)->execute(); $result = $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
\Our\Log::getInstance()->write($this->db->getLastSql(),'data/log/applog'); \Our\Log::getInstance()->write($this->db->getLastSql(),'/data/log/applog');
return $result; return $result;
} }
...@@ -973,7 +973,7 @@ class OrderModel extends \DAO\AbstractModel ...@@ -973,7 +973,7 @@ class OrderModel extends \DAO\AbstractModel
$where = $this->db->getSqlWhereByArray($where); $where = $this->db->getSqlWhereByArray($where);
} }
$result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll(); $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
\Our\Log::getInstance()->write($this->db->getLastSql(),'data/log/applog'); \Our\Log::getInstance()->write($this->db->getLastSql(),'/data/log/applog');
return $result; return $result;
} }
......
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