Commit 38a95e39 authored by etscript's avatar etscript

fix bug

parent 77a324b8
...@@ -97,6 +97,8 @@ class ConsumeOrder(Resource): ...@@ -97,6 +97,8 @@ class ConsumeOrder(Resource):
self.parser.add_argument('ab_pro_siid', type=str, required=False) self.parser.add_argument('ab_pro_siid', type=str, required=False)
self.parser.add_argument('openid', type=str, required=False) self.parser.add_argument('openid', type=str, required=False)
self.parser.add_argument('register_phone', type=str, required=False) self.parser.add_argument('register_phone', type=str, required=False)
self.parser.add_argument('ad', type=str, required=False)
self.parser.add_argument('ad_id', type=str, required=False)
args = self.parser.parse_args() args = self.parser.parse_args()
if request.headers.get('env') in ['ios', 'android']: if request.headers.get('env') in ['ios', 'android']:
......
...@@ -35,6 +35,8 @@ course_price_api = "http://s-nginx/course/res/money/price" ...@@ -35,6 +35,8 @@ course_price_api = "http://s-nginx/course/res/money/price"
course_rollback_api = "http://s-nginx/fatools/pay/course/rollback" course_rollback_api = "http://s-nginx/fatools/pay/course/rollback"
ad_course_rollback_api = "http://s-nginx/course/advertise/detail?id="
class TopUpOrderService: class TopUpOrderService:
"""""" """"""
def __init__(self): def __init__(self):
...@@ -257,7 +259,19 @@ class CurriculumOrderService: ...@@ -257,7 +259,19 @@ class CurriculumOrderService:
OrderFlow.ab_status == 'SUCCESS').all() OrderFlow.ab_status == 'SUCCESS').all()
if repeat_buy: if repeat_buy:
raise CustomFlaskErr(Errors.REPEAT_BUY) raise CustomFlaskErr(Errors.REPEAT_BUY)
if args['ab_type'] == 300: if args['ab_type'] == 300 and args.get('ad') == 'April':
amount = requests.get(ad_course_price_api + args.get('ad_id'),
timeout = 5)
try:
amount = amount.json()
amount = [float(amount["attributes"]["bargainPrice"]) / 100]
except:
raise CustomFlaskErr(Errors.PROD_NOPRICE)
args.pop('ad', '')
args.pop('ad_id', '')
elif args['ab_type'] == 300:
data = { data = {
"payReqs": [{"resId": args['ab_proid']}], "payReqs": [{"resId": args['ab_proid']}],
"userId": args['user_id'] "userId": args['user_id']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment