|
|
@@ -491,7 +491,7 @@ class PaymentService extends BaseService
|
|
|
// 生活充值
|
|
|
else if ($scene == 'pay') {
|
|
|
$orderInfo = PayOrdersModel::where(['order_no' => $orderNo, 'mark' => 1])
|
|
|
- ->select(['id as order_id', 'user_id','meal_id','product_id', 'order_no', 'total as pay_money', 'pay_at as pay_time', 'remark', 'status'])
|
|
|
+ ->select(['id as order_id', 'user_id','meal_id','product_id', 'order_no','transaction_id','account', 'total as pay_money', 'pay_at as pay_time', 'remark', 'status'])
|
|
|
->first();
|
|
|
$orderStatus = isset($orderInfo['status']) ? $orderInfo['status'] : 0;
|
|
|
// 验证订单
|
|
|
@@ -563,7 +563,7 @@ class PaymentService extends BaseService
|
|
|
$productId = isset($orderInfo['product_id'])? $orderInfo['product_id'] : '';
|
|
|
$orderNo = isset($orderInfo['order_no'])? $orderInfo['order_no'] : '';
|
|
|
$account = isset($orderInfo['account'])? $orderInfo['account'] : '';
|
|
|
- $amount = isset($orderInfo['total'])? $orderInfo['total'] : 0;
|
|
|
+ $amount = isset($orderInfo['pay_money'])? $orderInfo['pay_money'] : 0;
|
|
|
$result = DyrPayService::make()->recharge($orderNo, $account, $productId, $amount);
|
|
|
$errno = isset($result['errno'])?$result['errno'] : -1;
|
|
|
$errmsg = isset($result['errmsg'])?$result['errmsg'] : '';
|
