Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into ccw

application/library/Order/OrderConfirmUtil.php

@@ -932,11 +932,13 @@ class OrderConfirmUtil {
         $orderPayModel = \DAO\Order\OrderPayModel::getInstance($dbName);
         $orderModel->db->doTransaction();
         $paySn = $data['paySn'];
+        \Our\Log::getInstance()->write($paySn,'data/log/applog');
 		if(!$paySn){
             $errorCode = \Error\CodeConfigModel::emptyPaySnForOrder;
             return array('flag'=>\Our\ApiConst::zero,'errorCode'=>$errorCode,'data'=>$data);
         }
 		$oldOrderPay = $orderPayModel->find(array('pay_sn'=>$paySn));
+        \Our\Log::getInstance()->write(json_encode($oldOrderPay,true),'data/log/applog');
 		if($oldOrderPay['api_pay_state']==\Our\ApiConst::one){			
 			return array('flag'=>\Our\ApiConst::one,'errorCode'=>$errorCode);
 		}
@@ -950,7 +952,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 +963,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/Business/Order/PaymentService.php

@@ -52,12 +52,14 @@ class PaymentServiceModel extends \Business\AbstractModel{
             $param['pay_type'] = \Our\ApiConst::wxAppPayType;
         }
         $callbackInfo = $wxpay->getNotifyInfo();
+        \Our\Log::getInstance()->write(json_encode($callbackInfo,true),'data/log/applog');
         if($callbackInfo) {
             //验证成功
             $param['paySn'] = $callbackInfo['out_trade_no'];
             $orderConfirmUtil =  \Order\OrderConfirmUtil::getInstance();
             $return = $orderConfirmUtil->updateOrderToPayed($param);
             if($return['flag']) {
+                \Our\Log::getInstance()->write($callbackInfo['returnXml'],'data/log/applog');
                 echo $callbackInfo['returnXml'];
                 die;
             }

application/models/DAO/Order/Order.php

@@ -230,7 +230,9 @@ class OrderModel extends \DAO\AbstractModel
     {
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
         $data['gmt_update']=TIMESTAMP;
-        return $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');
+        return $result;
     }
 
     public function updateByOrderId($data,$orderId){
@@ -971,6 +973,7 @@ class OrderModel extends \DAO\AbstractModel
             $where = $this->db->getSqlWhereByArray($where);
         }
         $result = $this->db->select($field)->from($this->_tableName)->where($where)->fetchAll();
+        \Our\Log::getInstance()->write($this->db->getLastSql(),'data/log/applog');
         return $result;
     }
 

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";