api/hb_views.py

@@ -7,13 +7,20 @@ from django_we.models import SubscribeUserInfo

                 
              

                 from logs.models import RedpackSendLogInfo
              

                 from miniapp.redpack_views import send_jsapi_hb
              

                +from utils.redis.connect import r
              

                +from utils.redis.rkeys import REDPACK_WAITING_SEND_LIST
              

                 
              

                 
              

                -def exec_send_jsapi_hb(user, elog, amount):
              

                +def exec_send_jsapi_hb(user, elog, amount, sn=None):
              

                     if elog.redpack_send_num >= 3:
              

                         return
              

                 
              

                     if not SubscribeUserInfo.objects.filter(extraid=user.brand_id, unionid=user.unionid, openid=user.openid, subscribe=True).exists():
              

                +        r.rpushjson(REDPACK_WAITING_SEND_LIST, {
              

                +            'sn': sn,
              

                +            'user_id': user.user_id,
              

                +            'amount': amount,
              

                +        })
              

                         return
              

                 
              

                     pre_amount = elog.pre_redpack_send_amount or elog.redpack_amount or elog.redpack_max_amount
              

api/mch_views.py

@@ -399,7 +399,7 @@ def consumer_info_api(request):

                         if elog.redpack_max_amount:
              

                             amount = random.randint(100, elog.redpack_max_amount)
              

                         if user.openid:
              

                -            exec_send_jsapi_hb(user, elog, amount)
              

                +            exec_send_jsapi_hb(user, elog, amount, sn=serialNo)
              

                         else:
              

                             r.rpushjson(REDPACK_WAITING_SEND_LIST, {
              

                                 'sn': serialNo,
              

commands/management/commands/hb.py

@@ -59,6 +59,6 @@ class Command(CompatibilityBaseCommand):

                                 if v.get('user_id', '') == 1:
              

                                     exec_clerk_send_jsapi_hb(user, elog, v.get('amount', 100))
              

                                 else:
              

                -                    exec_send_jsapi_hb(user, elog, v.get('amount', 100))
              

                +                    exec_send_jsapi_hb(user, elog, v.get('amount', 100), sn=v.get('sn', ''))
              

                 
              

                             close_old_connections()