:art: iSort & PEP8
huangqimin001
共有 13 个文件被更改，包括 26 次插入 和 24 次删除
+ 8
- 8
api/admin_views.py
@@ -3,7 +3,6 @@ |
||
| 3 | 3 |
from __future__ import division |
| 4 | 4 |
|
| 5 | 5 |
import json |
| 6 |
- |
|
| 7 | 6 |
from collections import defaultdict |
| 8 | 7 |
from datetime import datetime |
| 9 | 8 |
|
@@ -16,14 +15,15 @@ from paginator import pagination |
||
| 16 | 15 |
from TimeConvert import TimeConvert as tc |
| 17 | 16 |
|
| 18 | 17 |
from account.models import UserInfo |
| 19 |
-from coupon.models import UserCouponInfo, CouponInfo |
|
| 18 |
+from coupon.models import CouponInfo, UserCouponInfo |
|
| 20 | 19 |
from integral.models import SaleclerkSubmitLogInfo |
| 21 |
-from logs.models import MchInfoEncryptLogInfo, ComplementCodeLogInfo |
|
| 20 |
+from logs.models import ComplementCodeLogInfo, MchInfoEncryptLogInfo |
|
| 22 | 21 |
from mch.models import AdministratorInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo |
| 23 |
-from member.models import GoodsOrderInfo, MemberActivityInfo, MemberActivityGroupShareInfo, GoodsInfo |
|
| 22 |
+from member.models import GoodsInfo, GoodsOrderInfo, MemberActivityGroupShareInfo, MemberActivityInfo |
|
| 24 | 23 |
from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo |
| 25 |
-from utils.error.errno_utils import (AdministratorStatusCode, ProductBrandStatusCode, ProductCouponStatusCode, |
|
| 26 |
- ProductMachineStatusCode, UserStatusCode, ComplementCodeStatusCode) |
|
| 24 |
+from utils.error.errno_utils import (AdministratorStatusCode, ComplementCodeStatusCode, ProductBrandStatusCode, |
|
| 25 |
+ ProductCouponStatusCode, ProductMachineStatusCode, UserStatusCode) |
|
| 26 |
+ |
|
| 27 | 27 |
|
| 28 | 28 |
WECHAT = settings.WECHAT |
| 29 | 29 |
|
@@ -1382,6 +1382,7 @@ def member_goods_create(request): |
||
| 1382 | 1382 |
|
| 1383 | 1383 |
return response(200, 'GoodsInfo Create Success', u'积分商品创建成功') |
| 1384 | 1384 |
|
| 1385 |
+ |
|
| 1385 | 1386 |
def complement_code_list(request): |
| 1386 | 1387 |
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
| 1387 | 1388 |
admin_id = request.POST.get('admin_id', '')
|
@@ -1406,9 +1407,8 @@ def complement_code_list(request): |
||
| 1406 | 1407 |
logs = logs.filter(audit_status=ComplementCodeLogInfo.AUDIT_REFUSED) |
| 1407 | 1408 |
logs = logs.order_by('audit_status', '-pk')
|
| 1408 | 1409 |
|
| 1409 |
- |
|
| 1410 |
- |
|
| 1411 | 1410 |
count = logs.count() |
| 1411 |
+ |
|
| 1412 | 1412 |
logs, left = pagination(logs, page, num) |
| 1413 | 1413 |
logs = [log.data for log in logs] |
| 1414 | 1414 |
|
+ 1
- 2
api/complement_views.py
@@ -2,13 +2,12 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from __future__ import division |
| 4 | 4 |
|
| 5 |
-from django.db import transaction |
|
| 6 | 5 |
from django_logit import logit |
| 7 | 6 |
from django_response import response |
| 8 |
-from paginator import pagination |
|
| 9 | 7 |
|
| 10 | 8 |
from logs.models import ComplementCodeLogInfo |
| 11 | 9 |
|
| 10 |
+ |
|
| 12 | 11 |
@logit(res=True) |
| 13 | 12 |
def complement_code(request): |
| 14 | 13 |
user_id = request.POST.get('user_id', '')
|
+ 2
- 2
api/staff_views.py
@@ -10,9 +10,9 @@ from django_response import response |
||
| 10 | 10 |
from account.models import UserInfo |
| 11 | 11 |
from coupon.models import CouponInfo, UserCouponInfo |
| 12 | 12 |
from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo |
| 13 |
-from mch.models import BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo, SaleclerkInfo, AdministratorInfo |
|
| 14 |
-from staff.models import StaffDeleteClerkSaleSubmitLogInfo, StaffDeleteConsumerSubmitLogInfo |
|
| 13 |
+from mch.models import AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo, SaleclerkInfo |
|
| 15 | 14 |
from member.models import RightInfo |
| 15 |
+from staff.models import StaffDeleteClerkSaleSubmitLogInfo, StaffDeleteConsumerSubmitLogInfo |
|
| 16 | 16 |
from statistic.models import (ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo, |
| 17 | 17 |
DistributorSaleStatisticInfo, ModelSaleStatisticInfo, ProvinceSaleStatisticInfo, |
| 18 | 18 |
SaleclerkSaleStatisticInfo, SaleStatisticInfo) |
+ 2
- 2
api/urls.py
@@ -3,8 +3,8 @@ |
||
| 3 | 3 |
from django.conf.urls import url |
| 4 | 4 |
from django_file_upload import views as file_views |
| 5 | 5 |
|
| 6 |
-from api import (admin_views, clerk_views, complement_views, distributor_views, encrypt_views, log_views, mch_views, member_views, |
|
| 7 |
- model_views, operator_views, refresh_views, sr_views, staff_views, wx_views) |
|
| 6 |
+from api import (admin_views, clerk_views, complement_views, distributor_views, encrypt_views, log_views, mch_views, |
|
| 7 |
+ member_views, model_views, operator_views, refresh_views, sr_views, staff_views, wx_views) |
|
| 8 | 8 |
from miniapp import qy_views |
| 9 | 9 |
from miniapp import views as mini_views |
| 10 | 10 |
from page import oauth_views, sale_views, screen_views |
+ 1
- 0
kodo/urls.py
@@ -25,6 +25,7 @@ from account import views as account_views |
||
| 25 | 25 |
from miniapp import views as mini_views |
| 26 | 26 |
from website import views as website_views |
| 27 | 27 |
|
| 28 |
+ |
|
| 28 | 29 |
urlpatterns = [ |
| 29 | 30 |
url(r'^kodoadmin/', admin.site.urls), |
| 30 | 31 |
] |
+ 2
- 1
logs/admin.py
@@ -3,7 +3,8 @@ |
||
| 3 | 3 |
from django.contrib import admin |
| 4 | 4 |
from django_admin import ReadOnlyModelAdmin |
| 5 | 5 |
|
| 6 |
-from logs.models import MchInfoDecryptLogInfo, MchInfoEncryptLogInfo, MchLogInfo, MchSearchModelAndCameraLogInfo, ComplementCodeLogInfo |
|
| 6 |
+from logs.models import (ComplementCodeLogInfo, MchInfoDecryptLogInfo, MchInfoEncryptLogInfo, MchLogInfo, |
|
| 7 |
+ MchSearchModelAndCameraLogInfo) |
|
| 7 | 8 |
|
| 8 | 9 |
|
| 9 | 10 |
class MchInfoEncryptLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin): |
+ 4
- 4
logs/models.py
@@ -2,7 +2,7 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from django.db import models |
| 4 | 4 |
from django.utils.translation import ugettext_lazy as _ |
| 5 |
-from django_models_ext import BaseModelMixin, upload_file_url, upload_path, upload_file_path |
|
| 5 |
+from django_models_ext import BaseModelMixin, upload_file_path, upload_file_url, upload_path |
|
| 6 | 6 |
from shortuuidfield import ShortUUIDField |
| 7 | 7 |
from TimeConvert import TimeConvert as tc |
| 8 | 8 |
|
@@ -155,7 +155,7 @@ class ComplementCodeLogInfo(BaseModelMixin): |
||
| 155 | 155 |
@property |
| 156 | 156 |
def shot_image_url(self): |
| 157 | 157 |
return upload_file_url(self.shot_image) |
| 158 |
- |
|
| 158 |
+ |
|
| 159 | 159 |
@property |
| 160 | 160 |
def shot_image_path(self): |
| 161 | 161 |
return upload_file_path(self.shot_image) |
@@ -163,10 +163,10 @@ class ComplementCodeLogInfo(BaseModelMixin): |
||
| 163 | 163 |
@property |
| 164 | 164 |
def invoice_image_url(self): |
| 165 | 165 |
return upload_file_url(self.invoice_image) |
| 166 |
- |
|
| 166 |
+ |
|
| 167 | 167 |
@property |
| 168 | 168 |
def invoice_image_path(self): |
| 169 |
- return upload_file_path(self.invoice_image) |
|
| 169 |
+ return upload_file_path(self.invoice_image) |
|
| 170 | 170 |
|
| 171 | 171 |
@property |
| 172 | 172 |
def data(self): |
+ 1
- 1
member/models.py
@@ -6,8 +6,8 @@ from django_models_ext import BaseModelMixin, upload_file_path, upload_file_url, |
||
| 6 | 6 |
from shortuuidfield import ShortUUIDField |
| 7 | 7 |
from TimeConvert import TimeConvert as tc |
| 8 | 8 |
|
| 9 |
-from mch.models import ModelInfo |
|
| 10 | 9 |
from coupon.models import CouponInfo |
| 10 |
+from mch.models import ModelInfo |
|
| 11 | 11 |
from simditor.fields import RichTextField |
| 12 | 12 |
|
| 13 | 13 |
|
+ 1
- 0
page/urls.py
@@ -4,6 +4,7 @@ from django.conf.urls import url |
||
| 4 | 4 |
|
| 5 | 5 |
from page import info_views, oauth_views, preauth_views, sale_views, screen_views, supersr_views |
| 6 | 6 |
|
| 7 |
+ |
|
| 7 | 8 |
urlpatterns = [ |
| 8 | 9 |
url(r'^clerk$', oauth_views.clerk_oauth, name='clerk_oauth'), # 店员授权页面 |
| 9 | 10 |
url(r'^clerk/info$', info_views.clerk_info_oauth, name='clerk_info_oauth'), # 店员信息授权页面 |
+ 1
- 2
utils/admin_utils.py
@@ -1,8 +1,7 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 |
-from TimeConvert import TimeConvert as tc |
|
| 4 |
- |
|
| 5 | 3 |
from group.models import GroupInfo, GroupUserInfo |
| 4 |
+from TimeConvert import TimeConvert as tc |
|
| 6 | 5 |
|
| 7 | 6 |
|
| 8 | 7 |
def is_group_admin(group_id, admin_id): |
+ 1
- 0
utils/message_utils.py
@@ -1,6 +1,7 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 | 3 |
from message.models import SystemMessageInfo |
| 4 |
+ |
|
| 4 | 5 |
from utils.redis.rmessage import get_system_message_delete_info, get_system_message_read_info |
| 5 | 6 |
|
| 6 | 7 |
|
+ 1
- 1
utils/storage_qiniu_utils.py
@@ -7,8 +7,8 @@ from django.conf import settings |
||
| 7 | 7 |
from django.core.files.storage import default_storage |
| 8 | 8 |
from django.db import transaction |
| 9 | 9 |
from django_file_md5 import calculate_md5 |
| 10 |
- |
|
| 11 | 10 |
from photo.models import PhotoUUIDInfo |
| 11 |
+ |
|
| 12 | 12 |
from utils.qiniucdn import upload_file_path |
| 13 | 13 |
from utils.thumbnail_utils import make_thumbnail |
| 14 | 14 |
from utils.watermark_utils import watermark_wrap |
+ 1
- 1
utils/storage_utils.py
@@ -7,8 +7,8 @@ from django.conf import settings |
||
| 7 | 7 |
from django.core.files.storage import default_storage |
| 8 | 8 |
from django.db import transaction |
| 9 | 9 |
from django_file_md5 import calculate_md5 |
| 10 |
- |
|
| 11 | 10 |
from photo.models import PhotoUUIDInfo |
| 11 |
+ |
|
| 12 | 12 |
from utils.thumbnail_utils import make_thumbnail |
| 13 | 13 |
from utils.watermark_utils import watermark_wrap |
| 14 | 14 |
|