feat(): 收款账户列表，订单列表根据商户过滤，增加商户ID入参

src/modules/virtual/controller/admin/bank.ts

@@ -1,6 +1,7 @@
 import { CoolController, BaseController } from '@cool-midway/core';
 import { BankEntity } from '../../entity/bank';
 import { BankService } from '../../service/bank';
+import { Context } from 'vm';
 /**
  * 描述
  */
@@ -8,5 +9,23 @@ import { BankService } from '../../service/bank';
   api: ['add', 'delete', 'update', 'info', 'list', 'page'],
   entity: BankEntity,
   service: BankService,
+  pageQueryOp: {
+    where: async (ctx: Context) => {
+      const { merchant, roleIds } = ctx.admin;
+      if ([2].includes(roleIds[0])) {
+        return [['merchantId=:merchantId', { merchantId: merchant.id }]];
+      }
+      return [];
+    },
+  },
+  listQueryOp: {
+    where: async (ctx: Context) => {
+      const { merchant, roleIds } = ctx.admin;
+      if ([2].includes(roleIds[0])) {
+        return [['merchantId=:merchantId', { merchantId: merchant.id }]];
+      }
+      return [];
+    },
+  },
 })
 export class BankController extends BaseController {}

src/modules/virtual/controller/admin/order.ts

@@ -1,6 +1,7 @@
 import { CoolController, BaseController } from '@cool-midway/core';
 import { OrderEntity } from '../../entity/order';
 import { OrderService } from '../../service/order';
+import { Context } from 'vm';
 /**
  * 描述
  */
@@ -8,5 +9,23 @@ import { OrderService } from '../../service/order';
   api: ['add', 'delete', 'update', 'info', 'list', 'page'],
   entity: OrderEntity,
   service: OrderService,
+  pageQueryOp: {
+    where: async (ctx: Context) => {
+      const { merchant, roleIds } = ctx.admin;
+      if ([2].includes(roleIds[0])) {
+        return [['merchantId=:merchantId', { merchantId: merchant.id }]];
+      }
+      return [];
+    },
+  },
+  listQueryOp: {
+    where: async (ctx: Context) => {
+      const { merchant, roleIds } = ctx.admin;
+      if ([2].includes(roleIds[0])) {
+        return [['merchantId=:merchantId', { merchantId: merchant.id }]];
+      }
+      return [];
+    },
+  },
 })
 export class VirtualOrderController extends BaseController {}

src/modules/virtual/entity/bank.ts

@@ -28,6 +28,8 @@ export class BankEntity extends BaseEntity {
 
   @Column({ default: false, comment: '是否POBO账户' })
   isPobo: boolean;
+  @Column({ default: false, comment: '商户ID' })
+  merchantId: number;
 
   @Column({
     type: 'enum',

src/modules/virtual/entity/order.ts

@@ -33,6 +33,8 @@ export class OrderEntity extends BaseEntity {
 
   @Column({ type: 'decimal', precision: 10, scale: 2, comment: '手续费' })
   fee: number;
+  @Column({ comment: '商户ID', nullable: true })
+  merchantId: number;
 
   @Column({ length: 10, comment: '币种', default: '' })
   currency?: string;