|
@@ -827,17 +827,17 @@ class CloudStorageView(View):
|
|
|
data = request.POST.dict()
|
|
|
logger = logging.getLogger('log')
|
|
|
try:
|
|
|
- logger.info('1')
|
|
|
+
|
|
|
signature = data["sign"]
|
|
|
data.pop('sign')
|
|
|
orderID = data['out_trade_no']
|
|
|
- logger.info('2')
|
|
|
+
|
|
|
order_qs = Order_Model.objects.filter(orderID=orderID, status=0)
|
|
|
|
|
|
aliPayObj = AliPayObject()
|
|
|
alipay = aliPayObj.conf()
|
|
|
success = alipay.verify(data, signature)
|
|
|
- logger.info('3')
|
|
|
+
|
|
|
if success and data["trade_status"] in ("TRADE_SUCCESS", "TRADE_FINISHED"):
|
|
|
print("trade succeed")
|
|
|
|
|
@@ -852,30 +852,40 @@ class CloudStorageView(View):
|
|
|
smqs = Store_Meal.objects.filter(id=rank). \
|
|
|
values("day", "bucket_id", "bucket__storeDay", "expire")
|
|
|
bucketId = smqs[0]['bucket_id']
|
|
|
- logger.info('4')
|
|
|
+
|
|
|
if not smqs.exists():
|
|
|
return response.json(173)
|
|
|
ubqs = UID_Bucket.objects.filter(bucket__id=bucketId, uid=UID, channel=channel, endTime__gte=nowTime). \
|
|
|
values("id", "bucket__storeDay", "bucket__region", "endTime").order_by('addTime')[:1]
|
|
|
nowTime = int(time.time())
|
|
|
expire = smqs[0]['expire']
|
|
|
- logger.info('5')
|
|
|
+
|
|
|
if order_list[0]['isSelectDiscounts'] == 1:
|
|
|
expire = smqs[0]['expire'] * 2
|
|
|
+ logger.info('1')
|
|
|
if ubqs.exists():
|
|
|
+ logger.info('2')
|
|
|
ubq = ubqs[0]
|
|
|
+ logger.info('3')
|
|
|
endTime = CommonService.calcMonthLater(expire, ubq['endTime'])
|
|
|
+ logger.info('4')
|
|
|
ub_cqs = UID_Bucket.objects.filter(id=ubq['id']).update \
|
|
|
(uid=UID, channel=channel, bucket_id=bucketId,
|
|
|
endTime=endTime, updateTime=nowTime)
|
|
|
+ logger.info('5')
|
|
|
uid_bucket_id = ubq['id']
|
|
|
+ logger.info('6')
|
|
|
else:
|
|
|
+ logger.info('7')
|
|
|
endTime = CommonService.calcMonthLater(expire)
|
|
|
+ logger.info('8')
|
|
|
ub_cqs = UID_Bucket.objects.create \
|
|
|
(uid=UID, channel=channel, bucket_id=bucketId, endTime=endTime, addTime=nowTime,
|
|
|
updateTime=nowTime)
|
|
|
+ logger.info('9')
|
|
|
uid_bucket_id = ub_cqs.id
|
|
|
- logger.info('6')
|
|
|
+ logger.info('10')
|
|
|
+
|
|
|
dvq = Device_Info.objects.filter(UID=UID, vodPrimaryUserID='', vodPrimaryMaster='')
|
|
|
if dvq.exists():
|
|
|
dvq_set_update_dict = {
|
|
@@ -883,10 +893,10 @@ class CloudStorageView(View):
|
|
|
'vodPrimaryMaster': username
|
|
|
}
|
|
|
dvq.update(**dvq_set_update_dict)
|
|
|
- logger.info('7')
|
|
|
+
|
|
|
order_qs.update(status=1, updTime=nowTime, uid_bucket_id=uid_bucket_id)
|
|
|
red_url = "{SERVER_DOMAIN}cloudstorage/payOK".format(SERVER_DOMAIN=SERVER_DOMAIN)
|
|
|
- logger.info('8')
|
|
|
+
|
|
|
return HttpResponseRedirect(red_url)
|
|
|
return response.json(0, signature)
|
|
|
except Exception as e:
|