blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-25 02:53:56 +08:00
Code Issues Projects Releases Wiki Activity

修改奖励

Browse Source
This commit is contained in:
邹景立 2021-03-11 17:57:12 +08:00
parent 44e6e6b3eb
commit 80e8ee9bbd
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/controller/api/auth/Order.php
View File

@ -289,7 +289,7 @@ class Order extends Auth
$openid = ''; $openid = '';
if (in_array($this->type, [UserService::APITYPE_WXAPP, UserService::APITYPE_WECHAT])) { if (in_array($this->type, [UserService::APITYPE_WXAPP, UserService::APITYPE_WECHAT])) {
$openid = $this->user[UserService::TYPES[$this->type]['auth']] ?? ''; $openid = $this->user[UserService::TYPES[$this->type]['auth']] ?? '';
if (empty($openid)) $this->error("发起支付失败"); // if (empty($openid)) $this->error("发起支付失败");
} }
// 返回订单数据及支付发起参数 // 返回订单数据及支付发起参数
$type = $order['amount_real'] <= 0 ? 'empty' : $data['payment_code']; $type = $order['amount_real'] <= 0 ? 'empty' : $data['payment_code'];

6
app/data/service/RebateCurrentService.php
View File

@ -221,11 +221,9 @@ class RebateCurrentService extends Service
$pids = array_reverse(explode('-', trim($this->user['path'], '-'))); $pids = array_reverse(explode('-', trim($this->user['path'], '-')));
if (empty($pids)) return false; if (empty($pids)) return false;
// 获取拥有差额奖励的等级 // 获取拥有差额奖励的等级
$query = $this->app->db->name('DataUserUpgrade'); $numbs = $this->app->db->name('DataUserUpgrade')->whereLike('rebate_rule', '%,' . self::PRIZE_05 . ',%')->column('number');
$numbs = $query->whereLike('rule', '%,' . self::PRIZE_05 . ',%')->column('number');
// 获取可以参与奖励的代理 // 获取可以参与奖励的代理
$query = $this->app->db->name('DataUser')->whereIn('vip_number', $numbs); $users = $this->app->db->name('DataUser')->whereIn('vip_number', $numbs)->whereIn('id', $pids)->orderField('id', $pids)->select()->toArray();
$users = $query->whereIn('id', $pids)->orderField('id', $pids)->select()->toArray();
// 查询需要计算奖励的商品 // 查询需要计算奖励的商品
$map = [['order_no', '=', $this->order['order_no']], ['discount_rate', '<', 100]]; $map = [['order_no', '=', $this->order['order_no']], ['discount_rate', '<', 100]];
$this->app->db->name('StoreOrderItem')->where($map)->select()->each(function ($item) use ($users) { $this->app->db->name('StoreOrderItem')->where($map)->select()->each(function ($item) use ($users) {