@@ -23,7 +23,7 @@ weixin-java-tools | |||
<dependency> | |||
<groupId>me.chanjar</groupId> | |||
<artifactId>weixin-java-mp</artifactId> | |||
<version>1.3.2</version> | |||
<version>1.3.3</version> | |||
</dependency> | |||
``` | |||
@@ -33,7 +33,7 @@ weixin-java-tools | |||
<dependency> | |||
<groupId>me.chanjar</groupId> | |||
<artifactId>weixin-java-cp</artifactId> | |||
<version>1.3.2</version> | |||
<version>1.3.3</version> | |||
</dependency> | |||
``` | |||
@@ -5,7 +5,7 @@ | |||
<modelVersion>4.0.0</modelVersion> | |||
<groupId>me.chanjar</groupId> | |||
<artifactId>weixin-java-parent</artifactId> | |||
<version>1.3.2</version> | |||
<version>1.3.3</version> | |||
<packaging>pom</packaging> | |||
<name>WeiXin Java Tools - Parent</name> | |||
<description>微信公众号、企业号上级POM</description> | |||
@@ -6,7 +6,7 @@ | |||
<parent> | |||
<groupId>me.chanjar</groupId> | |||
<artifactId>weixin-java-parent</artifactId> | |||
<version>1.3.2</version> | |||
<version>1.3.3</version> | |||
</parent> | |||
<artifactId>weixin-java-common</artifactId> | |||
@@ -30,6 +30,8 @@ public class WxConsts { | |||
public static final String CUSTOM_MSG_NEWS = "news"; | |||
public static final String CUSTOM_MSG_FILE = "file"; | |||
public static final String CUSTOM_MSG_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service"; | |||
public static final String CUSTOM_MSG_SAFE_NO = "0"; | |||
public static final String CUSTOM_MSG_SAFE_YES = "1"; | |||
/////////////////////// | |||
// 群发消息的消息类型 | |||
@@ -3,13 +3,13 @@ package me.chanjar.weixin.common.bean; | |||
import java.io.InputStream; | |||
import java.io.InputStreamReader; | |||
import java.io.Serializable; | |||
import java.nio.charset.Charset; | |||
import java.util.ArrayList; | |||
import java.util.List; | |||
import me.chanjar.weixin.common.util.json.WxGsonBuilder; | |||
import org.apache.commons.codec.Charsets; | |||
import me.chanjar.weixin.common.util.json.WxGsonBuilder; | |||
/** | |||
* 企业号菜单 | |||
* @author Daniel Qian | |||
@@ -19,6 +19,8 @@ public class WxMenu implements Serializable { | |||
private List<WxMenuButton> buttons = new ArrayList<WxMenuButton>(); | |||
private WxMenuRule matchRule; | |||
public List<WxMenuButton> getButtons() { | |||
return buttons; | |||
} | |||
@@ -27,6 +29,14 @@ public class WxMenu implements Serializable { | |||
this.buttons = buttons; | |||
} | |||
public WxMenuRule getMatchRule() { | |||
return matchRule; | |||
} | |||
public void setMatchRule(WxMenuRule matchRule) { | |||
this.matchRule = matchRule; | |||
} | |||
public String toJson() { | |||
return WxGsonBuilder.create().toJson(this); | |||
} | |||
@@ -118,5 +128,74 @@ public class WxMenu implements Serializable { | |||
'}'; | |||
} | |||
} | |||
public static class WxMenuRule { | |||
private String groupId; | |||
private String sex; | |||
private String country; | |||
private String province; | |||
private String city; | |||
private String clientPlatformType; | |||
public String getGroupId() { | |||
return groupId; | |||
} | |||
public void setGroupId(String groupId) { | |||
this.groupId = groupId; | |||
} | |||
public String getSex() { | |||
return sex; | |||
} | |||
public void setSex(String sex) { | |||
this.sex = sex; | |||
} | |||
public String getCountry() { | |||
return country; | |||
} | |||
public void setCountry(String country) { | |||
this.country = country; | |||
} | |||
public String getProvince() { | |||
return province; | |||
} | |||
public void setProvince(String province) { | |||
this.province = province; | |||
} | |||
public String getCity() { | |||
return city; | |||
} | |||
public void setCity(String city) { | |||
this.city = city; | |||
} | |||
public String getClientPlatformType() { | |||
return clientPlatformType; | |||
} | |||
public void setClientPlatformType(String clientPlatformType) { | |||
this.clientPlatformType = clientPlatformType; | |||
} | |||
@Override | |||
public String toString() { | |||
return "matchrule:{" + | |||
"group_id='" + groupId + '\'' + | |||
", sex='" + sex + '\'' + | |||
", country" + country + '\'' + | |||
", province" + province + '\'' + | |||
", city" + city + '\'' + | |||
", client_platform_type" + clientPlatformType + '\'' + | |||
"}"; | |||
} | |||
} | |||
} |
@@ -10,8 +10,7 @@ package me.chanjar.weixin.common.util.json; | |||
import java.lang.reflect.Type; | |||
import me.chanjar.weixin.common.bean.WxMenu; | |||
import com.google.gson.Gson; | |||
import com.google.gson.JsonArray; | |||
import com.google.gson.JsonDeserializationContext; | |||
import com.google.gson.JsonDeserializer; | |||
@@ -21,6 +20,8 @@ import com.google.gson.JsonParseException; | |||
import com.google.gson.JsonSerializationContext; | |||
import com.google.gson.JsonSerializer; | |||
import me.chanjar.weixin.common.bean.WxMenu; | |||
/** | |||
* | |||
* @author Daniel Qian | |||
@@ -38,6 +39,11 @@ public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializ | |||
} | |||
json.add("button", buttonArray); | |||
if (menu.getMatchRule() != null) { | |||
Gson gson = new Gson(); | |||
json.add("matchrule", gson.toJsonTree(menu.getMatchRule())); | |||
} | |||
return json; | |||
} | |||
@@ -6,7 +6,7 @@ | |||
<parent> | |||
<groupId>me.chanjar</groupId> | |||
<artifactId>weixin-java-parent</artifactId> | |||
<version>1.3.2</version> | |||
<version>1.3.3</version> | |||
</parent> | |||
<artifactId>weixin-java-cp</artifactId> | |||
@@ -26,6 +26,7 @@ public class WxCpMessage implements Serializable { | |||
private String description; | |||
private String musicUrl; | |||
private String hqMusicUrl; | |||
private String safe; | |||
private List<WxArticle> articles = new ArrayList<WxArticle>(); | |||
public String getToUser() { | |||
@@ -63,6 +64,14 @@ public class WxCpMessage implements Serializable { | |||
return msgType; | |||
} | |||
public String getSafe() { | |||
return safe; | |||
} | |||
public void setSafe(String safe) { | |||
this.safe = safe; | |||
} | |||
/** | |||
* <pre> | |||
* 请使用 | |||
@@ -1,5 +1,6 @@ | |||
package me.chanjar.weixin.cp.bean.messagebuilder; | |||
import me.chanjar.weixin.common.api.WxConsts; | |||
import me.chanjar.weixin.cp.bean.WxCpMessage; | |||
public class BaseBuilder<T> { | |||
@@ -8,6 +9,7 @@ public class BaseBuilder<T> { | |||
protected String toUser; | |||
protected String toParty; | |||
protected String toTag; | |||
protected String safe; | |||
public T agentId(String agentId) { | |||
this.agentId = agentId; | |||
@@ -29,6 +31,11 @@ public class BaseBuilder<T> { | |||
return (T) this; | |||
} | |||
public T safe(String safe) { | |||
this.safe = safe; | |||
return (T) this; | |||
} | |||
public WxCpMessage build() { | |||
WxCpMessage m = new WxCpMessage(); | |||
m.setAgentId(this.agentId); | |||
@@ -36,6 +43,8 @@ public class BaseBuilder<T> { | |||
m.setToUser(this.toUser); | |||
m.setToParty(this.toParty); | |||
m.setToTag(this.toTag); | |||
m.setSafe( | |||
(this.safe == null || "".equals(this.safe))? WxConsts.CUSTOM_MSG_SAFE_NO: this.safe); | |||
return m; | |||
} | |||
@@ -6,7 +6,7 @@ | |||
<parent> | |||
<groupId>me.chanjar</groupId> | |||
<artifactId>weixin-java-parent</artifactId> | |||
<version>1.3.2</version> | |||
<version>1.3.3</version> | |||
</parent> | |||
<artifactId>weixin-java-mp</artifactId> | |||
<name>WeiXin Java Tools - MP</name> | |||
@@ -324,6 +324,8 @@ public interface WxMpService { | |||
* <pre> | |||
* 自定义菜单创建接口 | |||
* 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=自定义菜单创建接口 | |||
* 如果要创建个性化菜单,请设置matchrule属性 | |||
* 详情请见:http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html | |||
* </pre> | |||
* @param menu | |||
* @throws WxErrorException | |||
@@ -339,6 +341,16 @@ public interface WxMpService { | |||
*/ | |||
public void menuDelete() throws WxErrorException; | |||
/** | |||
* <pre> | |||
* 删除个性化菜单接口 | |||
* 详情请见: http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html | |||
* </pre> | |||
* @param menuid | |||
* @throws WxErrorException | |||
*/ | |||
public void menuDelete(String menuid) throws WxErrorException; | |||
/** | |||
* <pre> | |||
* 自定义菜单查询接口 | |||
@@ -348,6 +360,16 @@ public interface WxMpService { | |||
* @throws WxErrorException | |||
*/ | |||
public WxMenu menuGet() throws WxErrorException; | |||
/** | |||
* <pre> | |||
* 测试个性化菜单匹配结果 | |||
* 详情请见: http://mp.weixin.qq.com/wiki/0/c48ccd12b69ae023159b4bfaa7c39c20.html | |||
* </pre> | |||
* @param userid 可以是粉丝的OpenID,也可以是粉丝的微信号。 | |||
* @throws WxErrorException | |||
*/ | |||
public WxMenu menuTryMatch(String userid) throws WxErrorException; | |||
/** | |||
* <pre> | |||
@@ -230,14 +230,24 @@ public class WxMpServiceImpl implements WxMpService { | |||
} | |||
public void menuCreate(WxMenu menu) throws WxErrorException { | |||
String url = "https://api.weixin.qq.com/cgi-bin/menu/create"; | |||
execute(new SimplePostRequestExecutor(), url, menu.toJson()); | |||
if (menu.getMatchRule() != null) { | |||
String url = "https://api.weixin.qq.com/cgi-bin/menu/addconditional"; | |||
execute(new SimplePostRequestExecutor(), url, menu.toJson()); | |||
} else { | |||
String url = "https://api.weixin.qq.com/cgi-bin/menu/create"; | |||
execute(new SimplePostRequestExecutor(), url, menu.toJson()); | |||
} | |||
} | |||
public void menuDelete() throws WxErrorException { | |||
String url = "https://api.weixin.qq.com/cgi-bin/menu/delete"; | |||
execute(new SimpleGetRequestExecutor(), url, null); | |||
} | |||
public void menuDelete(String menuid) throws WxErrorException { | |||
String url = "https://api.weixin.qq.com/cgi-bin/menu/delconditional"; | |||
execute(new SimpleGetRequestExecutor(), url, "menuid=" + menuid); | |||
} | |||
public WxMenu menuGet() throws WxErrorException { | |||
String url = "https://api.weixin.qq.com/cgi-bin/menu/get"; | |||
@@ -252,6 +262,20 @@ public class WxMpServiceImpl implements WxMpService { | |||
throw e; | |||
} | |||
} | |||
public WxMenu menuTryMatch(String userid) throws WxErrorException { | |||
String url = "https://api.weixin.qq.com/cgi-bin/menu/trymatch"; | |||
try { | |||
String resultContent = execute(new SimpleGetRequestExecutor(), url, "user_id=" + userid); | |||
return WxMenu.fromJson(resultContent); | |||
} catch (WxErrorException e) { | |||
// 46003 不存在的菜单数据 46002 不存在的菜单版本 | |||
if (e.getError().getErrorCode() == 46003 || e.getError().getErrorCode() == 46002) { | |||
return null; | |||
} | |||
throw e; | |||
} | |||
} | |||
public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream inputStream) throws WxErrorException, IOException { | |||
return mediaUpload(mediaType, FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), fileType)); | |||
@@ -892,44 +916,44 @@ public class WxMpServiceImpl implements WxMpService { | |||
@Override | |||
public WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) { | |||
String nonce_str = System.currentTimeMillis() + ""; | |||
String nonce_str = System.currentTimeMillis() + ""; | |||
SortedMap<String, String> packageParams = new TreeMap<String, String>(); | |||
packageParams.put("appid", wxMpConfigStorage.getAppId()); | |||
packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); | |||
SortedMap<String, String> packageParams = new TreeMap<String, String>(); | |||
packageParams.put("appid", wxMpConfigStorage.getAppId()); | |||
packageParams.put("mch_id", wxMpConfigStorage.getPartnerId()); | |||
if (transactionId != null && !"".equals(transactionId.trim())) | |||
packageParams.put("transaction_id", transactionId); | |||
else if (outTradeNo != null && !"".equals(outTradeNo.trim())) | |||
packageParams.put("out_trade_no", outTradeNo); | |||
packageParams.put("nonce_str", nonce_str); | |||
String sign = WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey()); | |||
String xml = "<xml>" + | |||
"<appid>" + wxMpConfigStorage.getAppId() + "</appid>" + | |||
"<mch_id>" + wxMpConfigStorage.getPartnerId() + "</mch_id>" + | |||
"<transaction_id>" + transactionId + "</transaction_id>" + | |||
"<out_trade_no>" + outTradeNo + "</out_trade_no>" + | |||
"<nonce_str>" + nonce_str + "</nonce_str>" + | |||
"<sign>" + sign + "</sign>" + | |||
"</xml>"; | |||
HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery"); | |||
if (httpProxy != null) { | |||
RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); | |||
httpPost.setConfig(config); | |||
} | |||
else | |||
throw new IllegalArgumentException("Either 'transactionId' or 'outTradeNo' must be given."); | |||
packageParams.put("nonce_str", nonce_str); | |||
packageParams.put("sign", WxCryptUtil.createSign(packageParams, wxMpConfigStorage.getPartnerKey())); | |||
StringEntity entity = new StringEntity(xml, Consts.UTF_8); | |||
httpPost.setEntity(entity); | |||
try { | |||
CloseableHttpResponse response = httpClient.execute(httpPost); | |||
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||
XStream xstream = XStreamInitializer.getInstance(); | |||
xstream.alias("xml", WxMpPayResult.class); | |||
WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent); | |||
return wxMpPayResult; | |||
} catch (IOException e) { | |||
e.printStackTrace(); | |||
} | |||
return new WxMpPayResult(); | |||
StringBuilder request = new StringBuilder("<xml>"); | |||
for (Entry<String, String> para : packageParams.entrySet()) { | |||
request.append(String.format("<%s>%s</%s>", para.getKey(), para.getValue(), para.getKey())); | |||
} | |||
request.append("</xml>"); | |||
HttpPost httpPost = new HttpPost("https://api.mch.weixin.qq.com/pay/orderquery"); | |||
if (httpProxy != null) { | |||
RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); | |||
httpPost.setConfig(config); | |||
} | |||
StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); | |||
httpPost.setEntity(entity); | |||
try { | |||
CloseableHttpResponse response = httpClient.execute(httpPost); | |||
String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); | |||
XStream xstream = XStreamInitializer.getInstance(); | |||
xstream.alias("xml", WxMpPayResult.class); | |||
WxMpPayResult wxMpPayResult = (WxMpPayResult) xstream.fromXML(responseContent); | |||
return wxMpPayResult; | |||
} catch (IOException e) { | |||
throw new RuntimeException("Failed to query order due to IO exception.", e); | |||
} | |||
} | |||
@Override | |||
@@ -1,9 +1,9 @@ | |||
package me.chanjar.weixin.mp.bean.result; | |||
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | |||
import java.io.Serializable; | |||
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; | |||
public class WxMpOAuth2AccessToken implements Serializable { | |||
private String accessToken; | |||
@@ -16,6 +16,8 @@ public class WxMpOAuth2AccessToken implements Serializable { | |||
private String scope; | |||
private String unionId; | |||
public String getRefreshToken() { | |||
return refreshToken; | |||
} | |||
@@ -56,6 +58,14 @@ public class WxMpOAuth2AccessToken implements Serializable { | |||
this.expiresIn = expiresIn; | |||
} | |||
public String getUnionId() { | |||
return unionId; | |||
} | |||
public void setUnionId(String unionId) { | |||
this.unionId = unionId; | |||
} | |||
public static WxMpOAuth2AccessToken fromJson(String json) { | |||
return WxMpGsonBuilder.create().fromJson(json, WxMpOAuth2AccessToken.class); | |||
} | |||
@@ -68,6 +78,7 @@ public class WxMpOAuth2AccessToken implements Serializable { | |||
", refreshToken='" + refreshToken + '\'' + | |||
", openId='" + openId + '\'' + | |||
", scope='" + scope + '\'' + | |||
", unionId='" + unionId + '\'' + | |||
'}'; | |||
} | |||
} |
@@ -13,203 +13,245 @@ import java.io.Serializable; | |||
* @author ukid | |||
*/ | |||
public class WxMpPayResult implements Serializable { | |||
private String return_code; | |||
private String return_msg; | |||
private String appid; | |||
private String mch_id; | |||
private String nonce_str; | |||
private String sign; | |||
private String result_code; | |||
private String err_code; | |||
private String err_code_des; | |||
private String trade_state; | |||
private String device_info; | |||
private String openid; | |||
private String is_subscribe; | |||
private String trade_type; | |||
private String bank_type; | |||
private String total_fee; | |||
private String coupon_fee; | |||
private String fee_type; | |||
private String transaction_id; | |||
private String out_trade_no; | |||
private String attach; | |||
private String time_end; | |||
public String getReturn_code() { | |||
return return_code; | |||
} | |||
public String getReturn_msg() { | |||
return return_msg; | |||
} | |||
public String getAppid() { | |||
return appid; | |||
} | |||
public String getMch_id() { | |||
return mch_id; | |||
} | |||
public String getNonce_str() { | |||
return nonce_str; | |||
} | |||
public String getSign() { | |||
return sign; | |||
} | |||
public String getResult_code() { | |||
return result_code; | |||
} | |||
public String getErr_code() { | |||
return err_code; | |||
} | |||
public String getErr_code_des() { | |||
return err_code_des; | |||
} | |||
public String getTrade_state() { | |||
return trade_state; | |||
} | |||
public String getDevice_info() { | |||
return device_info; | |||
} | |||
public String getOpenid() { | |||
return openid; | |||
} | |||
public String getIs_subscribe() { | |||
return is_subscribe; | |||
} | |||
public String getTrade_type() { | |||
return trade_type; | |||
} | |||
public String getBank_type() { | |||
return bank_type; | |||
} | |||
public String getTotal_fee() { | |||
return total_fee; | |||
} | |||
public String getCoupon_fee() { | |||
return coupon_fee; | |||
} | |||
public String getFee_type() { | |||
return fee_type; | |||
} | |||
public String getTransaction_id() { | |||
return transaction_id; | |||
} | |||
public String getOut_trade_no() { | |||
return out_trade_no; | |||
} | |||
public String getAttach() { | |||
return attach; | |||
} | |||
public String getTime_end() { | |||
return time_end; | |||
} | |||
public void setReturn_code(String return_code) { | |||
this.return_code = return_code; | |||
} | |||
public void setReturn_msg(String return_msg) { | |||
this.return_msg = return_msg; | |||
} | |||
public void setAppid(String appid) { | |||
this.appid = appid; | |||
} | |||
public void setMch_id(String mch_id) { | |||
this.mch_id = mch_id; | |||
} | |||
public void setNonce_str(String nonce_str) { | |||
this.nonce_str = nonce_str; | |||
} | |||
public void setSign(String sign) { | |||
this.sign = sign; | |||
} | |||
public void setResult_code(String result_code) { | |||
this.result_code = result_code; | |||
} | |||
public void setErr_code(String err_code) { | |||
this.err_code = err_code; | |||
} | |||
public void setErr_code_des(String err_code_des) { | |||
this.err_code_des = err_code_des; | |||
} | |||
public void setTrade_state(String trade_state) { | |||
this.trade_state = trade_state; | |||
} | |||
public void setDevice_info(String device_info) { | |||
this.device_info = device_info; | |||
} | |||
public void setOpenid(String openid) { | |||
this.openid = openid; | |||
} | |||
public void setIs_subscribe(String is_subscribe) { | |||
this.is_subscribe = is_subscribe; | |||
} | |||
public void setTrade_type(String trade_type) { | |||
this.trade_type = trade_type; | |||
} | |||
public void setBank_type(String bank_type) { | |||
this.bank_type = bank_type; | |||
} | |||
public void setTotal_fee(String total_fee) { | |||
this.total_fee = total_fee; | |||
} | |||
public void setCoupon_fee(String coupon_fee) { | |||
this.coupon_fee = coupon_fee; | |||
} | |||
public void setFee_type(String fee_type) { | |||
this.fee_type = fee_type; | |||
} | |||
public void setTransaction_id(String transaction_id) { | |||
this.transaction_id = transaction_id; | |||
} | |||
public void setOut_trade_no(String out_trade_no) { | |||
this.out_trade_no = out_trade_no; | |||
} | |||
public void setAttach(String attach) { | |||
this.attach = attach; | |||
} | |||
public void setTime_end(String time_end) { | |||
this.time_end = time_end; | |||
} | |||
/** | |||
* | |||
*/ | |||
private static final long serialVersionUID = -570934170727777190L; | |||
private String return_code; | |||
private String return_msg; | |||
private String appid; | |||
private String mch_id; | |||
private String nonce_str; | |||
private String sign; | |||
private String result_code; | |||
private String err_code; | |||
private String err_code_des; | |||
private String trade_state; | |||
private String trade_state_desc; | |||
private String device_info; | |||
private String openid; | |||
private String is_subscribe; | |||
private String trade_type; | |||
private String bank_type; | |||
private String total_fee; | |||
private String coupon_fee; | |||
private String fee_type; | |||
private String transaction_id; | |||
private String out_trade_no; | |||
private String attach; | |||
private String time_end; | |||
public String getReturn_code() { | |||
return return_code; | |||
} | |||
public String getReturn_msg() { | |||
return return_msg; | |||
} | |||
public String getAppid() { | |||
return appid; | |||
} | |||
public String getMch_id() { | |||
return mch_id; | |||
} | |||
public String getNonce_str() { | |||
return nonce_str; | |||
} | |||
public String getSign() { | |||
return sign; | |||
} | |||
public String getResult_code() { | |||
return result_code; | |||
} | |||
public String getErr_code() { | |||
return err_code; | |||
} | |||
public String getErr_code_des() { | |||
return err_code_des; | |||
} | |||
public String getTrade_state() { | |||
return trade_state; | |||
} | |||
public String getDevice_info() { | |||
return device_info; | |||
} | |||
public String getOpenid() { | |||
return openid; | |||
} | |||
public String getIs_subscribe() { | |||
return is_subscribe; | |||
} | |||
public String getTrade_type() { | |||
return trade_type; | |||
} | |||
public String getBank_type() { | |||
return bank_type; | |||
} | |||
public String getTotal_fee() { | |||
return total_fee; | |||
} | |||
public String getCoupon_fee() { | |||
return coupon_fee; | |||
} | |||
public String getFee_type() { | |||
return fee_type; | |||
} | |||
public String getTransaction_id() { | |||
return transaction_id; | |||
} | |||
public String getOut_trade_no() { | |||
return out_trade_no; | |||
} | |||
public String getAttach() { | |||
return attach; | |||
} | |||
public String getTime_end() { | |||
return time_end; | |||
} | |||
public void setReturn_code(String return_code) { | |||
this.return_code = return_code; | |||
} | |||
public void setReturn_msg(String return_msg) { | |||
this.return_msg = return_msg; | |||
} | |||
public void setAppid(String appid) { | |||
this.appid = appid; | |||
} | |||
public void setMch_id(String mch_id) { | |||
this.mch_id = mch_id; | |||
} | |||
public void setNonce_str(String nonce_str) { | |||
this.nonce_str = nonce_str; | |||
} | |||
public void setSign(String sign) { | |||
this.sign = sign; | |||
} | |||
public void setResult_code(String result_code) { | |||
this.result_code = result_code; | |||
} | |||
public void setErr_code(String err_code) { | |||
this.err_code = err_code; | |||
} | |||
public void setErr_code_des(String err_code_des) { | |||
this.err_code_des = err_code_des; | |||
} | |||
public void setTrade_state(String trade_state) { | |||
this.trade_state = trade_state; | |||
} | |||
public void setDevice_info(String device_info) { | |||
this.device_info = device_info; | |||
} | |||
public void setOpenid(String openid) { | |||
this.openid = openid; | |||
} | |||
public void setIs_subscribe(String is_subscribe) { | |||
this.is_subscribe = is_subscribe; | |||
} | |||
public void setTrade_type(String trade_type) { | |||
this.trade_type = trade_type; | |||
} | |||
public void setBank_type(String bank_type) { | |||
this.bank_type = bank_type; | |||
} | |||
public void setTotal_fee(String total_fee) { | |||
this.total_fee = total_fee; | |||
} | |||
public void setCoupon_fee(String coupon_fee) { | |||
this.coupon_fee = coupon_fee; | |||
} | |||
public void setFee_type(String fee_type) { | |||
this.fee_type = fee_type; | |||
} | |||
public void setTransaction_id(String transaction_id) { | |||
this.transaction_id = transaction_id; | |||
} | |||
public void setOut_trade_no(String out_trade_no) { | |||
this.out_trade_no = out_trade_no; | |||
} | |||
public void setAttach(String attach) { | |||
this.attach = attach; | |||
} | |||
public void setTime_end(String time_end) { | |||
this.time_end = time_end; | |||
} | |||
public String getTrade_state_desc() { | |||
return trade_state_desc; | |||
} | |||
public void setTrade_state_desc(String trade_state_desc) { | |||
this.trade_state_desc = trade_state_desc; | |||
} | |||
@Override | |||
public String toString() { | |||
return "WxMpPayResult{" + | |||
"return_code=" + return_code + | |||
", return_msg='" + return_msg + '\'' + | |||
", appid='" + appid + '\'' + | |||
", mch_id='" + mch_id + '\'' + | |||
", nonce_str='" + nonce_str + '\'' + | |||
", sign='" + sign + '\'' + | |||
", result_code='" + result_code + '\'' + | |||
", err_code='" + err_code + '\'' + | |||
", err_code_des='" + err_code_des + '\'' + | |||
", trade_state=" + trade_state + | |||
", trade_state_desc=" + trade_state_desc + | |||
", device_info='" + device_info + '\'' + | |||
", openid='" + openid + '\'' + | |||
", is_subscribe='" + is_subscribe + '\'' + | |||
", trade_type='" + trade_type + '\'' + | |||
", bank_type='" + bank_type + '\'' + | |||
", total_fee='" + total_fee + '\'' + | |||
", coupon_fee='" + coupon_fee + '\'' + | |||
", fee_type='" + fee_type + '\'' + | |||
", transaction_id='" + transaction_id + '\'' + | |||
", out_trade_no='" + out_trade_no + '\'' + | |||
", attach='" + attach + '\'' + | |||
", time_end='" + time_end + '\'' + | |||
'}'; | |||
} | |||
} |
@@ -1,11 +1,16 @@ | |||
package me.chanjar.weixin.mp.util.json; | |||
import com.google.gson.*; | |||
import java.lang.reflect.Type; | |||
import com.google.gson.JsonDeserializationContext; | |||
import com.google.gson.JsonDeserializer; | |||
import com.google.gson.JsonElement; | |||
import com.google.gson.JsonObject; | |||
import com.google.gson.JsonParseException; | |||
import me.chanjar.weixin.common.util.json.GsonHelper; | |||
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; | |||
import java.lang.reflect.Type; | |||
public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer<WxMpOAuth2AccessToken> { | |||
public WxMpOAuth2AccessToken deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws | |||
@@ -28,6 +33,9 @@ public class WxMpOAuth2AccessTokenAdapter implements JsonDeserializer<WxMpOAuth2 | |||
if (accessTokenJsonObject.get("scope") != null && !accessTokenJsonObject.get("scope").isJsonNull()) { | |||
accessToken.setScope(GsonHelper.getAsString(accessTokenJsonObject.get("scope"))); | |||
} | |||
if (accessTokenJsonObject.get("unionid") != null && !accessTokenJsonObject.get("unionid").isJsonNull()) { | |||
accessToken.setUnionId(GsonHelper.getAsString(accessTokenJsonObject.get("unionid"))); | |||
} | |||
return accessToken; | |||
} | |||