diff --git a/performance-api/src/main/java/com/clx/performance/vo/pc/broker/TransportPayConfirmParam.java b/performance-api/src/main/java/com/clx/performance/vo/pc/broker/TransportPayConfirmParam.java new file mode 100644 index 0000000000000000000000000000000000000000..303d8fcf0755434919e0e9ca522323ceb18624d4 --- /dev/null +++ b/performance-api/src/main/java/com/clx/performance/vo/pc/broker/TransportPayConfirmParam.java @@ -0,0 +1,25 @@ +package com.clx.performance.vo.pc.broker; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +import javax.validation.constraints.NotNull; + +@Getter +@Setter +@ToString +@NoArgsConstructor +public class TransportPayConfirmParam { + + @ApiModelProperty(value = "鐢ㄦ埛缂栧彿", required = true) + @NotNull(message = "鐢ㄦ埛缂栧彿涓嶈兘涓虹┖") + private String userCode; + + @ApiModelProperty(value = "杩愬崟缂栧彿", required = true) + @NotNull(message = "杩愬崟缂栧彿涓嶈兘涓虹┖") + String orderCode; + +} diff --git a/performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java b/performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java index 9ee9cc7edbb7e4c971d4b47df0801bf045526f06..b2f4ce06e8479f1351534d5093419bd2f10fbac7 100644 --- a/performance-web/src/main/java/com/clx/performance/extranal/broker/impl/BrokerServiceImpl.java +++ b/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; @@ -48,7 +49,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()); } diff --git a/performance-web/src/main/java/com/clx/performance/feign/BrokerFeign.java b/performance-web/src/main/java/com/clx/performance/feign/BrokerFeign.java index ffbe60e1106ea26fdd98363f03167d6f52fd1ca2..f75744bde1122b77203255a8a740f07a0ae53ed9 100644 --- a/performance-web/src/main/java/com/clx/performance/feign/BrokerFeign.java +++ b/performance-web/src/main/java/com/clx/performance/feign/BrokerFeign.java @@ -1,5 +1,6 @@ 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; @@ -36,7 +37,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); }