提货

application/api/controller/Order.php

@@ -110,7 +110,8 @@ class Order extends Api
             //扣除Rwa数量
             if(!empty($order_info->is_show) && $order_info->popular_price > config('min_rwa_price')) $userModel::updateForRwaNum($order_info->user_id, $userModel::getByParentId($order_info->user_id), 1, '-');
 
-            $order_info->status= $productOrder::Shipped; 
+            $order_info->type_id = $productOrder::Popular;
+            $order_info->status  = $productOrder::Shipped; 
             $order_info->save();
             // 提交事务
             Db::commit();

application/api/logic/UserLogic.php

@@ -136,7 +136,7 @@ class UserLogic
                   $where = ['a.type_id' => $productOrder::Giveaway, 'a.status' => $productOrder::Closure];
                   break;
                   case 5:
-                  $where = ['a.status' => $productOrder::Shipped];
+                  $where = ['a.type_id' => $productOrder::Popular, 'a.status' => $productOrder::Shipped];
                   break;
             }
             if($productId > 0) $where['a.product_id'] = ['=' , $productId];