修改接口

src/controller/OrderDetail.controller.ts

@@ -38,7 +38,6 @@ export class OrderDetailController extends BaseController {
 
   @Get('/queryInfo')
   @ApiQuery({ name: 'queryInfo' })
-  @ApiResponse({ type: QVO_OrderDetail })
   async queryInfo(@Query() filter: any) {
     const list: any = await this.service.queryInfo(filter);
     const data = list.list;

src/entity/Order.entity.ts

@@ -17,6 +17,10 @@ export class Order extends BaseModel {
   buy_time: string;
   @prop({ required: false, index: false, zh: '审核记录' })
   record: Array<any>;
+  @prop({ required: false, index: false, zh: '领导' })
+  leader: Array<any>;
+  @prop({ required: false, index: false, zh: '会计' })
+  accounting: Array<any>;
   @prop({
     required: false,
     index: true,

src/entity/OrderDetail.entity.ts

@@ -24,6 +24,10 @@ export class OrderDetail extends BaseModel {
   money: number;
   @prop({ required: false, index: false, zh: '审核记录' })
   record: Array<any>;
+  @prop({ required: false, index: false, zh: '领导' })
+  leader: Array<any>;
+  @prop({ required: false, index: false, zh: '会计' })
+  accounting: Array<any>;
   @prop({
     required: false,
     index: true,

src/interface/Order.interface.ts

@@ -26,6 +26,10 @@ export class FVO_Order {
   'buy_time': string = undefined;
   @ApiProperty({ description: '审核记录' })
   'record': Array<any> = undefined;
+  @ApiProperty({ description: '领导' })
+  'leader': Array<any> = undefined;
+  @ApiProperty({ description: '会计' })
+  'accounting': Array<any> = undefined;
   @ApiProperty({ description: '订单状态' })
   'status': string = undefined;
 }
@@ -71,6 +75,12 @@ export class CDTO_Order {
   @ApiProperty({ description: '审核记录' })
   @Rule(RuleType['array']().empty(''))
   'record': Array<any> = undefined;
+  @ApiProperty({ description: '领导' })
+  @Rule(RuleType['array']().empty(''))
+  'leader': Array<any> = undefined;
+  @ApiProperty({ description: '会计' })
+  @Rule(RuleType['array']().empty(''))
+  'accounting': Array<any> = undefined;
   @ApiProperty({ description: '订单状态' })
   @Rule(RuleType['string']().empty(''))
   'status': string = undefined;

src/interface/OrderDetail.interface.ts

@@ -34,6 +34,10 @@ export class FVO_OrderDetail {
   'money': number = undefined;
   @ApiProperty({ description: '审核记录' })
   'record': Array<any> = undefined;
+  @ApiProperty({ description: '领导' })
+  'leader': Array<any> = undefined;
+  @ApiProperty({ description: '会计' })
+  'accounting': Array<any> = undefined;
   @ApiProperty({ description: '状态' })
   'status': string = undefined;
 }
@@ -107,6 +111,12 @@ export class CDTO_OrderDetail {
   @ApiProperty({ description: '审核记录' })
   @Rule(RuleType['array']().empty(''))
   'record': Array<any> = undefined;
+  @ApiProperty({ description: '领导' })
+  @Rule(RuleType['array']().empty(''))
+  'leader': Array<any> = undefined;
+  @ApiProperty({ description: '会计' })
+  @Rule(RuleType['array']().empty(''))
+  'accounting': Array<any> = undefined;
   @ApiProperty({ description: '状态' })
   @Rule(RuleType['string']().empty(''))
   'status': string = undefined;

src/service/Cart.service.ts

@@ -144,7 +144,9 @@ export class CartService extends BaseService<modelType> {
           res = await this.offModel.findById(result.street).lean();
         } else assert(result.street, '缺少街道信息或社区信息！');
         if (res) obj.address = res.address;
-        if (!order) obj.status = '2';
+        if (!order) obj.status = '4';
+        obj.accounting = order.accounting;
+        obj.leader = order.leader;
         obj.total_money = data.totalMoney;
         obj.buy_time = moment().format('YYYY-MM-DD HH:mm:ss');
         order = await this.orderModel.create(obj);
@@ -159,6 +161,8 @@ export class CartService extends BaseService<modelType> {
             address: order.address,
             num: val.num,
             money: val.money,
+            accounting: order.accounting,
+            leader: order.leader,
             buy_time: order.buy_time,
             status: order.status,
           };

src/service/OrderDetail.service.ts

@@ -22,9 +22,11 @@ export class OrderDetailService extends BaseService<modelType> {
   userModel: ReturnModelType<typeof User>;
 
   async queryInfo(filter): Promise<object> {
-    const { skip = 0, limit, ...info } = filter;
+    const { skip = 0, limit, leader, accounting, ...info } = filter;
     let list: any = [];
     let total: any = 0;
+    if (leader) info.leader = { $in: [leader] };
+    else if (accounting) info.accounting = { $in: [accounting] };
     list = await this.model.find(info).skip(skip).limit(limit).lean();
     total = await this.model.count(info);
     for (const val of list) {