Browse Source

套餐表增加排序字段,套餐接口增加排序

lang 3 years ago
parent
commit
aa3bf75fdf
2 changed files with 2 additions and 2 deletions
  1. 1 1
      Controller/CloudStorage.py
  2. 1 1
      Model/models.py

+ 1 - 1
Controller/CloudStorage.py

@@ -219,7 +219,7 @@ class CloudStorageView(View):
         #qs = qs.filter(id='11111111')
         #qs = qs.filter(id='11111111')
         #qs = qs.filter(bucket__region_id=regionObj.region_id)  # 过滤大洲
         #qs = qs.filter(bucket__region_id=regionObj.region_id)  # 过滤大洲
         qs = qs.annotate(title=F('lang__title'),content=F('lang__content'),discount_content=F('lang__discount_content'))
         qs = qs.annotate(title=F('lang__title'),content=F('lang__content'),discount_content=F('lang__discount_content'))
-        qs = qs.values("id", "title", "content", "price", "day", "currency", "bucket__storeDay",
+        qs = qs.order_by('sort').values("id", "title", "content", "price", "day", "currency", "bucket__storeDay",
                        "bucket__bucket", "bucket__area", "commodity_code",
                        "bucket__bucket", "bucket__area", "commodity_code",
                        "commodity_type", "is_discounts", "virtual_price", "expire",
                        "commodity_type", "is_discounts", "virtual_price", "expire",
                        "discount_price", "discount_content", "symbol","cycle_config_id")
                        "discount_price", "discount_content", "symbol","cycle_config_id")

+ 1 - 1
Model/models.py

@@ -502,8 +502,8 @@ class Store_Meal(models.Model):
     # lang = models.CharField(default='', max_length=20, verbose_name='语言/国家')
     # lang = models.CharField(default='', max_length=20, verbose_name='语言/国家')
     lang = models.ManyToManyField(to='Lang', verbose_name='套餐语言', db_table='store_meal_lang')
     lang = models.ManyToManyField(to='Lang', verbose_name='套餐语言', db_table='store_meal_lang')
     cycle_config_id = models.IntegerField(null=True, verbose_name='周期付款配置表id')
     cycle_config_id = models.IntegerField(null=True, verbose_name='周期付款配置表id')
+    sort = models.IntegerField(default=99, blank=True, verbose_name=u'排序,越小越靠前') #单位月
     # 备用字段
     # 备用字段
-    spare_2 = models.CharField(default='', blank=True, max_length=64, verbose_name=u'备用字段2')
     spare_3 = models.CharField(default='', blank=True, max_length=64, db_index=True, verbose_name=u'备用字段3')
     spare_3 = models.CharField(default='', blank=True, max_length=64, db_index=True, verbose_name=u'备用字段3')
     spare_4 = models.CharField(default='', blank=True, max_length=64, db_index=True, verbose_name=u'备用字段4')
     spare_4 = models.CharField(default='', blank=True, max_length=64, db_index=True, verbose_name=u'备用字段4')