1

app/common/model/user/GiftLevel.php

@@ -26,7 +26,7 @@ class GiftLevel extends BaseModel
         //Todo 获取在$group_users内所有用户的消费情况
         $achievement = 0;
         //获取该用户购买过的礼包商品的全部订单
-        $achievement = StoreOrder::where('uid','in', $group_users)->where('paid', 1)->where('product_type',6)->whereNotIn('status',-1)->sum('pay_price');
+        $achievement = StoreOrder::where('uid','in', $group_users)->where('paid', 1)->where('product_type',2)->whereNotIn('status',-1)->sum('pay_price');
 
         $old_level = self::where('id', $user['level'])->find();
         if (!$old_level) $old_level = [

app/common/model/user/OilLevel.php

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

app/common/repositories/store/order/StoreOrderCreateRepository.php

@@ -960,7 +960,13 @@ class StoreOrderCreateRepository extends StoreOrderRepository
 //        获取商品类型
         $product_id = StoreCart::where('cart_id', $cartId[0])->value('product_id');
         $storeProduct = app()->make(Product::class);
-        $product_type =$storeProduct->where('product_id', $product_id)->value('type');
+        $is_oil =$storeProduct->where('product_id', $product_id)->value('is_oil');
+        $is_gift =$storeProduct->where('product_id', $product_id)->value('is_gift');
+        if ($is_oil == 1){
+            $product_type = 1;
+        }elseif ($is_gift == 1){
+            $product_type = 2;
+        }
         //Cache::delete($cache_key);
         //订单支付以后是否支持取消， 目前仅用于预约商品
         $is_cancel = 0;