feat(proto): 添加交易参考号字段以支持支付回调处理

@@ -104,7 +104,7 @@ public class SettlementDTO {
     private String avoidRemark;
     private String onlinePay;
     private String operationType;
-    private String transactionId;
+    private String tradeReferenceNo;
   }
 
   @Data

@@ -202,8 +202,10 @@ public class PayServiceClient {
                                 .setPayStatus(PayStatusEnum.SUCCEED)
                                 .setShouldUpdateStatus(true)
                                 .setStatus(OrderStatusEnum.PREPARING)
-                                .setShouldUpdateTransactionId(StringUtils.isNotEmpty(paymentCallbackResult.getTradeReferenceNo()))
-                                .setTransactionId(StringUtils.isNotEmpty(paymentCallbackResult.getTradeReferenceNo()) ? paymentCallbackResult.getTradeReferenceNo() : "")
+                                .setShouldUpdateTransactionId(true)
+                                .setTransactionId(paymentCallbackResult.getTransSN())
+                                .setShouldUpdateTradeReferenceNo(StringUtils.isNotEmpty(paymentCallbackResult.getTradeReferenceNo()))
+                                .setTradeReferenceNo(StringUtils.isNotEmpty(paymentCallbackResult.getTradeReferenceNo()) ? paymentCallbackResult.getTradeReferenceNo() : "")
                                 .build();
                 final var updateResponse =
                         orderServiceRpcClient.updateClientCustomerOrderPaymentResult(orderById, build);

@@ -486,7 +486,7 @@ public class SettlementServiceImpl implements SettlementService {
                 dataCell13.setCellStyle(dataStyle);
 
                 Cell dataCell14 = dataRow.createCell(columnNum++);
-                dataCell14.setCellValue(orderDetail.getTransactionId() != null ? orderDetail.getTransactionId() : "");
+                dataCell14.setCellValue(orderDetail.getTradeReferenceNo() != null ? orderDetail.getTradeReferenceNo() : "");
                 dataCell14.setCellStyle(dataStyle);
 
                 // 合并备注和忌口备注，用分号分割，备注在前
@@ -977,7 +977,7 @@ public class SettlementServiceImpl implements SettlementService {
                 .avoidRemark(order.getAvoidRemark())
                 .onlinePay(onlinePayDesc)
                 .operationType(operationType)
-                .transactionId(operationType.equals("已退款") ? "" : order.getTransactionId())
+                .tradeReferenceNo(operationType.equals("已退款") ? "" : order.getTradeReferenceNo())
                 .build();
     }
 

@@ -148,6 +148,7 @@ message SingleClientCustomerOrderRpcResponse {
   string syncRoomNo = 36;
   bool isCanceled = 37;
   string avoidRemark = 38;
+  string tradeReferenceNo = 39;
 }
 
 message GetClientCustomerOrderByIdRpcRequest {
@@ -394,6 +395,8 @@ message ClientCustomerOrderModification {
   bool isCanceled = 57;
   bool shouldUpdateAvoidRemark = 58;
   string avoidRemark = 59;
+  bool shouldUpdateTradeReferenceNo = 60;
+  string tradeReferenceNo = 61;
 }
 
 message UpdateClientCustomerOrderRpcRequest {