feat: 收款人、收款人地址改造

src/modules/payment/service/business.ts

@@ -119,7 +119,7 @@ export class BusinessService extends BaseService {
     `;
     }
     // 打印调试信息
-    console.log('SQL Query:', query, 'Params:', queryParams, 'RoleIds:', roleIds);
+    // console.log('SQL Query:', query, 'Params:', queryParams, 'RoleIds:', roleIds);
     // 执行分页查询
     return this.sqlRenderPage(query, params, false);
   }

src/modules/payment/service/individual.ts

@@ -111,7 +111,7 @@ export class IndividualService extends BaseService {
       `;
     }
     // 打印调试信息
-    console.log('SQL Query:', query, 'Params:', queryParams, 'RoleIds:', roleIds);
+    // console.log('SQL Query:', query, 'Params:', queryParams, 'RoleIds:', roleIds);
     // 执行分页查询
     return this.sqlRenderPage(query, params, false);
   }

src/modules/payment/service/payee.ts

@@ -89,7 +89,7 @@ export class PayeeService extends BaseService {
     } else {
       const { merchant } = this.ctx.admin;
       customer = await this.customerEntity.findOneBy({
-        merchantId: merchant.id,
+        merchantId: merchant.mchId,
       });
     }
     return customer
@@ -114,18 +114,19 @@ export class PayeeService extends BaseService {
   }
 
   async getMerchantId(params) {
-    let merchantId;
-    if (this._isOpenApi) {
-      merchantId = params.out_user_id;
-    } else if (params?.mch_id || params?.mchId) {
-      // const  merchantInfo = await this.merchantEntity.findOneBy({
-      //    mchId: params?.mch_id
-      //  })
-      merchantId = params?.mch_id || params?.mchId
-    } else {
-      const { merchant } = this.ctx.admin;
-      merchantId = merchant.mchId;
-    }
-    return merchantId
+    // let merchantId;
+    // if (this._isOpenApi) {
+    //   merchantId = params.out_user_id;
+    // } else if (params?.mch_id || params?.mchId) {
+    //   // const  merchantInfo = await this.merchantEntity.findOneBy({
+    //   //    mchId: params?.mch_id
+    //   //  })
+    //   merchantId = params?.mch_id || params?.mchId
+    // } else {
+    //   const { merchant } = this.ctx.admin;
+    //   merchantId = merchant.mchId;
+    // }
+    const { merchant } = this.ctx.admin;
+    return merchant.mchId
   }
 }

src/modules/payment/service/payee_address.ts

@@ -32,16 +32,8 @@ export class PayeeAddressService extends BaseService {
    * @returns
    */
   async add(params: any) {
-    let merchantId;
-    const isOpenApi = params.hasOwnProperty('isOpenApi')
-      ? params.isOpenApi
-      : false;
-    if (isOpenApi) {
-      merchantId = params.out_user_id;
-    } else {
-      const { merchant } = this.ctx.admin;
-      merchantId = merchant.id;
-    }
+    const { merchant } = this.ctx.admin;
+    const merchantId = merchant.mchId;
     if (!['TRC20', 'ERC20'].includes(params.currency)) {
       const res = await this.paymentService
         .setChannel(params.channel)
@@ -80,16 +72,8 @@ export class PayeeAddressService extends BaseService {
   }
   async list(params: any, option: any, connectionName?: any) {
     const { channel, currency } = params;
-    let merchantId;
-    const isOpenApi = params.hasOwnProperty('isOpenApi')
-      ? params.isOpenApi
-      : false;
-    if (isOpenApi) {
-      merchantId = params.out_user_id;
-    } else {
-      const { merchant } = this.ctx.admin;
-      merchantId = merchant.id;
-    }
+    const { merchant } = this.ctx.admin;
+    const merchantId = merchant.mchId;
     const res = await this.payeeAddressEntity.find({
       where: {
         merchantId: merchantId,
@@ -101,21 +85,9 @@ export class PayeeAddressService extends BaseService {
     return res;
   }
   async page(params: any) {
-    const merchantId = await this.getMerchantId(params);
+    const { merchant } = this.ctx.admin;
+    const merchantId = merchant.mchId;
     const query = `SELECT * FROM payee WHERE merchantId = '${merchantId}' ORDER BY merchantId ASC`;
     return this.sqlRenderPage(query, params, false);
   }
-
-  async getMerchantId(params) {
-    let merchantId;
-    if (this._isOpenApi) {
-      merchantId = params.out_user_id;
-    } else if (params?.mch_id || params?.mchId) {
-      merchantId = params?.mch_id || params?.mchId
-    } else {
-      const { merchant } = this.ctx.admin;
-      merchantId = merchant.mchId;
-    }
-    return merchantId
-  }
 }