api/activity/activity_urls.py

@@ -4,6 +4,7 @@ from django.conf.urls import include, url

                 
              

                 from api.activity import contribution_admin_views
              

                 
              

                +
              

                 urlpatterns = [
              

                     url(r'^admin/member/activity/contribute/delete$', contribution_admin_views.member_activity_contribution_delete_api, name='member_activity_contribution_delete_api'),
              

                -]
              

                +]
              

api/activity/contribution_admin_views.py

@@ -5,10 +5,10 @@ from django_query import get_query_value

                 from django_response import response
              

                 
              

                 from kodo.decorators import check_admin
              

                -
              

                 from member.models import MemberActivityContributionInfo
              

                 from utils.error.errno_utils import MemberActivityContributionStatusCode
              

                 
              

                +
              

                 @check_admin
              

                 @transaction.atomic
              

                 def member_activity_contribution_delete_api(request, administrator):
              
@@ -22,4 +22,4 @@ def member_activity_contribution_delete_api(request, administrator):

                     contribution.status = False
              

                     contribution.save()
              

                 
              

                -    return response(200, 'Member Activity Contribution  Delete Success', u'会员活动投稿删除成功')
              

                +    return response(200, 'Member Activity Contribution  Delete Success', u'会员活动投稿删除成功')
              

api/lensman/contract_admin_views.py

@@ -4,19 +4,19 @@ from django.conf import settings

                 from django_logit import logit
              

                 from django_response import response
              

                 
              

                -from kodo.decorators import check_admin
              

                -from utils.error.errno_utils import ContractStatusCode, TencentCloudStatusCode
              

                -from utils.tencentcloud.ess import describe_file_urls
              

                -
              

                +from account.models import LensmanInfo, UserInfo
              

                 from api.lensman import contract_mp_views
              

                -
              

                 from apps.contract.models import LensmanContributionContractInfo
              

                -from account.models import LensmanInfo, UserInfo
              

                +from kodo.decorators import check_admin
              

                 from member.models import MemberActivityInfo
              

                 from pre.custom_message import sendwxasubscribemessage
              

                +from utils.error.errno_utils import ContractStatusCode, TencentCloudStatusCode
              

                +from utils.tencentcloud.ess import describe_file_urls
              

                +
              

                 
              

                 WECHAT = settings.WECHAT
              

                 
              

                +
              

                 @logit(res=True)
              

                 @check_admin
              

                 def get_signed_contribtion_contract_file_api(request, administrator):
              
@@ -84,4 +84,4 @@ def start_contribution_contract_sign_api(request, administrator):

                 
              

                     res = sendwxasubscribemessage(openid=user.openid_miniapp, template_id=settings.TEMPLATE_ID_CONTRIBUTION_CONTRACT, data=data, miniprogram_state=None, lang=None, page='/pages/member/activity/activity?flow_id={}&contribution_id={}'.format(flow_id, contribution_id))
              

                 
              

                -    return response(200, 'Start Contribution Contract Sign Success', u'发起投稿授权书签署成功', data={})
              

                +    return response(200, 'Start Contribution Contract Sign Success', u'发起投稿授权书签署成功', data={})
              

api/lensman/contract_mp_views.py

@@ -72,6 +72,7 @@ def get_contribtion_contract_api(request):

                         'scheme_url': scheme_url
              

                     })
              

                 
              

                +
              

                 def get_contribtion_contract_sign_mppath_api(request):
              

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

                     flow_id = request.POST.get('flow_id', '')
              
@@ -165,8 +166,7 @@ def create_contribution_contract_flow(lensman):

                 
              

                 def create_contribution_contract_document(lensman, contribution_id, file_ids, FlowId):
              

                     # 创建电子签文档 https://qian.tencent.com/developers/companyApis/startFlows/CreateDocument
              

                -    IMAGE_COMPONENTIDS = ['ComponentId_37', 'ComponentId_38','ComponentId_39','ComponentId_40','ComponentId_41','ComponentId_42',
              

                -                           'ComponentId_43','ComponentId_44','ComponentId_45','ComponentId_46','ComponentId_47','ComponentId_48','ComponentId_49','ComponentId_50','ComponentId_51','ComponentId_52','ComponentId_53','ComponentId_54','ComponentId_55', 'ComponentId_55', 'ComponentId_56', 'ComponentId_57', 'ComponentId_58', 'ComponentId_59', 'ComponentId_60', 'ComponentId_9', 'ComponentId_10', 'ComponentId_11', 'ComponentId_12', 'ComponentId_13', 'ComponentId_14', 'ComponentId_15', 'ComponentId_16', 'ComponentId_17', 'ComponentId_18', 'ComponentId_19', 'ComponentId_20', 'ComponentId_21', 'ComponentId_22', 'ComponentId_23', 'ComponentId_24', 'ComponentId_25', 'ComponentId_26', 'ComponentId_27', 'ComponentId_28','ComponentId_29', 'ComponentId_30', 'ComponentId_31', 'ComponentId_32']
              

                +    IMAGE_COMPONENTIDS = ['ComponentId_37', 'ComponentId_38', 'ComponentId_39', 'ComponentId_40', 'ComponentId_41', 'ComponentId_42', 'ComponentId_43', 'ComponentId_44', 'ComponentId_45', 'ComponentId_46', 'ComponentId_47', 'ComponentId_48', 'ComponentId_49', 'ComponentId_50', 'ComponentId_51', 'ComponentId_52', 'ComponentId_53', 'ComponentId_54', 'ComponentId_55', 'ComponentId_55', 'ComponentId_56', 'ComponentId_57', 'ComponentId_58', 'ComponentId_59', 'ComponentId_60', 'ComponentId_9', 'ComponentId_10', 'ComponentId_11', 'ComponentId_12', 'ComponentId_13', 'ComponentId_14', 'ComponentId_15', 'ComponentId_16', 'ComponentId_17', 'ComponentId_18', 'ComponentId_19', 'ComponentId_20', 'ComponentId_21', 'ComponentId_22', 'ComponentId_23', 'ComponentId_24', 'ComponentId_25', 'ComponentId_26', 'ComponentId_27', 'ComponentId_28', 'ComponentId_29', 'ComponentId_30', 'ComponentId_31', 'ComponentId_32']
              

                 
              

                     try:
              

                         amount = LensmanContributionActivityIncomeExpensesInfo.objects.get(contribution_id=contribution_id, lensman_id=lensman.lensman_id).amount
              

api/lensman/lensman_urls.py

@@ -9,7 +9,7 @@ urlpatterns = [

                     url(r'^mp/lensman/contribution/contract/get$', contract_mp_views.get_contribtion_contract_api, name='get_contribtion_contract_api'),
              

                     url(r'^mp/lensman/contribution/contract/status/get$', contract_mp_views.get_contribtion_contract_status_api, name='get_contribtion_contract_status_api'),
              

                     url(r'^mp/lensman/contribution/contract/sign/mppach/get$', contract_mp_views.get_contribtion_contract_sign_mppath_api, name='get_contribtion_contract_sign_mppath_api'),
              

                -    
              

                +
              

                     url(r'^mp/ess/callback$', contract_mp_views.ess_callback, name='ess_callback'),
              

                 ]
              

                 
              

api/lensman_admin_views.py

@@ -75,6 +75,7 @@ def lensman_audit(request, administrator):

                 
              

                     return response(200, 'Lensman Audit Pass Suceess', u'摄影师审核通过')
              

                 
              

                +
              

                 @logit
              

                 @check_admin
              

                 def lensman_delete(request, administrator):
              

api/urls.py

@@ -393,4 +393,4 @@ urlpatterns += [

                 # 会员活动模块
              

                 urlpatterns += [
              

                     url(r'', include(('api.activity.activity_urls', 'activity'), namespace='activity')),
              

                -]
              

                +]
              

maintenance/models.py

@@ -112,7 +112,7 @@ class MaintenaceInfo(BaseModelMixin):

                             'model_id': self.model_id,
              

                             'model_name': model.model_name if model else '',
              

                             'model_full_name': model.model_full_name if model else '',
              

                -            #'model_image_url': model.image2_url,
              

                +            # 'model_image_url': model.image2_url,
              

                             'log_id': self.log_id,
              

                             'sn': self.sn,
              

                             'desc': self.desc,
              

member/activity_mp_views.py

@@ -153,7 +153,7 @@ def activity_contribute_create(request):

                         try:
              

                             lensman = LensmanInfo.objects.get(user_id=user_id, status=True)
              

                             user_name = lensman.name
              

                -        except:
              

                +        except LensmanInfo.DoesNotExist:
              

                             pass
              

                 
              

                     try:
              

utils/tencentcloud/ess.py

@@ -44,7 +44,6 @@ def upload_document_files(files, file_type='png'):

                         file_ids = file_ids + res.FileIds
              

                         _files = _files[20:]
              

                 
              

                -        
              

                     return file_ids