chapter order

app/Http/Controllers/Wap/Order/OrdersController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Wap\Order;
 
+use App\Modules\Subscribe\Models\Order;
 use App\Http\Controllers\Wap\BaseController;
 use App\Modules\Book\Services\BookConfigService;
 use App\Modules\Channel\Services\ChannelService;
@@ -36,6 +37,8 @@ class OrdersController extends BaseController
 
     private $force_subscribe_info;
 
+    private $chargeList;
+
     /**
      * @apiVersion 1.0.0
      * @apiDescription 充值列表
@@ -263,7 +266,8 @@ class OrdersController extends BaseController
         if (!$res) {
             return response()->error('WAP_SYS_ERROR');
         }
-
+        $this->chargeList = $res;
+        $this->exchangeList();
         /*if ($this->send_order_id) {
             try {
                 Redis::sadd('pay_page_uv' . $this->send_order_id, $this->uid);
@@ -797,4 +801,14 @@ class OrdersController extends BaseController
             -1, $template_id);
         return '';
     }
+
+    public function exchangeList(){
+        foreach ($this->chargeList as &$item){
+            if(!$item->switch_to) continue;
+            $order = Order::where('uid',$this->uid)->where('status','PAID')->where('product_id',$item->id)->first();
+            if($order){
+                $item = ProductService::getProductSingle($item->switch_to);
+            }
+        }
+    }
 }

app/Modules/Product/Models/Product.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 class Product extends Model
 {
     protected $table = 'products';
-    protected $fillable = ['price', 'type', 'given', 'is_default', 'is_enabled', 'sequence'];
+    protected $fillable = ['price', 'type', 'given', 'is_default', 'is_enabled', 'sequence','switch_to'];
 
     public static function getChargeProduct($template_type)
     {
@@ -20,7 +20,8 @@ class Product extends Model
                 'products.type',
                 'products.given',
                 'products.is_default',
-                'products.sequence'
+                'products.sequence',
+                'products.switch_to'
             )
             ->orderBy('sequence')->get();
     }

app/Modules/Subscribe/Services/ChapterOrderService.php

@@ -38,7 +38,7 @@ class ChapterOrderService
     {
         $chapter_model = new ChapterOrder();
         $chapter_model->setCurrentTable($uid);
-        return $chapter_model->where('uid', $uid)->orderBy('created_at', 'desc')->paginate($page_size);
+        return $chapter_model->where('uid', $uid)->orderBy('id', 'desc')->paginate($page_size);
     }
 
 
@@ -55,7 +55,7 @@ class ChapterOrderService
         $chapter_model = new ChapterOrder();
         $chapter_model->setCurrentTable($uid);
 
-        $chapter = $chapter_model->where('uid', $uid)->orderBy('updated_at', 'desc');
+        $chapter = $chapter_model->where('uid', $uid)->orderBy('id', 'desc');
         if ($startTime) {
             $chapter->where('updated_at', '>=', $startTime);
         }