zs 1 vuosi sitten
vanhempi
commit
f8d8c6a307

+ 4 - 0
src/entity/OrderDetail.entity.ts

@@ -18,6 +18,10 @@ export class OrderDetail extends BaseModel {
   address: string;
   @prop({ required: false, index: true, zh: '下单时间' })
   buy_time: string;
+  @prop({ required: false, index: false, zh: '数量' })
+  num: number;
+  @prop({ required: false, index: true, zh: '总金额' })
+  money: number;
   @prop({ required: false, index: false, zh: '审核记录' })
   record: Array<any>;
   @prop({

+ 10 - 0
src/interface/OrderDetail.interface.ts

@@ -28,6 +28,10 @@ export class FVO_OrderDetail {
   'address': string = undefined;
   @ApiProperty({ description: '下单时间' })
   'buy_time': string = undefined;
+  @ApiProperty({ description: '数量' })
+  'num': number = undefined;
+  @ApiProperty({ description: '总金额' })
+  'money': number = undefined;
   @ApiProperty({ description: '审核记录' })
   'record': Array<any> = undefined;
   @ApiProperty({ description: '状态' })
@@ -94,6 +98,12 @@ export class CDTO_OrderDetail {
   @ApiProperty({ description: '下单时间' })
   @Rule(RuleType['string']().empty(''))
   'buy_time': string = undefined;
+  @ApiProperty({ description: '数量' })
+  @Rule(RuleType['number']().empty(''))
+  'num': number = undefined;
+  @ApiProperty({ description: '总金额' })
+  @Rule(RuleType['number']().empty(''))
+  'money': number = undefined;
   @ApiProperty({ description: '审核记录' })
   @Rule(RuleType['array']().empty(''))
   'record': Array<any> = undefined;

+ 2 - 0
src/service/Cart.service.ts

@@ -157,6 +157,8 @@ export class CartService extends BaseService<modelType> {
             spec: val.spec,
             supplier: val.supplier_id,
             address: order.address,
+            num: val.num,
+            money: val.money,
             buy_time: order.buy_time,
             status: order.status,
           };

+ 4 - 0
src/service/OrderDetail.service.ts

@@ -31,10 +31,14 @@ export class OrderDetailService extends BaseService<modelType> {
       let res;
       res = await this.goodModel.findById(val.good).lean();
       val.good_name = res.name;
+      val.good_file = res.file[0];
       res = await this.specModel.findById(val.spec).lean();
       val.spec_name = res.name;
+      val.spec_file = res.file[0];
       res = await this.userModel.findById(val.user).lean();
       val.user_name = res.name;
+      res = await this.userModel.findById(val.supplier).lean();
+      val.supplier_name = res.name;
     }
     return { list, total };
   }