diff --git a/app/data/controller/api/auth/Order.php b/app/data/controller/api/auth/Order.php index 533e10f2d..949f7ea13 100644 --- a/app/data/controller/api/auth/Order.php +++ b/app/data/controller/api/auth/Order.php @@ -137,6 +137,7 @@ class Order extends Auth 'vip_code' => $this->user['vip_code'], // 是否入会礼包 'vip_entry' => $goodsInfo['vip_entry'], + 'vip_upgrade' => $goodsInfo['vip_upgrade'], // 是否参与返利 'rebate_type' => $goodsInfo['rebate_type'], 'rebate_amount' => $goodsInfo['rebate_type'] > 0 ? $goodsItem['price_selling'] * $count : 0, diff --git a/app/data/service/UserUpgradeService.php b/app/data/service/UserUpgradeService.php index 5571a2dd1..36f780eb6 100644 --- a/app/data/service/UserUpgradeService.php +++ b/app/data/service/UserUpgradeService.php @@ -64,7 +64,7 @@ class UserUpgradeService extends Service } // 购买商品升级 $query = $this->app->db->name('ShopOrderItem')->alias('b')->join('shop_order a', 'b.order_no=a.order_no'); - $tmpNumber = $query->whereRaw("a.uid={$uid} and a.payment_status=1 and a.status>=4 and b.vip_entry=1")->max('b.vip_code'); + $tmpNumber = $query->whereRaw("a.uid={$uid} and a.payment_status=1 and a.status>=4 and b.vip_entry=1")->max('b.vip_upgrade'); if ($tmpNumber > $vipCode) { $map = ['status' => 1, 'number' => $tmpNumber]; $upgrade = $this->app->db->name('DataUserUpgrade')->where($map)->find();