修改套餐类型为AI+云存

Controller/CloudStorage.py

@@ -1198,7 +1198,7 @@ class CloudStorageView(View):
         now_time = int(time.time())
         store_qs = Store_Meal.objects.filter(id=rank, pay_type=pay_type, lang__lang=lang, is_show=0). \
             values('currency', 'price', 'lang__content', 'day', 'commodity_type', 'lang__title', 'expire',
-                   'commodity_code', 'discount_price', 'bucket__mold', 'cycle_config_id')
+                   'commodity_code', 'discount_price', 'bucket__mold', 'cycle_config_id', 'is_ai')
         if not store_qs.exists():
             return response.json(173)
         store_meal_qs = Store_Meal.objects.filter(id=rank, lang__lang='cn', is_show=0).values('lang__title',
@@ -1209,6 +1209,8 @@ class CloudStorageView(View):
             store_meal_name = '未知套餐'
         currency = store_qs[0]['currency']
         price = store_qs[0]['price']
+        is_ai = store_qs[0]['is_ai']
+        order_type = 1 if is_ai else 0
         if is_select_discount == '1':
             price = float(store_qs[0]['price']) + float(store_qs[0]['discount_price'])
         content = store_qs[0]['lang__content']
@@ -1254,7 +1256,7 @@ class CloudStorageView(View):
                 Order_Model.objects.create(orderID=order_id, UID=uid, channel=channel, userID_id=user_id,
                                            desc=content, payType=pay_type, payTime=now_time,
                                            price=price, currency=currency, addTime=now_time,
-                                           updTime=now_time,
+                                           updTime=now_time, order_type=order_type,
                                            pay_url=sub_info['url'], isSelectDiscounts=is_select_discount,
                                            commodity_code=commodity_code, commodity_type=commodity_type,
                                            rank_id=rank, plan_id=sub_info['plan_id'], coupon_id=coupon_id,
@@ -1289,7 +1291,7 @@ class CloudStorageView(View):
                     Order_Model.objects.create(orderID=order_id, UID=uid, channel=channel, userID_id=user_id,
                                                desc=content, payType=pay_type, payTime=now_time,
                                                price=price, currency=currency, addTime=now_time,
-                                               updTime=now_time,
+                                               updTime=now_time, order_type=order_type,
                                                pay_url=approval_url, isSelectDiscounts=is_select_discount,
                                                commodity_code=commodity_code, commodity_type=commodity_type,
                                                rank_id=rank, paymentID=payment_id, coupon_id=coupon_id,
@@ -1440,6 +1442,7 @@ class CloudStorageView(View):
         if not uid_set_qs.exists():
             return response.json(173)
         is_ai = 1 if uid_set_qs[0]['is_ai'] != 2 else 0
+        order_type = 1 if is_ai and CONFIG_INFO != CONFIG_CN else 0
         use_flag = True
         end_time = CommonService.calcMonthLater(expire)
         try:
@@ -1470,7 +1473,7 @@ class CloudStorageView(View):
                 Order_Model.objects.create(orderID=order_id, UID=uid, channel=channel, userID_id=user_id,
                                            desc=store_qs[0]['lang__content'], payType=pay_type, payTime=now_time,
                                            price=store_qs[0]['price'], currency=store_qs[0]['currency'],
-                                           addTime=now_time,
+                                           addTime=now_time, order_type=order_type,
                                            updTime=now_time,
                                            pay_url="体验版", store_meal_name=store_meal_name,
                                            commodity_code=commodity_code, commodity_type=store_qs[0]['commodity_type'],

Controller/PaymentCycle.py

@@ -406,7 +406,7 @@ class PaypalCycleNotify(View):
             order_qs = Order_Model.objects.filter(orderID=order_id).values('UID', 'channel', 'commodity_code', 'rank',
                                                                            'isSelectDiscounts', 'plan_id', 'desc',
                                                                            'payType', 'currency', 'addTime',
-                                                                           'commodity_type', 'updTime',
+                                                                           'commodity_type', 'updTime', 'order_type',
                                                                            'userID__userID', 'uid_bucket_id',
                                                                            'userID__username', 'userID__region_country'
                                                                            )
@@ -441,6 +441,7 @@ class PaypalCycleNotify(View):
             username = order_qs[0]['userID__username']
             channel = order_qs[0]['channel']
             rank = order_qs[0]['rank']
+            order_type = order_qs[0]['order_type']
             store_meal_qs = Store_Meal.objects.filter(id=rank).values("day", "bucket_id", "bucket__storeDay", "expire",
                                                                       "is_ai")
             if not store_meal_qs.exists():
@@ -491,7 +492,7 @@ class PaypalCycleNotify(View):
                                            desc=desc, payType=pay_type, payTime=nowTime,
                                            price=amount.get('total'),
                                            currency=order_qs[0]['currency'], addTime=nowTime,
-                                           updTime=nowTime,
+                                           updTime=nowTime, order_type=order_type,
                                            pay_url='', isSelectDiscounts=0,
                                            commodity_code=commodity_code,
                                            commodity_type=commodity_type, rank_id=rank, paymentID='',