From e717a6b19ad2cb8f1d306d975ca2fd5af77b9893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Tue, 7 Sep 2021 23:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E5=A4=8D=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/data/controller/user/Rebate.php | 6 +++--- app/data/service/RebateService.php | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/data/controller/user/Rebate.php b/app/data/controller/user/Rebate.php index ea6fb2852..7eaeea3c8 100644 --- a/app/data/controller/user/Rebate.php +++ b/app/data/controller/user/Rebate.php @@ -39,7 +39,7 @@ class Rebate extends Controller $query = $this->_query($this->table)->equal('type')->like('name,order_no'); // 会员条件查询 $db = $this->_query('DataUser')->like('nickname#order_nickname,phone#order_phone')->db(); - if ($db->getOptions('where')) $query->whereRaw("order_uid in {$db->field('id')->buildSql()}"); + if ($db->getOptions('where')) $query->whereRaw("order_uuid in {$db->field('id')->buildSql()}"); // 代理条件查询 $db = $this->_query('DataUser')->like('nickname#agent_nickname,phone#agent_phone')->db(); if ($db->getOptions('where')) $query->whereRaw("uuid in {$db->field('id')->buildSql()}"); @@ -56,7 +56,7 @@ class Rebate extends Controller */ protected function _index_page_filter(array &$data) { - $uids = array_merge(array_column($data, 'uuid'), array_column($data, 'order_uid')); + $uids = array_merge(array_column($data, 'uuid'), array_column($data, 'order_uuid')); $userItem = $this->app->db->name('DataUser')->whereIn('id', array_unique($uids))->select(); $goodsItem = $this->app->db->name('ShopOrderItem')->whereIn('order_no', array_unique(array_column($data, 'order_no')))->select(); foreach ($data as &$vo) { @@ -64,7 +64,7 @@ class Rebate extends Controller [$vo['user'], $vo['agent'], $vo['list']] = [[], [], []]; foreach ($userItem as $user) { if ($user['id'] === $vo['uuid']) $vo['agent'] = $user; - if ($user['id'] === $vo['order_uid']) $vo['user'] = $user; + if ($user['id'] === $vo['order_uuid']) $vo['user'] = $user; } foreach ($goodsItem as $goods) { if ($goods['order_no'] === $vo['order_no']) { diff --git a/app/data/service/RebateService.php b/app/data/service/RebateService.php index 1827e9d6a..593e8d576 100644 --- a/app/data/service/RebateService.php +++ b/app/data/service/RebateService.php @@ -147,12 +147,12 @@ class RebateService extends Service protected function _prize01(): bool { if (empty($this->from1)) return false; - $map = ['order_uid' => $this->user['id']]; + $map = ['order_uuid' => $this->user['id']]; if ($this->app->db->name($this->table)->where($map)->count() > 0) return false; if (!$this->checkPrizeStatus(self::PRIZE_01, $this->from1['vip_code'])) return false; // 创建返利奖励记录 $key = "{$this->from1['vip_code']}_{$this->user['vip_code']}"; - $map = ['type' => self::PRIZE_01, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uuid']]; + $map = ['type' => self::PRIZE_01, 'order_no' => $this->order['order_no'], 'order_uuid' => $this->order['uuid']]; if ($this->config("frist_state_vip_{$key}") && $this->app->db->name($this->table)->where($map)->count() < 1) { $value = $this->config("frist_value_vip_{$key}"); if ($this->config("frist_type_vip_{$key}") == 1) { @@ -208,7 +208,7 @@ class RebateService extends Service 'amount' => $amount, 'status' => $this->status, 'order_no' => $this->order['order_no'], - 'order_uid' => $this->order['uuid'], + 'order_uuid' => $this->order['uuid'], 'order_amount' => $this->order['amount_total'], ])); // 刷新用户返利统计 @@ -225,7 +225,7 @@ class RebateService extends Service protected function _prize02(): bool { $map = []; - $map[] = ['order_uid', '=', $this->user['id']]; + $map[] = ['order_uuid', '=', $this->user['id']]; $map[] = ['order_no', '<>', $this->order['order_no']]; if ($this->app->db->name($this->table)->where($map)->count() < 1) return false; // 检查上级可否奖励 @@ -233,7 +233,7 @@ class RebateService extends Service if (!$this->checkPrizeStatus(self::PRIZE_02, $this->from1['vip_code'])) return false; // 创建返利奖励记录 $key = "vip_{$this->from1['vip_code']}_{$this->user['vip_code']}"; - $map = ['type' => self::PRIZE_02, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uuid']]; + $map = ['type' => self::PRIZE_02, 'order_no' => $this->order['order_no'], 'order_uuid' => $this->order['uuid']]; if ($this->config("repeat_state_{$key}") && $this->app->db->name($this->table)->where($map)->count() < 1) { $value = $this->config("repeat_value_{$key}"); if ($this->config("repeat_type_{$key}") == 1) { @@ -262,7 +262,7 @@ class RebateService extends Service if (!$this->checkPrizeStatus(self::PRIZE_03, $this->from1['vip_code'])) return false; // 创建返利奖励记录 $key = "{$this->user['vip_code']}"; - $map = ['type' => self::PRIZE_03, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uuid']]; + $map = ['type' => self::PRIZE_03, 'order_no' => $this->order['order_no'], 'order_uuid' => $this->order['uuid']]; if ($this->config("direct_state_vip_{$key}") && $this->app->db->name($this->table)->where($map)->count() < 1) { $value = $this->config("direct_value_vip_{$key}"); if ($this->config("direct_type_vip_{$key}") == 1) { @@ -290,7 +290,7 @@ class RebateService extends Service if (empty($this->from2)) return false; if (!$this->checkPrizeStatus(self::PRIZE_04, $this->from2['vip_code'])) return false; $key = "{$this->user['vip_code']}"; - $map = ['type' => self::PRIZE_04, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uuid']]; + $map = ['type' => self::PRIZE_04, 'order_no' => $this->order['order_no'], 'order_uuid' => $this->order['uuid']]; if ($this->config("indirect_state_vip_{$key}") && $this->app->db->name($this->table)->where($map)->count() < 1) { $value = $this->config("indirect_value_vip_{$key}"); if ($this->config("indirect_type_vip_{$key}") == 1) { @@ -363,7 +363,7 @@ class RebateService extends Service foreach ($this->app->db->name('DataUser')->whereIn('vip_code', $vips)->whereIn('id', $puids)->orderField('id', $puids)->cursor() as $user) { if ($user['vip_code'] > $prevLevel) { if (($amount = $this->_prize06amount($prevLevel + 1, $user['vip_code'])) > 0.00) { - $map = ['uuid' => $user['id'], 'type' => self::PRIZE_06, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uuid']]; + $map = ['uuid' => $user['id'], 'type' => self::PRIZE_06, 'order_no' => $this->order['order_no'], 'order_uuid' => $this->order['uuid']]; if ($this->app->db->name($this->table)->where($map)->count() < 1) { $name = "{$this->name(self::PRIZE_06)}，[ VIP{$prevLevel} > VIP{$user['vip_code']} ] 每单 {$amount} 元"; $this->writeRabate($user['id'], $map, $name, $amount); @@ -416,7 +416,7 @@ class RebateService extends Service if (!$this->checkPrizeStatus(self::PRIZE_07, $this->from1['vip_code'])) return false; // 创建返利奖励记录 $key = "{$this->user['vip_code']}"; - $map = ['type' => self::PRIZE_07, 'order_no' => $this->order['order_no'], 'order_uid' => $this->order['uuid']]; + $map = ['type' => self::PRIZE_07, 'order_no' => $this->order['order_no'], 'order_uuid' => $this->order['uuid']]; if ($this->config("upgrade_state_vip_{$key}") && $this->app->db->name($this->table)->where($map)->count() < 1) { $value = $this->config("upgrade_value_vip_{$key}"); if ($this->config("upgrade_type_vip_{$key}") == 1) {