Commit 142f17a0 authored by liuyuzhen's avatar liuyuzhen

支付小程序支付增加生成新的paySn

parent 009600cd
...@@ -67,6 +67,11 @@ class Pay { ...@@ -67,6 +67,11 @@ class Pay {
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyOrderAmountForPay); \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyOrderAmountForPay);
} }
$orderInfo['orderAmount'] = $this->orderAmount; $orderInfo['orderAmount'] = $this->orderAmount;
if($this->channel == \Our\NameConst::wxLiteChannel){
$orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
$newPaySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($this->paySn,$this->memberId);
$this->paySn = $newPaySn;
}
$orderInfo['paySn'] = $this->paySn; $orderInfo['paySn'] = $this->paySn;
$orderInfo['orderSns'] = array_column($orderList,'order_sn'); $orderInfo['orderSns'] = array_column($orderList,'order_sn');
return $orderInfo; return $orderInfo;
......
...@@ -791,12 +791,15 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -791,12 +791,15 @@ class OrderServiceModel extends \Business\AbstractModel
$orderIds[] = $order['order_id']; $orderIds[] = $order['order_id'];
} }
$return['orderState'] = $orderState; $return['orderState'] = $orderState;
/*$return['paySn'] = $data['paySn']; if(isset($data['wxLitePayFlag'])&&$data['wxLitePayFlag']==\Our\ApiConst::one){
if(!$orderState){ $return['paySn'] = $data['paySn'];
$orderConfirmUtil = \Order\OrderConfirmUtil::getInstance(); if(!$orderState){
$paySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($data['paySn'],$memberId); $orderConfirmUtil = \Order\OrderConfirmUtil::getInstance();
$return['paySn'] = $paySn; $paySn = $orderConfirmUtil->makeNewPaySnForOrderWithOldPaySn($data['paySn'],$memberId);
}*/ $return['paySn'] = $paySn;
}
}
$return['orderNos'] = $orderNos; $return['orderNos'] = $orderNos;
$return['totalOrderAmount'] = $totalOrderAmount; $return['totalOrderAmount'] = $totalOrderAmount;
$return['orderTips'] = $orderTips; $return['orderTips'] = $orderTips;
......
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