fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit f07e02c8b2d612fc1acb40be248501ad88ba5b90 1 parent 8e27c6ff

fix

Inline Side-by-side
Showing 3 changed files with 10 additions and 9 deletions
... ... @@ -154,9 +154,10 @@ module.exports = class extends global.yoho.BaseModel {
* 取消订单原因列表
* @return type
*/
closeReasons() {
closeReasons(uid) {
let options = {
method: 'app.SpaceOrders.closeReasons'
method: 'app.SpaceOrders.closeReasons',
uid
};
return this.get({data: options,
... ...
... ... @@ -502,7 +502,7 @@ module.exports = class extends global.yoho.BaseModel {
return co(function * () {
let result = yield Promise.props({
orders: that.getOrders(uid, page, limit, type, true),
cancelReason: new OrderApi(that.ctx).closeReasons().then(res => _.get(res, 'data', ''))
cancelReason: new OrderApi(that.ctx).closeReasons(uid).then(res => _.get(res, 'data', ''))
});
result.pager = pager(_.get(result, 'orders.pager.total', 0), {page, limit, type});
... ... @@ -937,8 +937,8 @@ module.exports = class extends global.yoho.BaseModel {
}
closeReason() {
return new OrderApi(this.ctx).closeReasons().then((result) => {
closeReason(uid) {
return new OrderApi(this.ctx).closeReasons(uid).then((result) => {
return _.get(result, 'data', []);
});
}
... ... @@ -955,7 +955,7 @@ module.exports = class extends global.yoho.BaseModel {
return co(function * () {
let apiData = yield Promise.props({
detailData: that._getOrderDetail(uid, orderId),
reason: that.closeReason()
reason: that.closeReason(uid)
});
if (apiData.detailData.code === 400) {
... ...
... ... @@ -263,9 +263,9 @@ if (isProduction) {
useOneapm: true,
useCache: true,
memcache: {
master: ['192.168.104.15:12111', '192.168.104.29:12111', '192.168.104.32:12111'],
slave: ['192.168.104.15:12112', '192.168.104.29:12112', '192.168.104.32:12112'],
session: ['192.168.104.15:12111', '192.168.104.29:12111', '192.168.104.32:12111'],
master: ['127.0.0.1:12111', '127.0.0.1:12111', '127.0.0.1:12111'],
slave: ['127.0.0.1:12112', '127.0.0.1:12112', '127.0.0.1:12112'],
session: ['120.0.0.1:12111', '127.0.0.1:12111', '127.0.0.1:12111'],
timeout: 1000,
retries: 0
},
... ...