WIN-2308041133\Administrator преди 5 месеца
родител
ревизия
d57b943bbf
променени са 2 файла, в които са добавени 6 реда и са изтрити 4 реда
  1. 3 2
      app/common/model/user/GiftLevel.php
  2. 3 2
      app/common/model/user/OilLevel.php

+ 3 - 2
app/common/model/user/GiftLevel.php

@@ -27,9 +27,10 @@ class GiftLevel extends BaseModel
         $achievement = 0;
         //获取该用户购买过的礼包商品的全部订单
         @file_put_contents('quanju2.txt', json_encode($group_users)."-礼包成员\r\n", 8);
-        $achievement = StoreOrder::where('uid','in', $group_users)->where('paid', 1)->where('product_type',2)->whereNotIn('status',-1)->sum('pay_price');
+        $achievement1 = StoreOrder::where('uid','in', $group_users)->where('paid', 1)->where('product_type',2)->whereNotIn('status',-1)->sum('pay_price');
+        $achievement2 = StoreOrder::wher('uid', $uid)->where('paid', 1)->where('product_type',2)->whereNotIn('status',-1)->sum('pay_price');
+        $achievement = bcadd($achievement1, $achievement2, 2);
         @file_put_contents('quanju2.txt', $achievement."-礼包总业绩\r\n", 8);
-        @file_put_contents('quanju2.txt', StoreOrder::getLastSql()."-礼包sql\r\n", 8);
 
         $old_level = self::where('id', $user['level'])->find();
         if (!$old_level) $old_level = [

+ 3 - 2
app/common/model/user/OilLevel.php

@@ -25,8 +25,9 @@ class OilLevel extends BaseModel
         //Todo 获取在$group_users内所有用户的消费情况
         $achievement = 0;
         //获取该用户购买过的节能油商品的全部订单
-        $achievement = StoreOrder::wher('uid', 'in',$group_users)->where('paid', 1)->where('product_type',1)->whereNotIn('status',-1)->sum('pay_price');
-
+        $achievement1 = StoreOrder::wher('uid', 'in',$group_users)->where('paid', 1)->where('product_type',1)->whereNotIn('status',-1)->sum('pay_price');
+        $achievement2 = StoreOrder::wher('uid', $uid)->where('paid', 1)->where('product_type',2)->whereNotIn('status',-1)->sum('pay_price');
+        $achievement = bcadd($achievement1, $achievement2, 2);
         $old_level = self::where('id', $user['level'])->find();
         if (!$old_level) $old_level = [
             'grade' => 0,