|
@@ -375,7 +375,7 @@ class OrderService extends CrudService {
|
|
|
async getPageData(data, actList) {
|
|
|
const arr = [];
|
|
|
for (const i of data) {
|
|
|
- const { goodsSpec, num, cart_id, is_set = '1', set_id } = i;
|
|
|
+ const { goodsSpec, num, cart_id, is_set = '1', set_id, shop } = i;
|
|
|
if (is_set === '1' || !set_id) {
|
|
|
const d = await this.goodsSpecModel.aggregate([
|
|
|
{ $match: { _id: ObjectId(goodsSpec) } },
|
|
@@ -433,7 +433,7 @@ class OrderService extends CrudService {
|
|
|
const setData = await this.setModel.findById(set_id).lean();
|
|
|
const { _id, set = [], sell_money, name, freight } = setData;
|
|
|
const newSet = [];
|
|
|
- const obj = { _id, name, sell_money, is_set: '0', num, cart_id, freight };
|
|
|
+ const obj = { _id, name, sell_money, is_set: '0', num, cart_id, freight, shop };
|
|
|
for (const s of set) {
|
|
|
const { goods, goods_name, spec, spec_name, set_num } = s;
|
|
|
const goodsData = await this.goodsModel.findById(goods, { file: 1 }).lean();
|