...
|
...
|
@@ -4,7 +4,6 @@ |
|
|
'use strict';
|
|
|
const co = require('bluebird').coroutine;
|
|
|
const seckillModel = require('../models/seckill');
|
|
|
const buyNowModel = require('../models/buynow');
|
|
|
const headerModel = require('../../../doraemon/models/header'); // 头部model
|
|
|
|
|
|
const BAD_REQUEST = '非法请求';
|
...
|
...
|
@@ -41,7 +40,7 @@ exports.ensure = (req, res, next) => { |
|
|
paymentOption.activity_id = skillData.activityId;
|
|
|
|
|
|
// 获取结算 数据
|
|
|
let paymentInfo = yield buyNowModel.payment(paymentOption, orderInfo);
|
|
|
let paymentInfo = yield seckillModel.payment(paymentOption, orderInfo);
|
|
|
let view;
|
|
|
|
|
|
if (paymentInfo.code !== 200) {
|
...
|
...
|
@@ -101,7 +100,7 @@ exports.compute = (req, res, next) => { |
|
|
activity_id: activityId
|
|
|
};
|
|
|
|
|
|
return buyNowModel.compute(options)
|
|
|
return seckillModel.compute(options)
|
|
|
.then(result => {
|
|
|
res.json(result.data);
|
|
|
})
|
...
|
...
|
@@ -154,7 +153,7 @@ exports.submit = (req, res, next) => { |
|
|
uid
|
|
|
};
|
|
|
|
|
|
return buyNowModel.submit(options)
|
|
|
return seckillModel.submit(options)
|
|
|
.then(result => {
|
|
|
res.clearCookie('order-info');
|
|
|
res.json(result);
|
...
|
...
|
|