Selaa lähdekoodia

查询对账结果

peng 1 vuosi sitten
vanhempi
commit
2003c90ab6
2 muutettua tiedostoa jossa 36 lisäystä ja 5 poistoa
  1. 31 2
      AdminController/ServeManagementController.py
  2. 5 3
      Model/models.py

+ 31 - 2
AdminController/ServeManagementController.py

@@ -22,7 +22,7 @@ from Controller.UnicomCombo.UnicomComboTaskController import UnicomComboTaskView
 from Model.models import VodBucketModel, CDKcontextModel, Store_Meal, Order_Model, \
 from Model.models import VodBucketModel, CDKcontextModel, Store_Meal, Order_Model, \
     UID_Bucket, ExperienceContextModel, Lang, CloudLogModel, UidSetModel, Unused_Uid_Meal, \
     UID_Bucket, ExperienceContextModel, Lang, CloudLogModel, UidSetModel, Unused_Uid_Meal, \
     Device_Info, DeviceTypeModel, UnicomComboOrderInfo, AiService, CountryModel, CouponLang, CouponConfigModel, \
     Device_Info, DeviceTypeModel, UnicomComboOrderInfo, AiService, CountryModel, CouponLang, CouponConfigModel, \
-    CouponCombo, CouponModel, Device_User, AbnormalOrder
+    CouponCombo, CouponModel, Device_User, AbnormalOrder, DailyReconciliation
 from Object.ResponseObject import ResponseObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.TokenObject import TokenObject
 from Object.UnicomObject import UnicomObjeect
 from Object.UnicomObject import UnicomObjeect
@@ -126,6 +126,8 @@ class serveManagement(View):
                 return self.getAbnormalOrderList(request_dict, response)
                 return self.getAbnormalOrderList(request_dict, response)
             elif operation == 'updateAbnormalOrder':
             elif operation == 'updateAbnormalOrder':
                 return self.updateAbnormalOrder(request_dict, response)
                 return self.updateAbnormalOrder(request_dict, response)
+            elif operation == 'getDailyReconciliation':
+                return self.getDailyReconciliation(request_dict, response)
             elif operation == 'deleteDeviceOrder':
             elif operation == 'deleteDeviceOrder':
                 return self.deleteDeviceOrder(userID, request_dict, response)
                 return self.deleteDeviceOrder(userID, request_dict, response)
             elif operation == 'getDevicePackageList':  # 云存设备套餐
             elif operation == 'getDevicePackageList':  # 云存设备套餐
@@ -1247,6 +1249,32 @@ class serveManagement(View):
         except Exception as e:
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
 
 
+    def getDailyReconciliation(self, request_dict, response):
+        print('request_dict: ', request_dict)
+        page_no = request_dict.get('page_no', None)
+        page_size = request_dict.get('page_size', None)
+        start_time = request_dict.get('start_time', None)
+        end_time = request_dict.get('end_time', None)
+
+        if not all([page_no, page_size]):
+            return response.json(444)
+
+        page = int(page_no)
+        line = int(page_size)
+        try:
+            order_qs = DailyReconciliation.objects.all()
+            # 筛选指定订单
+            if start_time and end_time:
+                order_qs = order_qs.filter(time__gte=start_time, time__lt=end_time)
+            if not order_qs.exists():
+                return response.json(0, [])
+            count = order_qs.count()
+            order_qs = order_qs.values("id", "trade_nos", "ansjer_total", "ansjer_num", "paypal_num", "paypal_total",
+                                       "time").order_by('-time')[(page - 1) * line:page * line]
+            return response.json(0, {'list': list(order_qs), 'total': count})
+        except Exception as e:
+            return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
+
     def vodOrderReconcile(self, request, request_dict, response):
     def vodOrderReconcile(self, request, request_dict, response):
 
 
         file = request.FILES.get('file', None)
         file = request.FILES.get('file', None)
@@ -2034,7 +2062,8 @@ class serveManagement(View):
                         return response.json(0)
                         return response.json(0)
                     uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, use_status=1, orderId='').values('endTime')
                     uid_bucket_qs = UID_Bucket.objects.filter(uid=uid, use_status=1, orderId='').values('endTime')
                     if uid_bucket_qs.exists():  # 如果通过uid查询正在使用的套餐,则更新过期时间和使用状态
                     if uid_bucket_qs.exists():  # 如果通过uid查询正在使用的套餐,则更新过期时间和使用状态
-                        end_time = pay_time + uid_bucket_qs[0]['endTime'] - CommonService.calcMonthLater(expire, pay_time)
+                        end_time = pay_time + uid_bucket_qs[0]['endTime'] - CommonService.calcMonthLater(expire,
+                                                                                                         pay_time)
                         use_status = 2 if end_time < nowTime else 1
                         use_status = 2 if end_time < nowTime else 1
                         uid_bucket_qs.update(endTime=end_time, use_status=use_status, updateTime=nowTime)
                         uid_bucket_qs.update(endTime=end_time, use_status=use_status, updateTime=nowTime)
                         return response.json(0)
                         return response.json(0)

+ 5 - 3
Model/models.py

@@ -4461,14 +4461,15 @@ class DailyReconciliation(models.Model):
         db_table = 'daily_reconciliation'
         db_table = 'daily_reconciliation'
         verbose_name = 'paypal每日对账'
         verbose_name = 'paypal每日对账'
 
 
+
 class AppAdvertiseCampaign(models.Model):
 class AppAdvertiseCampaign(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键')
     id = models.AutoField(primary_key=True, verbose_name='主键')
     image_url = models.CharField(default='', max_length=256, verbose_name='广告图片url')
     image_url = models.CharField(default='', max_length=256, verbose_name='广告图片url')
     campaign_url = models.CharField(default='', max_length=256, verbose_name='活动链接')
     campaign_url = models.CharField(default='', max_length=256, verbose_name='活动链接')
     campaign_name = models.CharField(default='', max_length=32, verbose_name='广告名称')
     campaign_name = models.CharField(default='', max_length=32, verbose_name='广告名称')
-    campaign_type = models.SmallIntegerField(default=1,verbose_name='广告类型') # 1:开屏广告
+    campaign_type = models.SmallIntegerField(default=1, verbose_name='广告类型')  # 1:开屏广告
     device_type = models.ManyToManyField(to="DeviceTypeModel", verbose_name='设备类型')
     device_type = models.ManyToManyField(to="DeviceTypeModel", verbose_name='设备类型')
-    status = models.SmallIntegerField(default=0, verbose_name='广告状态')# 0:关闭 1:开启 2:删除
+    status = models.SmallIntegerField(default=0, verbose_name='广告状态')  # 0:关闭 1:开启 2:删除
     country = models.ManyToManyField(to="CountryModel", verbose_name='广告地区')
     country = models.ManyToManyField(to="CountryModel", verbose_name='广告地区')
     campaign_start_date = models.IntegerField(default=0, verbose_name='广告开始日期')
     campaign_start_date = models.IntegerField(default=0, verbose_name='广告开始日期')
     campaign_end_date = models.IntegerField(default=0, verbose_name='广告结束日期')
     campaign_end_date = models.IntegerField(default=0, verbose_name='广告结束日期')
@@ -4481,6 +4482,7 @@ class AppAdvertiseCampaign(models.Model):
         db_table = 'app_advertise_campaign'
         db_table = 'app_advertise_campaign'
         verbose_name = 'App广告活动表'
         verbose_name = 'App广告活动表'
 
 
+
 class OpenScreenCampaign(models.Model):
 class OpenScreenCampaign(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键')
     id = models.AutoField(primary_key=True, verbose_name='主键')
     campaign_id = models.ForeignKey(AppAdvertiseCampaign, on_delete=models.CASCADE, verbose_name='广告活动id')
     campaign_id = models.ForeignKey(AppAdvertiseCampaign, on_delete=models.CASCADE, verbose_name='广告活动id')
@@ -4491,4 +4493,4 @@ class OpenScreenCampaign(models.Model):
 
 
     class Meta:
     class Meta:
         db_table = 'open_screen_campaign'
         db_table = 'open_screen_campaign'
-        verbose_name = '开屏广告表'
+        verbose_name = '开屏广告表'