From 8c0c7ef8428c4d552845507f39b267a93dda366a Mon Sep 17 00:00:00 2001 From: Anyon Date: Mon, 29 Mar 2021 21:45:59 +0800 Subject: [PATCH] Update RebateService.php --- app/data/service/RebateService.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/data/service/RebateService.php b/app/data/service/RebateService.php index 996f13ba3..1c1406620 100644 --- a/app/data/service/RebateService.php +++ b/app/data/service/RebateService.php @@ -309,8 +309,7 @@ class RebateService extends Service $vips = $this->app->db->name('DataBaseUpgrade')->whereLike('rebate_rule', '%,' . self::PRIZE_05 . ',%')->column('number'); $users = $this->app->db->name('DataUser')->whereIn('vip_code', $vips)->whereIn('id', $puids)->orderField('id', $puids)->select()->toArray(); // 查询需要计算奖励的商品 - $map = [['order_no', '=', $this->order['order_no']], ['discount_rate', '<', 100]]; - foreach ($this->app->db->name('ShopOrderItem')->where($map)->cursor() as $item) { + foreach ($this->app->db->name('ShopOrderItem')->where(['order_no' => $this->order['order_no']])->cursor() as $item) { $itemJson = $this->app->db->name('DataBaseDiscount')->where(['status' => 1, 'deleted' => 0])->value('items'); if (!empty($itemJson) && is_array($rules = json_decode($itemJson, true))) { [$tVip, $tRate] = [$item['vip_code'], $item['discount_rate']]; @@ -399,6 +398,7 @@ class RebateService extends Service */ private function _prize07(): bool { + if (empty($this->from1)) return false; if ($this->order['order_no'] !== $this->user['vip_order']) return false; if (!$this->isPrizeStatus(self::PRIZE_07, $this->from1['vip_code'])) return false; // 创建返利奖励记录