Merge branch 'refs/heads/v26.2-jdk17springboot3-20240912' into test_jdk17

performance-api/src/main/java/com/clx/performance/vo/pc/broker/TransportPayConfirmParam.java

+package com.clx.performance.vo.pc.broker;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class TransportPayConfirmParam {
+
+    @Schema(description = "用户编号", required = true)
+    @NotNull(message = "用户编号不能为空")
+    private String userCode;
+
+    @Schema(description = "运单编号", required = true)
+    @NotNull(message = "运单编号不能为空")
+    String orderCode;
+
+}

performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java

@@ -6,6 +6,7 @@ import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.extranal.broker.BrokerService;
 import com.clx.performance.feign.BrokerFeign;
 import com.clx.performance.vo.pc.broker.TransportParam;
+import com.clx.performance.vo.pc.broker.TransportPayConfirmParam;
 import com.clx.performance.vo.pc.broker.TransportVO;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
@@ -49,7 +50,11 @@ public class BrokerServiceImpl implements BrokerService {
     @Override
     public void orderChildPay(String childNo) {
 
-        Result<Object> result = brokerFeign.payConfirm(childNo, settlementConfig.getBrokerUserCode());
+        TransportPayConfirmParam param = new TransportPayConfirmParam();
+        param.setOrderCode(childNo);
+        param.setUserCode(settlementConfig.getBrokerUserCode());
+
+        Result<Object> result = brokerFeign.payConfirm(param);
         if (result.getCode() != 0) {
             log.info("司机支付, childNo:{}, msg:{}", childNo, result.getMsg());
         }

performance-web/src/main/java/com/clx/performance/feign/BrokerFeign.java

 package com.clx.performance.feign;
 
+import com.clx.performance.vo.pc.broker.TransportPayConfirmParam;
 import com.clx.performance.vo.pc.broker.TransportParam;
 import com.clx.performance.vo.pc.broker.TransportVO;
 import com.msl.common.result.Result;
@@ -32,7 +33,6 @@ public interface BrokerFeign {
      *  司机支付
      */
     @RequestMapping(value = "/broker-service/open/transport/payConfirm", method = RequestMethod.POST)
-    Result<Object> payConfirm(@RequestParam @NotBlank(message = "运单编号不能为空") String orderCode,
-                                              @RequestParam @NotNull(message = "userCode不能为空") String userCode);
+    Result<Object> payConfirm(@RequestBody TransportPayConfirmParam param);
 
 }