43f316872dd79c2b123ba09R88">88
+ continue
|
|
|
89
|
+
|
|
|
90
|
+ goods_info.append({
|
|
|
91
|
+ 'title': goods.title,
|
|
|
92
|
+ 'num': g.get('num', 0)
|
|
|
93
|
+ })
|
|
|
94
|
+
|
|
|
95
|
+ res.append({
|
|
|
96
|
+ 'name': info.name,
|
|
|
97
|
+ 'phone': info.phone,
|
|
|
98
|
+ 'address': info.address,
|
|
|
99
|
+ 'paid_at': tc.local_string(utc_dt=info.paid_at, format='%Y-%m-%d %H:%M'),
|
|
|
100
|
+ 'order_id': info.order_id,
|
|
|
101
|
+ 'transaction_id': info.transaction_id,
|
|
|
102
|
+ 'tracking_number': info.tracking_number,
|
|
|
103
|
+ 'goods_info': goods_info,
|
|
|
104
|
+ 'kol_name': kol.name,
|
|
|
105
|
+ 'pack_title': pack.title
|
|
|
106
|
+ })
|
|
|
107
|
+
|
|
|
108
|
+ return response(200, 'Order List Success', u'获取订单列表成功', {
|
|
103
|
109
|
'orders': res
|
|
104
|
110
|
})
|
|
105
|
111
|
|
|
|
112
|
+
|
|
106
|
113
|
@logit(res=True)
|
|
107
|
114
|
@transaction.atomic
|
|
108
|
115
|
def order_update(request):
|
|
|
|
@@ -111,15 +118,16 @@ def order_update(request):
|
|
111
|
118
|
tracking_number = request.POST.get('tracking_number', '')
|
|
112
|
119
|
|
|
113
|
120
|
try:
|
|
114
|
|
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
|
121
|
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True)
|
|
115
|
122
|
except AdministratorInfo.DoesNotExist:
|
|
116
|
|
- return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
|
123
|
+ return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND)
|
|
117
|
124
|
|
|
118
|
125
|
try:
|
|
119
|
|
- order = OrderInfo.objects.get(order_id=order_id)
|
|
120
|
|
- order.tracking_number = tracking_number
|
|
121
|
|
- order.save()
|
|
|
126
|
+ order = OrderInfo.objects.get(order_id=order_id)
|
|
122
|
127
|
except OrderInfo.DoesNotExist:
|
|
123
|
|
- return response(400001, 'Order Not Found', u'订单不存在')
|
|
124
|
|
-
|
|
125
|
|
- return response(200, 'Order Update Success', u'订单更新成功')
|
|
|
128
|
+ return response(OrderStatusCode.ORDER_NOT_FOUND)
|
|
|
129
|
+
|
|
|
130
|
+ order.tracking_number = tracking_number
|
|
|
131
|
+ order.save()
|
|
|
132
|
+
|
|
|
133
|
+ return response(200, 'Order Update Success', u'订单更新成功')
|
|
|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
|
|
3
|
3
|
from django.conf.urls import url
|
|
4
|
4
|
|
|
5
|
|
-from api import mini_views, oauth_views, pack_views, admin_views
|
|
|
5
|
+from api import admin_views, mini_views, oauth_views, pack_views
|
|
6
|
6
|
from pay import views as pay_views
|
|
7
|
7
|
|
|
8
|
8
|
|
|
|
|
@@ -27,8 +27,6 @@ urlpatterns += [
|
|
27
|
27
|
url(r'^admin/order/update$', admin_views.order_update, name='order_update'), # 订单列表
|
|
28
|
28
|
]
|
|
29
|
29
|
|
|
30
|
|
-
|
|
31
|
|
-
|
|
32
|
30
|
urlpatterns += [
|
|
33
|
31
|
url(r'^3rd/or$', oauth_views.oauth_redirect, name='3rd_or'),
|
|
34
|
32
|
url(r'^3rd/oauth_redirect$', oauth_views.oauth_redirect, name='3rd_oauth_redirect'),
|
|
|
|
@@ -87,7 +87,7 @@ class PackGoodsInfo(BaseModelMixin):
|
|
87
|
87
|
good = GoodsInfo.objects.get(good_id=self.good_id)
|
|
88
|
88
|
except GoodsInfo.DoesNotExist:
|
|
89
|
89
|
good = {}
|
|
90
|
|
-
|
|
|
90
|
+
|
|
91
|
91
|
data = good.data
|
|
92
|
92
|
data.update({'inventory': self.inventory, 'has_sale_num': self.has_sale_num})
|
|
93
|
93
|
return data
|
|
|
|
@@ -1,7 +1,7 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
3
|
3
|
from django.contrib import admin
|
|
4
|
|
-from django_admin import ReadOnlyModelAdmin, Readonly2ModelAdmin
|
|
|
4
|
+from django_admin import Readonly2ModelAdmin, ReadOnlyModelAdmin
|
|
5
|
5
|
|
|
6
|
6
|
from pay.models import OrderInfo
|
|
7
|
7
|
|
|
|
|
@@ -71,4 +71,4 @@ class OrderInfo(BaseModelMixin):
|
|
71
|
71
|
verbose_name_plural = _('订单信息')
|
|
72
|
72
|
|
|
73
|
73
|
def __unicode__(self):
|
|
74
|
|
- return self.pk
|
|
|
74
|
+ return self.pk
|
|
|
|
@@ -76,7 +76,7 @@ def wx_order_create_api(request):
|
|
76
|
76
|
for g in goods_info:
|
|
77
|
77
|
try:
|
|
78
|
78
|
good = GoodsInfo.objects.get(good_id=g.get('good_id', ''))
|
|
79
|
|
- except:
|
|
|
79
|
+ except GoodsInfo.DoesNotExist:
|
|
80
|
80
|
continue
|
|
81
|
81
|
amount = amount + good.price * g.get('num', 0)
|
|
82
|
82
|
|
|
|
|
@@ -116,7 +116,7 @@ def wx_order_create_api(request):
|
|
116
|
116
|
except WeChatPayException as e:
|
|
117
|
117
|
order.unifiedorder_result = e.args
|
|
118
|
118
|
order.save()
|
|
119
|
|
- return response(OrderStatusCode.WX_UNIFIED_ORDER_FAIL)
|
|
|
119
|
+ return response(OrderStatusCode.UNIFIED_ORDER_FAIL)
|
|
120
|
120
|
|
|
121
|
121
|
prepay_id = prepay_data.get('prepay_id', '')
|
|
122
|
122
|
order.prepay_id = prepay_id
|
|
|
|
@@ -2,6 +2,7 @@
|
|
2
|
2
|
|
|
3
|
3
|
from StatusCode import BaseStatusCode, StatusCodeField
|
|
4
|
4
|
|
|
|
5
|
+
|
|
5
|
6
|
class AdministratorStatusCode(BaseStatusCode):
|
|
6
|
7
|
""" 操作员相关错误码 4002xx """
|
|
7
|
8
|
ADMINISTRATOR_NOT_FOUND = StatusCodeField(400201, 'Administrator Not Found', description=u'管理员不存在')
|
|
|
|
@@ -14,6 +15,7 @@ class AdministratorStatusCode(BaseStatusCode):
|
|
14
|
15
|
ADMINISTRATOR_HAS_DISABLED = StatusCodeField(400216, 'Administrator Has Disabled', description=u'管理员已禁用')
|
|
15
|
16
|
ADMINISTRATOR_HAS_DELETED = StatusCodeField(400217, 'Administrator Has Deleted', description=u'管理员已删除')
|
|
16
|
17
|
|
|
|
18
|
+
|
|
17
|
19
|
class ParamStatusCode(BaseStatusCode):
|
|
18
|
20
|
""" 4000xx 参数相关错误码 """
|
|
19
|
21
|
PARAM_NOT_FOUND = StatusCodeField(400000, 'Param Not Found', description=u'参数不存在')
|
|
|
|
@@ -48,7 +50,6 @@ class PackGoodsStatusCode(BaseStatusCode):
|
|
48
|
50
|
PACK_GOODS_INVENTORY_SHORTAGE = StatusCodeField(403002, 'Pack Goods Inventory Shortage', description=u'库存不足')
|
|
49
|
51
|
|
|
50
|
52
|
|
|
51
|
|
-
|
|
52
|
53
|
class OrderStatusCode(BaseStatusCode):
|
|
53
|
54
|
""" 4040xx 订单／支付相关错误码 """
|
|
54
|
55
|
UNIFIED_ORDER_FAIL = StatusCodeField(404000, 'Unified Order Fail', description=u'统一下单失败')
|