diff --git a/app/data/service/UserBalanceService.php b/app/data/service/UserBalanceService.php index 36c357b58..7c97e37ad 100644 --- a/app/data/service/UserBalanceService.php +++ b/app/data/service/UserBalanceService.php @@ -47,16 +47,18 @@ class UserBalanceService extends Service */ public function confirm(string $orderNo): array { - $map = [['order_no', '=', $orderNo], ['status', '>=', 4]]; + $map = [['status', '>=', 4], ['order_no', '=', $orderNo]]; $order = $this->app->db->name('ShopOrder')->where($map)->find(); if (empty($order)) throw new \think\admin\Exception('需处理的订单状态异常'); - data_save('DataUserBalance', [ + + if ($order['reward_balance'] > 0) data_save('DataUserBalance', [ 'uid' => $order['uid'], 'code' => $order['order_no'], 'name' => "订单余额充值", 'remark' => "来自订单{$order['order_no']}的余额充值", 'amount' => $order['reward_balance'], ], 'code', ['name' => '订单余额充值']); + return $this->amount($order['uid']); } diff --git a/app/data/view/shop_order_send/config.html b/app/data/view/shop_order_send/config.html index 131f5688f..683d50c4e 100644 --- a/app/data/view/shop_order_send/config.html +++ b/app/data/view/shop_order_send/config.html @@ -3,7 +3,7 @@