max пре 7 месеци
родитељ
комит
7080a4b74d
2 измењених фајлова са 18 додато и 4 уклоњено
  1. 3 3
      src/modules/api/controller/beneficiary.ts
  2. 15 1
      src/modules/payment/service/payee.ts

+ 3 - 3
src/modules/api/controller/beneficiary.ts

@@ -68,8 +68,8 @@ export class BeneficiaryController extends BaseController {
    * 删除受益人
    * /api/v3/Fiat/Beneficiary/{id}
    */
-  @Del('/Beneficiary', { summary: '删除受益人' })
-  async deleteBeneficiaryForId(@Body(ALL) params: BusinessEntity) {
-    return await this.payeeService.delete(params);
+  @Del('/Beneficiary/:id', { summary: '删除受益人' })
+  async deleteBeneficiaryForId(@Param('id') id: string) {
+    return await this.payeeService.delete({ id: id });
   }
 }

+ 15 - 1
src/modules/payment/service/payee.ts

@@ -55,7 +55,7 @@ export class PayeeService extends BaseService {
       .setChannel(customer.channel)
       .addPayee(custom);
     params.beneficiary_id = res.data.id;
-    params.customerId = customer.id;
+    params.customerId = customer.customer_id;
     params.merchantId = merchant.mchId;
     params.channel = customer.channel;
     params.type = customer.type ? 'COMPANY' : 'INDIVIDUAL';
@@ -103,6 +103,20 @@ export class PayeeService extends BaseService {
     return res;
   }
   async delete(params: any) {
+    if(this.ctx.admin?.openApi) {
+      const payee = await this.payeeEntity.findOneBy({
+        beneficiary_id: params.id
+      })
+      const res = await this.paymentService
+        .setChannel(params.channel || 'SUNPAY')
+        .deletePayee(params);
+      try{
+        payee && await super.delete([payee.id]);
+      } catch (err) {
+        console.log(err);
+      }
+      return  res
+    }
     const res = await this.paymentService
       .setChannel(params.channel)
       .deletePayee(params);