api/member_views.py

@@ -464,7 +464,11 @@ def activity_signin(request):

                 
              

                 def get_group_share_info_integral(activity_id, share_user_id, open_gid, group_share_integral, group_share_max_integral):
              

                     # 校验该分享人是否已领取该群积分
              

                -    has_integral = MemberActivityGroupShareInfo.objects.filter(activity_id=activity_id, share_user_id=share_user_id, open_gid=open_gid, is_integral=True).exists()
              

                +    if open_gid:
              

                +        has_integral = MemberActivityGroupShareInfo.objects.filter(activity_id=activity_id, share_user_id=share_user_id, open_gid=open_gid, is_integral=True).exists()
              

                +    else:
              

                +        has_integral = MemberActivityGroupShareInfo.objects.filter(activity_id=activity_id, share_user_id=share_user_id, is_integral=True).exists()
              

                +
              

                     if has_integral:
              

                         return False, 0
              

                     # 校验该分享人是否已领取该活动积分上限
              
@@ -485,20 +489,22 @@ def activity_group_share(request):

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

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

                 
              

                -    wxcfg = WECHAT.get('MINIAPP', {})
              

                +    open_gid = None
              

                +    if iv and encryptedData:
              

                +        wxcfg = WECHAT.get('MINIAPP', {})
              

                 
              

                -    appid = wxcfg.get('appID')
              

                -    secret = wxcfg.get('appsecret')
              

                +        appid = wxcfg.get('appID')
              

                +        secret = wxcfg.get('appsecret')
              

                 
              

                -    # {
              

                -    #     "openGId": "OPENGID"
              

                -    # }
              

                -    shareinfo = get_shareinfo(appid=appid, secret=secret, unid=click_user_id, session_key=None, encryptedData=encryptedData, iv=iv, storage=RedisStorage(r))
              

                +        # {
              

                +        #     "openGId": "OPENGID"
              

                +        # }
              

                +        shareinfo = get_shareinfo(appid=appid, secret=secret, unid=click_user_id, session_key=None, encryptedData=encryptedData, iv=iv, storage=RedisStorage(r))
              

                 
              

                -    open_gid = shareinfo.get('openGId')
              

                +        open_gid = shareinfo.get('openGId')
              

                 
              

                -    if not open_gid:
              

                -        return response()
              

                +        if not open_gid:
              

                +            return response()
              

                 
              

                     try:
              

                         user = UserInfo.objects.select_for_update().get(user_id=share_user_id, status=True)
              

member/migrations/0053_alter_memberactivitygroupshareinfo_unique_together.py

@@ -0,0 +1,18 @@

                +# -*- coding: utf-8 -*-
              

                +# Generated by Django 3.2.16 on 2022-11-11 04:42
              

                +
              

                +from django.db import migrations
              

                +
              

                +
              

                +class Migration(migrations.Migration):
              

                +
              

                +    dependencies = [
              

                +        ('member', '0052_auto_20221107_2238'),
              

                +    ]
              

                +
              

                +    operations = [
              

                +        migrations.AlterUniqueTogether(
              

                +            name='memberactivitygroupshareinfo',
              

                +            unique_together={('activity_id', 'share_user_id', 'click_user_id', 'brand_id')},
              

                +        ),
              

                +    ]
              

member/models.py

@@ -711,7 +711,7 @@ class MemberActivityGroupShareInfo(BaseModelMixin, BrandInfoMixin):

                         verbose_name_plural = _(u'会员活动群组分享信息')
              

                 
              

                         unique_together = (
              

                -            ('activity_id', 'share_user_id', 'click_user_id', 'open_gid', 'brand_id'),
              

                +            ('activity_id', 'share_user_id', 'click_user_id', 'brand_id'),
              

                         )
              

                 
              

                     def __unicode__(self):