|
@@ -186,7 +186,9 @@ class OrderService extends CrudService {
|
|
|
this.tran.update('GoodsSpec', _id, { num: newNum });
|
|
|
if (cart_id) {
|
|
|
const num = await this.cartModel.count({ _id: cart_id });
|
|
|
- if (num > 0) { this.tran.remove('Cart', cart_id); }
|
|
|
+ if (num > 0) {
|
|
|
+ this.tran.remove('Cart', cart_id);
|
|
|
+ }
|
|
|
}
|
|
|
// 活动相关:
|
|
|
// 买赠:不一定非要处理赠品,赠品可能不在库中;
|
|
@@ -210,7 +212,6 @@ class OrderService extends CrudService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -264,8 +265,9 @@ class OrderService extends CrudService {
|
|
|
const couponList = await this.ctx.service.user.userCoupon.toMakeOrder_getList(specsData);
|
|
|
pageData.couponList = couponList;
|
|
|
// 返现部分:添加推荐人信息
|
|
|
- const inviter = data.find(f => ObjectId.isValid(f.inviter));
|
|
|
- pageData.inviter = inviter;
|
|
|
+ const inviter = _.get(_.head(data), 'inviter');
|
|
|
+ // const inviter = data.find((f) => ObjectId.isValid(f.inviter));
|
|
|
+ if (inviter) pageData.inviter = inviter;
|
|
|
// 活动部分
|
|
|
// 将加价购拿出来,给前端,需要特殊处理;
|
|
|
pageData.actList = actList.filter(f => f.platform_act_type === '4' && f.activity);
|