Начало Разгледай Помощ
Регистриране Влизане
Pai2
/
pai2
Следи 2
Харесвам 0
Разклонение 0

Преглед на кода
remove to_lid

Brightcells преди 8 години
родител
f7b627af9b
ревизия
8468d9f9c5
променени са 2 файла, в които са добавени 5 реда и са изтрити 42 реда
Покажи статистика за разликите
  1. 2 17
      group/lensman_views.py
  2. 3 25
      pay/views.py

+ 2 - 17
group/lensman_views.py
Преглед на файла 

@@ -138,8 +138,6 @@ def lensman_photo_upload_api(request):
138 138
139 139 
     photo = request.FILES.get('photo', '')
140 140
141 
-    # current_id = int(request.POST.get('current_id', -1))
142 
-
143 141 
     # 用户校验
144 142 
     try:
145 143 
         user = UserInfo.objects.get(user_id=user_id)
 
@@ -156,12 +154,11 @@ def lensman_photo_upload_api(request):
156 154 
     group_id = group.group_id
157 155
158 156 
     # Redis 群组数据缓存
159 
-    group_info = set_group_info(group) if group_created else get_group_info(group_id)
157 
+    set_group_info(group) if group_created else get_group_info(group_id)
160 158
161 159 
     # 判断 group_id/user_id 的群组用户是否存在，如果不存在，则直接创建
162 160 
     group_user_current_id = -1
163 161 
     group_user, group_user_created = GroupUserInfo.objects.get_or_create(group_id=group_id, user_id=user_id, defaults={
164 
-        # 'current_id': int(r.get(GROUP_LAST_PHOTO_PK % group_id) or -1),
165 162 
         'current_id': group_user_current_id,  # 通过扫描 session_id 二维码进群的用户，默认可以查看该群组所有照片
166 163 
         'nickname': nickname or user.final_nickname,
167 164 
         'avatar': user.avatar,
 
@@ -175,7 +172,7 @@ def lensman_photo_upload_api(request):
175 172 
         group_user.save()
176 173
177 174 
     # Redis 群组用户数据缓存
178 
-    group_users = set_group_users_info(group) if group_user_created else get_group_users_info(group_id, user_id)
175 
+    set_group_users_info(group) if group_user_created else get_group_users_info(group_id, user_id)
179 176
180 177 
     if photo:
181 178 
         # 写 PhotosInfo 表
 
@@ -250,20 +247,8 @@ def lensman_photo_upload_api(request):
250 247 
         # 更新今日上传照片数量
251 248 
         r.incr(TODAY_UPLOAD_PHOTO_AMOUNT % (user_id, tc.local_string(format='%Y%m%d')))
252 249
253 
-    # 获取从 current_id 到 now 的群组照片列表
254 
-    # group_photos = GroupPhotoInfo.objects.filter(
255 
-    #     group_id=group_id,
256 
-    #     status=True,
257 
-    #     pk__gt=max(current_id, group_user.current_id),
258 
-    # ).order_by(
259 
-    #     '-pk'
260 
-    # )
261 
-    # latest_photo = group_photos.first()
262 
-
263 250 
     return response(200, 'Lensman Upload Photo Success', u'摄影师照片上传成功', {
264 251 
         'group_id': group_id,
265 
-        # 'current_id': latest_photo and latest_photo.pk or current_id,
266 
-        # 'photos': [photo.photo_info(user_id) for photo in group_photos],
267 252 
     })
268 253
269 254

+ 3 - 25
pay/views.py
Преглед на файла 

@@ -8,7 +8,7 @@ from logit import logit
8 8 
 from TimeConvert import TimeConvert as tc
9 9 
 from wechatpy import WeChatPay, WeChatPayException
10 10
11 
-from account.models import LensmanIncomeExpensesInfo, LensmanInfo, UserIncomeExpensesInfo, UserInfo
11 
+from account.models import UserIncomeExpensesInfo, UserInfo
12 12 
 from group.models import GroupPhotoInfo, GroupPhotoOrderInfo
13 13 
 from pay.models import OrderInfo
14 14 
 from photo.models import PhotosInfo
 
@@ -49,10 +49,9 @@ def wx_order_create_api(request):
49 49 
     # if int(r.get(LENSMAN_PHOTO_PRICE % (user_id, photo_id, photo_type)) or 0) != total_fee:
50 50 
     #     return response(OrderStatusCode.FEE_CHECK_FAIL)
51 51
52 
-    # 获取 from_uid, to_lid, to_uid
52 
+    # 获取 from_uid, to_uid
53 53 
     from_uid = user_id
54 
-    to_lid = group_photo.lensman_id
55 
-    to_uid = '' if group_photo.lensman_id else group_photo.user_id
54 
+    to_uid = group_photo.lensman_id or group_photo.user_id
56 55
57 56 
     # JSAPI--公众号支付、NATIVE--原生扫码支付、APP--app支付，统一下单接口trade_type的传参可参考这里
58 57 
     trade_type = request.POST.get('trade_type', '')
 
@@ -69,7 +68,6 @@ def wx_order_create_api(request):
69 68 
         lensman_photo_id=group_photo.lensman_photo_id,
70 69 
         photo_type=1 if photo_type == 'origin' else 0,
71 70 
         from_uid=from_uid,
72 
-        to_lid=to_lid,
73 71 
         to_uid=to_uid,
74 72 
         total_fee=total_fee,
75 73 
         trade_type=trade_type,
 
@@ -124,26 +122,6 @@ def order_paid_success(order):
124 122
125 123 
     set_lensman_order_record(porder)
126 124
127 
-    # Lensman ==> User
128 
-    # if order.to_lid:
129 
-    #     try:
130 
-    #         lensman = LensmanInfo.objects.select_for_update().filter(lensman_id=order.to_lid)[0]
131 
-    #     except IndexError:
132 
-    #         return
133 
-    #
134 
-    #     lensman.balance += order.total_fee
135 
-    #     lensman.save()
136 
-    #
137 
-    #     LensmanIncomeExpensesInfo.objects.create(
138 
-    #         lensman_id=order.to_lid,
139 
-    #         photo_id=order.photo_id,
140 
-    #         type=LensmanIncomeExpensesInfo.INCOME,
141 
-    #         amount=order.total_fee,
142 
-    #         balance=lensman.balance,
143 
-    #         remark=u'图片购买',
144 
-    #     )
145 
-    # elif order.to_uid:
146 
-
147 125 
     to_uid = order.to_uid
148 126 
     total_fee = order.total_fee
149 127