page/sale_views.py

@@ -687,6 +687,8 @@ def clerk_sale_submit_api(request):

                 def clerk_integral_list_api(request):
              

                     brandID = request.POST.get('BrandID', settings.KODO_DEFAULT_BRAND_PK)
              

                     user_id = request.POST.get('user_id', '')
              

                +    ftime = request.POST.get('ftime', '')
              

                +    ttime = request.POST.get('ttime', '')
              

                     page = int(request.POST.get('page', 1))
              

                     num = int(request.POST.get('num', settings.GROUP_NUM_PER_PAGE))
              

                 
              
@@ -714,12 +716,17 @@ def clerk_integral_list_api(request):

                         return response(SaleclerkStatusCode.CLERK_NOT_FOUND)
              

                 
              

                     integrals = SaleclerkIntegralIncomeExpensesInfo.objects.filter(clerk_id=clerk.clerk_id).order_by('-pk')
              

                +    if ftime and ttime:
              

                +        fdt = tc.string_to_utc_datetime(ftime)
              

                +        tdt = tc.string_to_utc_datetime(ttime)
              

                +        integrals = integrals.filter(created_at__gte=fdt, created_at__lte=tdt)
              

                     integrals, left = pagination(integrals, page, num)
              

                     integrals = [integral.data for integral in integrals]
              

                 
              

                     return response(200, data={
              

                         'integrals': integrals,
              

                -        'total_integral': clerk.integral,
              

                +        'total_integral': sum([i.get('integral', 0) for i in integrals]),
              

                +        'left_integral': clerk.integral,
              

                     })