six_006

django_app/积分查询管理接口.py

@@ -2,6 +2,7 @@ from datetime import datetime
 from typing import cast
 
 from channels.layers import BaseChannelLayer, get_channel_layer
+from django.db import models
 from django.db.models import Case, Count, IntegerField, Sum, When
 from rest_framework.decorators import action
 from rest_framework.request import Request
@@ -52,7 +53,7 @@ class 积分查询接口ViewSets(ViewSet):
                     share总积分=Sum("share分享者积分值"),
                     share可提现积分=Sum(
                         Case(
-                            When(share积分是否可以提现的状态=miniUser提现状态().可提现, then="share分享者积分值"),
+                            When(models.Q(share积分是否可以提现的状态=miniUser提现状态().可提现) & models.Q(share提现微信侧返回的提现状态__isnull=True), then="share分享者积分值"),
                             default=0,
                             output_field=IntegerField()
                             )
@@ -68,17 +69,23 @@ class 积分查询接口ViewSets(ViewSet):
                         ),
                     share已提现积分=Sum(
                         Case(
-                            When(share积分是否可以提现的状态="已提现", then="share分享者积分值"
+                            When(share提现微信侧返回的提现状态="SUCCESS", then="share分享者积分值"
                                 ),
                             default=0,
                             output_field=IntegerField()
                             )
                         ),
+                    share提现中积分=Sum(
+                        Case(
+                            When(models.Q(share提现微信侧返回的提现状态="WAIT_USER_CONFIRM"), then="share分享者积分值", ),
+                            default=0,
+                            output_field=IntegerField()
+                            )
+                        ),
                     share点击次数=Count("id_主键")
                     )
             )
             xiaozizidata["unionid"] = self_mini_unionid
-            print(xiaozizidata)
             return Response(data=xiaozizidata)
     
     @action(detail=False, methods=["get", "post", "put", "delete"], url_path="查询当前用户积列详情列表数据")
@@ -89,4 +96,5 @@ class 积分查询接口ViewSets(ViewSet):
         self_mini_unionid = request.data.get("self_mini_unionid", None)
         当前的月份 = datetime.now().month
         shareDaat = share积分表.objects.filter(share分享者unionid=self_mini_unionid, ).order_by("-dateAndTime").values()
+        print("shareDaatshareDaatshareDaatshareDaatshareDaatshareDaatshareDaatshareDaat", shareDaat)
         return Response(data=shareDaat)