Jelajahi Sumber

paypal回调追加日志

peng 1 tahun lalu
induk
melakukan
48c9d08158
2 mengubah file dengan 14 tambahan dan 9 penghapusan
  1. 11 6
      Controller/CloudStorage.py
  2. 3 3
      Model/models.py

+ 11 - 6
Controller/CloudStorage.py

@@ -209,7 +209,7 @@ class CloudStorageView(View):
         if experience_context_qs.exists():
             if not is_ai:  # 返回云存套餐
                 store_qs = store_qs.filter(~Q(pay_type='10'), Q(pixel_level=pixel_level), Q(is_ai=0))  # 筛选像素等级
-            else:          # 返回云存+AI套餐
+            else:  # 返回云存+AI套餐
                 is_ai = uid_set_qs[0]['is_ai']
                 is_ai = 1 if is_ai != 2 and CONFIG_INFO != CONFIG_CN else 0  # 国内不支持AI服务
                 if not is_ai:
@@ -1125,16 +1125,19 @@ class CloudStorageView(View):
                     if uid_bucket['use_status'] == 1 and uid_bucket['endTime'] > now_time:  # 套餐使用中并且相同套餐叠加过期时间
                         Unused_Uid_Meal.objects.create(uid=uid, channel=channel, addTime=now_time, order_id=order_id,
                                                        expire=expire, is_ai=is_ai, bucket_id=bucket_id)
-                        UID_Bucket.objects.filter(id=uid_bucket_id).update(has_unused=1)
+                        update_status = UID_Bucket.objects.filter(id=uid_bucket_id).update(has_unused=1)
                         use_flag = False
                     else:
-                        UID_Bucket.objects.filter(id=uid_bucket_id).update(channel=channel, bucket_id=bucket_id,
-                                                                           endTime=end_time, updateTime=now_time,
-                                                                           use_status=1)
+                        update_status = UID_Bucket.objects.filter(id=uid_bucket_id).update(channel=channel,
+                                                                                           bucket_id=bucket_id,
+                                                                                           endTime=end_time,
+                                                                                           updateTime=now_time,
+                                                                                           use_status=1)
                 else:
                     uid_bucket = UID_Bucket.objects.create(uid=uid, channel=channel, bucket_id=bucket_id,
                                                            endTime=end_time, addTime=now_time, updateTime=now_time,
                                                            use_status=1)
+                    update_status = True
                     uid_bucket_id = uid_bucket.id
 
                 device_info_qs = Device_Info.objects.filter(UID=uid, vodPrimaryUserID='', vodPrimaryMaster='')
@@ -1148,7 +1151,9 @@ class CloudStorageView(View):
                 # 核销coupon
                 if order_list[0]['coupon_id']:
                     CouponModel.objects.filter(id=order_list[0]['coupon_id']).update(use_status=2, update_time=now_time)
-
+                logger.info(
+                    'uid:{},uid_bucket_id:{},update_status:{},order_id:{}'.format(uid, uid_bucket_id, update_status,
+                                                                                  order_id))
                 order_qs.update(status=1, updTime=now_time, uid_bucket_id=uid_bucket_id,
                                 promotion_rule_id=promotion_rule_id)
                 date_time = time.strftime("%Y-%m-%d", time.localtime())

+ 3 - 3
Model/models.py

@@ -1874,10 +1874,10 @@ class Unused_Uid_Meal(models.Model):
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, verbose_name='存储空间')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     expire = models.IntegerField(verbose_name='存储桶存储时长[月份]', default=0)
-    # is_ai = models.SmallIntegerField(verbose_name='是否开通AI服务', default=0)  # 0:不开通;1:开通
-    # order_id = models.CharField(max_length=20, verbose_name='关联订单号', default='', db_index=True)
+    is_ai = models.SmallIntegerField(verbose_name='是否开通AI服务', default=0)  # 0:不开通;1:开通
+    order_id = models.CharField(max_length=20, verbose_name='关联订单号', default='', db_index=True)
 
-    num = models.IntegerField(verbose_name='个数', default=0)
+    # num = models.IntegerField(verbose_name='个数', default=0)
     # effect_time = models.BigIntegerField(verbose_name='生效时间', db_index=True, default=0)
     # uid_bucket = models.ForeignKey(UID_Bucket, blank=True, to_field='id', on_delete=models.CASCADE, default=0,
     #                            verbose_name='uid_bucket关联')