diff --git a/addons/shopro/job/trade/OrderPaid.php b/addons/shopro/job/trade/OrderPaid.php index 5b57bed..a374129 100755 --- a/addons/shopro/job/trade/OrderPaid.php +++ b/addons/shopro/job/trade/OrderPaid.php @@ -42,11 +42,11 @@ class OrderPaid extends BaseJob $gift = (isset($rule['gift']) && $rule['gift'] > 0) ? $rule['gift'] : 0; if ($money > 0) { // 增加余额 - WalletService::change($user, 'money', $money, 'order_recharge', [ - 'order_id' => $order->id, - 'order_sn' => $order->order_sn, - 'order_type' => 'trade_order', - ]); +// WalletService::change($user, 'money', $money, 'order_recharge', [ +// 'order_id' => $order->id, +// 'order_sn' => $order->order_sn, +// 'order_type' => 'trade_order', +// ]); // 增加积分 WalletService::change($user, 'score', $money, 'order_recharge', [ diff --git a/application/admin/model/shopro/user/WalletLog.php b/application/admin/model/shopro/user/WalletLog.php index 3d04645..85ba3a1 100755 --- a/application/admin/model/shopro/user/WalletLog.php +++ b/application/admin/model/shopro/user/WalletLog.php @@ -31,13 +31,14 @@ class WalletLog extends Common 'activity_gift' => '活动-赠送积分', 'score_shop_pay' => '积分商城-积分支付', // 'order_pay' => '商城订单-积分抵扣', - 'order_pay' => '个人下单', + 'order_pay' => '积分支付', 'order_refund' => '订单退款-退还积分', 'admin_recharge' => '后台-积分充值', 'recharge_gift' => '线上充值-赠送积分', 'user_recharge' => '积分充值', 'user_exchange' => '积分转让', 'team_order' => '团队下单', + 'order_recharge' => '积分充值', ], 'money' => [ 'order_pay' => '商城订单-余额支付',