Merge remote-tracking branch 'origin/test' into test

cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoCustomService.java

@@ -44,7 +44,7 @@ public interface OrderInfoCustomService {
 
     CzgResult<Object> mergeOrder(MergeOrderDTO param);
 
-    void payCallBackOrder(@NotBlank String orderNo, @NotNull PayNotifyRespDTO notifyRespDTO, int retryCount);
+    void payCallBackOrder(@NotBlank String orderNo, @NotNull PayNotifyRespDTO notifyRespDTO, String channel, int retryCount);
 
     void refundCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson);
 

cash-common/cash-common-service/src/main/java/com/czg/pay/QueryOrderRespDTO.java

@@ -0,0 +1,39 @@
+package com.czg.pay;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 查询订单响应参数
+ * @author yjjie
+ * @date 2026/1/15 13:56
+ */
+@Data
+@Accessors(chain = true)
+public class QueryOrderRespDTO {
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 金额
+     */
+    private Long amount;
+
+    /**
+     * 错误信息
+     */
+    private String errorMsg;
+
+    /**
+     * 原始响应数据
+     */
+    private String originResp;
+}