304
+    freeze_income_amount = models.IntegerField(_(u'freeze_income_amount'), default=0, help_text=u'收入冻结余额增减数量(分)')
305
+    freeze_income_balance = models.IntegerField(_(u'freeze_income_balance'), default=0, help_text=u'收入冻结余额增减后数量(分)')
306
+    freeze_expense_amount = models.IntegerField(_(u'freeze_expense_amount'), default=0, help_text=u'支出冻结余额增减数量(分)')
307
+    freeze_expense_balance = models.IntegerField(_(u'freeze_expense_balance'), default=0, help_text=u'支出冻结余额增减后数量(分)')
302 308
 
303 309
     remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
304 310
 

+ 8 - 8
group/lensman_views.py

@@ -319,8 +319,8 @@ def lensman_origin_photo_upload_api(request):
319 319
                 type=UserIncomeExpensesInfo.INCOME,
320 320
                 amount=order.total_fee,
321 321
                 balance=from_user.balance,
322
-                freeze_amount=0,
323
-                freeze_balance=from_user.freeze_balance,
322
+                freeze_income_amount=0,
323
+                freeze_income_balance=from_user.freeze_income_balance,
324 324
                 remark=u'高清图购买退款',
325 325
             )
326 326
 
@@ -332,7 +332,7 @@ def lensman_origin_photo_upload_api(request):
332 332
 
333 333
         if to_user:
334 334
             # 余额减少
335
-            to_user.freeze_balance -= order.total_fee
335
+            to_user.freeze_income_balance -= order.total_fee
336 336
             to_user.save()
337 337
             # 余额记录
338 338
             UserIncomeExpensesInfo.objects.create(
@@ -341,8 +341,8 @@ def lensman_origin_photo_upload_api(request):
341 341
                 type=UserIncomeExpensesInfo.EXPENSE,
342 342
                 amount=order.total_fee,
343 343
                 balance=to_user.balance,
344
-                freeze_amount=0,
345
-                freeze_balance=to_user.freeze_balance,
344
+                freeze_income_amount=0,
345
+                freeze_income_balance=to_user.freeze_income_balance,
346 346
                 remark=u'高清图购买退款',
347 347
             )
348 348
 
@@ -392,7 +392,7 @@ def lensman_origin_photo_upload_api(request):
392 392
         if to_user:
393 393
             # 余额解冻
394 394
             to_user.balance += order.total_fee
395
-            to_user.freeze_balance -= order.total_fee
395
+            to_user.freeze_income_balance -= order.total_fee
396 396
             to_user.save()
397 397
             # Redis 数值更新
398 398
             set_brief_info(order.to_uid, order.photo_type, order.total_fee, dt=order.created_at)
@@ -403,8 +403,8 @@ def lensman_origin_photo_upload_api(request):
403 403
                 type=UserIncomeExpensesInfo.UNFREEZE,
404 404
                 amount=order.total_fee,
405 405
                 balance=to_user.balance,
406
-                freeze_amount=order.total_fee,
407
-                freeze_balance=to_user.freeze_balance,
406
+                freeze_income_amount=order.total_fee,
407
+                freeze_income_balance=to_user.freeze_income_balance,
408 408
                 remark=u'高清图购买退款',
409 409
             )
410 410
 

+ 5 - 5
pay/views.py

@@ -143,7 +143,7 @@ def order_paid_success(order):
143 143
 
144 144
     if order.photo_type == OrderInfo.NOMARK:
145 145
         # 余额增加
146
-        amount, freeze_amount = total_fee, 0
146
+        amount, freeze_income_amount = total_fee, 0
147 147
         user.balance += amount
148 148
         # Redis 数值更新
149 149
         set_brief_info(to_uid, order.photo_type, total_fee)
@@ -154,13 +154,13 @@ def order_paid_success(order):
154 154
             type=UserIncomeExpensesInfo.INCOME,
155 155
             amount=amount,
156 156
             balance=user.balance,
157
-            freeze_amount=freeze_amount,
158
-            freeze_balance=user.freeze_balance,
157
+            freeze_income_amount=freeze_income_amount,
158
+            freeze_income_balance=user.freeze_income_balance,
159 159
             remark=u'图片购买',
160 160
         )
161 161
     elif order.photo_type == OrderInfo.ORIGIN:
162
-        amount, freeze_amount = 0, total_fee
163
-        user.freeze_balance += freeze_amount
162
+        amount, freeze_income_amount = 0, total_fee
163
+        user.freeze_income_balance += freeze_income_amount
164 164
     user.save()
165 165
 
166 166
 

kodo - Gogs: Go Git Service

暂无描述

Brightcells: a7cbbf15a7 Update max_length for CharField 8 年之前
..
0001_initial.py e184e7dd5b add api group_create/group_join 10 年之前
0002_groupinfo_session_id.py e184e7dd5b add api group_create/group_join 10 年之前
0003_groupinfo_admin_id.py 7e305483ab add api group_detail/group_lock/group_pass/group_refuse 10 年之前
0004_auto_20151216_2337.py 7467a3e68a add api group_update/group_remove 10 年之前
0005_groupuserinfo_current_id.py f587f0a48f user can just see photo after he joined the group & zh_Hans replace zh_CN in settings.py 10 年之前
0006_groupuserinfo_avatar.py 4afdb94e20 add avatar for GroupUserInfo 10 年之前
0007_auto_20160112_2040.py df1df69fe3 add api upgrade/splash 10 年之前
0008_photocommentinfo.py c72d89f6e5 add api comment_submit_api/comment_list_api/thumbup_submit_api/thumbup_list_api/thumbup_cancel_api 10 年之前
0009_photothumbupinfo.py c72d89f6e5 add api comment_submit_api/comment_list_api/thumbup_submit_api/thumbup_list_api/thumbup_cancel_api 10 年之前
0010_auto_20160120_1830.py a121b75ff2 add db_index=True for status field 10 年之前
0011_auto_20160302_2048.py da2a81fff1 add api pai2_home 10 年之前
0012_groupinfo_group_avatar.py da2a81fff1 add api pai2_home 10 年之前
0013_groupinfo_group_default_avatar.py f6a88c632b add group_default_avatar field for GroupInfo 10 年之前
0014_auto_20160308_2347.py ca727b0362 store/return w/h for photo 10 年之前
0015_groupphotoinfo_avatar.py 88049b12db store/return more field for photo 10 年之前
0016_auto_20160321_1535.py 537bd9bd41 add api group_quit_api 10 年之前
0017_groupphotoinfo_photo_from.py dbea356558 add photo_from field for GroupPhotoInfo and return photo_from for some api 10 年之前
0018_auto_20160417_2246.py d64b3c216b add and return photo_thumbnail2 relative 10 年之前
0019_auto_20160422_1322.py 102152ca4a add api lensman_photo_bought & modify api wx_order_create_api and adjust return field 10 年之前
0020_groupphotoinfo_session_id.py 102152ca4a add api lensman_photo_bought & modify api wx_order_create_api and adjust return field 10 年之前
0021_photocommentinfo_to_uid.py fa36c26ce4 extend param to_uid for comment_submit_api 10 年之前
0022_auto_20160901_1439.py 6199c8f7ad add api lensman_origin_wanted_api/lensman_origin_photo_upload_api 9 年之前
0023_groupinfo_group_initio.py e06dc10006 Make join session group by scan group qrcode fetch group photos initio 9 年之前
0024_auto_20161214_1329.py f724e0f9c0 Add tour guide apis 9 年之前
0025_auto_20161214_1659.py ad69866b26 Add tour guide's name and phone in GroupInfo 9 年之前
0026_auto_20161216_1301.py 034acddb68 Add total_persons for GroupInfo 9 年之前
0027_groupuserinfo_authority.py 88f0697a89 Add authority field for GroupUserInfo 9 年之前
0028_auto_20161220_1815.py 272f181c50 Makemigrations 9 年之前
0029_auto_20161224_1616.py 564ff620d7 Add unique_together = (('group_id', 'user_id'),) for GroupUserInfo 9 年之前
0030_groupinfo_gather_location.py 90d377ee6e Add gather location 9 年之前
0031_groupphotoinfo_photo_md5.py d824fbd441 Add photo_md5 for GroupPhotoInfo 9 年之前
0032_groupinfo_gather_screenshot.py e8cd9652b7 Add gather_screenshot for api tg_group_gather_start_api 9 年之前
0033_groupphotoinfo_photo_id.py 3c6e34823b Add photo_id for GroupPhotoInfo replaced pk 9 年之前
0034_auto_20170411_1156.py 14d5d63e3b Add nomark/origin price for GroupPhotoInfo 9 年之前
0035_groupuserinfo_admin_status.py 9e4ac4fd3b Add admin_status for GroupUserInfo 9 年之前
0036_groupphotoinfo_has_watermark.py 3b92e37156 Add field has_watermark for GroupPhotoInfo 8 年之前
0037_auto_20170821_1600.py bf678fc740 Add unique_together = (('session_id', 'group_from'),) 8 年之前
0038_auto_20170821_1608.py 7060597dd6 Add unique_together = (('group_id', 'user_id', 'photo_md5'),) for GroupPhotoInfo 8 年之前
0039_auto_20170821_1613.py 9f4c919c29 Add unique_together = (('photo_id', 'user_id'),) for PhotoThumbUpInfo 8 年之前
0040_auto_20170825_1342.py e5ad69259f Add unique_together = (('group_id', 'session_id', 'user_id', 'photo_id', 'lensman_photo_id'),) for GroupPhotoOrderInfo 8 年之前
0041_auto_20170825_1342.py e5ad69259f Add unique_together = (('group_id', 'session_id', 'user_id', 'photo_id', 'lensman_photo_id'),) for GroupPhotoOrderInfo 8 年之前
0042_groupphotoinfo_lensman_type.py a6195fa70d Add outtake lensman 8 年之前
0043_auto_20180101_2220.py 9bb56c50cc Makemigrations 8 年之前
0044_auto_20180103_0446.py a7cbbf15a7 Update max_length for CharField 8 年之前
__init__.py e184e7dd5b add api group_create/group_join 10 年之前