|
|
@@ -471,7 +471,7 @@ class PaymentService extends BaseService
|
|
|
$orderInfo = [];
|
|
|
// 商城订单支付
|
|
|
if ($scene == 'store') {
|
|
|
- $orderInfo = OrderModel::with(['user'])->where(['order_no' => $orderNo, 'mark' => 1])
|
|
|
+ $orderInfo = OrderModel::with(['user','orderGoods'])->where(['order_no' => $orderNo, 'mark' => 1])
|
|
|
->select(['id as order_id', 'user_id', 'order_no', 'total as pay_money', 'pay_at as pay_time', 'remark', 'status'])
|
|
|
->first();
|
|
|
$orderStatus = isset($orderInfo['status']) ? $orderInfo['status'] : 0;
|
|
|
@@ -538,7 +538,9 @@ class PaymentService extends BaseService
|
|
|
switch ($scene) {
|
|
|
case 'store': //
|
|
|
$userInfo = isset($orderInfo['user'])?$orderInfo['user']:[];
|
|
|
+ $orderGoods = isset($orderInfo['orderGoods'])?$orderInfo['orderGoods']:[];
|
|
|
$balance = isset($userInfo['balance'])? $userInfo['balance'] : 0;
|
|
|
+ $goodsName = isset($orderGoods[0]['goods_name'])?$orderGoods[0]['goods_name']:'';
|
|
|
$data = [
|
|
|
'user_id'=>$orderUserId,
|
|
|
'source_order_no'=>$orderNo,
|
|
|
@@ -548,6 +550,7 @@ class PaymentService extends BaseService
|
|
|
'date'=>date('Y-m-d'),
|
|
|
'create_time'=>time(),
|
|
|
'remark'=> '订单付款-商品',
|
|
|
+ 'remark1'=> $goodsName,
|
|
|
'status'=>1,
|
|
|
'mark'=>1
|
|
|
];
|
