group/views.py

@@ -17,6 +17,7 @@ from message.models import UserMessageInfo

                 from utils.error.errno_utils import GroupPhotoStatusCode, GroupStatusCode, GroupUserStatusCode, UserStatusCode
              

                 from utils.error.response_utils import response
              

                 from utils.group_photo_utils import get_current_photos
              

                +from utils.price_utils import get_group_photo_price
              

                 from utils.qiniucdn import qiniu_file_url
              

                 from utils.redis.connect import r
              

                 from utils.redis.rgroup import (del_group_photo_thumbup_flag, get_group_info, get_group_photo_comment_list,
              
@@ -27,7 +28,6 @@ from utils.redis.rgroup import (del_group_photo_thumbup_flag, get_group_info, ge

                 from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, GROUP_PHOTO_WATCHER_SET, GROUP_USERS_PASSED_SET
              

                 from utils.redis.rlock import upload_lock
              

                 from utils.redis.rorder import get_lensman_order_record
              

                -from utils.redis.rprice import get_lensman_price_fixed
              

                 from utils.sql.raw import PAI2_HOME_API
              

                 from utils.storage_qiniu_utils import file_save
              

                 from utils.time_utils import origin_expired_stamps
              
@@ -677,11 +677,8 @@ def lensman_photo_price(request):

                     except GroupPhotoInfo.DoesNotExist:
              

                         return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND)
              

                 
              

                -    # 获取摄影师定价
              

                -    price = get_lensman_price_fixed(group_photo.user_id).get(photo_type, 999)
              

                -
              

                     return response(200, 'Get Price Success', u'获取价格成功', {
              

                -        'price': price
              

                +        'price': get_group_photo_price(group_photo, photo_type)
              

                     })
              

                 
              

                 
              

pay/views.py

@@ -19,6 +19,7 @@ from photo.models import PhotosInfo

                 from utils.error.errno_utils import (GroupPhotoStatusCode, OrderStatusCode, UserStatusCode, WechatStatusCode,
              

                                                      WithdrawStatusCode)
              

                 from utils.error.response_utils import response
              

                +from utils.price_utils import get_group_photo_price
              

                 from utils.redis.rbrief import set_brief_info
              

                 from utils.redis.rorder import set_lensman_order_record
              

                 from utils.wx_utils import get_trade_type, get_user_openid
              
@@ -58,8 +59,8 @@ def wx_order_create_api(request):

                     total_fee = int(request.POST.get('total_fee', 0))  # 总金额，单位分
              

                 
              

                     # 金额校验
              

                -    # if r.getint(LENSMAN_PHOTO_PRICE % (user_id, photo_id, photo_type)) != total_fee:
              

                -    #     return response(OrderStatusCode.FEE_CHECK_FAIL)
              

                +    if get_group_photo_price(group_photo, photo_type) != total_fee:
              

                +        return response(OrderStatusCode.FEE_CHECK_FAIL)
              

                 
              

                     # 获取 from_uid, to_uid
              

                     from_uid = user_id
              

utils/price_utils.py

@@ -0,0 +1,9 @@

                +# -*- coding: utf-8 -*-
              

                +
              

                +
              

                +def get_group_photo_price(group_photo, photo_type):
              

                +    if photo_type == 'origin':
              

                +        return group_photo.origin
              

                +    elif photo_type == 'nomark':
              

                +        return group_photo.nomark
              

                +    return 0