diff --git a/app/data/service/UserRebateService.php b/app/data/service/UserRebateService.php index d3b606664..734f38a60 100644 --- a/app/data/service/UserRebateService.php +++ b/app/data/service/UserRebateService.php @@ -42,9 +42,10 @@ class UserRebateService extends Service */ public function confirm(string $orderNo): array { - $map = ['order_no' => $orderNo, 'status' => 6]; + $map = [['status', '>', 3], ['order_no', '=', $orderNo]]; $order = $this->app->db->name('ShopOrder')->where($map)->find(); if (empty($order)) return [0, '需处理的订单状态异常!']; + $map = [['status', '=', 0], ['order_no', 'like', "{$orderNo}%"]]; $this->app->db->name('DataUserRebate')->where($map)->update(['status' => 1]); if (UserUpgradeService::instance()->upgrade($order['uid'])) { diff --git a/app/data/service/payment/BalancePyamentService.php b/app/data/service/payment/BalancePyamentService.php index c943db252..41d8bbca0 100644 --- a/app/data/service/payment/BalancePyamentService.php +++ b/app/data/service/payment/BalancePyamentService.php @@ -63,10 +63,10 @@ class BalancePyamentService extends PaymentService data_save('DataUserBalance', [ 'uid' => $order['uid'], 'code' => $order['order_no'], - 'name' => "订单余额支付", + 'name' => "账户余额支付", 'remark' => "使用余额支付订单{$order['order_no']}金额{$paymentAmount}元", 'amount' => -$paymentAmount, - ], 'code', ['name' => '订单余额支付']); + ], 'code', ['name' => '账户余额支付']); // 更新支付行为 $this->updatePaymentAction($orderNo, CodeExtend::uniqidDate(20), $paymentAmount, '账户余额支付'); // 刷新用户余额