Merge branch 'tamron' of http://git.xfoto.com.cn/Kodo/kodo into tamron
променени са 5 файла, в които са добавени 18 реда и са изтрити 16 реда
+ 5
- 5
api/maintenance_views.py
@@ -12,8 +12,8 @@ from paginator import pagination |
||
| 12 | 12 |
from TimeConvert import TimeConvert as tc |
| 13 | 13 |
|
| 14 | 14 |
from account.models import UserInfo |
| 15 |
-from mch.models import ModelInfo |
|
| 16 | 15 |
from maintenance.models import ExpressCompanyInfo, MaintenaceInfo |
| 16 |
+from mch.models import ModelInfo |
|
| 17 | 17 |
from pre.custom_message import sendtemplatemessage |
| 18 | 18 |
from utils.admin_utils import is_admin, is_maintenanceman |
| 19 | 19 |
from utils.error.errno_utils import MaintenanceStatusCode |
@@ -203,7 +203,7 @@ def maintenance_list(request): |
||
| 203 | 203 |
start_time = tc.string_to_utc_datetime(start_time, format='%Y%m%d') |
| 204 | 204 |
end_time = tc.string_to_utc_datetime(end_time + ' 23:59:59', format='%Y%m%d %H:%M:%S') |
| 205 | 205 |
maintenances = maintenances.filter(created_at__range=(start_time, end_time)) |
| 206 |
- |
|
| 206 |
+ |
|
| 207 | 207 |
if point_id: |
| 208 | 208 |
maintenances = maintenances.filter(point_id=point_id) |
| 209 | 209 |
|
@@ -264,10 +264,10 @@ def maintenance_status_update_sendtemplatemessage(maintenance): |
||
| 264 | 264 |
"color": "#173177" |
| 265 | 265 |
} |
| 266 | 266 |
} |
| 267 |
- |
|
| 267 |
+ |
|
| 268 | 268 |
wxcfg = WECHAT.get('MINIAPP', {})
|
| 269 | 269 |
appid = wxcfg.get('appID')
|
| 270 |
- |
|
| 270 |
+ |
|
| 271 | 271 |
sendtemplatemessage(openid=user.openid, template_id=settings.TEMPLATE_ID_MAINTENANCE, data=data, miniappid=appid, minipagepath='/pages/index/index') |
| 272 | 272 |
|
| 273 | 273 |
|
@@ -297,7 +297,7 @@ def maintenance_tracking_info_update(maintenance, type_, tracking_info): |
||
| 297 | 297 |
maintenance.back_tracking_signed = is_tracking_signed |
| 298 | 298 |
if is_tracking_signed and old_maintenance_status == MaintenaceInfo.TRACKING_FIXED_BACK: |
| 299 | 299 |
maintenance_status = MaintenaceInfo.TRACKING_BACK_SIGNED |
| 300 |
- |
|
| 300 |
+ |
|
| 301 | 301 |
if maintenance_status: |
| 302 | 302 |
maintenance.maintenance_status = maintenance_status |
| 303 | 303 |
maintenance_status_at = maintenance.maintenance_status_at |
+ 3
- 3
commands/management/commands/sale.py
@@ -26,9 +26,9 @@ class Command(CompatibilityBaseCommand): |
||
| 26 | 26 |
month = tc.local_string(format='%Y%m') |
| 27 | 27 |
day = tc.local_string(format='%Y%m%d') |
| 28 | 28 |
|
| 29 |
- # lastyear = tc.local_string(tc.several_time_ago(years=1), format='%Y') |
|
| 30 |
- lastmonth = tc.local_string(tc.several_time_ago(months=1), format='%Y%m') |
|
| 31 |
- lastday = tc.local_string(tc.several_time_ago(days=1), format='%Y%m%d') |
|
| 29 |
+ # lastyear = tc.local_string(years=-1, format='%Y') |
|
| 30 |
+ lastmonth = tc.local_string(months=-1, format='%Y%m') |
|
| 31 |
+ lastday = tc.local_string(days=-1, format='%Y%m%d') |
|
| 32 | 32 |
|
| 33 | 33 |
brands = BrandInfo.objects.filter(status=True) |
| 34 | 34 |
|
+ 5
- 3
miniapp/views.py
@@ -262,28 +262,30 @@ def get_userinfo_api2(request): |
||
| 262 | 262 |
|
| 263 | 263 |
return response(200, 'Mini App Get Userinfo Success', u'微信小程序获取用户信息成功', user.brandata(brand_id=brand_id)) |
| 264 | 264 |
|
| 265 |
+ |
|
| 265 | 266 |
@logit(res=True) |
| 266 | 267 |
@transaction.atomic |
| 267 | 268 |
def update_userinfo_api(request): |
| 268 | 269 |
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
| 269 | 270 |
user_id = request.POST.get('user_id', '')
|
| 270 | 271 |
nickname = request.POST.get('nickname', '')
|
| 271 |
- avatar = request.POST.get('avatar', '')
|
|
| 272 |
+ avatar = request.POST.get('avatar', '')
|
|
| 272 | 273 |
|
| 273 | 274 |
try: |
| 274 | 275 |
user = UserInfo.objects.select_for_update().get(user_id=user_id, status=True) |
| 275 | 276 |
except UserInfo.DoesNotExist: |
| 276 | 277 |
return response(UserStatusCode.USER_NOT_FOUND) |
| 277 |
- |
|
| 278 |
+ |
|
| 278 | 279 |
if nickname: |
| 279 | 280 |
user.nickname = nickname |
| 280 | 281 |
if avatar: |
| 281 | 282 |
user.avatar = avatar |
| 282 |
- |
|
| 283 |
+ |
|
| 283 | 284 |
user.save() |
| 284 | 285 |
|
| 285 | 286 |
return response(200, 'Mini App Get Userinfo Success', u'微信小程序获取用户信息成功', user.brandata(brand_id=brand_id)) |
| 286 | 287 |
|
| 288 |
+ |
|
| 287 | 289 |
@logit(res=True) |
| 288 | 290 |
@transaction.atomic |
| 289 | 291 |
def membercard_extradata(request): |
+ 1
- 1
page/oauth_views.py
@@ -85,7 +85,7 @@ def clerk_submit_api(request): |
||
| 85 | 85 |
if clerk.user_status not in [SaleclerkInfo.UNVERIFIED, SaleclerkInfo.REFUSED]: |
| 86 | 86 |
return response(SaleclerkStatusCode.CLERK_ALREADY_NOT_UNVERIFIED) |
| 87 | 87 |
if not created: |
| 88 |
- for key, value in fields.iteritems(): |
|
| 88 |
+ for key, value in fields.items(): |
|
| 89 | 89 |
setattr(clerk, key, value) |
| 90 | 90 |
clerk.save() |
| 91 | 91 |
|
+ 4
- 4
statistic/views.py
@@ -276,7 +276,7 @@ def ytj(brand_id): |
||
| 276 | 276 |
provinces_users[province.province_code] += province.users |
| 277 | 277 |
else: |
| 278 | 278 |
provinces_users[province.province_code] = province.users |
| 279 |
- provinces = [{'province_code': province_code, 'num': len(set(users))} for province_code, users in provinces_users.iteritems()]
|
|
| 279 |
+ provinces = [{'province_code': province_code, 'num': len(set(users))} for province_code, users in provinces_users.items()]
|
|
| 280 | 280 |
provinces = sorted(provinces, key=lambda p: p['num'], reverse=True) |
| 281 | 281 |
|
| 282 | 282 |
return {
|
@@ -350,9 +350,9 @@ def v2_tj_distributor(request): |
||
| 350 | 350 |
month = tc.local_string(format='%Y%m') |
| 351 | 351 |
day = tc.local_string(format='%Y%m%d') |
| 352 | 352 |
|
| 353 |
- # lastyear = tc.local_string(tc.several_time_ago(years=1), format='%Y') |
|
| 354 |
- lastmonth = tc.local_string(tc.several_time_ago(months=1), format='%Y%m') |
|
| 355 |
- lastday = tc.local_string(tc.several_time_ago(days=1), format='%Y%m%d') |
|
| 353 |
+ # lastyear = tc.local_string(years=-1, format='%Y') |
|
| 354 |
+ lastmonth = tc.local_string(months=-1, format='%Y%m') |
|
| 355 |
+ lastday = tc.local_string(days=-1, format='%Y%m%d') |
|
| 356 | 356 |
|
| 357 | 357 |
year_data = ytj(brand_id) |
| 358 | 358 |
month_data = ymdtj(brand_id, month, lastmonth) |