Change to fixed price
Brightcells
Se han modificado 3 ficheros con 9 adiciones y 31 borrados
+ 9
- 26
group/views.py
@@ -25,8 +25,7 @@ from utils.redis.rgroup import (del_group_photo_thumbup_flag, get_group_info, ge |
||
| 25 | 25 |
get_group_photo_watchers, get_group_users_info, set_group_info, set_group_info_by_id, |
| 26 | 26 |
set_group_photo_comment_list, set_group_photo_data, set_group_photo_thumbup_flag, |
| 27 | 27 |
set_group_photo_thumbup_list, set_group_users_info) |
| 28 |
-from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_PHOTO_WATCHER_SET, GROUP_USERS_PASSED_SET, |
|
| 29 |
- LENSMAN_PHOTO_HAGGLE_TIMES, LENSMAN_PHOTO_PRICE) |
|
| 28 |
+from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, GROUP_PHOTO_WATCHER_SET, GROUP_USERS_PASSED_SET |
|
| 30 | 29 |
from utils.redis.rorder import get_lensman_order_record |
| 31 | 30 |
from utils.redis.rprice import get_lensman_price_fixed |
| 32 | 31 |
from utils.sql.raw import PAI2_HOME_API |
@@ -666,30 +665,14 @@ def lensman_photo_price(request): |
||
| 666 | 665 |
photo_id = request.POST.get('photo_id', '')
|
| 667 | 666 |
photo_type = request.POST.get('photo_type', 'nomark') # nomark for 去除水印, origin for 获取高清图
|
| 668 | 667 |
|
| 669 |
- lensman_photo_price_key = LENSMAN_PHOTO_PRICE % (user_id, photo_id, photo_type) |
|
| 670 |
- |
|
| 671 |
- # Redis 获取存储的价格 |
|
| 672 |
- price = int(r.get(lensman_photo_price_key) or 0) |
|
| 673 |
- if price: |
|
| 674 |
- # Redis 获取存储的砍价次数 |
|
| 675 |
- haggle_times = r.incr(LENSMAN_PHOTO_HAGGLE_TIMES % (user_id, photo_id, photo_type)) |
|
| 676 |
- # 判断砍价是否已经超过次数 |
|
| 677 |
- if haggle_times <= settings.LENSMAN_PHOTO_HAGGLE_MAX_TIMES: |
|
| 678 |
- # 砍掉的价格 |
|
| 679 |
- haggle_price = random.choice([50, 100]) |
|
| 680 |
- # 砍价后的价格 |
|
| 681 |
- price = max(price - haggle_price, 1) |
|
| 682 |
- # Redis 设置新价格 |
|
| 683 |
- r.set(lensman_photo_price_key, price) |
|
| 684 |
- else: |
|
| 685 |
- try: |
|
| 686 |
- group_photo = GroupPhotoInfo.objects.get(pk=photo_id) |
|
| 687 |
- except GroupPhotoInfo.DoesNotExist: |
|
| 688 |
- return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND) |
|
| 689 |
- # 获取摄影师定价 |
|
| 690 |
- price = get_lensman_price_fixed(group_photo.user_id).get(photo_type, 999) |
|
| 691 |
- # Redis 设置新价格 |
|
| 692 |
- r.set(lensman_photo_price_key, price) |
|
| 668 |
+ # 群组照片校验 |
|
| 669 |
+ try: |
|
| 670 |
+ group_photo = GroupPhotoInfo.objects.get(pk=photo_id) |
|
| 671 |
+ except GroupPhotoInfo.DoesNotExist: |
|
| 672 |
+ return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND) |
|
| 673 |
+ |
|
| 674 |
+ # 获取摄影师定价 |
|
| 675 |
+ price = get_lensman_price_fixed(group_photo.user_id).get(photo_type, 999) |
|
| 693 | 676 |
|
| 694 | 677 |
return response(200, 'Get Price Success', u'获取价格成功', {
|
| 695 | 678 |
'price': price |
+ 0
- 3
pai2/settings.py
@@ -306,9 +306,6 @@ MIN_VERSION = '0.0.0' |
||
| 306 | 306 |
MAX_VERSION = '999.999.999' |
| 307 | 307 |
CURRENT_VERSION = '1.0.0' |
| 308 | 308 |
|
| 309 |
-# 价格设置 |
|
| 310 |
-LENSMAN_PHOTO_HAGGLE_MAX_TIMES = 3 # 摄影师照片最大砍价次数 |
|
| 311 |
- |
|
| 312 | 309 |
# 订单设置 |
| 313 | 310 |
ORDER_NUM_PER_PAGE = 10 # 订单每页数量 |
| 314 | 311 |
|
+ 0
- 2
utils/redis/rkeys.py
@@ -37,8 +37,6 @@ GROUP_PHOTO_WATCHER_SET = 'group:photo:watcher:set:%s' # SET，群组照片用 |
||
| 37 | 37 |
GROUP_LAST_PHOTO_PK = 'group:last:photo:pk:%s' # STRING，群组最后一张照片PK，group_id |
| 38 | 38 |
|
| 39 | 39 |
# 摄影师照片相关 |
| 40 |
-LENSMAN_PHOTO_PRICE = 'lensman:photo:price:%s:%s:%s' # STRING，摄影师照片价格(单位:分)，photo_id、user_id、photo_type |
|
| 41 |
-LENSMAN_PHOTO_HAGGLE_TIMES = 'lensman:photo:haggle:times:%s:%s:%s' # STRING，摄影师照片砍价次数，photo_id、user_id、photo_type |
|
| 42 | 40 |
LENSMAN_PHOTO_ORDER_RECORD = 'lensman:photo:order:record:%s:%s' # STRING，摄影师照片购买记录，photo_id、user_id |
| 43 | 41 |
|
| 44 | 42 |
# 摄影师简报相关 |