Merge branch 'feature/1.9.35-支付超时时间设置-肖家炜'

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/entities/vo/RefundNotifyCallbackRequestVo.java

 package cn.freemud.entities.vo;
 
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString
 public class RefundNotifyCallbackRequestVo {
     /**
      * 第三方交易单号

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -604,6 +604,10 @@ public class OrderServiceImpl implements Orderservice {
             //只有退款成功更新状态.其他情况不处理
             return refundFaileMessage("pay refundStatus is not 100,refundStatus=" + refundStatus);
         }
+        // 如果transId为空,返回失败
+        if (StringUtils.isBlank(requestVo.getTransId())) {
+            return refundFaileMessage("transId is empty " + requestVo);
+        }
         //查询订单详情
         QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(requestVo.getTransId());
         if (queryOrderByIdResponseDto.getData() == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, queryOrderByIdResponseDto.getErrcode())) {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/ResponseResultEnum.java

@@ -24,6 +24,7 @@ public enum ResponseResultEnum {
     ORDER_DATA_NOT_FOUND("54001", "查询订单数据失败"),
     ORDER_DATA_NOT_EXIST("54002", "没有相关数据"),
     ORDER_STORE_NOT_FOUND("54003", "门店ID或门店名称不存在"),
+    ORDER_TRANS_ID_IS_NULL("54004", "transId为null"),
 
     ;
     private String code;

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -600,11 +600,12 @@ public class OrderSdkService {
      * @return
      */
     public BaseResponse<List<OrderInfoReqs>> queryRelatedOrderByCode(QueryRelatedOrderByCodeReq request, String trackingNo) {
-        StringBuilder urlString = new StringBuilder(InterfaceAddressConstant.QUERY_RELATED_ORDER_BY_CODE)
-                .append("?orderCode=").append(request.getOrderCode());
-        OrderBaseResp<List<OrderInfoReqs>> responseDTO = RequestThirdPartyUtils.httpGetReqComplex(restTemplate, urlString.toString(),
-                createBaseRequest(null, trackingNo), new ParameterizedTypeReference<OrderBaseResp<List<OrderInfoReqs>>>() {
-                });
+        if (StringUtils.isBlank(request.getOrderCode())) {
+            return ResponseUtil.error(ResponseResultEnum.ORDER_TRANS_ID_IS_NULL);
+        }
+        String urlString = InterfaceAddressConstant.QUERY_RELATED_ORDER_BY_CODE + "?orderCode=" + request.getOrderCode();
+        OrderBaseResp<List<OrderInfoReqs>> responseDTO = RequestThirdPartyUtils.httpGetReqComplex(restTemplate, urlString,
+                createBaseRequest(null, trackingNo), new ParameterizedTypeReference<OrderBaseResp<List<OrderInfoReqs>>>() {});
         return responseHandle(responseDTO);
     }