ConsumeInfoSubmitLogInfo add filter status

FFIB 5 年之前
父节点
当前提交
2b568a66e9
共有 4 个文件被更改,包括 5 次插入4 次删除
  1. 1 0
      api/mch_views.py
  2. 2 2
      commands/management/commands/membercard.py
  3. 1 1
      page/sale_views.py
  4. 1 1
      pre/views.py

+ 1 - 0
api/mch_views.py

@@ -284,6 +284,7 @@ def consumer_info_api(request):
284 284
         serialNo=serialNo,
285 285
         verifyResult=1,
286 286
         test_user=False,
287
+        status=True
287 288
     ).exists()
288 289
 
289 290
     if dupload:

+ 2 - 2
commands/management/commands/membercard.py

@@ -84,7 +84,7 @@ class Command(CompatibilityBaseCommand):
84 84
                     logger.info(e.message)
85 85
                     continue
86 86
 
87
-                logs = ConsumeInfoSubmitLogInfo.objects.filter(Q(user_id=userinfo.user_id) & (Q(phone=None) | Q(phone='')))
87
+                logs = ConsumeInfoSubmitLogInfo.objects.filter(Q(status=True) & Q(user_id=userinfo.user_id) & (Q(phone=None) | Q(phone='')))
88 88
                 for log in logs:
89 89
                     log.phone = userinfo.phone
90 90
                     log.save()
@@ -100,7 +100,7 @@ class Command(CompatibilityBaseCommand):
100 100
                     logger.info(e.message)
101 101
                     continue
102 102
 
103
-                logs = ConsumeInfoSubmitLogInfo.objects.filter(user_id=userinfo.user_id)
103
+                logs = ConsumeInfoSubmitLogInfo.objects.filter(user_id=userinfo.user_id, status=True)
104 104
                 for log in logs:
105 105
                     log.province = log.province if log.lat and log.lon else province_name
106 106
                     log.save()

+ 1 - 1
page/sale_views.py

@@ -100,7 +100,7 @@ def clerk_sale_submit_api(request):
100 100
     ymd = tc.local_string(format='%Y%m%d')
101 101
 
102 102
     # 是否被消费者扫过
103
-    has_scan = ConsumeInfoSubmitLogInfo.objects.filter(model_id=model.model_id, serialNo=serialNo).exists()
103
+    has_scan = ConsumeInfoSubmitLogInfo.objects.filter(model_id=model.model_id, serialNo=serialNo, status=True).exists()
104 104
 
105 105
     # 是否是新二维码,即统览码2
106 106
     if not code_version:

+ 1 - 1
pre/views.py

@@ -246,7 +246,7 @@ def refreshs():
246 246
     ConsumeProvinceSaleStatisticInfo.objects.all().delete()
247 247
     ConsumeModelSaleStatisticInfo.objects.all().delete()
248 248
 
249
-    logs = ConsumeInfoSubmitLogInfo.objects.filter(verifyResult=1, dupload=False, test_user=False)
249
+    logs = ConsumeInfoSubmitLogInfo.objects.filter(verifyResult=1, dupload=False, test_user=False, status=True)
250 250
 
251 251
     for log in logs:
252 252
         ymd = tc.local_string(utc_dt=log.created_at, format='%Y%m%d')