|
|
@@ -240,8 +240,11 @@ class PaypalCycleNotify(View):
|
|
|
update_status = UID_Bucket.objects.filter(id=uid_bucket_id).update(has_unused=1)
|
|
|
use_flag = False
|
|
|
else: # 云存服务已过期则重新开通云存服务
|
|
|
- update_status = UID_Bucket.objects.filter(id=uid_bucket_id).update(uid=UID, channel=channel, bucket_id=bucketId,
|
|
|
- endTime=endTime, updateTime=nowTime)
|
|
|
+ update_status = UID_Bucket.objects.filter(id=uid_bucket_id).update(uid=UID, channel=channel,
|
|
|
+ bucket_id=bucketId,
|
|
|
+ endTime=endTime,
|
|
|
+ updateTime=nowTime,
|
|
|
+ use_status=1)
|
|
|
|
|
|
else:
|
|
|
ub_cqs = UID_Bucket.objects.create \
|
|
|
@@ -464,16 +467,23 @@ class PaypalCycleNotify(View):
|
|
|
if ubq['use_status'] == 1 and ubq['endTime'] > nowTime: # 套餐使用中并且未过期
|
|
|
Unused_Uid_Meal.objects.create(uid=UID, channel=channel, addTime=nowTime, is_ai=is_ai,
|
|
|
order_id=orderID, expire=expire, bucket_id=bucketId)
|
|
|
- UID_Bucket.objects.filter(id=ubq['id']).update(has_unused=1)
|
|
|
+ update_status = UID_Bucket.objects.filter(id=ubq['id']).update(has_unused=1)
|
|
|
use_flag = False
|
|
|
else: # 已过期或者不相同的套餐加入未使用的关联套餐表
|
|
|
- UID_Bucket.objects.filter(id=uid_bucket_id).update(uid=UID, channel=channel, bucket_id=bucketId,
|
|
|
- endTime=endTime, updateTime=nowTime)
|
|
|
+ update_status = UID_Bucket.objects.filter(id=uid_bucket_id).update(uid=UID, channel=channel,
|
|
|
+ bucket_id=bucketId,
|
|
|
+ endTime=endTime,
|
|
|
+ updateTime=nowTime,
|
|
|
+ use_status=1)
|
|
|
|
|
|
else:
|
|
|
ub_cqs = UID_Bucket.objects.create(uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime,
|
|
|
addTime=nowTime, updateTime=nowTime, use_status=1)
|
|
|
uid_bucket_id = ub_cqs.id
|
|
|
+ update_status = True
|
|
|
+ PAY_LOGGER.info(
|
|
|
+ 'uid:{},uid_bucket_id:{},update_status:{},order_id:{}'.format(UID, uid_bucket_id, update_status,
|
|
|
+ orderID))
|
|
|
dvq = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
|
|
|
if dvq.exists():
|
|
|
dvq_set_update_dict = {
|
