fe / yohobuy-node · Commits

Go to a project

Authored by yyq
Commit a916d43d6d0796c8dae434eaee3f2557293f3066 2 parents 69a9cba4 3c1623ef

Merge branch 'master' into feature/web-apm

Inline Side-by-side
Showing 22 changed files with 1174 additions and 948 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 22 of 22+ files are displayed.

... ... @@ -59,11 +59,6 @@ if (config.zookeeperServer) {
app.enable('trust proxy');
// 请求限制中间件
if (!app.locals.devEnv) {
app.use(require('./doraemon/middleware/limiter'));
}
app.set('subdomain offset', 2);
// 添加请求上下文
... ... @@ -150,6 +145,12 @@ try {
app.use(mobileRefer());
app.use(mobileCheck());
app.use(user());
// 请求限制中间件
if (!app.locals.devEnv) {
app.use(require('./doraemon/middleware/limiter'));
}
app.use(seo());
app.use(setPageInfo());
app.use(layoutTools());
... ...
... ... @@ -3,6 +3,8 @@
const cache = global.yoho.cache.master;
const Promise = require('bluebird');
const co = Promise.coroutine;
const config = global.yoho.config;
const _ = require('lodash');
const HeaderModel = require('../../../doraemon/models/header');
... ... @@ -15,24 +17,13 @@ const index = co(function* (channel) {
});
const removeBlack = (remoteIp) => {
let key = `pc:limiter:${remoteIp}`,
key10m = `pc:limiter:10m:${remoteIp}`,
keyMax = `pc:limiter:max:${remoteIp}`,
key10mMax = `pc:limiter:10m:max:${remoteIp}`,
synchronizeKey = `pc:limiter:synchronize:${remoteIp}`,
asynchronousKey = `pc:limiter:asynchronous:${remoteIp}`,
spiderKey = `pc:limiter:spider:${remoteIp}`;
return Promise.all([
cache.delAsync(key),
cache.delAsync(key10m),
cache.delAsync(keyMax),
cache.delAsync(key10mMax),
cache.delAsync(synchronizeKey),
cache.delAsync(asynchronousKey),
cache.delAsync(spiderKey)
]);
let operations = [cache.delAsync(`${config.app}:limiter:${remoteIp}`)];
_.forEach(config.REQUEST_LIMIT, (val, key) => {
operations.push(cache.delAsync(`${config.app}:limiter:${key}:max:${remoteIp}`));
});
return Promise.all(operations);
};
module.exports = {
... ...
... ... @@ -18,16 +18,16 @@
</p><br/>
<p>
<strong>广告服务：</strong><br/>
北京：（+86）10 56312657<br/>
上海：（+86）21 51698833*8005<br/>
广州：（+86）83831060<br/>
EMAIL：advertising#yoho.cn (发送邮件时请将#换成@)
北京：（+86）10-56312657<br/>
上海：（+86）21-51698833-8005<br/>
广州：（+86）20-83831060<br/>
EMAIL：advertising#yoho.cn (发送邮件时请将#换成@)
</p><br/>
<p>
<strong>市场合作：</strong><br/>
北京：（+86）10 56312548<br/>
上海：（+86）21 51698833*8013<br/>
EMAIL：marketing#yoho.cn (发送邮件时请将#换成@)
北京：（+86）10-56312548<br/>
上海：（+86）21-51698833-8089<br/>
EMAIL：marketing#yoho.cn (发送邮件时请将#换成@)
</p><br/>
<p>
<strong>网站合作：</strong><br/>
... ... @@ -35,43 +35,43 @@
</p><br/>
<p>
<strong>有货品牌合作：</strong><br/>
上海：（+86）21 51698833*8007<br/>
广州：（+86）83831060<br/>
EMAIL：brands#yoho.cn (发送邮件时请将#换成@)
上海：（+86）21-51698833-8007<br/>
广州：（+86）20-83831060<br/>
EMAIL：brands#yoho.cn (发送邮件时请将#换成@)
</p><br/>
<p>
<strong>有货推广合作：</strong><br/>
EMAIL：haizheng.zhao#yoho.cn (发送邮件时请将#换成@)
EMAIL：zhiqing.fu#yoho.cn (发送邮件时请将#换成@)
</p><br/>
<p>
<strong>南京新与力文化传播有限公司：</strong><br/>
地址：南京市建邺区嘉陵江东街18号国家广告产业园5栋17,18楼<br/>
邮编：210017<br/>
电话：（+86）25 87781000<br/>
传真：（+86）25 87781155<br/>
电话：（+86）25-87781000<br/>
传真：（+86）25-87781155<br/>
</p><br/>
<p>
<strong>南京新与力文化传播有限公司北京分公司：</strong><br/>
地址：北京市朝阳区建国路81号华贸中心1号楼3层<br/>
邮编：100025<br/>
电话：（+86）10 56312400<br/>
电话：（+86）10-56312400<br/>
</p><br/>
<p>
<strong>南京新与力文化传播有限公司上海分公司：</strong><br/>
地址：上海市徐汇区富民路291号悟锦世纪大厦801室<br/>
邮编：200040<br/>
电话：（+86）21 51698833
电话：（+86）21-51698833
</p><br/>
<p>
<strong>南京新与力文化传播有限公司广州分公司：</strong><br/>
地址：广州市天河区林和西路157号保利中汇大厦A座602室<br/>
邮编：510610<br/>
电话：（+86）20 83777600
电话：（+86）20-83777600
</p><br/>
<p>
<strong>南京新与力文化传播有限公司香港分公司：</strong><br/>
地址：香港鰂魚涌海澤街28號東港中心1505室<br/>
电话：（+852）34602671
地址：香港香港中環嘉咸街41-43號天安城商業大廈11樓全層 (2號升降機)<br/>
电话：（+852）8523460-2671
</p><br/>
</div>
</div>
... ...
... ... @@ -83,7 +83,7 @@ exports.getCouponData = (channel, params) => {
exports.getCouponStatus = (params) => {
return Promise.coroutine(function*() {
const coupon = yield api.get('', Object.assign(params, {
method: 'app.promotion.queryCouponCenter'
method: 'app.promotion.couponStatus'
}));
const result = {
code: coupon.code,
... ... @@ -95,26 +95,21 @@ exports.getCouponStatus = (params) => {
break;
}
coupon.data.forEach(function(val) {
if (val.template_name === 'getCoupon' && val.data.length) {
// 优惠券楼层
val.data.forEach(function(item) {
const status = Number(item.status);
coupon.data.forEach(function(item) {
const status = Number(item.status);
if ([2, 3].indexOf(status) > -1) {
const cou = {
id: crypto.encryption('yoho9646abcdefgh', item.couponID) // 加密优惠券号
};
if ([2, 3].indexOf(status) > -1) {
const cou = {
id: crypto.encryption('yoho9646abcdefgh', String(item.couponId)) // 加密优惠券号
};
if (status === 2) {
cou.empty = true; // 优惠券已抢光
} else if (status === 3) {
cou.got = true; // 优惠券已领取
}
if (status === 2) {
cou.empty = true; // 优惠券已抢光
} else if (status === 3) {
cou.got = true; // 优惠券已领取
}
result.categories.push(cou);
}
});
result.categories.push(cou);
}
});
}
... ...
... ... @@ -17,7 +17,7 @@ const getArea = (req, res, next) => {
});
}
address.getAreaListData(id).then(result => {
req.ctx(address).getAreaListData(id).then(result => {
res.send(result);
}).catch(next);
};
... ... @@ -32,7 +32,7 @@ const getList = (req, res, next) => {
});
}
address.getAddressListData(uid).then(result => {
req.ctx(address).getAddressListData(uid).then(result => {
res.send(result);
}).catch(next);
};
... ... @@ -45,7 +45,7 @@ const delAddress = (req, res, next) => {
return next();
}
address.delAddressById(uid, id).then(result => {
req.ctx(address).delAddressById(uid, id).then(result => {
res.send(result);
}).catch(next);
};
... ... @@ -58,7 +58,7 @@ const saveAddress = (req, res, next) => {
return next();
}
address.saveAddressData(uid, params).then(result => {
req.ctx(address).saveAddressData(uid, params).then(result => {
res.send(result);
}).catch(next);
};
... ... @@ -71,7 +71,7 @@ const setDefault = (req, res, next) => {
return next();
}
address.setDefaultAddress(uid, id).then(result => {
req.ctx(address).setDefaultAddress(uid, id).then(result => {
res.send(result);
}).catch(next);
};
... ...
... ... @@ -17,7 +17,7 @@ const index = (req, res, next) => {
let uid = req.user.uid;
let params = req.query;
easypay.getEasypayOrderData(params, uid).then(result => {
req.ctx(easypay).getEasypayOrderData(params, uid).then(result => {
let header = headerModel.setSimpleHeaderData() || {};
result.stepper = stepper;
... ... @@ -39,7 +39,7 @@ const compute = (req, res, next) => {
let uid = req.user.uid;
let params = req.body;
easypay.getOrderComputeData(uid, 'ordinary', params).then(result => {
req.ctx(easypay).getOrderComputeData(uid, 'ordinary', params).then(result => {
res.json(result);
}).catch(next);
};
... ... @@ -53,7 +53,7 @@ const submit = (req, res, next) => {
return next();
}
easypay.easypayOrderSubmit(uid, 'ordinary', params, remoteIp).then(result => {
req.ctx(easypay).easypayOrderSubmit(uid, 'ordinary', params, remoteIp).then(result => {
res.json(result);
}).catch(next);
};
... ...
... ... @@ -6,6 +6,7 @@
'use strict';
const _ = require('lodash');
const crypto = global.yoho.crypto;
const logger = global.yoho.logger;
... ... @@ -23,7 +24,7 @@ const stepper = [
const index = (req, res, next) => {
let cartType = req.query.type === '2' ? 'advance' : 'ordinary';
oeModel.index(req.user.uid, cartType).then(result => {
req.ctx(oeModel).index(req.user.uid, cartType).then(result => {
let header = headerModel.setSimpleHeaderData() || {};
Object.assign(result, {
... ... @@ -46,14 +47,21 @@ const index = (req, res, next) => {
// 获取优惠券列表
const getCoupons = (req, res, next) => {
oeModel.getCoupons(req.user.uid).then(data => {
req.ctx(oeModel).getCoupons(req.user.uid).then(data => {
res.send(data);
}).catch(next);
};
// 获取优惠券列表
const convertCoupons = (req, res, next) => {
oeModel.convertCoupons(req.user.uid, req.query.code).then(data => {
req.ctx(oeModel).convertCoupons(req.user.uid, req.query.code).then(data => {
res.send(data);
}).catch(next);
};
// 获取礼品卡列表
const getGiftCards = (req, res, next) => {
req.ctx(oeModel).getGiftCards(req.user.uid).then(data => {
res.send(data);
}).catch(next);
};
... ... @@ -64,17 +72,47 @@ const compute = (req, res, next) => {
let cartType = params.cartType === '2' ? 'advance' : 'ordinary';
if (params.sku) { // 快捷结算
easypayModel.getOrderComputeData(req.user.uid, 'ordinary', params).then(result => {
req.ctx(easypayModel).getOrderComputeData(req.user.uid, 'ordinary', params).then(result => {
res.json(result);
}).catch(next);
} else {
oeModel.compute(req.user.uid, cartType, params).then(data => {
req.ctx(oeModel).compute(req.user.uid, cartType, params).then(data => {
res.send(data);
}).catch(next);
}
};
// 发送虚拟资产使用校验短信（目前仅有礼品卡 --- giftCard）
const sendCheckSms = (req, res, next) => {
let params = req.body;
if (params.giftCard) {
return req.ctx(oeModel).sendGiftCardCkeckSms(req.user.uid, req.yoho.udid).then(result => {
res.json(result);
}).catch(next);
}
return next();
};
// 订单提交前置校验
const submitCheck = (req, res, next) => {
let checkCode = req.body.checkCode;
// 带礼品卡号和短信验证码，则校验短信验证码，否则删除使用礼品卡
if (req.body.giftCard && checkCode) {
return req.ctx(oeModel).checkGiftCardSmsCode(req.user.uid, checkCode, req.yoho.udid).then(result => {
if (result.code === 200) {
return next();
}
res.json(result);
}).catch(next);
} else {
_.unset(req.body, 'giftCard');
}
return next();
};
// 提交订单
... ... @@ -150,14 +188,23 @@ const submit = (req, res, next) => {
userAgent: userAgent
});
params.udid = req.cookies._yasvd || 'yoho_pc';
params.udid = req.yoho.udid;
// 5.8.1 发票优化需求
// 只接受电子发票（1 纸质 2 电子），发票内容为明细（id 12：明细）
if (params.invoicesType) {
Object.assign(params, {
invoicesType: 2,
invoicesContent: 12
});
}
if (params.sku) { // 快捷结算
easypayModel.easypayOrderSubmit(uid, 'ordinary', params, remoteIp).then(result => {
req.ctx(easypayModel).easypayOrderSubmit(uid, 'ordinary', params, remoteIp).then(result => {
res.json(result);
}).catch(next);
} else {
oeModel.submit(uid, cartType, params, remoteIp).then(data => {
req.ctx(oeModel).submit(uid, cartType, params, remoteIp).then(data => {
if (data && data.code === 200 && unionKey) {
data.data.unionKey = {
client_id: clientId
... ... @@ -173,6 +220,9 @@ module.exports = {
index,
getCoupons,
convertCoupons,
getGiftCards,
compute,
sendCheckSms,
submitCheck,
submit
};
... ...
... ... @@ -21,7 +21,7 @@ const ticketEnsure = (req, res, next) => {
let buyNumber = req.query.buyNumber || 0;
let skn = req.query.productSkn || 0;
ticketService.addTicket(uid, sku, buyNumber).then(result => {
req.ctx(ticketService).addTicket(uid, sku, buyNumber).then(result => {
let header = headerModel.setSimpleHeaderData() || {};
result.stepper = stepper;
... ... @@ -39,10 +39,11 @@ const ticketEnsure = (req, res, next) => {
const ticketSubmit = (req, res, next) => {
let uid = req.user.uid;
let sku = req.body.sku || 0;
let count = req.body.count || 0;
let mobile = req.body.mobile || 0;
let yohoCoin = req.body.coin || 0;
let params = req.body;
let sku = params.sku || 0;
let count = params.count || 0;
let mobile = params.mobile || 0;
let yohoCoin = params.coin || 0;
if (!sku || !count || !mobile) {
return res.json({
... ... @@ -51,7 +52,9 @@ const ticketSubmit = (req, res, next) => {
});
}
ticketService.submitTicket(uid, sku, count, mobile, yohoCoin).then(result => {
params.udid = req.yoho.udid;
req.ctx(ticketService).submitTicket(uid, sku, count, mobile, yohoCoin, params).then(result => {
return res.json(result);
}).catch(next);
};
... ... @@ -62,7 +65,7 @@ const ticketCompute = (req, res, next) => {
let buyNumber = req.body.count || 0;
let yohoCoin = req.body.coin || 0;
ticketService.addTicket(uid, sku, buyNumber, yohoCoin).then(result => {
req.ctx(ticketService).addTicket(uid, sku, buyNumber, yohoCoin, req.body).then(result => {
if (_.isEmpty(result)) {
return res.json({
code: 401,
... ...
... ... @@ -5,104 +5,122 @@
*/
'use strict';
const api = global.yoho.API;
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
/**
* 获取用户收货地址列表
* @param uid [number] uid
*/
const getAddressListAsync = (uid) => api.get('', {
method: 'app.address.gethidden',
uid: uid
}, {code: 200});
/**
* 获取用户收货地址列表
* @param uid [number] uid
*/
getAddressListAsync(uid) {
let options = {
method: 'app.address.gethidden',
uid: uid
};
/**
* 省市区列表
* @param id [number] 省市区id
*/
const getAreaListAsync = (id) => {
return api.get('', {
method: 'app.address.provinces',
id: id || 0
});
};
return this.get({data: options, param: {
code: 200
}});
}
/**
* 地址删除
* @param uid [number] uid
* @param id [string] address id
*/
const delAddressAsync = (uid, id) => api.get('', {
method: 'app.address.del',
uid: uid,
id: id
});
/**
* 省市区列表
* @param id [number] 省市区id
*/
getAreaListAsync(id) {
let options = {
method: 'app.address.provinces',
id: id || 0
};
/**
* 新增地址api
* @param uid [Number]
* @param consignee [String] 收货人
* @param areaCode [Number] 区号
* @param address [String] 地址
* @param mobile [String] 手机号
* @param phone [String] 电话号码
* @param zipCode [String] 邮编
* @param email [String] 邮箱
*/
const addAddressAsync = (uid, consignee, areaCode, address, mobile, phone, zipCode, email) => api.get('', {
method: 'app.address.add',
uid: uid,
consignee: consignee,
area_code: areaCode,
address: address,
mobile: mobile,
phone: phone,
zip_code: zipCode,
email: email
});
return this.get({data: options});
}
/**
* 更新地址地址api
* @param uid [Number]
* @param id [Number] 地址id
* @param consignee [String] 收货人
* @param areaCode [Number] 区号
* @param address [String] 地址
* @param mobile [String] 手机号
* @param phone [String] 电话号码
* @param zipCode [String] 邮编
* @param email [String] 邮箱
*/
const updateAddressAsync = (uid, id, consignee, areaCode, address, mobile, phone, zipCode, email) => api.get('', {
method: 'app.address.update',
uid: uid,
id: id,
consignee: consignee,
area_code: areaCode,
address: address,
mobile: mobile,
phone: phone,
zip_code: zipCode,
email: email
});
/**
* 地址删除
* @param uid [number] uid
* @param id [string] address id
*/
delAddressAsync(uid, id) {
let options = {
method: 'app.address.del',
uid: uid,
id: id
};
/**
* 设置默认地址
* @param uid [Number]
* @param id [Number] 地址id
*/
const setDefaultAddressAsync = (uid, id) => api.get('', {
method: 'app.address.setdefault',
uid: uid,
id: id
});
return this.get({data: options});
}
/**
* 新增地址api
* @param uid [Number]
* @param consignee [String] 收货人
* @param areaCode [Number] 区号
* @param address [String] 地址
* @param mobile [String] 手机号
* @param phone [String] 电话号码
* @param zipCode [String] 邮编
* @param email [String] 邮箱
*/
addAddressAsync(uid, consignee, areaCode, address, mobile, phone, zipCode, email) {
let options = {
method: 'app.address.add',
uid: uid,
consignee: consignee,
area_code: areaCode,
address: address,
mobile: mobile,
phone: phone,
zip_code: zipCode,
email: email
};
return this.get({data: options});
}
/**
* 更新地址地址api
* @param uid [Number]
* @param id [Number] 地址id
* @param consignee [String] 收货人
* @param areaCode [Number] 区号
* @param address [String] 地址
* @param mobile [String] 手机号
* @param phone [String] 电话号码
* @param zipCode [String] 邮编
* @param email [String] 邮箱
*/
updateAddressAsync(uid, id, consignee, areaCode, address, mobile, phone, zipCode, email) {
let options = {
method: 'app.address.update',
uid: uid,
id: id,
consignee: consignee,
area_code: areaCode,
address: address,
mobile: mobile,
phone: phone,
zip_code: zipCode,
email: email
};
return this.get({data: options});
}
/**
* 设置默认地址
* @param uid [Number]
* @param id [Number] 地址id
*/
setDefaultAddressAsync(uid, id) {
let options = {
method: 'app.address.setdefault',
uid: uid,
id: id
};
module.exports = {
getAddressListAsync,
getAreaListAsync,
delAddressAsync,
addAddressAsync,
updateAddressAsync,
setDefaultAddressAsync
return this.get({data: options});
}
};
... ...
... ... @@ -10,89 +10,88 @@ const _ = require('lodash');
const crypto = global.yoho.crypto;
const pinyin = require('../models/province-pinyin');
const addressApi = require('../models/address-api');
const AddressApi = require('../models/address-api');
const worldSort = 'abcdefghijklmnopqrstuvwxyz';
const getAreaListData = (id) => {
return addressApi.getAreaListAsync(id).then(result => {
let list = _.get(result, 'data', []);
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
if (id * 1 === 0 && list.length) {
_.forEach(list, value => {
value.initial = pinyin[value.caption] || 'z';
value.pySort = _.indexOf(worldSort, value.initial);
});
result.data = list;
}
return result;
});
};
getAreaListData(id) {
return new AddressApi(this.ctx).getAreaListAsync(id).then(result => {
let list = _.get(result, 'data', []);
const getAddressListData = (uid) => {
return addressApi.getAddressListAsync(uid).then(result => {
if (result.code !== 200) {
if (id * 1 === 0 && list.length) {
_.forEach(list, value => {
value.initial = pinyin[value.caption] || 'z';
value.pySort = _.indexOf(worldSort, value.initial);
});
result.data = list;
}
return result;
}
let d = result.data;
});
}
_.forEach(d, dd => {
if (dd.is_default === 'Y') {
dd.default = true;
getAddressListData(uid) {
return new AddressApi(this.ctx).getAddressListAsync(uid).then(result => {
if (result.code !== 200) {
return result;
}
// 地址加密
let id = dd.address_id;
let d = result.data;
_.forEach(d, dd => {
if (dd.is_default === 'Y') {
dd.default = true;
}
// 地址加密
let id = dd.address_id;
dd.id = crypto.encryption('', `${id}`);
delete dd.address_id;
delete dd.uid; // 删除uid，用户数据保密
});
dd.id = crypto.encryption('', `${id}`);
delete dd.address_id;
delete dd.uid; // 删除uid，用户数据保密
return result;
});
}
return result;
});
};
delAddressById(uid, id) {
id = crypto.decrypt('', `${id}`);
return new AddressApi(this.ctx).delAddressAsync(uid, id);
}
const delAddressById = (uid, id) => {
id = crypto.decrypt('', `${id}`);
saveAddressData(uid, info) {
let addressApiModel = new AddressApi(this.ctx);
return addressApi.delAddressAsync(uid, id);
};
if (info.id) {
let id = crypto.decrypt('', `${info.id}`);
const saveAddressData = (uid, info) => {
if (info.id) {
let id = crypto.decrypt('', `${info.id}`);
return addressApi.updateAddressAsync(uid, id, info.consignee, info.areaCode, info.address,
info.mobile, info.phone, info.zipCode, info.email);
} else {
return addressApi.addAddressAsync(uid, info.consignee, info.areaCode, info.address, info.mobile,
info.phone, info.zipCode, info.email).then(result => {
if (result.code === 200) {
let d = result.data;
d.id = crypto.encryption('', `${d.address_id}`);
delete d.address_id;
delete d.uid;
}
return addressApiModel.updateAddressAsync(uid, id, info.consignee, info.areaCode, info.address,
info.mobile, info.phone, info.zipCode, info.email);
} else {
return addressApiModel.addAddressAsync(uid, info.consignee, info.areaCode, info.address, info.mobile,
info.phone, info.zipCode, info.email).then(result => {
if (result.code === 200) {
let d = result.data;
return result;
});
}
d.id = crypto.encryption('', `${d.address_id}`);
delete d.address_id;
delete d.uid;
}
};
return result;
});
}
const setDefaultAddress = (uid, id) => {
id = crypto.decrypt('', `${id}`);
}
return addressApi.setDefaultAddressAsync(uid, id);
};
setDefaultAddress(uid, id) {
id = crypto.decrypt('', `${id}`);
module.exports = {
getAreaListData,
getAddressListData,
delAddressById,
saveAddressData,
setDefaultAddress
return new AddressApi(this.ctx).setDefaultAddressAsync(uid, id);
}
};
... ...
/**
* address api
* easypay api
* @author: yyq<yanqing.yang@yoho.cn>
* @date: 2016/11/04
*/
'use strict';
const api = global.yoho.API;
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
const getEasyPaymentAsync = (uid, goods, activity) => {
let param = {
method: 'app.Shopping.easyPayment',
uid: uid,
cart_type: 'ordinary',
product_sku_list: goods,
yoho_coin_mode: 0,
is_support_apple_pay: 'N'
};
getEasyPaymentAsync(uid, goods, activity) {
let param = {
method: 'app.Shopping.easyPayment',
uid: uid,
cart_type: 'ordinary',
product_sku_list: goods,
yoho_coin_mode: 0,
is_support_apple_pay: 'N'
};
if (activity) {
param.activity_id = activity;
}
if (activity) {
param.activity_id = activity;
return this.get({data: param});
}
return api.get('', param, {code: 200});
};
/**
* 订单计算API
* @param uid [number] uid
* @param cartType [string] 购物车类型，ordinary表示普通, advance表示预售
* @param paymentType [number] 支付方式，1表示在线支付，2表示货到付款
* @param deliveryWay [number] 配送方式，1表示普通快递，2表示顺丰速运
* @param coin [number] 使用的有货币
* @param useRedEnvelops [number] 红包
* @param couponCode [string] 优惠券码
* @param promotionCode [string] 优惠码
* @param productSkuList [string] 限购商品
*/
getEasypayComputeAsync(uid, cartType, paymentType, deliveryWay, other) {
let param = {
method: 'app.Shopping.easyCompute',
uid: uid,
cart_type: cartType || 'ordinary',
payment_type: paymentType,
delivery_way: deliveryWay
};
// 其他可选参数
if (other) {
if (other.coin) {
Object.assign(param, {
use_yoho_coin: other.coin / 100
});
}
if (other.useRedEnvelops) {
Object.assign(param, {
use_red_envelopes: other.useRedEnvelops
});
}
/**
* 订单计算API
* @param uid [number] uid
* @param cartType [string] 购物车类型，ordinary表示普通, advance表示预售
* @param paymentType [number] 支付方式，1表示在线支付，2表示货到付款
* @param deliveryWay [number] 配送方式，1表示普通快递，2表示顺丰速运
* @param coin [number] 使用的有货币
* @param useRedEnvelops [number] 红包
* @param couponCode [string] 优惠券码
* @param promotionCode [string] 优惠码
* @param productSkuList [string] 限购商品
if (other.couponCode) {
Object.assign(param, {
coupon_code: other.couponCode
});
}
*/
const getEasypayComputeAsync = (uid, cartType, paymentType, deliveryWay, other) => {
let param = {
method: 'app.Shopping.easyCompute',
uid: uid,
cart_type: cartType || 'ordinary',
payment_type: paymentType,
delivery_way: deliveryWay
};
// 其他可选参数
if (other) {
if (other.giftCard) {
Object.assign(param, {
gift_card_code: other.giftCard
});
}
if (other.promotionCode) {
Object.assign(param, {
promotion_code: other.promotionCode
});
}
if (other.productSkuList) {
Object.assign(param, {
product_sku_list: other.productSkuList
});
if (other.bundle) {
Object.assign(param, {
activity_id: other.bundle
});
}
}
}
return this.get({data: param});
}
/**
* 订单提交API
* @param uid [number] uid
* @param cartType [String] 购物车类型，ordinary表示普通, advance表示预售
* @param addressId [String] 地址
* @param deliveryTime [number] 寄送时间类型
* @param deliveryWay [number] 配送方式，1表示普通快递，2表示顺丰速运
* @param invoicesType [number] 发票类型
* @param invoicesTitle [string] 发票抬头
* @param invoicesContent [int] 发票类型
* @param receiverMobile [string] 发票收人电话
* @param coin [number] 使用的有货币金额
* @param redEnvelopes [number] 使用的红包
* @param paymentId [number] 支付id
* @param paymentType [number] 支付类型
* @param remark [string] 备注
* @param couponCode [string] 优惠券码
* @param printPrice [string] 是否打印价格
*/
easypayOrderSubmitAsync(uid, cartType, addressId, deliveryTime, deliveryWay, paymentType, paymentId, printPrice, other, remoteIp) { // eslint-disable-line
let param = {
method: 'app.Shopping.easySubmit',
uid: uid,
cart_type: cartType || 'ordinary',
address_id: addressId,
delivery_time: deliveryTime,
delivery_way: deliveryWay,
payment_type: paymentType,
payment_id: paymentId,
is_print_price: printPrice
};
// 发票
if (other.invoicesType) {
Object.assign(param, {
invoices_type: other.invoicesType,
invoices_title: other.invoicesTitle,
invoice_content: other.invoicesContent,
receiverMobile: other.receiver
});
}
// 有货币
if (other.coin) {
Object.assign(param, {
use_yoho_coin: other.coin / 100
use_yoho_coin: other.coin / 100 // 有货币稀释
});
}
if (other.useRedEnvelops) {
// 红包
if (other.redEnvelopes) {
Object.assign(param, {
use_red_envelopes: other.useRedEnvelops
use_red_envelopes: other.redEnvelopes
});
}
if (other.couponCode) {
// 备注
if (other.remark) {
Object.assign(param, {
coupon_code: other.couponCode
remark: other.remark
});
}
// 礼品卡
if (other.giftCard) {
Object.assign(param, {
gift_card_code: other.giftCard
});
}
// 优惠码
if (other.promotionCode) {
Object.assign(param, {
promotion_code: other.promotionCode
});
}
// 优惠券码
if (other.couponCode) {
Object.assign(param, {
coupon_code: other.couponCode
});
}
if (other.productSkuList) {
Object.assign(param, {
product_sku_list: other.productSkuList
... ... @@ -85,106 +192,16 @@ const getEasypayComputeAsync = (uid, cartType, paymentType, deliveryWay, other)
}
}
}
return api.get('', param);
};
/**
* 订单提交API
* @param uid [number] uid
* @param cartType [String] 购物车类型，ordinary表示普通, advance表示预售
* @param addressId [String] 地址
* @param deliveryTime [number] 寄送时间类型
* @param deliveryWay [number] 配送方式，1表示普通快递，2表示顺丰速运
* @param invoicesType [number] 发票类型
* @param invoicesTitle [string] 发票抬头
* @param invoicesContent [int] 发票类型
* @param receiverMobile [string] 发票收人电话
* @param coin [number] 使用的有货币金额
* @param redEnvelopes [number] 使用的红包
* @param paymentId [number] 支付id
* @param paymentType [number] 支付类型
* @param remark [string] 备注
* @param couponCode [string] 优惠券码
* @param printPrice [string] 是否打印价格
*/
const easypayOrderSubmitAsync = (uid, cartType, addressId, deliveryTime, deliveryWay, paymentType, paymentId, printPrice, other, remoteIp) => { // eslint-disable-line
let param = {
method: 'app.Shopping.easySubmit',
uid: uid,
cart_type: cartType || 'ordinary',
address_id: addressId,
delivery_time: deliveryTime,
delivery_way: deliveryWay,
payment_type: paymentType,
payment_id: paymentId,
is_print_price: printPrice
};
// 发票
if (other.invoicesType) {
Object.assign(param, {
invoices_type: other.invoicesType,
invoices_title: other.invoicesTitle,
invoice_content: other.invoicesContent,
receiverMobile: other.receiver
});
}
// 有货币
if (other.coin) {
Object.assign(param, {
use_yoho_coin: other.coin / 100 // 有货币稀释
});
}
// 红包
if (other.redEnvelopes) {
Object.assign(param, {
use_red_envelopes: other.redEnvelopes
});
}
// 备注
if (other.remark) {
Object.assign(param, {
remark: other.remark
});
}
// 优惠券码
if (other.couponCode) {
Object.assign(param, {
coupon_code: other.couponCode
});
}
if (other.productSkuList) {
Object.assign(param, {
product_sku_list: other.productSkuList
});
if (other.bundle) {
if (other.udid) {
Object.assign(param, {
activity_id: other.bundle
udid: other.udid
});
}
}
if (other.udid) {
Object.assign(param, {
udid: other.udid
});
return this.get({data: param, param: {
headers: {
'X-Forwarded-For': remoteIp || ''
}
}});
}
return api.get('', param, {
headers: {'X-Forwarded-For': remoteIp || ''}
});
};
module.exports = {
getEasyPaymentAsync,
getEasypayComputeAsync,
easypayOrderSubmitAsync
};
... ...
... ... @@ -10,91 +10,101 @@ const _ = require('lodash');
const helper = global.yoho.helpers;
const crypto = global.yoho.crypto;
const easypayApi = require('./easypay-api');
const addressApi = require('./address-api');
const ensureApi = require('./order-ensure-api');
const ensureHandle = require('./order-ensure-handle');
const _getLimitProductData = (params) => {
let resList = [];
if (params.limitcode && params.sku && params.skn) {
resList.push({
type: 'limitcode',
buy_number: 1,
sku: params.sku,
skn: params.skn,
limitproductcode: params.limitcode
});
} else if (params.bundle && params.sku) {
resList = [];
const EasypayApi = require('./easypay-api');
const AddressApi = require('./address-api');
const EnsureApi = require('./order-ensure-api');
_.forEach(_.split(params.sku, ',', 10), val => {
resList.push({
type: 'bundle',
sku: parseInt(val, 10),
buy_number: 1
});
});
const EnsureHandle = require('./order-ensure-handle');
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
return resList.length ? JSON.stringify(resList) : false;
};
_getLimitProductData(params) {
let resList = [];
// 获取结算信息
const getEasypayOrderData = (params, uid) => {
let resData = {};
let strInfo = _getLimitProductData(params);
let bundle = params.bundle ? parseInt(params.bundle, 10) : false;
return Promise.all([
easypayApi.getEasyPaymentAsync(uid, strInfo, bundle),
addressApi.getAddressListAsync(uid),
ensureApi.getUserProfileAsync(uid)
]).then(result => {
let data = _.get(result, '[0].data', false);
let address = _.get(result, '[1].data', []);
let receiver = _.get(result, '[2].data.mobile', '');
if (data) {
Object.assign(resData, ensureHandle.handlePaymentInfo(data, address), {
receiverMobile: receiver,
hideReceiverMobile: _.replace(receiver, /(\d{3})\d{4}(\d{4,9})/, '$1****$2')
if (params.limitcode && params.sku && params.skn) {
resList.push({
type: 'limitcode',
buy_number: 1,
sku: params.sku,
skn: params.skn,
limitproductcode: params.limitcode
});
} else if (params.bundle && params.sku) {
resList = [];
_.forEach(_.split(params.sku, ',', 10), val => {
resList.push({
type: 'bundle',
sku: parseInt(val, 10),
buy_number: 1
});
});
}
return resData;
});
};
// 价格计算
const getOrderComputeData = (uid, cartType, params) => {
params.productSkuList = _getLimitProductData(params);
return resList.length ? JSON.stringify(resList) : false;
}
return easypayApi.getEasypayComputeAsync(uid, cartType, params.paymentType, params.deliveryWay, params).then(result => { // eslint-disable-line
if (result.code === 200) {
if (_.has(result, 'data.last_order_amount')) {
result.data.last_order_amount = (result.data.last_order_amount).toFixed(2);
// 获取结算信息
getEasypayOrderData(params, uid) {
let resData = {};
let strInfo = this._getLimitProductData(params);
let bundle = params.bundle ? parseInt(params.bundle, 10) : false;
return Promise.all([
new EasypayApi(this.ctx).getEasyPaymentAsync(uid, strInfo, bundle),
new AddressApi(this.ctx).getAddressListAsync(uid),
new EnsureApi(this.ctx).getUserProfileAsync(uid)
]).then(result => {
let data = _.get(result, '[0].data', false);
let address = _.get(result, '[1].data', []);
let receiver = _.get(result, '[2].data.mobile', '');
if (data) {
Object.assign(resData, new EnsureHandle(this.ctx).handlePaymentInfo(data, address), {
receiverMobile: receiver,
hideReceiverMobile: _.replace(receiver, /(\d{3})\d{4}(\d{4,9})/, '$1****$2')
});
}
if (_.has(result, 'data.promotion_formula_list')) {
ensureHandle.handleViewPrice(result.data.promotion_formula_list);
}
return resData;
});
}
result.data = Object.assign(result.data, ensureHandle.handleUseYohoCoin(result.data));
}
return result;
});
};
// 价格计算
getOrderComputeData(uid, cartType, params) {
params.productSkuList = this._getLimitProductData(params);
return new EasypayApi(this.ctx).getEasypayComputeAsync(uid, cartType, params.paymentType, params.deliveryWay, params).then(result => { // eslint-disable-line
if (result.code === 200) {
let ensureHandleModel = new EnsureHandle(this.ctx);
if (_.has(result, 'data.last_order_amount')) {
result.data.last_order_amount = (result.data.last_order_amount).toFixed(2);
}
if (_.has(result, 'data.promotion_formula_list')) {
ensureHandleModel.handleViewPrice(result.data.promotion_formula_list);
}
result.data = Object.assign(result.data, ensureHandleModel.handleUseYohoCoin(result.data));
}
return result;
});
}
// 订单提交
const easypayOrderSubmit = (uid, cartType, params, remoteIp) => {
params.addressId = crypto.decrypt('', params.addressId);
params.productSkuList = _getLimitProductData(params);
// 订单提交
easypayOrderSubmit(uid, cartType, params, remoteIp) {
params.addressId = crypto.decrypt('', params.addressId);
params.productSkuList = this._getLimitProductData(params);
return easypayApi.easypayOrderSubmitAsync(uid, cartType, params.addressId, params.deliveryTime,
params.deliveryWay, params.paymentType, params.paymentId, params.printPrice, params, remoteIp).then(result => {
return new EasypayApi(this.ctx).easypayOrderSubmitAsync(
uid, cartType, params.addressId, params.deliveryTime,
params.deliveryWay, params.paymentType, params.paymentId,
params.printPrice, params, remoteIp
).then(result => {
if (result.code === 200) {
let d = result.data;
... ... @@ -103,12 +113,6 @@ const easypayOrderSubmit = (uid, cartType, params, remoteIp) => {
});
}
return result;
}
);
};
module.exports = {
getEasypayOrderData,
getOrderComputeData,
easypayOrderSubmit
});
}
};
... ...
... ... @@ -5,85 +5,234 @@
*/
'use strict';
const api = global.yoho.API;
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
/**
* 获取用户信息API
* @param uid [number] uid
*/
const getUserProfileAsync = (uid) => api.get('', {
method: 'app.passport.profile',
uid: uid
});
/**
* 获取用户信息API
* @param uid [number] uid
*/
getUserProfileAsync(uid) {
let options = {
method: 'app.passport.profile',
uid: uid
};
/**
* 购物车结算API
* @param uid [number] uid
* @param cartType [string] 购物车类型，ordinary表示普通, advance表示预售
* @param yohoCoinMode [number] 是否使用yoho币，1使用,0不使用
*/
const getOrderPaymentAsync = (uid, cartType, yohoCoinMode) => api.get('', {
method: 'app.Shopping.payment',
cart_type: cartType,
yoho_coin_mode: yohoCoinMode,
uid: uid
});
return this.get({data: options});
}
/**
* 获取用户优惠券信息API
* @param uid [number] uid
*/
const getUesrCouponAsync = (uid) => api.get('', {
method: 'app.Shopping.listCoupon',
uid: uid,
is_group_frees: 'Y'
});
/**
* 购物车结算API
* @param uid [number] uid
* @param cartType [string] 购物车类型，ordinary表示普通, advance表示预售
* @param yohoCoinMode [number] 是否使用yoho币，1使用,0不使用
*/
getOrderPaymentAsync(uid, cartType, yohoCoinMode) {
let options = {
method: 'app.Shopping.payment',
cart_type: cartType,
yoho_coin_mode: yohoCoinMode,
uid: uid
};
/**
* 优惠码兑换优惠券API
* @param uid [number] uid
* @param code [number] code
*/
const getCouponByCodeAsync = (uid, code) => api.get('', {
method: 'app.Shopping.useCoupon',
uid: uid,
coupon_code: code
});
return this.get({data: options});
}
/**
* 订单计算API
* @param uid [number] uid
* @param cartType [string] 购物车类型，ordinary表示普通, advance表示预售
* @param paymentType [number] 支付方式，1表示在线支付，2表示货到付款
* @param deliveryWay [number] 配送方式，1表示普通快递，2表示顺丰速运
* @param coin [number] 使用的有货币
* @param useRedEnvelops [number] 红包
* @param couponCode [string] 优惠券码
* @param promotionCode [string] 优惠码
*/
const getOrderComputeAsync = (uid, cartType, paymentType, deliveryWay, other) => {
let param = {
method: 'app.Shopping.compute',
uid: uid,
cart_type: cartType,
payment_type: paymentType,
delivery_way: deliveryWay
};
// 其他可选参数
if (other) {
/**
* 获取用户优惠券信息API
* @param uid [number] uid
*/
getUesrCouponAsync(uid) {
let options = {
method: 'app.Shopping.listCoupon',
uid: uid,
is_group_frees: 'Y'
};
return this.get({data: options});
}
/**
* 优惠码兑换优惠券API
* @param uid [number] uid
* @param code [number] code
*/
getCouponByCodeAsync(uid, code) {
let options = {
method: 'app.Shopping.useCoupon',
uid: uid,
coupon_code: code
};
return this.get({data: options});
}
/**
* 获取用户可用礼品卡信息API
* @param uid [number] uid
*/
getGiftCardAsync(uid) {
return this.get({data: {
method: 'app.Shopping.listGiftCard',
uid: uid
}});
}
/**
* 订单计算API
* @param uid [number] uid
* @param cartType [string] 购物车类型，ordinary表示普通, advance表示预售
* @param paymentType [number] 支付方式，1表示在线支付，2表示货到付款
* @param deliveryWay [number] 配送方式，1表示普通快递，2表示顺丰速运
* @param coin [number] 使用的有货币
* @param useRedEnvelops [number] 红包
* @param couponCode [string] 优惠券码
* @param promotionCode [string] 优惠码
*/
getOrderComputeAsync(uid, cartType, paymentType, deliveryWay, other) {
let param = {
method: 'app.Shopping.compute',
uid: uid,
cart_type: cartType,
payment_type: paymentType,
delivery_way: deliveryWay
};
// 其他可选参数
if (other) {
if (other.coin) {
Object.assign(param, {
use_yoho_coin: other.coin
});
}
if (other.redEnvelopes) {
Object.assign(param, {
use_red_envelopes: other.redEnvelopes
});
}
if (other.giftCard) {
Object.assign(param, {
gift_card_code: other.giftCard
});
}
if (other.couponCode) {
Object.assign(param, {
coupon_code: other.couponCode
});
} else if (other.promotionCode) {
Object.assign(param, {
promotion_code: other.promotionCode
});
}
}
return this.get({data: param});
}
/**
* 发送礼品卡使用校验短信API
* @param uid [number] uid
*/
sendGiftCardCkeckSmsAsync(uid, udid) {
return this.get({data: {
method: 'app.giftcard.sendSms',
uid: uid,
udid: udid
}});
}
/**
* 校验礼品卡使用短信验证码API
* @param code [number] code
*/
checkGiftCardSmsCodeAsync(uid, code, udid) {
return this.get({data: {
method: 'app.giftcard.validRegCode',
uid: uid,
code: code,
udid: udid
}});
}
/**
* 订单提交API
* @param uid [number] uid
* @param cartType [String] 购物车类型，ordinary表示普通, advance表示预售
* @param addressId [String] 地址
* @param deliveryTime [number] 寄送时间类型
* @param deliveryWay [number] 配送方式，1表示普通快递，2表示顺丰速运
* @param invoicesType [number] 发票类型
* @param invoicesTitle [string] 发票抬头
* @param invoicesContent [int] 发票类型
* @param receiverMobile [string] 发票收人电话
* @param coin [number] 使用的有货币金额
* @param redEnvelopes [number] 使用的红包
* @param paymentId [number] 支付id
* @param paymentType [number] 支付类型
* @param remark [string] 备注
* @param couponCode [string] 优惠券码
* @param printPrice [string] 是否打印价格
*/
orderSubmitAsync(uid, cartType, addressId, deliveryTime, deliveryWay, paymentType, paymentId, printPrice, other, remoteIp) { // eslint-disable-line
let param = {
method: 'app.Shopping.submit',
uid: uid,
cart_type: cartType,
address_id: addressId,
delivery_time: deliveryTime,
delivery_way: deliveryWay,
payment_type: paymentType,
payment_id: paymentId,
is_print_price: printPrice,
is_continue_buy: other.continueBuy ? 'Y' : 'N'
};
// 发票
if (other.invoicesType) {
Object.assign(param, {
invoices_type: other.invoicesType,
invoices_title: other.invoicesTitle,
invoice_content: other.invoicesContent,
receiverMobile: other.receiverMobile,
buyerTaxNumber: other.taxNumber,
invoice_payable_type: other.taxNumber ? 2 : 1
});
}
// 有货币
if (other.coin) {
Object.assign(param, {
use_yoho_coin: other.coin
use_yoho_coin: other.coin / 100 // 有货币稀释
});
}
// 红包
if (other.redEnvelopes) {
Object.assign(param, {
use_red_envelopes: other.redEnvelopes
});
}
// 礼品卡
if (other.giftCard) {
Object.assign(param, {
gift_card_code: other.giftCard
});
}
// 备注
if (other.remark) {
Object.assign(param, {
remark: other.remark
});
}
// 优惠券码
if (other.couponCode) {
Object.assign(param, {
coupon_code: other.couponCode
... ... @@ -93,120 +242,31 @@ const getOrderComputeAsync = (uid, cartType, paymentType, deliveryWay, other) =>
promotion_code: other.promotionCode
});
}
}
return api.get('', param);
};
/**
* 订单提交API
* @param uid [number] uid
* @param cartType [String] 购物车类型，ordinary表示普通, advance表示预售
* @param addressId [String] 地址
* @param deliveryTime [number] 寄送时间类型
* @param deliveryWay [number] 配送方式，1表示普通快递，2表示顺丰速运
* @param invoicesType [number] 发票类型
* @param invoicesTitle [string] 发票抬头
* @param invoicesContent [int] 发票类型
* @param receiverMobile [string] 发票收人电话
* @param coin [number] 使用的有货币金额
* @param redEnvelopes [number] 使用的红包
* @param paymentId [number] 支付id
* @param paymentType [number] 支付类型
* @param remark [string] 备注
* @param couponCode [string] 优惠券码
* @param printPrice [string] 是否打印价格
*/
const orderSubmitAsync = (uid, cartType, addressId, deliveryTime, deliveryWay, paymentType, paymentId, printPrice, other, remoteIp) => { // eslint-disable-line
let param = {
method: 'app.Shopping.submit',
uid: uid,
cart_type: cartType,
address_id: addressId,
delivery_time: deliveryTime,
delivery_way: deliveryWay,
payment_type: paymentType,
payment_id: paymentId,
is_print_price: printPrice,
is_continue_buy: other.continueBuy ? 'Y' : 'N'
};
// 发票
if (other.invoicesType) {
Object.assign(param, {
invoices_type: other.invoicesType,
invoices_title: other.invoicesTitle,
invoice_content: other.invoicesContent,
receiverMobile: other.receiverMobile,
buyerTaxNumber: other.taxNumber,
invoice_payable_type: other.taxNumber ? 2 : 1
});
}
// 有货币
if (other.coin) {
Object.assign(param, {
use_yoho_coin: other.coin / 100 // 有货币稀释
});
}
// 红包
if (other.redEnvelopes) {
Object.assign(param, {
use_red_envelopes: other.redEnvelopes
});
}
// 备注
if (other.remark) {
Object.assign(param, {
remark: other.remark
});
}
// 优惠券码
if (other.couponCode) {
Object.assign(param, {
coupon_code: other.couponCode
});
} else if (other.promotionCode) {
Object.assign(param, {
promotion_code: other.promotionCode
});
}
if (other.continueBuy) {
Object.assign(param, {
is_continue_buy: 'Y'
});
}
if (other.udid) {
Object.assign(param, {
udid: other.udid
});
}
if (other.continueBuy) {
Object.assign(param, {
is_continue_buy: 'Y'
});
}
// 友盟有关信息的传递
if (other.qhyUnion) {
Object.assign(param, {
qhy_union: other.qhyUnion
});
}
if (other.udid) {
Object.assign(param, {
udid: other.udid
});
}
return api.get('', param, {
headers: {
'X-Forwarded-For': remoteIp || '',
'User-Agent': other.userAgent || ''
// 友盟有关信息的传递
if (other.qhyUnion) {
Object.assign(param, {
qhy_union: other.qhyUnion
});
}
});
};
module.exports = {
getUserProfileAsync,
getOrderPaymentAsync,
getUesrCouponAsync,
getCouponByCodeAsync,
getOrderComputeAsync,
orderSubmitAsync
return this.get({data: param, param: {
headers: {
'X-Forwarded-For': remoteIp || '',
'User-Agent': other.userAgent || ''
}
}});
}
};
... ...
... ... @@ -6,121 +6,119 @@
'use strict';
const _ = require('lodash');
const helper = global.yoho.helpers;
const crypto = global.yoho.crypto;
const handleViewPrice = list => {
if (list) {
_.forEach(list, val => {
if (val.promotion === '商品金额') {
val.promotion = '商品总价';
val.promotion_amount = `+ ${val.promotion_amount}`;
} else {
val.promotion_amount = _.replace(val.promotion_amount, '+', '+ ');
val.promotion_amount = _.replace(val.promotion_amount, '-', '- ');
}
});
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
};
const handleUseYohoCoin = (info) => {
let resData = {};
let limitCoin = _.get(info, 'yoho_coin_pay_rule.num_limit', 0);
if (info) {
Object.assign(resData, {
yoho_coin: info.yoho_coin.toFixed(2),
use_yoho_coin: info.use_yoho_coin,
total_yoho_coin_num: info.total_yoho_coin_num,
yoho_coin_pay_rule: info.yoho_coin_pay_rule,
canUseCoinNum: _.round(info.yoho_coin * 100),
usedCoinNum: _.round(info.use_yoho_coin * 100)
});
if (!resData.canUseCoinNum) {
let coinErrorTip = '';
handleViewPrice(list) {
if (list) {
_.forEach(list, val => {
if (val.promotion === '商品金额') {
val.promotion = '商品总价';
val.promotion_amount = `+ ${val.promotion_amount}`;
} else {
val.promotion_amount = _.replace(val.promotion_amount, '+', '+ ');
val.promotion_amount = _.replace(val.promotion_amount, '-', '- ');
}
});
}
}
if (info.total_yoho_coin_num > limitCoin) {
coinErrorTip = '抱歉，您的订单实付款不满足有货币使用条件';
} else {
coinErrorTip = `抱歉，您的有货币不足，有货币满${limitCoin}个方可使用`;
handleUseYohoCoin(info) {
let resData = {};
let limitCoin = _.get(info, 'yoho_coin_pay_rule.num_limit', 0);
if (info) {
Object.assign(resData, {
yoho_coin: info.yoho_coin.toFixed(2),
use_yoho_coin: info.use_yoho_coin,
total_yoho_coin_num: info.total_yoho_coin_num,
yoho_coin_pay_rule: info.yoho_coin_pay_rule,
canUseCoinNum: _.round(info.yoho_coin * 100),
usedCoinNum: _.round(info.use_yoho_coin * 100)
});
if (!resData.canUseCoinNum) {
let coinErrorTip = '';
if (info.total_yoho_coin_num > limitCoin) {
coinErrorTip = '抱歉，您的订单实付款不满足有货币使用条件';
} else {
coinErrorTip = `抱歉，您的有货币不足，有货币满${limitCoin}个方可使用`;
}
resData.coinErrorTip = coinErrorTip;
}
resData.coinErrorTip = coinErrorTip;
}
return resData;
}
return resData;
};
handlePaymentInfo(d, address) {
let resData = {};
let defAddrId = _.get(d, 'delivery_address.address_id', 0);
const handlePaymentInfo = (d, address) => {
let resData = {};
let defAddrId = _.get(d, 'delivery_address.address_id', 0);
_.forEach(address, dd => {
if (dd.is_default === 'Y') {
dd.default = true;
}
_.forEach(address, dd => {
if (dd.is_default === 'Y') {
dd.default = true;
}
// 地址加密
let id = dd.address_id;
// 地址加密
let id = dd.address_id;
dd.id = crypto.encryption('', `${id}`);
dd.id = crypto.encryption('', `${id}`);
// 设置默认选中地址
if (id === defAddrId) {
dd.selected = true;
}
// 设置默认选中地址
if (id === defAddrId) {
dd.selected = true;
}
// 删除uid，用户数据保密
_.unset(dd, 'address_id');
_.unset(dd, 'uid');
});
// 删除uid，用户数据保密
_.unset(dd, 'address_id');
_.unset(dd, 'uid');
});
resData.deliveryAddress = address;
resData.deliveryAddress = address;
d.shopping_cart_data.hasCoin = _.round(d.yoho_coin * 100); // 有货币稀释
d.shopping_cart_data.hasCoin = _.round(d.yoho_coin * 100); // 有货币稀释
_.forEach(d.goods_list, g => {
g.last_vip_price = g.last_vip_price && Number(g.last_vip_price).toFixed(2) || '';
g.sales_price = g.sales_price && Number(g.sales_price).toFixed(2) || '';
_.forEach(d.goods_list, g => {
g.last_vip_price = g.last_vip_price && Number(g.last_vip_price).toFixed(2) || '';
g.sales_price = g.sales_price && Number(g.sales_price).toFixed(2) || '';
// link to goods
g.linkToGoods = helper.urlFormat(`/product/pro_${g.product_id}_${g.goods_id}/${g.cn_alphabet}.html`,
'', 'item');
g.productPrice = g.sales_price;
g.isVipPrice = g.discount_tag === 'V';
g.isStuPrice = g.discount_tag === 'S';
// link to goods
g.linkToGoods = helper.urlFormat(`/product/pro_${g.product_id}_${g.goods_id}/${g.cn_alphabet}.html`,
'', 'item');
g.productPrice = g.sales_price;
g.isVipPrice = g.discount_tag === 'V';
g.isStuPrice = g.discount_tag === 'S';
// 赠品、加价购
if (g.goods_type === 'gift' || g.goods_type === 'price_gift') {
g.productPrice = g.last_price;
}
});
resData.goodsList = d.goods_list;
// 赠品、加价购
if (g.goods_type === 'gift' || g.goods_type === 'price_gift') {
g.productPrice = g.last_price;
if (d.shopping_cart_data && d.shopping_cart_data.promotion_formula_list) {
this.handleViewPrice(d.shopping_cart_data.promotion_formula_list);
}
});
resData.goodsList = d.goods_list;
if (d.shopping_cart_data && d.shopping_cart_data.promotion_formula_list) {
handleViewPrice(d.shopping_cart_data.promotion_formula_list);
}
Object.assign(resData, {
paymentWay: d.payment_way,
deliveryTime: d.delivery_time,
deliveryWay: d.delivery_way,
shoppingCartData: Object.assign(d.shopping_cart_data, handleUseYohoCoin(d), {
redEnvelopes: d.red_envelopes,
useRedEnvelopes: d.use_red_envelopes
}),
invoices: d.invoices
});
return resData;
};
Object.assign(resData, {
paymentWay: d.payment_way,
deliveryTime: d.delivery_time,
deliveryWay: d.delivery_way,
shoppingCartData: Object.assign(d.shopping_cart_data, this.handleUseYohoCoin(d), {
redEnvelopes: d.red_envelopes,
useRedEnvelopes: d.use_red_envelopes
}),
invoices: d.invoices
});
module.exports = {
handleViewPrice,
handleUseYohoCoin,
handlePaymentInfo
return resData;
}
};
... ...
... ... @@ -6,109 +6,136 @@
'use strict';
const _ = require('lodash');
// const api = global.yoho.API;
const helper = global.yoho.helpers;
const crypto = global.yoho.crypto;
// const config = global.yoho.config;
const ensureApi = require('./order-ensure-api');
const addressApi = require('./address-api');
const EnsureApi = require('./order-ensure-api');
const AddressApi = require('./address-api');
const EnsureHandle = require('./order-ensure-handle');
const ensureHandle = require('./order-ensure-handle');
const index = (uid, cartType) => {
let resData = {};
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
return Promise.all([
ensureApi.getOrderPaymentAsync(uid, cartType, 0),
addressApi.getAddressListAsync(uid),
ensureApi.getUserProfileAsync(uid)
]).then(result => {
let data = _.get(result, '[0].data', false);
let address = _.get(result, '[1].data', []);
let receiver = _.get(result, '[2].data.mobile', '');
index(uid, cartType) {
let resData = {};
let addressApiModel = new AddressApi(this.ctx);
let ensureApiModel = new EnsureApi(this.ctx);
let ensureHandleModel = new EnsureHandle(this.ctx);
return Promise.all([
ensureApiModel.getOrderPaymentAsync(uid, cartType, 0),
addressApiModel.getAddressListAsync(uid),
ensureApiModel.getUserProfileAsync(uid)
]).then(result => {
let data = _.get(result, '[0].data', false);
let address = _.get(result, '[1].data', []);
let receiver = _.get(result, '[2].data.mobile', '');
if (data) {
Object.assign(resData, ensureHandleModel.handlePaymentInfo(data, address), {
receiverMobile: receiver,
hideReceiverMobile: _.replace(receiver, /(\d{3})\d{4}(\d{4,9})/, '$1****$2')
});
}
if (data) {
Object.assign(resData, ensureHandle.handlePaymentInfo(data, address), {
receiverMobile: receiver,
hideReceiverMobile: _.replace(receiver, /(\d{3})\d{4}(\d{4,9})/, '$1****$2')
});
}
return resData;
});
}
return resData;
});
};
// 获取优惠券列表
getCoupons(uid) {
return new EnsureApi(this.ctx).getUesrCouponAsync(uid).then(result => {
if (_.isEmpty(_.get(result, 'data.usable_coupons', [])) &&
_.isEmpty(_.get(result, 'data.usable_frees_coupons', []))) {
_.set(result, 'data.emptyUsable', true);
}
return result;
});
}
// 获取优惠券列表
const getCoupons = (uid) => ensureApi.getUesrCouponAsync(uid).then(result => {
if (_.isEmpty(_.get(result, 'data.usable_coupons', [])) &&
_.isEmpty(_.get(result, 'data.usable_frees_coupons', []))) {
_.set(result, 'data.emptyUsable', true);
// 兑换优惠券
convertCoupons(uid, code) {
return new EnsureApi(this.ctx).getCouponByCodeAsync(uid, code);
}
return result;
});
// 订单计算
compute(uid, cartType, pa) {
return new EnsureApi(this.ctx).getOrderComputeAsync(
uid, cartType, pa.paymentType, pa.deliveryWay, pa
).then(result => {
if (result.code === 200) {
let ensureHandleModel = new EnsureHandle(this.ctx);
// 兑换优惠券
const convertCoupons = (uid, code) => ensureApi.getCouponByCodeAsync(uid, code);
if (_.has(result, 'data.last_order_amount')) {
result.data.last_order_amount = (result.data.last_order_amount).toFixed(2);
}
if (_.has(result, 'data.promotion_formula_list')) {
ensureHandleModel.handleViewPrice(result.data.promotion_formula_list);
}
// 订单计算
const compute = (uid, cartType, pa) => {
return ensureApi.getOrderComputeAsync(uid, cartType, pa.paymentType, pa.deliveryWay, pa).then(result => {
if (result.code === 200) {
if (_.has(result, 'data.last_order_amount')) {
result.data.last_order_amount = (result.data.last_order_amount).toFixed(2);
result.data = Object.assign(result.data, ensureHandleModel.handleUseYohoCoin(result.data));
}
if (_.has(result, 'data.promotion_formula_list')) {
ensureHandle.handleViewPrice(result.data.promotion_formula_list);
}
return result;
});
}
result.data = Object.assign(result.data, ensureHandle.handleUseYohoCoin(result.data));
}
// 获取礼品卡列表
getGiftCards(uid) {
const ensureApiModel = new EnsureApi(this.ctx);
return result;
});
};
return Promise.all([
ensureApiModel.getGiftCardAsync(uid),
ensureApiModel.getUserProfileAsync(uid)
]).then(result => {
let resData = result[0];
// 订单提交
const submit = (uid, cartType, p, remoteIp) => {
if (p.addressId) {
p.addressId = crypto.decrypt('', `${p.addressId}`);
}
if (!_.isEmpty(_.get(resData, 'data.usable_giftCards', []))) {
_.map(resData.data.usable_giftCards, value => {
return Object.assign(value, {price: _.replace(value.remainAmount, /[^(0-9.)]/ig, '')});
});
}
// 5.8.1 发票优化需求
// 只接受电子发票（1 纸质 2 电子），发票内容为明细（id 12：明细）
if (p.invoicesType) {
Object.assign(p, {
invoicesType: 2,
invoicesContent: 12
if (result[1].code === 200) {
_.set(resData, 'data.userMobile', _.get(result[1], 'data.mobile'));
}
return resData;
});
}
return ensureApi.orderSubmitAsync(uid, cartType, p.addressId, p.deliveryTime,
p.deliveryWay, p.paymentType, p.paymentId, p.printPrice, p, remoteIp).then(result => {
if (result.code === 200) {
let d = result.data;
// 发送礼品卡使用校验短信
sendGiftCardCkeckSms(uid, udid) {
return new EnsureApi(this.ctx).sendGiftCardCkeckSmsAsync(uid, udid);
}
d.url = helper.urlFormat('/shopping/newpay', {
ordercode: d.order_code
});
}
// 校验礼品卡使用短信验证码
checkGiftCardSmsCode(uid, code, udid) {
return new EnsureApi(this.ctx).checkGiftCardSmsCodeAsync(uid, code, udid);
}
return result;
// 订单提交
submit(uid, cartType, p, remoteIp) {
if (p.addressId) {
p.addressId = crypto.decrypt('', `${p.addressId}`);
}
);
};
module.exports = {
index,
getCoupons,
convertCoupons,
compute,
submit
return new EnsureApi(this.ctx).orderSubmitAsync(uid, cartType, p.addressId, p.deliveryTime,
p.deliveryWay, p.paymentType, p.paymentId, p.printPrice, p, remoteIp).then(result => {
if (result.code === 200) {
let d = result.data;
d.url = helper.urlFormat('/shopping/newpay', {
ordercode: d.order_code
});
}
return result;
}
);
}
};
... ...
... ... @@ -2,55 +2,72 @@
* Created by TaoHuang on 2017/6/22.
*/
const api = global.yoho.API;
/**
* 电子票下单
* @param uid 用户id
* @param sku 商品sku
* @param count 购买数量 1-4
* @param mobile 手机号码
* @param yohoCoin 有货币
*/
function submit(uid, sku, count, mobile, yohoCoin) {
let params = {
method: 'app.shopping.submitTicket',
uid,
product_sku: sku,
buy_number: count,
mobile: mobile
};
if (yohoCoin) {
params.use_yoho_coin = yohoCoin / 100;
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
return api.get('', params);
}
/**
* 电子票下单
* @param uid 用户id
* @param sku 商品sku
* @param count 购买数量 1-4
* @param mobile 手机号码
* @param yohoCoin 有货币
*/
submit(uid, sku, count, mobile, yohoCoin, other = {}) {
let params = {
method: 'app.shopping.submitTicket',
uid,
product_sku: sku,
buy_number: count,
mobile: mobile
};
/**
* 电子票添加和查询
* @param uid 用户 id
* @param sku 商品sku
* @param count 购买数量 1-4
* @param yohoCoin 有货币
*/
function add(uid, sku, count, yohoCoin) {
let params = {
method: 'app.shopping.ticket',
uid,
product_sku: sku,
buy_number: count
};
if (yohoCoin) {
params.use_yoho_coin = yohoCoin / 100;
if (yohoCoin) {
params.use_yoho_coin = yohoCoin / 100;
}
if (other.giftCard) {
Object.assign(params, {
gift_card_code: other.giftCard
});
}
if (other.udid) {
Object.assign(params, {
udid: other.udid
});
}
return this.get({data: params});
}
return api.get('', params);
}
/**
* 电子票添加和查询
* @param uid 用户 id
* @param sku 商品sku
* @param count 购买数量 1-4
* @param yohoCoin 有货币
*/
add(uid, sku, count, yohoCoin, other = {}) {
let params = {
method: 'app.shopping.ticket',
uid,
product_sku: sku,
buy_number: count
};
if (yohoCoin) {
params.use_yoho_coin = yohoCoin / 100;
}
module.exports = {
submit,
add
if (other.giftCard) {
Object.assign(params, {
gift_card_code: other.giftCard
});
}
return this.get({data: params});
}
};
... ...
... ... @@ -2,80 +2,83 @@
* Created by TaoHuang on 2017/6/22.
*/
const api = require('./ticket-api');
const Promise = require('bluebird');
const co = Promise.coroutine;
const TicketApi = require('./ticket-api');
const _ = require('lodash');
const helpers = global.yoho.helpers;
const _handleUseYhoCoin = require('./order-ensure-handle').handleUseYohoCoin;
const OrderEnsureHandle = require('./order-ensure-handle');
function _handleGoodsList(list) {
return list.map((i) => {
i.linkToGoods = helpers.getUrlBySkc(i.product_skn);
i.productPrice = i.sales_price;
return i;
});
}
function _handleAmount(info) {
return _.get(info, 'data.shopping_cart_data.last_order_amount', 0);
}
const addTicket = co(function * (uid, sku, count, yohoCoin) {
let ticketInfo = yield api.add(uid, sku, count, yohoCoin);
let result = {};
module.exports = class extends global.yoho.BaseModel {
constructor(ctx) {
super(ctx);
}
if (_.isEmpty(ticketInfo)) {
return {
last_order_amount: 0,
error: '人太多啦，稍后再试！'
};
_handleGoodsList(list) {
return list.map((i) => {
i.linkToGoods = helpers.getUrlBySkc(i.product_skn);
i.productPrice = i.sales_price;
return i;
});
}
if (ticketInfo.code !== 200) {
return {
last_order_amount: 0,
error: ticketInfo.message
};
_handleAmount(info) {
return _.get(info, 'data.shopping_cart_data.last_order_amount', 0);
}
result.virtualGood = true;
result.goodsList = _handleGoodsList(_.get(ticketInfo, 'data.goods_list', []));
result.last_order_amount = _handleAmount(ticketInfo);
Object.assign(result, _handleUseYhoCoin(_.get(ticketInfo, 'data.shopping_cart_data', {})));
addTicket(uid, sku, count, yohoCoin, other) {
return new TicketApi(this.ctx).add(uid, sku, count, yohoCoin, other).then(ticketInfo => {
let result = {};
return result;
});
if (_.isEmpty(ticketInfo)) {
return {
last_order_amount: 0,
error: '人太多啦，稍后再试！'
};
}
const submitTicket = co(function * (uid, sku, count, mobile, yohoCoin) {
let result = yield api.submit(uid, sku, count, mobile, yohoCoin);
if (ticketInfo.code !== 200) {
return {
last_order_amount: 0,
error: ticketInfo.message
};
}
if (_.isEmpty(result)) {
return {
code: 500,
message: '人太多啦，稍后再试！'
};
}
result.virtualGood = true;
result.goodsList = this._handleGoodsList(_.get(ticketInfo, 'data.goods_list', []));
result.last_order_amount = this._handleAmount(ticketInfo);
if (result.code !== 200) {
return {
code: result.code,
message: result.message
};
Object.assign(result, new OrderEnsureHandle(this.ctx).handleUseYohoCoin(
_.get(ticketInfo, 'data.shopping_cart_data', {}
)));
return result;
});
}
return {
code: 200,
message: '提交成功',
data: {
refer: helpers.urlFormat('/shopping/newpay', {
ordercode: result.data.order_code
})
}
};
});
submitTicket(uid, sku, count, mobile, yohoCoin, other) {
return new TicketApi(this.ctx).submit(uid, sku, count, mobile, yohoCoin, other).then(result => {
if (_.isEmpty(result)) {
return {
code: 500,
message: '人太多啦，稍后再试！'
};
}
if (result.code !== 200) {
return {
code: result.code,
message: result.message
};
}
module.exports = {
addTicket,
submitTicket
return {
code: 200,
message: '提交成功',
data: {
refer: helpers.urlFormat('/shopping/newpay', {
ordercode: result.data.order_code
})
}
};
});
}
};
... ...
... ... @@ -30,16 +30,18 @@ router.post('/address/setdefault', address.setDefault); // 设置默认地址
router.get('/ensure', auth, ensure.index); // 限购商品快捷结算页
router.get('/ensure/coupons', auth, ensure.getCoupons); // 结算优惠券列表
router.get('/ensure/giftcards', auth, ensure.getGiftCards); // 结算礼品卡列表
router.get('/ensure/couponcode', auth, ensure.convertCoupons); // 优惠码兑换券
router.post('/ensure/compute', auth, ensure.compute); // 价格重新计算
router.post('/ensure/submit', auth, ensure.submit); // 价格重新计算
router.post('/ensure/submit', auth, ensure.submitCheck, ensure.submit); // 订单提交
router.post('/property/checksms', ensure.sendCheckSms); // 虚拟资产使用校验
router.get('/easypay', auth, easypay.index); // 限购商品快捷结算页
router.post('/easypay/compute', auth, easypay.compute); // 价格重新计算
router.post('/easypay/submit', auth, easypay.submit); // 限购商品订单提交
router.get('/ticketEnsure', auth, ticket.ticketEnsure);
router.post('/ticketSubmit', auth, ticket.ticketSubmit);
router.post('/ticketSubmit', auth, ensure.submitCheck, ticket.ticketSubmit);
router.post('/ticketCompute', auth, ticket.ticketCompute);
router.get('/cart', cart.cart);
... ...
... ... @@ -100,7 +100,7 @@
{{/each}}
</ul>
</div>
<p class="package-shipping">运费：¥{{shopping_cost}}元（原价{{shopping_orig_cost}}元，优惠{{shopping_cut_cost}}元）</p>
<p class="package-shipping"></p>
</div>
{{/each}}
</div>
... ... @@ -251,6 +251,27 @@
</div>
</dd>
{{/if}}
<dt id="use-gift-card" class="hide"><span class="locker-switch"></span>使用礼品卡<span class="can-use-tip"></span></dt>
<dd class="gift-card-box hide">
<table>
<thead>
<tr>
<th width="260">卡号</th>
<th>面值</th>
<th>卡内余额</th>
<th width="230">有效期</th>
<th width="86">选择</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="5">暂无礼品卡</td>
</tr>
</tbody>
</table>
</dd>
<dt><span class="locker-switch"></span>添加备注信息</dt>
<dd id="remark-box" class="remark-box">
<div class="note-text-box">
... ... @@ -284,7 +305,7 @@
</div>
<div class="sum-wrap">
应付金额：<span id="order-price" class="price">¥ {{round last_order_amount 2}}</span>
应付金额：<span id="order-price" class="price" data-price="{{last_order_amount}}">¥ {{round last_order_amount 2}}</span>
<button id="order-submit">提交订单</button>
</div>
{{/ shoppingCartData}}
... ...
... ... @@ -75,35 +75,55 @@
<dd id="yoho-coin-box" class="yoho-coin-box" data-coin="{{usedCoinNum}}"
data-max={{canUseCoinNum}} data-total="{{total_yoho_coin_num}}">
<div class="outer-view">
<p class="coin-err-tip">{{coinErrorTip}}</p>
<p>有货币满<span class="red">{{yoho_coin_pay_rule.num_limit}}</span>个即可使用，每次使用有货币为<span
class="red">{{yoho_coin_pay_rule.num_limit}}</span>的整数倍</p>
<i class="help-icon"></i>
<div class="coin-tip-help">
<p>有货币使用提示：</p>
<p>
1.订单金额大于20元（含20元）<br>
2.有货币数量大于{{yoho_coin_pay_rule.num_limit}}个（含{{yoho_coin_pay_rule.num_limit}}个） <br>
3.有货币支付上限为每笔订单应付金额的{{yoho_coin_pay_rule.max_pay_rate_desc}}
</p>
<p class="rs-text">备注：使用有货币数量为{{yoho_coin_pay_rule.num_limit}}的整数倍，100有货币抵1元</p>
</div>
</div>
<div class="coin-main-view">
<p>本次使用有货币<span class="red">{{canUseCoinNum}}</span>个，抵扣 <span class="red">¥{{yoho_coin}}</span>
</p>
<p class="grey fw300">您当前共有有货币 <span class="red">{{total_yoho_coin_num}}</span> 个，可用 <span
class="red">{{canUseCoinNum}}</span> 个</p>
<label class="coin-cancel-btn fw300">取消使用</label>
<label class="coin-use-btn">确定</label>
</div>
<p class="coin-err-tip">{{coinErrorTip}}</p>
<p>有货币满<span class="red">{{yoho_coin_pay_rule.num_limit}}</span>个即可使用，每次使用有货币为<span
class="red">{{yoho_coin_pay_rule.num_limit}}</span>的整数倍</p>
<i class="help-icon"></i>
<div class="coin-tip-help">
<p>有货币使用提示：</p>
<p>
1.订单金额大于20元（含20元）<br>
2.有货币数量大于{{yoho_coin_pay_rule.num_limit}}个（含{{yoho_coin_pay_rule.num_limit}}个） <br>
3.有货币支付上限为每笔订单应付金额的{{yoho_coin_pay_rule.max_pay_rate_desc}}
</p>
<p class="rs-text">备注：使用有货币数量为{{yoho_coin_pay_rule.num_limit}}的整数倍，100有货币抵1元</p>
</div>
</div>
<div class="coin-main-view">
<p>本次使用有货币<span class="red">{{canUseCoinNum}}</span>个，抵扣 <span class="red">¥{{yoho_coin}}</span>
</p>
<p class="grey fw300">您当前共有有货币 <span class="red">{{total_yoho_coin_num}}</span> 个，可用 <span
class="red">{{canUseCoinNum}}</span> 个</p>
<label class="coin-cancel-btn fw300">取消使用</label>
<label class="coin-use-btn">确定</label>
</div>
</dd>
</dl>
<dt id="use-gift-card" class="hide"><span class="locker-switch"></span>使用礼品卡<span class="can-use-tip"></span></dt>
<dd class="gift-card-box hide">
<table>
<thead>
<tr>
<th width="260">卡号</th>
<th>面值</th>
<th>卡内余额</th>
<th width="230">有效期</th>
<th width="86">选择</th>
</tr>
</thead>
<tbody>
<tr>
<td colspan="5">暂无礼品卡</td>
</tr>
</tbody>
</table>
</dd>
</div>
<div class="sum-wrap">
应付金额：<span id="order-price" class="price">¥ {{round last_order_amount 2}}</span>
应付金额：<span id="order-price" class="price" data-price="{{last_order_amount}}">¥ {{round last_order_amount 2}}</span>
<button id="order-submit" data-url="{{productUrl}}">提交订单</button>
</div>
... ...
... ... @@ -106,7 +106,7 @@
<li class="invoice-personal-name invoice-row personal-row">
<span class="row-title"></span>
<div class="row-content">
<input id="personal-name" class="personal-name" type="text" placeholder="个人（ 可修改 ）">
<input id="personal-name" class="personal-name" type="text" placeholder="个人（ 可修改 ）" maxlength="100">
</div>
</li>
<li class="invoice-title-name invoice-row company-row hide">
... ... @@ -115,7 +115,7 @@
单&nbsp;位&nbsp;名&nbsp;称：
</span>
<div class="row-content">
<input id="company-name" class="company-name" type="text" placeholder="请填写单位名称">
<input id="company-name" class="company-name" type="text" placeholder="请填写单位名称" maxlength="100">
<span class="input-tip company-name-tip red hide">
<span class="iconfont">&#xe629;</span>
<em>请填写发票抬头</em>
... ...
... ... @@ -8,14 +8,14 @@
const _ = require('lodash');
const channelModel = require('../models/index');
const ChannelModel = require('../models/index');
exports.index = (req, res, next) => {
let channelType = req.path.split('/')[1] || 'boys';
let poolId = req.query.template_id;
let isJKChannel = req.query.mChannel === 'japanKorean';
channelModel.getContent(channelType, isJKChannel, poolId).then(data => {
req.ctx(ChannelModel).getContent(channelType, isJKChannel, poolId).then(data => {
// channel为空不缓存
if (_.isEmpty(data.channel)) {
... ... @@ -28,7 +28,7 @@ exports.index = (req, res, next) => {
// 日韩馆频道页
exports.japanKorean = (req, res, next) => {
channelModel.getJKContent(req).then(data => {
req.ctx(ChannelModel).getJKContent(req).then(data => {
// channel为空不缓存
if (_.isEmpty(data.channel)) {
... ... @@ -55,7 +55,7 @@ exports.getNewArrival = (req, res, next) => {
pageCount = 20;
}
channelModel.getNewArrival(channel, isJKChannel, poolId).then(data => {
req.ctx(ChannelModel).getNewArrival(channel, isJKChannel, poolId).then(data => {
goods = _.slice(data, pageIndex, pageIndex + pageCount);
if (goods.length !== 0) {
... ... @@ -69,15 +69,15 @@ exports.getNewArrival = (req, res, next) => {
};
exports.getIndexGuide = (req, res, next) => {
channelModel.getIndexGuideData().then(data => {
req.ctx(ChannelModel).getIndexGuideData().then(data => {
if (data.code !== 200) {
const err = new Error('异常');
throw err;
}
return channelModel.formatIndexGuideData(data.data);
return req.ctx(ChannelModel).formatIndexGuideData(data.data);
}).then(data => {
return channelModel.getResourceData(data);
return req.ctx(ChannelModel).getResourceData(data);
}).then(data => {
let result = {list: data, layout: false};
... ... @@ -87,7 +87,7 @@ exports.getIndexGuide = (req, res, next) => {
exports.hasNewUserFloor = (req, res, next) => {
channelModel.hasNewUserFloor(req.yoho.channel, req.user.uid).then(data => {
req.ctx(ChannelModel).hasNewUserFloor(req.yoho.channel, req.user.uid).then(data => {
res.send(data);
}).catch(next);
};
... ...