@@ -82,6 +82,6 @@ def start_contribution_contract_sign_api(request, administrator): |
||
| 82 | 82 |
wxcfg = WECHAT.get('MINIAPP', {})
|
| 83 | 83 |
appid = wxcfg.get('appID')
|
| 84 | 84 |
|
| 85 |
- 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={}'.format(flow_id))
|
|
| 85 |
+ 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))
|
|
| 86 | 86 |
|
| 87 | 87 |
return response(200, 'Start Contribution Contract Sign Success', u'发起投稿授权书签署成功', data={})
|
@@ -75,19 +75,20 @@ def get_contribtion_contract_sign_mppath_api(request): |
||
| 75 | 75 |
user_id = request.POST.get('user_id', '')
|
| 76 | 76 |
flow_id = request.POST.get('flow_id', '')
|
| 77 | 77 |
lensman_id = request.POST.get('lensman_id', '')
|
| 78 |
+ contribution_id = request.POST.get('contribution_id', '')
|
|
| 78 | 79 |
|
| 79 | 80 |
lensman = LensmanInfo.objects.get(lensman_id=lensman_id) |
| 80 | 81 |
|
| 81 | 82 |
try: |
| 82 | 83 |
contract = LensmanContributionContractInfo.objects.get( |
| 83 | 84 |
user_id=user_id, |
| 85 |
+ contribution_id=contribution_id, |
|
| 84 | 86 |
lensman_id=lensman_id, |
| 85 |
- flow_id=flow_id, |
|
| 86 | 87 |
) |
| 87 | 88 |
except LensmanContributionContractInfo.DoesNotExist: |
| 88 | 89 |
return response(ContractStatusCode.CONTRACT_NOT_FOUND) |
| 89 | 90 |
|
| 90 |
- scheme_url = get_contribtion_contract_sign_mppath(lensman, flow_id) |
|
| 91 |
+ scheme_url = get_contribtion_contract_sign_mppath(lensman, contract.flow_id) |
|
| 91 | 92 |
|
| 92 | 93 |
return response(200, data={
|
| 93 | 94 |
'contract': contract.mpdata, |