去除<?>
This commit is contained in:
@@ -50,9 +50,8 @@ public class FastJson2Config implements WebMvcConfigurer {
|
||||
// 设置支持的媒体类型
|
||||
List<MediaType> supportedMediaTypes = new ArrayList<>();
|
||||
supportedMediaTypes.add(MediaType.APPLICATION_JSON);
|
||||
supportedMediaTypes.add(MediaType.APPLICATION_JSON_UTF8);
|
||||
converter.setSupportedMediaTypes(supportedMediaTypes);
|
||||
// 将转换器添加到 Spring MVC 的消息转换器列表中
|
||||
converters.add(0, converter);
|
||||
converters.addFirst(converter);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ import lombok.NonNull;
|
||||
* @author ww
|
||||
*/
|
||||
@Data
|
||||
public class CzgPayBaseReq<T> {
|
||||
public class CzgPayBaseReq {
|
||||
//必填范围
|
||||
/**
|
||||
* 订单标题
|
||||
@@ -84,9 +84,9 @@ public class CzgPayBaseReq<T> {
|
||||
private String subAppid;
|
||||
|
||||
/**
|
||||
* 额外参数
|
||||
* 支付条码
|
||||
*/
|
||||
private T data;
|
||||
private String authCode;
|
||||
|
||||
public CzgPayBaseReq() {
|
||||
|
||||
@@ -107,27 +107,27 @@ public class CzgPayBaseReq<T> {
|
||||
this.notifyUrl = notifyUrl;
|
||||
}
|
||||
|
||||
public static CzgPayBaseReq<?> ltPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount
|
||||
public static CzgPayBaseReq ltPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount
|
||||
, @NonNull String payType, @NonNull String openId, @NonNull String clientIp) {
|
||||
return new CzgPayBaseReq<>(mchOrderNo, detail, amount, payType, openId, clientIp);
|
||||
return new CzgPayBaseReq(mchOrderNo, detail, amount, payType, openId, clientIp);
|
||||
}
|
||||
|
||||
public static CzgPayBaseReq<?> h5PayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String clientIp) {
|
||||
return new CzgPayBaseReq<>(mchOrderNo, detail, amount, null, null, clientIp);
|
||||
public static CzgPayBaseReq h5PayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String clientIp) {
|
||||
return new CzgPayBaseReq(mchOrderNo, detail, amount, null, null, clientIp);
|
||||
}
|
||||
|
||||
public static CzgPayBaseReq<?> jsPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount
|
||||
public static CzgPayBaseReq jsPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount
|
||||
, @NonNull String payType, @NonNull String openId, @NonNull String clientIp) {
|
||||
return new CzgPayBaseReq<>(mchOrderNo, detail, amount, payType, openId, clientIp);
|
||||
return new CzgPayBaseReq(mchOrderNo, detail, amount, payType, openId, clientIp);
|
||||
}
|
||||
|
||||
public static CzgPayBaseReq<?> scanPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String clientIp) {
|
||||
return new CzgPayBaseReq<>(mchOrderNo, detail, amount, null, null, clientIp);
|
||||
public static CzgPayBaseReq scanPayReq(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String clientIp) {
|
||||
return new CzgPayBaseReq(mchOrderNo, detail, amount, null, null, clientIp);
|
||||
}
|
||||
|
||||
public static CzgPayBaseReq<String> microPay(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String authCode) {
|
||||
CzgPayBaseReq<String> stringReq = new CzgPayBaseReq<>(mchOrderNo, detail, amount, null, null, null);
|
||||
stringReq.setData(authCode);
|
||||
public static CzgPayBaseReq microPay(@NonNull String mchOrderNo, @NonNull String detail, @NonNull Long amount, @NonNull String authCode) {
|
||||
CzgPayBaseReq stringReq = new CzgPayBaseReq(mchOrderNo, detail, amount, null, null, null);
|
||||
stringReq.setAuthCode(authCode);
|
||||
return stringReq;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user