1. 维护代码健壮

2. 更新项目结构文档

app/model/admin/ChannelNotifyLog.php

@@ -55,6 +55,7 @@ class ChannelNotifyLog extends BaseModel
     protected $casts = [
         'channel_id' => 'integer',
         'notify_type' => 'integer',
+        'raw_payload' => 'array',
         'verify_status' => 'integer',
         'process_status' => 'integer',
         'retry_count' => 'integer',
@@ -65,4 +66,3 @@ class ChannelNotifyLog extends BaseModel
 }
 
 
-

app/model/admin/PayCallbackLog.php

@@ -34,9 +34,11 @@ class PayCallbackLog extends BaseModel
         'channel_id',
         'callback_type',
         'request_data',
+        'request_hash',
         'verify_status',
         'process_status',
         'process_result',
+        'created_at',
     ];
 
     /**
@@ -57,11 +59,12 @@ class PayCallbackLog extends BaseModel
     protected $casts = [
         'channel_id' => 'integer',
         'callback_type' => 'integer',
+        'request_data' => 'array',
+        'request_hash' => 'string',
         'verify_status' => 'integer',
         'process_status' => 'integer',
+        'process_result' => 'array',
         'created_at' => 'datetime',
     ];
 }
 
-
-

app/model/merchant/Merchant.php

@@ -37,6 +37,9 @@ class Merchant extends BaseModel
         'settlement_account_no',
         'settlement_bank_name',
         'settlement_bank_branch',
+        'pay_status',
+        'settle_status',
+        'settle_type',
         'status',
         'last_login_at',
         'last_login_ip',
@@ -62,6 +65,9 @@ class Merchant extends BaseModel
         'merchant_type' => 'integer',
         'group_id' => 'integer',
         'risk_level' => 'integer',
+        'pay_status' => 'integer',
+        'settle_status' => 'integer',
+        'settle_type' => 'integer',
         'status' => 'integer',
         'last_login_at' => 'datetime',
         'password_updated_at' => 'datetime',
@@ -70,4 +76,3 @@ class Merchant extends BaseModel
     ];
 }
 
-

app/model/merchant/MerchantApiCredential.php

@@ -6,7 +6,7 @@ use app\common\base\BaseModel;
 
 /**
  * 商户对外接口凭证模型。
- * 保存商户 API 凭证、签名类型、启用状态和最近使用时间。
+ * 保存商户 API 凭证、商户公钥、签名类型、启用状态和最近使用时间。
  */
 class MerchantApiCredential extends BaseModel
 {
@@ -26,6 +26,7 @@ class MerchantApiCredential extends BaseModel
         'merchant_id',
         'sign_type',
         'api_key',
+        'merchant_public_key',
         'status',
         'last_used_at',
     ];
@@ -53,4 +54,3 @@ class MerchantApiCredential extends BaseModel
         'updated_at' => 'datetime',
     ];
 }
-

app/model/payment/BizOrder.php

@@ -6,7 +6,7 @@ use app\common\base\BaseModel;
 
 /**
  * 业务订单模型。
- * 表示商户业务侧原始订单，支付单和退款单都从这里展开。
+ * 表示商户业务侧原始订单，只保留业务事实与收银台恢复所需字段。
  */
 class BizOrder extends BaseModel
 {
@@ -26,11 +26,13 @@ class BizOrder extends BaseModel
         'biz_no',
         'trace_no',
         'merchant_id',
-        'merchant_group_id',
-        'poll_group_id',
         'merchant_order_no',
         'subject',
         'body',
+        'notify_url',
+        'return_url',
+        'client_ip',
+        'device',
         'order_amount',
         'paid_amount',
         'refund_amount',
@@ -52,8 +54,10 @@ class BizOrder extends BaseModel
      */
     protected $casts = [
         'merchant_id' => 'integer',
-        'merchant_group_id' => 'integer',
-        'poll_group_id' => 'integer',
+        'notify_url' => 'string',
+        'return_url' => 'string',
+        'client_ip' => 'string',
+        'device' => 'string',
         'order_amount' => 'integer',
         'paid_amount' => 'integer',
         'refund_amount' => 'integer',
@@ -70,6 +74,3 @@ class BizOrder extends BaseModel
     ];
 }
 
-
-
-

app/model/payment/NotifyTask.php

@@ -24,6 +24,8 @@ class NotifyTask extends BaseModel
      */
     protected $fillable = [
         'notify_no',
+        'event_type',
+        'ref_no',
         'merchant_id',
         'merchant_group_id',
         'biz_no',
@@ -53,8 +55,11 @@ class NotifyTask extends BaseModel
      * @var mixed
      */
     protected $casts = [
+        'event_type' => 'string',
+        'ref_no' => 'string',
         'merchant_id' => 'integer',
         'merchant_group_id' => 'integer',
+        'notify_data' => 'array',
         'status' => 'integer',
         'retry_count' => 'integer',
         'next_retry_at' => 'datetime',
@@ -65,5 +70,3 @@ class NotifyTask extends BaseModel
 }
 
 
-
-

app/model/payment/PayOrder.php

@@ -36,6 +36,10 @@ class PayOrder extends BaseModel
         'channel_type',
         'channel_mode',
         'pay_amount',
+        'notify_url',
+        'return_url',
+        'client_ip',
+        'device',
         'fee_rate_bp_snapshot',
         'split_rate_bp_snapshot',
         'fee_estimated_amount',
@@ -74,6 +78,10 @@ class PayOrder extends BaseModel
         'channel_type' => 'integer',
         'channel_mode' => 'integer',
         'pay_amount' => 'integer',
+        'notify_url' => 'string',
+        'return_url' => 'string',
+        'client_ip' => 'string',
+        'device' => 'string',
         'fee_rate_bp_snapshot' => 'integer',
         'split_rate_bp_snapshot' => 'integer',
         'fee_estimated_amount' => 'integer',
@@ -96,5 +104,3 @@ class PayOrder extends BaseModel
 }
 
 
-
-

app/model/payment/PaymentPlugin.php

@@ -53,6 +53,7 @@ class PaymentPlugin extends BaseModel
         'version',
         'author',
         'link',
+        'allow_merchant',
         'status',
         'remark',
     ];
@@ -66,6 +67,7 @@ class PaymentPlugin extends BaseModel
         'config_schema' => 'array',
         'pay_types' => 'array',
         'transfer_types' => 'array',
+        'allow_merchant' => 'integer',
         'status' => 'integer',
         'created_at' => 'datetime',
         'updated_at' => 'datetime',
@@ -74,4 +76,3 @@ class PaymentPlugin extends BaseModel
 
 
 
-

app/model/payment/PaymentPluginConf.php

@@ -23,6 +23,7 @@ class PaymentPluginConf extends BaseModel
      * @var mixed
      */
     protected $fillable = [
+        'merchant_id',
         'plugin_code',
         'config',
         'settlement_cycle_type',
@@ -36,6 +37,7 @@ class PaymentPluginConf extends BaseModel
      * @var mixed
      */
     protected $casts = [
+        'merchant_id' => 'integer',
         'config' => 'array',
         'settlement_cycle_type' => 'integer',
         'created_at' => 'datetime',
@@ -45,4 +47,3 @@ class PaymentPluginConf extends BaseModel
 
 
 
-

app/model/payment/TransferOrder.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace app\model\payment;
+
+use app\common\base\BaseModel;
+
+/**
+ * 转账单模型。
+ */
+class TransferOrder extends BaseModel
+{
+    protected $table = 'ma_transfer_order';
+
+    protected $fillable = [
+        'biz_no',
+        'trace_no',
+        'merchant_id',
+        'merchant_group_id',
+        'out_biz_no',
+        'type',
+        'account',
+        'name',
+        'amount',
+        'cost_amount',
+        'remark',
+        'bookid',
+        'channel_id',
+        'channel_request_no',
+        'channel_order_no',
+        'channel_trade_no',
+        'channel_error_code',
+        'channel_error_msg',
+        'status',
+        'request_at',
+        'processing_at',
+        'succeeded_at',
+        'failed_at',
+        'ext_json',
+    ];
+
+    protected $casts = [
+        'merchant_id' => 'integer',
+        'merchant_group_id' => 'integer',
+        'channel_id' => 'integer',
+        'amount' => 'integer',
+        'cost_amount' => 'integer',
+        'status' => 'integer',
+        'request_at' => 'datetime',
+        'processing_at' => 'datetime',
+        'succeeded_at' => 'datetime',
+        'failed_at' => 'datetime',
+        'ext_json' => 'array',
+        'created_at' => 'datetime',
+        'updated_at' => 'datetime',
+    ];
+}
+