解决首次续费回调失败

Controller/PaymentCycle.py

@@ -467,7 +467,6 @@ class PaypalCycleNotify(View):
             if not self.config_match_region(uid, country_id):
                 return HttpResponse('Fail', status=500)
 
-            orderID = CommonService.createOrderID()
             UID = order_qs[0]['UID']
             isSelectDiscounts = order_qs[0]['isSelectDiscounts']
             coupon_id = order_qs[0]['coupon_id']
@@ -498,7 +497,7 @@ class PaypalCycleNotify(View):
                         promotion_rule_id = ''
                     if isSelectDiscounts:
                         expire = expire * 2
-                    uid_bucket_id = self.create_vod(UID, expire, is_ai, nowTime, channel, bucketId, orderID,
+                    uid_bucket_id = self.create_vod(UID, expire, is_ai, nowTime, channel, bucketId, order_id,
                                                     userid, username)
                     order_qs.update(status=1, trade_no=paypal_transaction_id, updTime=nowTime,
                                     uid_bucket_id=uid_bucket_id, create_vod=1,
@@ -521,6 +520,7 @@ class PaypalCycleNotify(View):
             order_type = order_qs[0]['order_type']
             endTime = CommonService.calcMonthLater(expire)
             use_flag = True
+            orderID = CommonService.createOrderID()
             ubqs = UID_Bucket.objects.filter(uid=UID).values("id", "endTime", "use_status")
             with transaction.atomic():
                 if ubqs.exists():

Model/models.py

@@ -1291,6 +1291,7 @@ class Order_Model(models.Model):
     agreement_id = models.CharField(default='', blank=True, max_length=64, verbose_name=u'paypal协议id')
     coupon_id = models.CharField(default='', blank=True, max_length=10, verbose_name=u'优惠券id')
     store_meal_name = models.CharField(default='', blank=True, max_length=64, verbose_name=u'关联套餐名')
+    create_vod = models.SmallIntegerField(default=0, verbose_name='是否生成云存服务')  # 0：未生成，1：已生成
 
     def __str__(self):
         return self.orderID