unify fee(return and params) to fen
Brightcells
3 mainītis faili ar 6 papildinājumiem un 6 dzēšanām
+ 3
- 3
group/views.py
@@ -932,17 +932,17 @@ def lensman_photo_price(request): |
||
| 932 | 932 |
lensman_photo_price_key = LENSMAN_PHOTO_PRICE % (user_id, photo_id, photo_type) |
| 933 | 933 |
lensman_photo_haggle_times_key = LENSMAN_PHOTO_HAGGLE_TIMES % (user_id, photo_id, photo_type) |
| 934 | 934 |
# Redis 获取存储的价格 |
| 935 |
- price = float(r.get(lensman_photo_price_key) or 0) |
|
| 935 |
+ price = int(r.get(lensman_photo_price_key) or 0) |
|
| 936 | 936 |
if price: |
| 937 | 937 |
haggle_times = int(r.get(lensman_photo_haggle_times_key) or 0) |
| 938 | 938 |
# 砍价逻辑 |
| 939 | 939 |
if haggle_times < settings.LENSMAN_PHOTO_HAGGLE_MAX_TIMES: |
| 940 |
- price -= random.choice([0.5, 1]) |
|
| 940 |
+ price -= random.choice([50, 100]) |
|
| 941 | 941 |
r.incr(lensman_photo_haggle_times_key) |
| 942 | 942 |
else: |
| 943 | 943 |
# 获取摄影师定价 |
| 944 | 944 |
# TODO, 此处需要完整的摄影师定价 |
| 945 |
- price = 9.9 if photo_type == 'origin' else 6.6 |
|
| 945 |
+ price = 999 if photo_type == 'origin' else 666 |
|
| 946 | 946 |
|
| 947 | 947 |
r.set(lensman_photo_price_key, price) |
| 948 | 948 |
|
+ 1
- 1
pay/views.py
@@ -56,7 +56,7 @@ def wx_order_create_api(request): |
||
| 56 | 56 |
total_fee = int(request.POST.get('total_fee', 0)) # 总金额，单位分
|
| 57 | 57 |
|
| 58 | 58 |
# 金额校验 |
| 59 |
- # if float(r.get(LENSMAN_PHOTO_PRICE % (user_id, photo_id, photo_type)) or 0) != total_fee: |
|
| 59 |
+ # if int(r.get(LENSMAN_PHOTO_PRICE % (user_id, photo_id, photo_type)) or 0) != total_fee: |
|
| 60 | 60 |
# return response(OrderStatusCode.FEE_CHECK_FAIL) |
| 61 | 61 |
|
| 62 | 62 |
# 获取 from_uid, to_lid, to_uid |
+ 2
- 2
utils/redis/rkeys.py
@@ -19,8 +19,8 @@ GROUP_PHOTO_THUMB_UP = 'group:photo:thumb:up:%s:%s' # STRING，群组照片用 |
||
| 19 | 19 |
GROUP_LAST_PHOTO_PK = 'group:last:photo:pk:%s' # STRING，群组最后一张照片PK，group_id |
| 20 | 20 |
|
| 21 | 21 |
# 摄影师照片相关 |
| 22 |
-LENSMAN_PHOTO_PRICE = 'lensman:photo:price:%s:%s:%s' # STRING，摄影师照片价格，photo_id、user_id、photo_type |
|
| 23 |
-LENSMAN_PHOTO_HAGGLE_TIMES = 'lensman:photo:haggle:times:%s:%s:%s' # STRING，摄影师照片价格，photo_id、user_id、photo_type |
|
| 22 |
+LENSMAN_PHOTO_PRICE = 'lensman:photo:price:%s:%s:%s' # STRING，摄影师照片价格(单位:分)，photo_id、user_id、photo_type |
|
| 23 |
+LENSMAN_PHOTO_HAGGLE_TIMES = 'lensman:photo:haggle:times:%s:%s:%s' # STRING，摄影师照片砍价次数，photo_id、user_id、photo_type |
|
| 24 | 24 |
LENSMAN_PHOTO_ORDER_RECORD = 'lensman:photo:order:record:%s:%s' # STRING，摄影师照片购买记录，photo_id、user_id |
| 25 | 25 |
|
| 26 | 26 |
# 系统消息相关 |