lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-05-07 14:17:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 优化部分代码

Browse Source
This commit is contained in:
vostro2013 2023-06-08 12:36:33 +08:00 committed by Binary Wang
parent a357d794b6
commit 9615edd882
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/CombineTransactionsResult.java
View File

@ -69,6 +69,7 @@ public class CombineTransactionsResult implements Serializable {
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public static class JsapiResult implements Serializable { public static class JsapiResult implements Serializable {
private static final long serialVersionUID = -3485718620283251481L;
private String appId; private String appId;
private String timeStamp; private String timeStamp;
private String nonceStr; private String nonceStr;
@ -84,6 +85,7 @@ public class CombineTransactionsResult implements Serializable {
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
public static class AppResult implements Serializable { public static class AppResult implements Serializable {
private static final long serialVersionUID = -4462225641904225011L;
private String appid; private String appid;
private String partnerid; private String partnerid;
private String prepayid; private String prepayid;
@ -95,6 +97,7 @@ public class CombineTransactionsResult implements Serializable {
public <T> T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey) { public <T> T getPayInfo(TradeTypeEnum tradeType, String appId, String mchId, PrivateKey privateKey) {
String timestamp = String.valueOf(System.currentTimeMillis() / 1000); String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
String nonceStr = SignUtils.genRandomStr(); String nonceStr = SignUtils.genRandomStr();
switch (tradeType) { switch (tradeType) {
case JSAPI: case JSAPI:
JsapiResult jsapiResult = new JsapiResult(); JsapiResult jsapiResult = new JsapiResult();
@ -114,7 +117,8 @@ public class CombineTransactionsResult implements Serializable {
return (T) appResult; return (T) appResult;
case NATIVE: case NATIVE:
return (T) this.codeUrl; return (T) this.codeUrl;
default:
throw new IllegalStateException("Unexpected value: " + tradeType);
} }
return null;
} }
} }

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/enums/TradeTypeEnum.java
View File

@ -5,6 +5,8 @@ import lombok.Getter;
/** /**
* 支付方式 * 支付方式
*
* @author thinsstar
*/ */
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor