chenshibin 4 роки тому
батько
коміт
440f87360b
1 змінених файлів з 6 додано та 6 видалено
  1. 6 6
      Controller/CloudStorage.py

+ 6 - 6
Controller/CloudStorage.py

@@ -1009,8 +1009,8 @@ class CloudStorageView(View):
         # if dv_qs[0]['vodPrimaryUserID'] != '' and dv_qs[0]['vodPrimaryUserID'] != userID:
         #     return response.json(10033)
         smqs = Store_Meal.objects.filter(id=rank, pay_type=pay_type). \
-            values('currency', 'price', 'content', 'day',
-                   'commodity_type', 'title', 'content',
+            values('currency', 'price', 'lang__content', 'day',
+                   'commodity_type', 'lang__title',
                    'expire', 'commodity_code', 'discount_price')
         if not smqs.exists():
             return response.json(173)
@@ -1018,7 +1018,7 @@ class CloudStorageView(View):
         price = smqs[0]['price']
         if is_select_discount == '1':
             price = float(smqs[0]['price']) + float(smqs[0]['discount_price'])
-        content = smqs[0]['content']
+        content = smqs[0]['lang__content']
         day = smqs[0]['day']
         commodity_code = smqs[0]['commodity_code']
         commodity_type = smqs[0]['commodity_type']
@@ -1068,7 +1068,7 @@ class CloudStorageView(View):
             try:
                 aliPayObj = AliPayObject()
                 alipay = aliPayObj.conf()
-                subject = smqs[0]['title'] + smqs[0]['content']
+                subject = smqs[0]['lang__title'] + smqs[0]['lang__content']
                 # biz_content = {
                 #     "subject": subject,
                 #     "out_trade_no": orderID,
@@ -1175,7 +1175,7 @@ class CloudStorageView(View):
         orderID = CommonService.createOrderID()
         nowTime = int(time.time())
         smqs = Store_Meal.objects.filter(id=rank). \
-            values("day", "bucket_id", "bucket__storeDay", "expire", 'content', 'price', 'currency', 'commodity_type')
+            values("day", "bucket_id", "bucket__storeDay", "expire", 'lang__content', 'price', 'currency', 'commodity_type')
         if not smqs.exists():
             return response.json(173)
         bucketId = smqs[0]['bucket_id']
@@ -1196,7 +1196,7 @@ class CloudStorageView(View):
                 (uid=uid, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime, updateTime=nowTime)
             uid_bucket_id = ub_cqs.id
         Order_Model.objects.create(orderID=orderID, UID=uid, channel=channel, userID_id=userID,
-                                   desc=smqs[0]['content'], payType=pay_type, payTime=nowTime,
+                                   desc=smqs[0]['lang__content'], payType=pay_type, payTime=nowTime,
                                    price=smqs[0]['price'], currency=smqs[0]['currency'], addTime=nowTime,
                                    updTime=nowTime,
                                    pay_url="体验版",