feat: 区分白标注册用户

src/modules/payment/service/order.ts

@@ -801,7 +801,8 @@ export class OrderService extends BaseService {
     }
     const merchant = await this.merchantEntity.findOne({
       where: {
-        id: Number(order.merchantId),
+        // id: Number(order.merchantId),
+        mchId: order.merchantId
       },
     });
     const rate = await this.rateEntity.findOne({