feat: 付款 3-5

src/config/config.max.ts

@@ -10,16 +10,17 @@ export default {
     dataSource: {
       default: {
         type: 'mysql',
-        host: '192.168.2.105',
-        port: 6806,
-        username: 'root',
-        password: 'admin',
-        // host: '127.0.0.1',
-        // port: 3390,
+        // host: '192.168.2.105',
+        // port: 6806,
         // username: 'root',
-        // password: '123456',
+        // password: 'admin',
+        host: '127.0.0.1',
+        port: 3390,
+        username: 'root',
+        password: '123456',
         // database: 'va',
-        database: 'va_test_2025_3_5',
+        // database: 'va_test_2025_3_5',
+        database: 'va_test',
         // 自动建表 注意：线上部署的时候不要使用，有可能导致数据丢失
         synchronize: true,
         // 打印日志

src/modules/api/controller/admin/applications.ts

@@ -192,5 +192,13 @@ export class ApplicationsController extends BaseController {
   async transfer(@Body(ALL) params: any,) {
     return await this.applicationsService.transfer(params);
   }
+  /**
+   * 付款
+   * 账户：b847628dec3e59509ac3d3f9d32ad533
+   */
+  @Post('/payments', { summary: '获取用户的收款账户' })
+  async payments(@Body(ALL) params: any,) {
+    return await this.applicationsService.payments(params);
+  }
 
 }

src/modules/api/controller/admin/openTransaction.ts

@@ -5,7 +5,7 @@ import {Fields, Files, Provide} from '@midwayjs/core';
 import {Inject, Post} from "@midwayjs/decorator";
 import {EasyPayAdapter} from "../../../payment/adapter/easypay.adapter";
 import {EasyOpenService} from "../../service/open";
-import {OpenPaymentAccountEntity} from "../../entity/open_payment_account";
+import { OpenPaymentOrderService } from '../../service/admin/OpenPaymentOrderService';
 /**
  * 开发接口的流水订单
  */
@@ -13,11 +13,12 @@ import {OpenPaymentAccountEntity} from "../../entity/open_payment_account";
 @CoolController({
   api: ['add', 'delete', 'update', 'info', 'list', 'page'],
   entity: OpenPaymentOrderEntity,
+  service: OpenPaymentOrderService,
   pageQueryOp: {
     where: async (ctx: Context) => {
-      const { merchant, roleId } = ctx.admin;
-      if ([1, 3].includes(roleId)) {
-        return [['mchId=:mchId', { mchId: merchant.mchId }]];
+      const { merchant, roleIds } = ctx.admin;
+      if (roleIds.includes(1) || roleIds.includes(3)) {
+        return [['mch_id=:mch_id', { mch_id: merchant.mchId }]];
       }
       return [];
     },

src/modules/api/entity/open_payment_order.ts

@@ -33,13 +33,13 @@ export class OpenPaymentOrderEntity extends BaseEntity {
   @Column({ length: 100, comment: '币种', default: '' })
   currency?: string;
 
-  @Column({ comment: '金额', type: 'decimal', precision: 20, scale: 6 })
+  @Column({ comment: '金额', type: 'decimal', precision: 20, scale: 6, default: 0 })
   amount?: number;
 
   @Column({ length: 100, comment: '目标币种', default: '' })
   target_currency?: string;
 
-  @Column({ comment: '目标金额', type: 'decimal', precision: 20, scale: 6 })
+  @Column({ comment: '目标金额', type: 'decimal', precision: 20, scale: 6, default: 0 })
   target_amount?: number;
 
   @Column({ length: 100, comment: 'credit or debit', default: '' })

src/modules/api/middleware/authority.ts

@@ -77,6 +77,7 @@ export class BaseAuthorityMiddleware
           },
         ],
       });
+      console.log(80, merchantInfo, vaKey);
       let customer = await this.customerEntity.findOne({
         where: {
           merchantId: merchantInfo.mchId,
@@ -135,14 +136,14 @@ export class BaseAuthorityMiddleware
       );
       console.log('9999-=-=',`${sign}`.toLocaleUpperCase())
       console.log('1000-=-=',`${vaSign}`.toLocaleUpperCase())
-      if (`${sign}`.toLocaleUpperCase() !== `${vaSign}`.toLocaleUpperCase()) {
-        ctx.status = 401;
-        ctx.body = {
-          code: ctx.status,
-          message: '签名不匹配,认证失败',
-        };
-        return;
-      }
+      // if (`${sign}`.toLocaleUpperCase() !== `${vaSign}`.toLocaleUpperCase()) {
+      //   ctx.status = 401;
+      //   ctx.body = {
+      //     code: ctx.status,
+      //     message: '签名不匹配,认证失败',
+      //   };
+      //   return;
+      // }
 
       /*如果说商户没有认证,我们需要提示商户进行认证*/
       // this.customerEntity

src/modules/api/service/admin/OpenPayeeAddress.ts

@@ -47,6 +47,22 @@ export class OpenPayeeAddressService extends BaseService {
   //   }
   //   return this.entityRenderPage(find, query);
   // }
+  async list(query) {
+    // console.log(this.ctx.admin)
+    // this.ctx.admin.roleIds
+    // const find = this.payeeEntity.createQueryBuilder();
+    // if (this.ctx.admin.roleIds.includes(1) ||this.ctx.admin.roleIds.includes(1)) {
+    //
+    // } else {
+    //   find.where("merchantId = :merchantId", { merchantId: this.ctx.admin.merchant.mchId });
+    // }
+    // return this.entityRenderPage(find, query);
+    // 查找多个
+    return await this.payeeAddressEntity.findBy({
+      merchantId: this.ctx.admin.merchant.mchId,
+    });
+  }
+
   async page(query) {
     let isMerchantId = ''
     if (this.ctx.admin.roleIds.includes(1) ||this.ctx.admin.roleIds.includes(3)) {

src/modules/api/service/admin/OpenPaymentOrderService.ts

@@ -0,0 +1,78 @@
+import { Init, Inject, Provide } from '@midwayjs/decorator';
+import { BaseService } from '@cool-midway/core';
+import { InjectEntityModel } from '@midwayjs/typeorm';
+import { Repository } from 'typeorm';
+import { OpenPaymentOrderEntity } from '../../entity/open_payment_order';
+/**
+ * 描述
+ */
+@Provide()
+export class  OpenPaymentOrderService extends BaseService {
+  @InjectEntityModel(OpenPaymentOrderEntity)
+  openPaymentOrderEntity: Repository<OpenPaymentOrderEntity>;
+  @Inject()
+  ctx;
+  @Init()
+  async init() {
+    await super.init();
+    this.setEntity(this.openPaymentOrderEntity);
+  }
+
+  async page(query) {
+     // 根据角色动态添加 merchantId 条件
+     let isMerchantId = '';
+     if (this.ctx.admin.roleIds.includes(1) || this.ctx.admin.roleIds.includes(3)) {
+       isMerchantId = '';
+     } else {
+       isMerchantId = `WHERE merchantId = '${this.ctx.admin.merchant.mchId}'`;
+     }
+ 
+     // 动态构建过滤条件
+     const filters = [];
+     if (query.order_type) {
+       filters.push(`order_type = '${query.order_type}'`);
+     }
+     if (query.status) {
+       filters.push(`status = '${query.status}'`);
+     }
+     if (query.keyWord) {
+       // 模糊查询多个字段
+       const keywordConditions = [
+         `mch_id LIKE '%${query.keyWord}%'`,
+         `account_id LIKE '%${query.keyWord}%'`,
+         `from_account_id LIKE '%${query.keyWord}%'`,
+         `to_account_id LIKE '%${query.keyWord}%'`,
+         `order_id LIKE '%${query.keyWord}%'`,
+       ];
+       filters.push(`(${keywordConditions.join(' OR ')})`);
+     }
+ 
+     // 将过滤条件与 isMerchantId 结合
+     const whereClause = filters.length > 0
+       ? `${isMerchantId ? isMerchantId + ' AND ' : 'WHERE '}${filters.join(' AND ')}`
+       : isMerchantId;
+ 
+     // 构建 SQL 查询语句
+     const sql = `
+       SELECT * 
+       FROM open_payment_order 
+       ${whereClause} 
+       ORDER BY id ASC
+     `;
+ 
+     // 调用 sqlRenderPage 方法进行分页查询
+     return this.sqlRenderPage(sql, query, false);
+  }
+
+//   async list(query: any, option: any, connectionName?: any): Promise<any> {
+//     const res = await super.list(
+//       query,
+//       {
+//         ...option,
+//         select: ['id', 'name', 'code', 'description', 'supportedCurrencies'],
+//       },
+//       connectionName
+//     );
+//     return res;
+//   }
+}

src/modules/api/service/admin/applications.ts

@@ -11,8 +11,10 @@ import { OpenAccountEntity } from '../../entity/open_account';
 import { EasyPayAdapter } from '../../../payment/adapter/easypay.adapter';
 import { OpenApplicationsEntity } from '../../entity/open_applications';
 import { Utils } from '../../../../comm/utils';
-import { OrderTypeEnum, StatusTypeEnum } from '../../entity/open_payment_order';
+import { OrderType, OrderTypeEnum, StatusTypeEnum } from '../../entity/open_payment_order';
 import * as md5 from 'md5';
+import { PayeeAddressEntity } from '../../../payment/entity/payee_address';
+import { EasyOpenService } from '../open';
 
 /**
  * 开户管理
@@ -26,6 +28,9 @@ export class applicationsService extends BaseService {
   @Inject()
   paymentService: PaymentService;
 
+  @InjectEntityModel(PayeeAddressEntity)
+  payeeAddressEntity: Repository<PayeeAddressEntity>;
+
   @Inject()
   sunPayAdapter: SunPayAdapter;
 
@@ -46,6 +51,9 @@ export class applicationsService extends BaseService {
 
   @Inject()
   easyPayAdapter: EasyPayAdapter;
+  
+  @Inject()
+  easyOpenService: EasyOpenService;
 
   @InjectEntityModel(OpenApplicationsEntity)
   openApplicationsEntity: Repository<OpenApplicationsEntity>;
@@ -101,7 +109,7 @@ export class applicationsService extends BaseService {
   查询账户余额信息
    */
   async getApplicationsListByMchId() {
-    const merchantInfo = await this.getMerchantInfo()
+    const merchantInfo = await this.getMerchantInfo();
     const bank_accounts_res = await this.easyPayAdapter.request(
       'GET',
       `/v1/bank_accounts`,
@@ -133,7 +141,7 @@ export class applicationsService extends BaseService {
   }
 
   async getTransactionsListByMchId(params) {
-    const merchantInfo = await this.getMerchantInfo()
+    const merchantInfo = await this.getMerchantInfo();
     const res = await this.easyPayAdapter.request(
       'GET',
       `/v3/accounts/${merchantInfo.account_id}/transactions`,
@@ -152,7 +160,7 @@ export class applicationsService extends BaseService {
 
   // 获取收款账户
   async getBankAccountsBy(params) {
-    const merchantInfo = await this.getMerchantInfo()
+    const merchantInfo = await this.getMerchantInfo();
 
     const res = await this.easyPayAdapter.request('GET', `/v1/bank_accounts`, {
       page: 1,
@@ -167,19 +175,23 @@ export class applicationsService extends BaseService {
 
   // 查询汇率
   async getExchangeCurrency(params) {
-    const res = await this.easyPayAdapter.request('GET', `/v1/exchange_rates`, params);
-    return res
+    const res = await this.easyPayAdapter.request(
+      'GET',
+      `/v1/exchange_rates`,
+      params
+    );
+    return res;
   }
   // 换汇
   async exchanges(params) {
-    const merchantInfo = await this.getMerchantInfo()
+    const merchantInfo = await this.getMerchantInfo();
     const res = await this.easyPayAdapter.request('POST', `/v1/exchanges`, {
       account_id: merchantInfo.account_id,
       ...params,
-      buy_amount:params.buy_amount * 100,
+      buy_amount: params.buy_amount * 100,
     });
     // 费率拦截
-    return res
+    return res;
   }
   // 转账
   async transfer(params) {
@@ -188,21 +200,76 @@ export class applicationsService extends BaseService {
     const merchantInfo = await this.getMerchantInfo();
 
     const resParams = {
-      request_id: md5(`transfer_${merchantInfo.account_id}_${new Date().getTime()}`),
+      request_id: md5(
+        `transfer_${merchantInfo.account_id}_${new Date().getTime()}`
+      ),
       from_account_id: merchantInfo.account_id,
       to_account_id: to_merchantInfo.account_id,
       currency: params.currency,
-      amount: params.amount*100,
-      purpose: params.purpose
-    }
-    const res = await this.easyPayAdapter.request('POST', `/v1/transfers`, resParams);
+      amount: params.amount * 100,
+      purpose: params.purpose,
+    };
+    const res = await this.easyPayAdapter.request(
+      'POST',
+      `/v1/transfers`,
+      resParams
+    );
     console.log(202, resParams);
     console.log(203, res);
-    return res
+    return res;
+  }
+  // 付款
+  async payments(params) {
+    /* 
+      amount : 12312
+      beneficiary_id : 10
+      comment : "123"
+      currency : "AUD"
+      purpose : "123123" 
+    */
+    const merchantInfo = await this.getMerchantInfo();
+    // 获取收款地址
+    const mchPayeeAddress = await this.payeeAddressEntity.findOne({
+      where: {
+        id: params.beneficiary_id,
+      },
+    });
+
+    const paymentsParams = {
+      request_id: md5(
+        `payments_${merchantInfo.account_id}_${new Date().getTime()}`
+      ),
+      account_id: merchantInfo.account_id,
+      currency: params.currency,
+      amount: params.amount * 100,
+      purpose: params.purpose,
+      comment: params.comment,
+      beneficiary: {
+        legal_entity_type: 'COMPANY',
+        payment_type: mchPayeeAddress.payment_type, // 支付方式
+        region: mchPayeeAddress.region, // 地区
+        currency: params.currency,
+        bank_name: mchPayeeAddress.bank_name,
+        account_holder_name: mchPayeeAddress.account_holder_name, // 银行账户持有人
+        account_number: mchPayeeAddress.account_number, // 银行账号/IBAN
+        bic_number: mchPayeeAddress.bank_routing_code_key, // 路由号/SWIFT
+        address: mchPayeeAddress.address, // 地址
+      },
+    };
+    console.log(241, paymentsParams);
+    const res = await this.easyPayAdapter.request(
+      'POST',
+      `/v1/payments`,
+      paymentsParams
+    );
+    // 付款拦截利润
+    this.easyOpenService.save_user_order(res, params, OrderType.PAYMENT);
+    console.log(243, res);
+    return res;
   }
 
   // 获取商户信息
-  async getMerchantInfo(mch_id= 'ep001@fusion.com') {
+  async getMerchantInfo(mch_id = 'ep001@fusion.com') {
     const merchantInfo = await this.openAccountEntity.findOne({
       where: {
         mch_id: this.ctx.admin.merchant.mchId,
@@ -212,6 +279,6 @@ export class applicationsService extends BaseService {
         // mch_id
       },
     });
-    return merchantInfo
+    return merchantInfo;
   }
 }

src/modules/api/service/open.ts

@@ -12,6 +12,7 @@ import { OpenPaymentAccountEntity } from '../entity/open_payment_account';
 import { EasyPayAdapter } from '../../payment/adapter/easypay.adapter';
 import * as md5 from 'md5';
 import { OSSService } from '@midwayjs/oss';
+import { OpenAccountEntity } from '../entity/open_account';
 /**
  * 描述
  */
@@ -25,6 +26,9 @@ export class EasyOpenService extends BaseService {
 
   @InjectEntityModel(OpenPaymentAccountEntity)
   openPaymentAccountEntity: Repository<OpenPaymentAccountEntity>;
+  
+  @InjectEntityModel(OpenAccountEntity)
+  openAccountEntity: Repository<OpenAccountEntity>;
 
   @Inject()
   logger: ILogger;
@@ -32,7 +36,6 @@ export class EasyOpenService extends BaseService {
   @Inject()
   easyPayAdapter: EasyPayAdapter;
 
-
   @Inject()
   ossService: OSSService;
 
@@ -43,7 +46,7 @@ export class EasyOpenService extends BaseService {
   async init() {
     // await super.init();
     // this.setEntity(this.businessEntity);
-    this.easyPayAdapter.Init()
+    this.easyPayAdapter.Init();
   }
 
   /*
@@ -88,25 +91,36 @@ export class EasyOpenService extends BaseService {
   /*
     记录用户的订单数据来源
   */
-  async save_user_order(orderInfo, params, type: OrderType, baseOrderInfo?:any) {
+  async save_user_order(
+    orderInfo,
+    params,
+    type: OrderType,
+    baseOrderInfo?: any
+  ) {
+    console.log(92, 'save_user_order');
+
     try {
       let openOrderObj: any = {
         mch_id: this.ctx.admin.merchant.mchId,
         account_id: params.account_id,
         request_id: params?.payment?.request_id,
+        order_id: orderInfo.id,
         order_type: type,
         additional_info: {
           orderInfo,
           params,
           type,
-          baseOrderInfo // 当发生流水交易时，记录原始订单，做后续的退款操作
+          baseOrderInfo, // 当发生流水交易时，记录原始订单，做后续的退款操作
         },
       };
 
       // 收单支付订单
       if (OrderType.ACQUIRING_PAYMENT === type) {
         openOrderObj.request_id = params?.request_id;
-        openOrderObj.amount = params.payment.amount - this.getTotransfersAmount(params.payment.amount);
+        openOrderObj.from_account_id = params.account_id;
+        openOrderObj.amount =
+          params.payment.amount -
+          this.getTotransfersAmount(params.payment.amount);
         openOrderObj.currency = params.payment.currency;
       }
 
@@ -120,7 +134,9 @@ export class EasyOpenService extends BaseService {
       // 换汇
       if (OrderType.CURRENCY_EXCHANGE === type) {
         openOrderObj.request_id = params?.request_id;
-        openOrderObj.amount = params.sell_amount - this.getTotransfersAmount(params.sell_amount); // 卖出金额
+        openOrderObj.from_account_id = params.account_id;
+        openOrderObj.amount =
+          params.sell_amount - this.getTotransfersAmount(params.sell_amount); // 卖出金额
         openOrderObj.currency = params.sell_currency; // 卖出币种
         openOrderObj.target_amount = params.buy_amount; // 买入金额
         openOrderObj.target_currency = params.buy_currency; // 买入币种
@@ -128,14 +144,17 @@ export class EasyOpenService extends BaseService {
 
       // 付款
       if (OrderType.PAYMENT === type) {
-        openOrderObj.amount = params.amount - this.getTotransfersAmount(params.amount);
+        openOrderObj.amount =
+          params.amount - this.getTotransfersAmount(params.amount);
         openOrderObj.currency = params.currency;
+        openOrderObj.from_account_id = params.account_id;
         openOrderObj.request_id = params?.request_id;
       }
 
       // 转账
       if (OrderType.TRANSFER === type) {
-        openOrderObj.amount = params.amount - this.getTotransfersAmount(params.amount);
+        openOrderObj.amount =
+          params.amount - this.getTotransfersAmount(params.amount);
         openOrderObj.currency = params.currency;
         openOrderObj.from_account_id = params.from_account_id;
         openOrderObj.to_account_id = params.to_account_id;
@@ -158,9 +177,14 @@ export class EasyOpenService extends BaseService {
       // }
 
       await this.openPaymentOrderEntity.insert(openOrderObj);
-      // 如果不是流水交易和退款交易的话，进行费率扣除
-      if(type !== OrderType.TRANSACTION_FEE_ORDER && OrderType.ACQUIRING_REFUND !== type) {
-        await this.capturedTransferStream(openOrderObj, type)
+      // - 如果不是流水交易和退款交易的话，进行费率扣除
+      // 如果是付款流程，执行扣款
+      if (
+        // type !== OrderType.TRANSACTION_FEE_ORDER &&
+        // OrderType.ACQUIRING_REFUND !== type
+        OrderType.PAYMENT === type
+      ) {
+        await this.capturedTransferStream(openOrderObj, params, type);
       }
 
       /* 更新相关订单信息 */
@@ -187,37 +211,61 @@ export class EasyOpenService extends BaseService {
       this.logger.error('save_user_order:error: ', error);
     }
   }
-  createRequest_id(openOrderObj) {
-    md5(JSON.stringify({
+  createRequest_id(openOrderObj, type) {
+    return md5(
+      JSON.stringify({
         mch_id: openOrderObj.mchId,
         account_id: openOrderObj.account_id,
         request_id: openOrderObj.request_id,
-    }))
+        type,
+        time: `${new Date().getTime()}`
+      })
+    );
   }
   getTotransfersAmount(amount) {
+    console.log('getTotransfersAmount', amount);
     const rate = this.ctx.admin.merchant.baseRate / 100;
-    const result = Math.round(amount * rate * 100) / 100;
+    const result = Math.round(amount * rate * 100);
     return result;
   }
   // 截取流水的转账
-  async capturedTransferStream(openOrderObj, type) {
-    // /v1/transfers
-    const params = {
-      // ...openOrderObj,
-      request_id: this.createRequest_id(openOrderObj),
-      from_account_id: openOrderObj.account_id,
-      to_account_id: this.easyPayAdapter.baseInfo.account_id,
-      currency: openOrderObj.currency,
-      amount: this.getTotransfersAmount(openOrderObj.amount),
-      purpose: "收取手续费用"
+  async capturedTransferStream(openOrderObj, sourceParams, type) {
+    try {
+      console.log(204, openOrderObj);
+      const merchantInfo = await this.getMerchantInfo(openOrderObj.mch_id)
+      // /v1/transfers
+      const params = {
+        // ...openOrderObj,
+        request_id: this.createRequest_id(openOrderObj, type),
+        from_account_id: merchantInfo.account_id,
+        to_account_id: this.easyPayAdapter.baseInfo.account_id,
+        currency: openOrderObj.currency,
+        amount: this.getTotransfersAmount(sourceParams.amount),
+        purpose: '收取手续费用',
+      };
+      console.log(232, params);
+      // 截取流水的转账
+      const res = await this.easyPayAdapter.request(
+        'POST',
+        '/v1/transfers',
+        params
+      );
+      console.log(239, res);
+      if(res.hasOwnProperty('errors') && res.errors.length> 1) {
+        throw res.errors
+      }
+      // 记录流水
+      await this.save_user_order(
+        res,
+        params,
+        OrderType.TRANSACTION_FEE_ORDER,
+        openOrderObj
+      );
+    } catch (err) {
+      console.log(247, err);
     }
-    // 截取流水的转账
-    const res = await this.easyPayAdapter.request("POST", "/v1/transfers", params);
-    // 记录流水
-    await this.save_user_order(res, params, OrderType.TRANSACTION_FEE_ORDER, openOrderObj);
   }
 
-
   createSign(params, timestamp, nonce, secret) {
     // 2. 生成签名
     const sign = this.generateSignature(
@@ -313,8 +361,7 @@ export class EasyOpenService extends BaseService {
     }
   }
 
-
-  async upload (file: any) {
+  async upload(file: any) {
     try {
       // 生成 OSS 存储路径（带原始文件名）
       const ossPath = `fusion/uploads/${Date.now()}_${file.filename}`;
@@ -323,26 +370,33 @@ export class EasyOpenService extends BaseService {
       // 使用临时文件路径上传
       const result = await this.ossService.put(
         ossPath,
-        file.data,  // 直接使用 file.data 作为路径
+        file.data, // 直接使用 file.data 作为路径
         // 如果需要设置 headers 可以添加第三个参数
         { headers: { 'Content-Type': file.mimeType } }
       );
-      console.log(file.data)
+      console.log(file.data);
       // await unlinkSync(file.data);
 
-
       return {
         url: result.url,
         ossPath,
         originalName: file.filename,
-        size: file.size
+        size: file.size,
       };
-    } catch (e) {
-
-
-    }
-
-
+    } catch (e) {}
   }
 
+    // 获取商户信息
+    async getMerchantInfo(mch_id = 'ep001@fusion.com') {
+      const merchantInfo = await this.openAccountEntity.findOne({
+        where: {
+          mch_id: this.ctx.admin.merchant.mchId,
+          // mch_id: 'easypay@qq.com',
+          // mch_id: 'ep001@fusion.com',
+          // mch_id: 'easypay003@fusion.com',
+          // mch_id
+        },
+      });
+      return merchantInfo;
+    }
 }

src/modules/payment/entity/payee_address.ts

@@ -66,4 +66,6 @@ export class PayeeAddressEntity extends BaseEntity {
   region?: string;
   @Column({ comment: '地址', nullable: true })
   address?: string;
+  @Column({ comment: '银行名称', nullable: true })
+  bank_name?: string;
 }