Inicio Explorar Ayuda
Registro Iniciar sesión
Kodo
/
kodo
Vigilar 2
Destacar 0
Fork 0

Explorar el Código
Add Clerk Api

Brightcells %!s(int64=7) %!d(string=hace) años
padre
7f0e4aac3b
commit
0edbc92c74
Se han modificado 6 ficheros con 50 adiciones y 12 borrados
Mostrar Estadísticas de Diff
  1. 8 3
      api/urls.py
  2. 22 1
      page/sale_views.py
  3. 8 3
      pai2/settings.py
  4. 11 3
      pai2/urls.py
  5. 0 1
      photo/views.py
  6. 1 1
      requirements.txt

+ 8 - 3
api/urls.py
Ver Fichero 

@@ -1,15 +1,16 @@
1 1 
 # -*- coding: utf-8 -*-
2 2
3 3 
 from django.conf.urls import url
4 
+from django_file_upload import views as file_views
4 5
5 
-from account import views as account_views
6 6 
 from account import tourguide_views
7 
+from account import views as account_views
7 8 
 from api import encrypt_views, mch_views
8 9 
 from box import views as box_views
9 10 
 from geo import views as geo_views
10 
-from group import views as group_views
11 11 
 from group import (groupuser_views, lensman_views, tourguidegroup_views, tourguidegroupadmin_views,
12 12 
                    tourguidegroupuser_views)
13 
+from group import views as group_views
13 14 
 from message import views as message_views
14 15 
 from miniapp import views as mini_views
15 16 
 from operation import views as op_views
 
@@ -211,5 +212,9 @@ urlpatterns += [
211 212
212 213 
 urlpatterns += [
213 214 
     url(r'^clerk/submit$', oauth_views.clerk_submit_api, name='clerk_submit_api'),  # 店员信息提交
214 
-    url(r'^clerk/sale/submit$', sale_views.clerk_sale_submit_api, name='clerk_sale_submit_api'),  # 店员销售信息提交
215 
+    url(r'^clerk/sale/submit$', sale_views.clerk_sale_submit_api, name='clerk_sale_submit'),  # 店员销售信息提交
216 
+]
217 
+
218 
+urlpatterns = [
219 
+    url(r'^upload$', file_views.file_upload, name='file_upload'),
215 220 
 ]

+ 22 - 1
page/sale_views.py
Ver Fichero 

@@ -33,8 +33,29 @@ def clerk_sale_oauth(request):
33 33
34 34
35 35 
 @logit
36 
-@transaction.atomic
37 36 
 def clerk_sale_submit_api(request):
37 
+    user_id = request.POST.get('user_id', '')
38 
+    iv = request.POST.get('iv', '')
39 
+    encryptedData = request.POST.get('encryptedData', '')
40 
+    lat = request.POST.get('lat', '')
41 
+    lon = request.POST.get('lon', '')
42 
+    serialNo = request.POST.get('SerialNo', '')
43 
+    verifyResult = request.POST.get('verifyResult', '')
44 
+
45 
+    consumer_name = request.POST.get('consumer_name', '')
46 
+    consumer_phone = request.POST.get('consumer_phone', '')
47 
+
48 
+    file_path = request.POST.get('file_path', '')
49 
+
50 
+    return response(200, data={
51 
+        'integral': 123,
52 
+        'total_integral': 12345,
53 
+    })
54 
+
55 
+
56 
+@logit
57 
+@transaction.atomic
58 
+def clerk_sale_submit_api_bak(request):
38 59 
     """ 店员信息提交 """
39 60 
     step = int(request.POST.get('step', 1))
40 61

+ 8 - 3
pai2/settings.py
Ver Fichero 

@@ -43,8 +43,7 @@ INSTALLED_APPS = (
43 43 
     'django.contrib.sessions',
44 44 
     'django.contrib.messages',
45 45 
     'django.contrib.staticfiles',
46 
-    # 'rest_framework',
47 
-    # 'django_q',
46 
+    'django_file_upload',
48 47 
     'django_rlog',
49 48 
     'django_uniapi',
50 49 
     'django_we',
 
@@ -353,7 +352,13 @@ ADMINS = [('Kimi', 'kimi@pai.ai')]
353 352 
 MANAGERS = ADMINS
354 353 
 # Subject-line prefix for email messages send with django.core.mail.mail_admins
355 354 
 # or ...mail_managers.  Make sure to include the trailing space.
356 
-EMAIL_SUBJECT_PREFIX = u'[Pai2] '
355 
+EMAIL_SUBJECT_PREFIX = u'[Kodo] '
356 
+
357 
+# Django-Admin Settings
358 
+DISABLE_ACTION = False
359 
+
360 
+# Django-Logit Settings
361 
+DJANGO_LOGIT_ENABLED = True
357 362
358 363 
 try:
359 364 
     from local_settings import *

+ 11 - 3
pai2/urls.py
Ver Fichero 

@@ -22,8 +22,8 @@ from django.contrib import admin
22 22 
 from rest_framework import routers
23 23
24 24 
 from account import views as account_views
25 
-from group import views as group_views
26 25 
 from group import grouppage_views
26 
+from group import views as group_views
27 27 
 from miniapp import views as mini_views
28 28 
 from photo import views as photo_views
29 29 
 from website import views as website_views
 
@@ -84,11 +84,19 @@ urlpatterns += [
84 84 
 # Additionally, we include login URLs for the browsable API.
85 85 
 urlpatterns += [
86 86 
     # url(r'^restapi/', include(router.urls)),
87 
-    url(r'^uniapi/', include('django_uniapi.urls', namespace='uniapi')),
88 87 
     url(r'^api/', include('api.urls', namespace='api')),
88 
+    url(r'^uniapi/', include('django_uniapi.urls', namespace='uniapi')),
89 
+    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
90 
+]
91 
+
92 
+urlpatterns += [
89 93 
     url(r'^w/', include('django_we.urls', namespace='shortwechat')),
90 94 
     url(r'^we/', include('django_we.urls', namespace='wechat')),
91 
-    url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework'))
95 
+]
96 
+
97 
+urlpatterns += [
98 
+    url(r'^f/', include('page.urls', namespace='shortpage')),
99 
+    url(r'^page/', include('page.urls', namespace='page')),
92 100 
 ]
93 101
94 102 
 urlpatterns += [

+ 0 - 1
photo/views.py
Ver Fichero 

@@ -3,7 +3,6 @@
3 3 
 from curtail_uuid import CurtailUUID
4 4 
 from django.db import transaction
5 5 
 from django.shortcuts import render
6 
-# from django_q.tasks import async
7 6 
 from django_response import response
8 7 
 from ipaddr import client_ip
9 8 
 from logit import logit

+ 1 - 1
requirements.txt
Ver Fichero 

@@ -1,4 +1,3 @@
1 
--e git+https://github.com/Brightcells/django-q.git#egg=django-q
2 1 
 CodeConvert==2.0.4
3 2 
 Django==1.11.9
4 3 
 MySQL-python==1.2.5
 
@@ -10,6 +9,7 @@ django-admin==1.1.1
10 9 
 django-curtail-uuid==1.0.0
11 10 
 django-detect==1.0.5
12 11 
 django-file-md5==1.0.1
12 
+django-file-upload==1.0.0
13 13 
 django-ip==1.0.2
14 14 
 django-json-render==1.0.0
15 15 
 django-json-response==1.1.5