+ freeze_income_amount = models.IntegerField(_(u'freeze_income_amount'), default=0, help_text=u'收入冻结余额增减数量(分)')
+ freeze_income_balance = models.IntegerField(_(u'freeze_income_balance'), default=0, help_text=u'收入冻结余额增减后数量(分)')
+ freeze_expense_amount = models.IntegerField(_(u'freeze_expense_amount'), default=0, help_text=u'支出冻结余额增减数量(分)')
+ freeze_expense_balance = models.IntegerField(_(u'freeze_expense_balance'), default=0, help_text=u'支出冻结余额增减后数量(分)')
remark = models.CharField(_(u'remark'), max_length=255, blank=True, null=True, help_text=u'备注')
@@ -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 |
|
@@ -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 |
|