From ad71e3c0f3f437a20d48a165bc9490aecf5f2c00 Mon Sep 17 00:00:00 2001 From: YuJian Date: Sun, 18 Sep 2016 21:30:39 +0800 Subject: [PATCH 01/51] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=A1=E5=88=B8?= =?UTF-8?q?=E7=9A=84=E5=AE=A2=E6=9C=8D=E6=B6=88=E6=81=AF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. WxCardBuilder用于构建卡券的客服消息; 2. WxMpCustomMessage新作cardId字段及卡券builder; 3. CustomMessageGsonAdapter处理cardId序列化名字; 4. WxConsts新作WXCARD卡券类型。 --- .../chanjar/weixin/common/api/WxConsts.java | 1 + .../weixin/mp/bean/WxMpCustomMessage.java | 49 +++++++++++++------ .../mp/bean/custombuilder/WxCardBuilder.java | 31 ++++++++++++ .../json/WxMpCustomMessageGsonAdapter.java | 6 +++ 4 files changed, 72 insertions(+), 15 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java index 46dd11f2..eae90d97 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java @@ -30,6 +30,7 @@ public class WxConsts { public static final String CUSTOM_MSG_MUSIC = "music"; public static final String CUSTOM_MSG_NEWS = "news"; public static final String CUSTOM_MSG_FILE = "file"; + public static final String CUSTOM_MSG_WXCARD = "wxcard"; 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"; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java index 04eee332..f1ed0fa7 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java @@ -14,7 +14,7 @@ import java.util.List; */ public class WxMpCustomMessage implements Serializable { private static final long serialVersionUID = -9196732086954365246L; - + private String toUser; private String msgType; private String content; @@ -25,8 +25,9 @@ public class WxMpCustomMessage implements Serializable { private String musicUrl; private String hqMusicUrl; private String kfAccount; + private String cardId; private List articles = new ArrayList<>(); - + public String getToUser() { return this.toUser; } @@ -36,7 +37,7 @@ public class WxMpCustomMessage implements Serializable { public String getMsgType() { return this.msgType; } - + /** *
    * 请使用
@@ -46,6 +47,7 @@ public class WxMpCustomMessage implements Serializable {
    * {@link me.chanjar.weixin.common.api.WxConsts#CUSTOM_MSG_MUSIC}
    * {@link me.chanjar.weixin.common.api.WxConsts#CUSTOM_MSG_VIDEO}
    * {@link me.chanjar.weixin.common.api.WxConsts#CUSTOM_MSG_NEWS}
+   * {@link me.chanjar.weixin.common.api.WxConsts#CUSTOM_MSG_WXCARD}
    * 
* @param msgType */ @@ -94,24 +96,33 @@ public class WxMpCustomMessage implements Serializable { public void setHqMusicUrl(String hqMusicUrl) { this.hqMusicUrl = hqMusicUrl; } + + public String getCardId() { + return cardId; + } + + public void setCardId(String cardId) { + this.cardId = cardId; + } + public List getArticles() { return this.articles; } public void setArticles(List articles) { this.articles = articles; } - + public String toJson() { return WxMpGsonBuilder.INSTANCE.create().toJson(this); } - + public static class WxArticle { - + private String title; private String description; private String url; private String picUrl; - + public String getTitle() { return this.title; } @@ -136,9 +147,9 @@ public class WxMpCustomMessage implements Serializable { public void setPicUrl(String picUrl) { this.picUrl = picUrl; } - + } - + /** * 获得文本消息builder */ @@ -159,34 +170,42 @@ public class WxMpCustomMessage implements Serializable { public static VoiceBuilder VOICE() { return new VoiceBuilder(); } - + /** * 获得视频消息builder */ public static VideoBuilder VIDEO() { return new VideoBuilder(); } - + /** * 获得音乐消息builder */ public static MusicBuilder MUSIC() { return new MusicBuilder(); } - + /** * 获得图文消息builder */ public static NewsBuilder NEWS() { return new NewsBuilder(); } - + + + /** + * 获得卡券消息builder + * @return + */ + public static WxCardBuilder WXCARD() { + return new WxCardBuilder(); + } + public String getKfAccount() { return this.kfAccount; } - + public void setKfAccount(String kfAccount) { this.kfAccount = kfAccount; } - } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java new file mode 100644 index 00000000..c7d451ef --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java @@ -0,0 +1,31 @@ +package me.chanjar.weixin.mp.bean.custombuilder; + +import me.chanjar.weixin.common.api.WxConsts; +import me.chanjar.weixin.mp.bean.WxMpCustomMessage; + +/** + * 卡券消息builder + *
+ * 用法: WxMpCustomMessage m = WxMpCustomMessage.WXCARD().cardId(...).toUser(...).build();
+ * 
+ * @author mgcnrx11 + * + */ +public final class WxCardBuilder extends BaseBuilder { + private String cardId; + + public WxCardBuilder() { + this.msgType = WxConsts.CUSTOM_MSG_WXCARD; + } + + public WxCardBuilder cardId(String cardId) { + this.cardId = cardId; + return this; + } + + public WxMpCustomMessage build() { + WxMpCustomMessage m = super.build(); + m.setCardId(this.cardId); + return m; + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCustomMessageGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCustomMessageGsonAdapter.java index 74a2acfe..973966db 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCustomMessageGsonAdapter.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpCustomMessageGsonAdapter.java @@ -75,6 +75,12 @@ public class WxMpCustomMessageGsonAdapter implements JsonSerializer Date: Tue, 20 Sep 2016 21:03:55 +0800 Subject: [PATCH 02/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=8B=E7=B2=89=E4=B8=9D=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/WxMpUserTagService.java | 15 ++- .../mp/api/impl/WxMpUserTagServiceImpl.java | 26 ++++-- .../weixin/mp/bean/tag/WxTagListUser.java | 92 +++++++++++++++++++ .../api/impl/WxMpUserTagServiceImplTest.java | 21 +++-- 4 files changed, 138 insertions(+), 16 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java index bcf657fa..128f2cb7 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java @@ -1,10 +1,11 @@ package me.chanjar.weixin.mp.api; -import java.util.List; - import me.chanjar.weixin.common.exception.WxErrorException; +import me.chanjar.weixin.mp.bean.tag.WxTagListUser; import me.chanjar.weixin.mp.bean.tag.WxUserTag; +import java.util.List; + /** * 用户标签管理相关接口 * Created by Binary Wang on 2016/9/2. @@ -55,4 +56,14 @@ public interface WxMpUserTagService { */ Boolean tagDelete(Integer id) throws WxErrorException; + /** + *
+   * 获取标签下粉丝列表
+   * 详情请见:用户标签管理
+   * 接口url格式: https://api.weixin.qq.com/cgi-bin/user/tag/get?access_token=ACCESS_TOKEN
+   * 
+ * + */ + WxTagListUser tagListUser(Integer tagId, String nextOpenid) throws WxErrorException; + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java index c2167556..bb6daf63 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java @@ -1,17 +1,17 @@ package me.chanjar.weixin.mp.api.impl; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gson.JsonObject; - import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.WxMpUserTagService; +import me.chanjar.weixin.mp.bean.tag.WxTagListUser; import me.chanjar.weixin.mp.bean.tag.WxUserTag; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; /** * @@ -92,4 +92,18 @@ public class WxMpUserTagServiceImpl implements WxMpUserTagService { throw new WxErrorException(wxError); } + + @Override + public WxTagListUser tagListUser(Integer tagId, String nextOpenid) throws WxErrorException { + String url = "https://api.weixin.qq.com/cgi-bin/user/tag/get"; + + JsonObject json = new JsonObject(); + json.addProperty("tagid", tagId); + json.addProperty("next_openid", StringUtils.trimToEmpty(nextOpenid)); + + String responseContent = this.wxMpService.post(url, json.toString()); + this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, json.toString(), + responseContent); + return WxTagListUser.fromJson(responseContent); + } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java new file mode 100644 index 00000000..0ba48edc --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java @@ -0,0 +1,92 @@ +package me.chanjar.weixin.mp.bean.tag; + +import com.google.gson.annotations.SerializedName; +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.List; + +/** + * 获取标签下粉丝列表的结果对象 + * @author binarywang(https://github.com/binarywang) + * Created by Binary Wang on 2016-09-19. + */ +public class WxTagListUser { + + public static WxTagListUser fromJson(String json) { + return WxMpGsonBuilder.create().fromJson(json,WxTagListUser.class); + } + + public String toJson() { + return WxMpGsonBuilder.create().toJson(this); + } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } + + /** + *"count":2,这次获取的粉丝数量 + */ + @SerializedName("count") + private Integer count; + + /** + *"data" 粉丝列表 + */ + @SerializedName("data") + private WxTagListUserData data; + + /** + *"next_openid" 拉取列表最后一个用户的openid + */ + @SerializedName("next_openid") + private String nextOpenid; + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public WxTagListUserData getData() { + return data; + } + + public void setData(WxTagListUserData data) { + this.data = data; + } + + public String getNextOpenid() { + return nextOpenid; + } + + public void setNextOpenid(String nextOpenid) { + this.nextOpenid = nextOpenid; + } + + public static class WxTagListUserData { + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } + + /** + * openid 列表 + */ + @SerializedName("openid") + private List openidList; + + public List getOpenidList() { + return openidList; + } + + public void setOpenidList(List openidList) { + this.openidList = openidList; + } + } +} diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java index 6471b88c..60ab3780 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java @@ -1,15 +1,14 @@ package me.chanjar.weixin.mp.api.impl; -import java.util.List; - +import com.google.inject.Inject; +import me.chanjar.weixin.mp.api.ApiTestModule; +import me.chanjar.weixin.mp.bean.tag.WxTagListUser; +import me.chanjar.weixin.mp.bean.tag.WxUserTag; import org.testng.Assert; import org.testng.annotations.Guice; import org.testng.annotations.Test; -import com.google.inject.Inject; - -import me.chanjar.weixin.mp.api.ApiTestModule; -import me.chanjar.weixin.mp.bean.tag.WxUserTag; +import java.util.List; /** * @@ -22,7 +21,7 @@ public class WxMpUserTagServiceImplTest { @Inject protected WxMpServiceImpl wxService; - private Integer tagId; + private Integer tagId = 2; @Test public void testTagCreate() throws Exception { @@ -55,4 +54,10 @@ public class WxMpUserTagServiceImplTest { Assert.assertTrue(res); } -} \ No newline at end of file + @Test + public void testTagListUser() throws Exception { + WxTagListUser res = this.wxService.getUserTagService().tagListUser(this.tagId, null); + System.out.println(res); + Assert.assertNotNull(res); + } +} From a304bc573b2413de37454dd00b759b60c4a8f5dc Mon Sep 17 00:00:00 2001 From: devina Date: Tue, 20 Sep 2016 21:03:55 +0800 Subject: [PATCH 03/51] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E8=BF=94=E5=9B=9E=E7=9A=84?= =?UTF-8?q?=E7=BB=93=E6=9E=9CWxMpPayResult=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/WxMpUserTagService.java | 15 +- .../mp/api/impl/WxMpUserTagServiceImpl.java | 26 +++- .../weixin/mp/bean/result/WxMpPayResult.java | 131 +++++++++++------- .../weixin/mp/bean/tag/WxTagListUser.java | 92 ++++++++++++ .../api/impl/WxMpUserTagServiceImplTest.java | 21 +-- 5 files changed, 222 insertions(+), 63 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java index bcf657fa..128f2cb7 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java @@ -1,10 +1,11 @@ package me.chanjar.weixin.mp.api; -import java.util.List; - import me.chanjar.weixin.common.exception.WxErrorException; +import me.chanjar.weixin.mp.bean.tag.WxTagListUser; import me.chanjar.weixin.mp.bean.tag.WxUserTag; +import java.util.List; + /** * 用户标签管理相关接口 * Created by Binary Wang on 2016/9/2. @@ -55,4 +56,14 @@ public interface WxMpUserTagService { */ Boolean tagDelete(Integer id) throws WxErrorException; + /** + *
+   * 获取标签下粉丝列表
+   * 详情请见:用户标签管理
+   * 接口url格式: https://api.weixin.qq.com/cgi-bin/user/tag/get?access_token=ACCESS_TOKEN
+   * 
+ * + */ + WxTagListUser tagListUser(Integer tagId, String nextOpenid) throws WxErrorException; + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java index c2167556..bb6daf63 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java @@ -1,17 +1,17 @@ package me.chanjar.weixin.mp.api.impl; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gson.JsonObject; - import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.WxMpUserTagService; +import me.chanjar.weixin.mp.bean.tag.WxTagListUser; import me.chanjar.weixin.mp.bean.tag.WxUserTag; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; /** * @@ -92,4 +92,18 @@ public class WxMpUserTagServiceImpl implements WxMpUserTagService { throw new WxErrorException(wxError); } + + @Override + public WxTagListUser tagListUser(Integer tagId, String nextOpenid) throws WxErrorException { + String url = "https://api.weixin.qq.com/cgi-bin/user/tag/get"; + + JsonObject json = new JsonObject(); + json.addProperty("tagid", tagId); + json.addProperty("next_openid", StringUtils.trimToEmpty(nextOpenid)); + + String responseContent = this.wxMpService.post(url, json.toString()); + this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, json.toString(), + responseContent); + return WxTagListUser.fromJson(responseContent); + } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java index 1ea8fd65..774cd442 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java @@ -41,93 +41,102 @@ public class WxMpPayResult implements Serializable { private String out_trade_no; private String attach; private String time_end; - + /** + * 现金支付金额 cash_fee 是 Int 100 现金支付金额订单现金支付金额,详见支付金额 + */ + private String cash_fee; + + /** + * 现金支付货币类型 cash_fee_type 否 + * + */ + private String cash_fee_type; public String getReturn_code() { - return this.return_code; + return return_code; } public String getReturn_msg() { - return this.return_msg; + return return_msg; } public String getAppid() { - return this.appid; + return appid; } public String getMch_id() { - return this.mch_id; + return mch_id; } public String getNonce_str() { - return this.nonce_str; + return nonce_str; } public String getSign() { - return this.sign; + return sign; } public String getResult_code() { - return this.result_code; + return result_code; } public String getErr_code() { - return this.err_code; + return err_code; } public String getErr_code_des() { - return this.err_code_des; + return err_code_des; } public String getTrade_state() { - return this.trade_state; + return trade_state; } public String getDevice_info() { - return this.device_info; + return device_info; } public String getOpenid() { - return this.openid; + return openid; } public String getIs_subscribe() { - return this.is_subscribe; + return is_subscribe; } public String getTrade_type() { - return this.trade_type; + return trade_type; } public String getBank_type() { - return this.bank_type; + return bank_type; } public String getTotal_fee() { - return this.total_fee; + return total_fee; } public String getCoupon_fee() { - return this.coupon_fee; + return coupon_fee; } public String getFee_type() { - return this.fee_type; + return fee_type; } public String getTransaction_id() { - return this.transaction_id; + return transaction_id; } public String getOut_trade_no() { - return this.out_trade_no; + return out_trade_no; } public String getAttach() { - return this.attach; + return attach; } public String getTime_end() { - return this.time_end; + return time_end; } public void setReturn_code(String return_code) { @@ -219,7 +228,7 @@ public class WxMpPayResult implements Serializable { } public String getTrade_state_desc() { - return this.trade_state_desc; + return trade_state_desc; } public void setTrade_state_desc(String trade_state_desc) { @@ -229,29 +238,57 @@ public class WxMpPayResult implements Serializable { @Override public String toString() { return "WxMpPayResult{" + - "return_code=" + this.return_code + - ", return_msg='" + this.return_msg + '\'' + - ", appid='" + this.appid + '\'' + - ", mch_id='" + this.mch_id + '\'' + - ", nonce_str='" + this.nonce_str + '\'' + - ", sign='" + this.sign + '\'' + - ", result_code='" + this.result_code + '\'' + - ", err_code='" + this.err_code + '\'' + - ", err_code_des='" + this.err_code_des + '\'' + - ", trade_state=" + this.trade_state + - ", trade_state_desc=" + this.trade_state_desc + - ", device_info='" + this.device_info + '\'' + - ", openid='" + this.openid + '\'' + - ", is_subscribe='" + this.is_subscribe + '\'' + - ", trade_type='" + this.trade_type + '\'' + - ", bank_type='" + this.bank_type + '\'' + - ", total_fee='" + this.total_fee + '\'' + - ", coupon_fee='" + this.coupon_fee + '\'' + - ", fee_type='" + this.fee_type + '\'' + - ", transaction_id='" + this.transaction_id + '\'' + - ", out_trade_no='" + this.out_trade_no + '\'' + - ", attach='" + this.attach + '\'' + - ", time_end='" + this.time_end + '\'' + + "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 + '\'' + '}'; } + +/** + * @return the cash_fee + */ +public String getCash_fee() { + return cash_fee; +} + +/** + * @param cash_fee the cash_fee to set + */ +public void setCash_fee(String cash_fee) { + this.cash_fee = cash_fee; +} + +/** + * @return the cash_fee_type + */ +public String getCash_fee_type() { + return cash_fee_type; +} + +/** + * @param cash_fee_type the cash_fee_type to set + */ +public void setCash_fee_type(String cash_fee_type) { + this.cash_fee_type = cash_fee_type; +} } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java new file mode 100644 index 00000000..0ba48edc --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java @@ -0,0 +1,92 @@ +package me.chanjar.weixin.mp.bean.tag; + +import com.google.gson.annotations.SerializedName; +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.List; + +/** + * 获取标签下粉丝列表的结果对象 + * @author binarywang(https://github.com/binarywang) + * Created by Binary Wang on 2016-09-19. + */ +public class WxTagListUser { + + public static WxTagListUser fromJson(String json) { + return WxMpGsonBuilder.create().fromJson(json,WxTagListUser.class); + } + + public String toJson() { + return WxMpGsonBuilder.create().toJson(this); + } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } + + /** + *"count":2,这次获取的粉丝数量 + */ + @SerializedName("count") + private Integer count; + + /** + *"data" 粉丝列表 + */ + @SerializedName("data") + private WxTagListUserData data; + + /** + *"next_openid" 拉取列表最后一个用户的openid + */ + @SerializedName("next_openid") + private String nextOpenid; + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + public WxTagListUserData getData() { + return data; + } + + public void setData(WxTagListUserData data) { + this.data = data; + } + + public String getNextOpenid() { + return nextOpenid; + } + + public void setNextOpenid(String nextOpenid) { + this.nextOpenid = nextOpenid; + } + + public static class WxTagListUserData { + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } + + /** + * openid 列表 + */ + @SerializedName("openid") + private List openidList; + + public List getOpenidList() { + return openidList; + } + + public void setOpenidList(List openidList) { + this.openidList = openidList; + } + } +} diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java index 6471b88c..60ab3780 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java @@ -1,15 +1,14 @@ package me.chanjar.weixin.mp.api.impl; -import java.util.List; - +import com.google.inject.Inject; +import me.chanjar.weixin.mp.api.ApiTestModule; +import me.chanjar.weixin.mp.bean.tag.WxTagListUser; +import me.chanjar.weixin.mp.bean.tag.WxUserTag; import org.testng.Assert; import org.testng.annotations.Guice; import org.testng.annotations.Test; -import com.google.inject.Inject; - -import me.chanjar.weixin.mp.api.ApiTestModule; -import me.chanjar.weixin.mp.bean.tag.WxUserTag; +import java.util.List; /** * @@ -22,7 +21,7 @@ public class WxMpUserTagServiceImplTest { @Inject protected WxMpServiceImpl wxService; - private Integer tagId; + private Integer tagId = 2; @Test public void testTagCreate() throws Exception { @@ -55,4 +54,10 @@ public class WxMpUserTagServiceImplTest { Assert.assertTrue(res); } -} \ No newline at end of file + @Test + public void testTagListUser() throws Exception { + WxTagListUser res = this.wxService.getUserTagService().tagListUser(this.tagId, null); + System.out.println(res); + Assert.assertNotNull(res); + } +} From 21c5855f74b3e08130d1bfad8e83dc9b72952470 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Wed, 21 Sep 2016 11:17:45 +0800 Subject: [PATCH 04/51] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a546f16d..f061f5b0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Weixin Java Tools 微信公众号/企业号开发Java SDK -## [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badge/) ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) [![Build Status](https://travis-ci.org/binarywang/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/binarywang/weixin-java-tools) +## [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badge/) ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) [![Build Status](https://travis-ci.org/wechat-group/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/wechat-group/weixin-java-tools) ### 声明:本项目Fork自chanjarster/weixin-java-tools,但由于原项目已停止维护,故单独维护和发布,且发布到maven上的groupId也会不同,详细信息见下文。 From 0fd7906501aaa71590cb9f7b296d273c3f29b59d Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Wed, 21 Sep 2016 12:17:01 +0800 Subject: [PATCH 05/51] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E4=B8=9C=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/bean/result/WxMpPayResult.java | 121 +++++++----------- 1 file changed, 43 insertions(+), 78 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java index 774cd442..98bba87f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java @@ -2,6 +2,9 @@ package me.chanjar.weixin.mp.bean.result; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + /** *
  * 查询订单支付状态返回的结果
@@ -13,9 +16,11 @@ import java.io.Serializable;
  * @author ukid
  */
 public class WxMpPayResult implements Serializable {
-  /**
-   * 
-   */
+  @Override
+  public String toString() {
+    return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
+  }
+
   private static final long serialVersionUID = -570934170727777190L;
   
   private String return_code;
@@ -51,92 +56,93 @@ public class WxMpPayResult implements Serializable {
    * 
    */
   private String cash_fee_type;
+
   public String getReturn_code() {
-    return return_code;
+    return this.return_code;
   }
 
   public String getReturn_msg() {
-    return return_msg;
+    return this.return_msg;
   }
 
   public String getAppid() {
-    return appid;
+    return this.appid;
   }
 
   public String getMch_id() {
-    return mch_id;
+    return this.mch_id;
   }
 
   public String getNonce_str() {
-    return nonce_str;
+    return this.nonce_str;
   }
 
   public String getSign() {
-    return sign;
+    return this.sign;
   }
 
   public String getResult_code() {
-    return result_code;
+    return this.result_code;
   }
 
   public String getErr_code() {
-    return err_code;
+    return this.err_code;
   }
 
   public String getErr_code_des() {
-    return err_code_des;
+    return this.err_code_des;
   }
 
   public String getTrade_state() {
-    return trade_state;
+    return this.trade_state;
   }
 
   public String getDevice_info() {
-    return device_info;
+    return this.device_info;
   }
 
   public String getOpenid() {
-    return openid;
+    return this.openid;
   }
 
   public String getIs_subscribe() {
-    return is_subscribe;
+    return this.is_subscribe;
   }
 
   public String getTrade_type() {
-    return trade_type;
+    return this.trade_type;
   }
 
   public String getBank_type() {
-    return bank_type;
+    return this.bank_type;
   }
 
   public String getTotal_fee() {
-    return total_fee;
+    return this.total_fee;
   }
 
   public String getCoupon_fee() {
-    return coupon_fee;
+    return this.coupon_fee;
   }
 
   public String getFee_type() {
-    return fee_type;
+    return this.fee_type;
   }
 
   public String getTransaction_id() {
-    return transaction_id;
+    return this.transaction_id;
   }
 
   public String getOut_trade_no() {
-    return out_trade_no;
+    return this.out_trade_no;
   }
 
   public String getAttach() {
-    return attach;
+    return this.attach;
   }
 
   public String getTime_end() {
-    return time_end;
+    return this.time_end;
   }
 
   public void setReturn_code(String return_code) {
@@ -228,67 +234,26 @@ public class WxMpPayResult implements Serializable {
   }
 
   public String getTrade_state_desc() {
-    return trade_state_desc;
+    return this.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 + '\'' +
-        '}';
+  public String getCash_fee() {
+    return this.cash_fee;
   }
 
-/**
- * @return the cash_fee
- */
-public String getCash_fee() {
-	return cash_fee;
-}
-
-/**
- * @param cash_fee the cash_fee to set
- */
-public void setCash_fee(String cash_fee) {
-	this.cash_fee = cash_fee;
-}
+  public void setCash_fee(String cash_fee) {
+    this.cash_fee = cash_fee;
+  }
 
-/**
- * @return the cash_fee_type
- */
-public String getCash_fee_type() {
-	return cash_fee_type;
-}
+  public String getCash_fee_type() {
+    return this.cash_fee_type;
+  }
 
-/**
- * @param cash_fee_type the cash_fee_type to set
- */
-public void setCash_fee_type(String cash_fee_type) {
-	this.cash_fee_type = cash_fee_type;
-}
+  public void setCash_fee_type(String cash_fee_type) {
+    this.cash_fee_type = cash_fee_type;
+  }
 }

From 1ca8e51f5b3bcd670519d52206bbdec7820d028a Mon Sep 17 00:00:00 2001
From: BinaryWang 
Date: Wed, 21 Sep 2016 14:49:52 +0800
Subject: [PATCH 06/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E7=82=B9?=
 =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/mp/bean/WxMpCustomMessage.java | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java
index f1ed0fa7..a7f1670f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java
@@ -1,12 +1,18 @@
 package me.chanjar.weixin.mp.bean;
 
-import me.chanjar.weixin.mp.bean.custombuilder.*;
-import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import me.chanjar.weixin.mp.bean.custombuilder.ImageBuilder;
+import me.chanjar.weixin.mp.bean.custombuilder.MusicBuilder;
+import me.chanjar.weixin.mp.bean.custombuilder.NewsBuilder;
+import me.chanjar.weixin.mp.bean.custombuilder.TextBuilder;
+import me.chanjar.weixin.mp.bean.custombuilder.VideoBuilder;
+import me.chanjar.weixin.mp.bean.custombuilder.VoiceBuilder;
+import me.chanjar.weixin.mp.bean.custombuilder.WxCardBuilder;
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
 /**
  * 客服消息
  * @author chanjarster
@@ -98,7 +104,7 @@ public class WxMpCustomMessage implements Serializable {
   }
 
   public String getCardId() {
-    return cardId;
+    return this.cardId;
   }
 
   public void setCardId(String cardId) {
@@ -195,7 +201,6 @@ public class WxMpCustomMessage implements Serializable {
 
   /**
    * 获得卡券消息builder
-   * @return
    */
   public static WxCardBuilder WXCARD() {
     return new WxCardBuilder();

From 592ac8116379bbfd493de4cf76123fa5e87e4702 Mon Sep 17 00:00:00 2001
From: BinaryWang 
Date: Wed, 21 Sep 2016 15:07:28 +0800
Subject: [PATCH 07/51] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=80=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/api/impl/WxMpMenuServiceImpl.java      | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMenuServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMenuServiceImpl.java
index ac34cdbf..2f40f709 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMenuServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMenuServiceImpl.java
@@ -5,8 +5,6 @@ import org.slf4j.LoggerFactory;
 
 import me.chanjar.weixin.common.bean.menu.WxMenu;
 import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
-import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
 import me.chanjar.weixin.mp.api.WxMpMenuService;
 import me.chanjar.weixin.mp.api.WxMpService;
 
@@ -15,7 +13,8 @@ import me.chanjar.weixin.mp.api.WxMpService;
  */
 public class WxMpMenuServiceImpl implements WxMpMenuService {
   private static final String API_URL_PREFIX = "https://api.weixin.qq.com/cgi-bin/menu";
-  private static Logger log = LoggerFactory.getLogger(WxMpMenuServiceImpl.class);
+  private static Logger log = LoggerFactory
+      .getLogger(WxMpMenuServiceImpl.class);
 
   private WxMpService wxMpService;
 
@@ -25,36 +24,37 @@ public class WxMpMenuServiceImpl implements WxMpMenuService {
 
   @Override
   public void menuCreate(WxMenu menu) throws WxErrorException {
-	String menuJson  = menu.toJson();
-	String url  =   API_URL_PREFIX + "/create";
+    String menuJson = menu.toJson();
+    String url = API_URL_PREFIX + "/create";
     if (menu.getMatchRule() != null) {
       url = API_URL_PREFIX + "/addconditional";
-    } 
-    log.trace("开始创建菜单:{}", menuJson);
-      
-    String result = this.wxMpService.execute(new SimplePostRequestExecutor(), url,menuJson);
+    }
+
+    log.debug("开始创建菜单:{}", menuJson);
+
+    String result = this.wxMpService.post(url, menuJson);
     log.debug("创建菜单:{},结果:{}", menuJson, result);
   }
 
   @Override
   public void menuDelete() throws WxErrorException {
     String url = API_URL_PREFIX + "/delete";
-    String result  = this.wxMpService.execute(new SimpleGetRequestExecutor(), url, null);
+    String result = this.wxMpService.get(url, null);
     log.debug("删除菜单结果:{}", result);
   }
 
   @Override
   public void menuDelete(String menuid) throws WxErrorException {
     String url = API_URL_PREFIX + "/delconditional";
-    String result  = this.wxMpService.execute(new SimpleGetRequestExecutor(), url, "menuid=" + menuid);
-    log.debug("根据MeunId({})删除菜单结果:{}", menuid,result);
+    String result = this.wxMpService.get(url, "menuid=" + menuid);
+    log.debug("根据MeunId({})删除菜单结果:{}", menuid, result);
   }
 
   @Override
   public WxMenu menuGet() throws WxErrorException {
     String url = API_URL_PREFIX + "/get";
     try {
-      String resultContent = this.wxMpService.execute(new SimpleGetRequestExecutor(), url, null);
+      String resultContent = this.wxMpService.get(url, null);
       return WxMenu.fromJson(resultContent);
     } catch (WxErrorException e) {
       // 46003 不存在的菜单数据
@@ -69,11 +69,12 @@ public class WxMpMenuServiceImpl implements WxMpMenuService {
   public WxMenu menuTryMatch(String userid) throws WxErrorException {
     String url = API_URL_PREFIX + "/trymatch";
     try {
-      String resultContent = this.wxMpService.execute(new SimpleGetRequestExecutor(), url, "user_id=" + userid);
+      String resultContent = this.wxMpService.get(url, "user_id=" + userid);
       return WxMenu.fromJson(resultContent);
     } catch (WxErrorException e) {
       // 46003 不存在的菜单数据     46002 不存在的菜单版本
-      if (e.getError().getErrorCode() == 46003 || e.getError().getErrorCode() == 46002) {
+      if (e.getError().getErrorCode() == 46003
+          || e.getError().getErrorCode() == 46002) {
         return null;
       }
       throw e;

From 9780d651d6a3ec050e84097d259794e5f0af3999 Mon Sep 17 00:00:00 2001
From: BinaryWang 
Date: Wed, 21 Sep 2016 20:49:23 +0800
Subject: [PATCH 08/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E4=B8=BA=E7=94=A8=E6=88=B7=E6=89=93=E6=A0=87=E7=AD=BE=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/api/WxMpUserTagService.java     | 10 ++++++++
 .../mp/api/impl/WxMpUserTagServiceImpl.java   | 24 +++++++++++++++++++
 .../api/impl/WxMpUserTagServiceImplTest.java  |  8 +++++++
 3 files changed, 42 insertions(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java
index 128f2cb7..6592865d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java
@@ -66,4 +66,14 @@ public interface WxMpUserTagService {
    */
   WxTagListUser tagListUser(Integer tagId, String nextOpenid) throws WxErrorException;
 
+  /**
+   * 
+   * 批量为用户打标签
+   * 详情请见:用户标签管理
+   * 接口url格式: https://api.weixin.qq.com/cgi-bin/tags/members/batchtagging?access_token=ACCESS_TOKEN
+   * 
+ * + */ + boolean batchTagging(Integer tagId, String[] openids) throws WxErrorException; + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java index bb6daf63..d10c92dd 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java @@ -1,5 +1,6 @@ package me.chanjar.weixin.mp.api.impl; +import com.google.gson.JsonArray; import com.google.gson.JsonObject; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; @@ -106,4 +107,27 @@ public class WxMpUserTagServiceImpl implements WxMpUserTagService { responseContent); return WxTagListUser.fromJson(responseContent); } + + @Override + public boolean batchTagging(Integer tagId, String[] openids) throws WxErrorException { + String url = "https://api.weixin.qq.com/cgi-bin/tags/members/batchtagging"; + + JsonObject json = new JsonObject(); + json.addProperty("tagid", tagId); + JsonArray openidArrayJson = new JsonArray(); + for (String openid : openids) { + openidArrayJson.add(openid); + } + json.add("openid_list", openidArrayJson); + + String responseContent = this.wxMpService.post(url, json.toString()); + this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, json.toString(), + responseContent); + WxError wxError = WxError.fromJson(responseContent); + if (wxError.getErrorCode() == 0) { + return true; + } + + throw new WxErrorException(wxError); + } } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java index 60ab3780..7593ab13 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java @@ -60,4 +60,12 @@ public class WxMpUserTagServiceImplTest { System.out.println(res); Assert.assertNotNull(res); } + + @Test + public void testBatchTagging() throws Exception { + String[] openids = new String[]{((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid()}; + boolean res = this.wxService.getUserTagService().batchTagging(this.tagId, openids); + System.out.println(res); + Assert.assertTrue(res); + } } From 6e32028c501ad195d52ec2b5f5368f985d4d89e6 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Wed, 21 Sep 2016 20:54:17 +0800 Subject: [PATCH 09/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=B8=BA=E7=94=A8=E6=88=B7=E5=8F=96=E6=B6=88=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/WxMpUserTagService.java | 10 ++++++++ .../mp/api/impl/WxMpUserTagServiceImpl.java | 23 +++++++++++++++++++ .../api/impl/WxMpUserTagServiceImplTest.java | 4 ++-- 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java index 6592865d..3bbe98ee 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java @@ -76,4 +76,14 @@ public interface WxMpUserTagService { */ boolean batchTagging(Integer tagId, String[] openids) throws WxErrorException; + /** + *
+   * 批量为用户取消标签
+   * 详情请见:用户标签管理
+   * 接口url格式: https://api.weixin.qq.com/cgi-bin/tags/members/batchtagging?access_token=ACCESS_TOKEN
+   * 
+ * + */ + boolean batchUntagging(Integer tagId, String[] openids) throws WxErrorException; + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java index d10c92dd..1d7ea0ff 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java @@ -130,4 +130,27 @@ public class WxMpUserTagServiceImpl implements WxMpUserTagService { throw new WxErrorException(wxError); } + + @Override + public boolean batchUntagging(Integer tagId, String[] openids) throws WxErrorException { + String url = "https://api.weixin.qq.com/cgi-bin/tags/members/batchuntagging"; + + JsonObject json = new JsonObject(); + json.addProperty("tagid", tagId); + JsonArray openidArrayJson = new JsonArray(); + for (String openid : openids) { + openidArrayJson.add(openid); + } + json.add("openid_list", openidArrayJson); + + String responseContent = this.wxMpService.post(url, json.toString()); + this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, json.toString(), + responseContent); + WxError wxError = WxError.fromJson(responseContent); + if (wxError.getErrorCode() == 0) { + return true; + } + + throw new WxErrorException(wxError); + } } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java index 7593ab13..8422ab66 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java @@ -62,9 +62,9 @@ public class WxMpUserTagServiceImplTest { } @Test - public void testBatchTagging() throws Exception { + public void testBatchUntagging() throws Exception { String[] openids = new String[]{((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid()}; - boolean res = this.wxService.getUserTagService().batchTagging(this.tagId, openids); + boolean res = this.wxService.getUserTagService().batchUntagging(this.tagId, openids); System.out.println(res); Assert.assertTrue(res); } From 7e21f4692b37783b883e372eaeb25298c1e82767 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Wed, 21 Sep 2016 21:05:57 +0800 Subject: [PATCH 10/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BA=AB=E4=B8=8A=E7=9A=84=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/WxMpUserTagService.java | 11 ++++++++++ .../mp/api/impl/WxMpUserTagServiceImpl.java | 20 +++++++++++++++++++ .../api/impl/WxMpUserTagServiceImplTest.java | 8 ++++++++ 3 files changed, 39 insertions(+) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java index 3bbe98ee..406842db 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java @@ -86,4 +86,15 @@ public interface WxMpUserTagService { */ boolean batchUntagging(Integer tagId, String[] openids) throws WxErrorException; + + /** + *
+   * 获取用户身上的标签列表
+   * 详情请见:用户标签管理
+   * 接口url格式: https://api.weixin.qq.com/cgi-bin/tags/getidlist?access_token=ACCESS_TOKEN
+   * 
+ * + */ + List userTagList(String openid) throws WxErrorException; + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java index 1d7ea0ff..d2bb3213 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImpl.java @@ -2,12 +2,15 @@ package me.chanjar.weixin.mp.api.impl; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.google.gson.reflect.TypeToken; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.WxMpUserTagService; import me.chanjar.weixin.mp.bean.tag.WxTagListUser; import me.chanjar.weixin.mp.bean.tag.WxUserTag; +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -153,4 +156,21 @@ public class WxMpUserTagServiceImpl implements WxMpUserTagService { throw new WxErrorException(wxError); } + + @Override + public List userTagList(String openid) throws WxErrorException { + String url = "https://api.weixin.qq.com/cgi-bin/tags/getidlist"; + + JsonObject json = new JsonObject(); + json.addProperty("openid", openid); + + String responseContent = this.wxMpService.post(url, json.toString()); + this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, json.toString(), + responseContent); + + return WxMpGsonBuilder.create().fromJson( + new JsonParser().parse(responseContent).getAsJsonObject().get("tagid_list"), + new TypeToken>() { + }.getType()); + } } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java index 8422ab66..5ccae195 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java @@ -68,4 +68,12 @@ public class WxMpUserTagServiceImplTest { System.out.println(res); Assert.assertTrue(res); } + + @Test + public void testUserTagList() throws Exception { + List res = this.wxService.getUserTagService().userTagList( + ((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid()); + System.out.println(res); + Assert.assertNotNull(res); + } } From 95aa369058dcf24587cfb9ad813464fc923831ce Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 22 Sep 2016 15:11:52 +0800 Subject: [PATCH 11/51] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/MediaImgUploadRequestExecutor.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java index 49606031..9b87b5af 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MediaImgUploadRequestExecutor.java @@ -24,27 +24,32 @@ import java.io.IOException; public class MediaImgUploadRequestExecutor implements RequestExecutor { @Override public WxMediaImgUploadResult execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, File data) throws WxErrorException, IOException { + if (data == null) { + throw new WxErrorException(WxError.newBuilder().setErrorMsg("文件对象为空").build()); + } + HttpPost httpPost = new HttpPost(uri); if (httpProxy != null) { RequestConfig config = RequestConfig.custom().setProxy(httpProxy).build(); httpPost.setConfig(config); } - if (data != null) { - HttpEntity entity = MultipartEntityBuilder - .create() - .addBinaryBody("media", data) - .setMode(HttpMultipartMode.RFC6532) - .build(); - httpPost.setEntity(entity); - httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString()); - } + + HttpEntity entity = MultipartEntityBuilder + .create() + .addBinaryBody("media", data) + .setMode(HttpMultipartMode.RFC6532) + .build(); + httpPost.setEntity(entity); + httpPost.setHeader("Content-Type", ContentType.MULTIPART_FORM_DATA.toString()); + try (CloseableHttpResponse response = httpclient.execute(httpPost)) { String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); WxError error = WxError.fromJson(responseContent); if (error.getErrorCode() != 0) { throw new WxErrorException(error); } + return WxMediaImgUploadResult.fromJson(responseContent); } } -} \ No newline at end of file +} From 9f0c22141aca7a51b477901c6dbc6d67cd7683cf Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 22 Sep 2016 15:12:58 +0800 Subject: [PATCH 12/51] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=97=A0=E7=94=A8javad?= =?UTF-8?q?oc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/common/util/http/RequestExecutor.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java index d625460d..6d2dbe9a 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/RequestExecutor.java @@ -2,7 +2,6 @@ package me.chanjar.weixin.common.util.http; import me.chanjar.weixin.common.exception.WxErrorException; import org.apache.http.HttpHost; -import org.apache.http.client.ClientProtocolException; import org.apache.http.impl.client.CloseableHttpClient; import java.io.IOException; @@ -21,7 +20,6 @@ public interface RequestExecutor { * @param uri uri * @param data 数据 * @throws WxErrorException - * @throws ClientProtocolException * @throws IOException */ T execute(CloseableHttpClient httpclient, HttpHost httpProxy, String uri, E data) throws WxErrorException, IOException; From 5b4a0eafa369cb7d2b4db3dc681ef212d027629b Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 22 Sep 2016 15:13:16 +0800 Subject: [PATCH 13/51] =?UTF-8?q?=E8=B0=83=E6=95=B4javadoc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java index 2325ccac..48a6f610 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java @@ -10,10 +10,12 @@ import java.io.IOException; import java.io.InputStream; /** + *
  * Created by Binary Wang on 2016/7/21.
  * 素材管理的相关接口,包括媒体管理的接口,
  * 即以https://api.weixin.qq.com/cgi-bin/material
  * 和 https://api.weixin.qq.com/cgi-bin/media开头的接口
+ * 
*/ public interface WxMpMaterialService { From b3234a059b36b1701ff53add8262d68ff667f8d8 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 22 Sep 2016 16:07:01 +0800 Subject: [PATCH 14/51] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=B4=A0=E6=9D=90=E7=AE=A1=E7=90=86=E7=9A=84=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/api/impl/WxMpMaterialServiceImpl.java | 5 +- .../api/impl/WxMpMaterialServiceImplTest.java | 89 ++++++++----------- 2 files changed, 42 insertions(+), 52 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java index c6825815..310bbe78 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java @@ -50,7 +50,10 @@ public class WxMpMaterialServiceImpl implements WxMpMaterialService { @Override public File mediaDownload(String media_id) throws WxErrorException { String url = MEDIA_API_URL_PREFIX + "/get"; - return this.wxMpService.execute(new MediaDownloadRequestExecutor(this.wxMpService.getWxMpConfigStorage().getTmpDirFile()), url, "media_id=" + media_id); + return this.wxMpService.execute( + new MediaDownloadRequestExecutor(this.wxMpService.getWxMpConfigStorage().getTmpDirFile()), + url, + "media_id=" + media_id); } @Override diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java index ed67a79b..5cde8adc 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java @@ -1,26 +1,6 @@ package me.chanjar.weixin.mp.api.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import org.testng.annotations.DataProvider; -import org.testng.annotations.Guice; -import org.testng.annotations.Test; - import com.google.inject.Inject; - import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.exception.WxErrorException; @@ -29,11 +9,17 @@ import me.chanjar.weixin.mp.api.ApiTestModule; import me.chanjar.weixin.mp.bean.WxMpMaterial; import me.chanjar.weixin.mp.bean.WxMpMaterialArticleUpdate; import me.chanjar.weixin.mp.bean.WxMpMaterialNews; -import me.chanjar.weixin.mp.bean.result.WxMpMaterialCountResult; -import me.chanjar.weixin.mp.bean.result.WxMpMaterialFileBatchGetResult; -import me.chanjar.weixin.mp.bean.result.WxMpMaterialNewsBatchGetResult; -import me.chanjar.weixin.mp.bean.result.WxMpMaterialUploadResult; -import me.chanjar.weixin.mp.bean.result.WxMpMaterialVideoInfoResult; +import me.chanjar.weixin.mp.bean.result.*; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Guice; +import org.testng.annotations.Test; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.*; + +import static org.junit.Assert.*; /** * 素材管理相关接口的测试 @@ -48,7 +34,7 @@ public class WxMpMaterialServiceImplTest { @Inject protected WxMpServiceImpl wxService; - private Map> media_ids = new LinkedHashMap<>(); + private Map> mediaIds = new LinkedHashMap<>(); // 缩略图的id,测试上传图文使用 private String thumbMediaId = ""; // 单图文消息media_id @@ -59,7 +45,7 @@ public class WxMpMaterialServiceImplTest { private WxMpMaterialCountResult wxMaterialCountResultBeforeTest; @DataProvider - public Object[][] uploadMedia() { + public Object[][] mediaFiles() { return new Object[][] { new Object[] { WxConsts.MEDIA_IMAGE, WxConsts.FILE_JPG, "mm.jpeg" }, new Object[] { WxConsts.MEDIA_VOICE, WxConsts.FILE_MP3, "mm.mp3" }, @@ -68,7 +54,7 @@ public class WxMpMaterialServiceImplTest { }; } - @Test(dataProvider = "uploadMedia") + @Test(dataProvider = "mediaFiles") public void testUploadMaterial(String mediaType, String fileType, String fileName) throws WxErrorException, IOException { if (this.wxMaterialCountResultBeforeTest == null) { this.wxMaterialCountResultBeforeTest = this.wxService.getMaterialService() @@ -104,7 +90,7 @@ public class WxMpMaterialServiceImplTest { materialInfo.put("media_id", res.getMediaId()); materialInfo.put("length", tempFile.length()); materialInfo.put("filename", tempFile.getName()); - this.media_ids.put(res.getMediaId(), materialInfo); + this.mediaIds.put(res.getMediaId(), materialInfo); System.out.println(res); } @@ -172,18 +158,18 @@ public class WxMpMaterialServiceImplTest { } @Test(dependsOnMethods = {"testMaterialCount"}, dataProvider = "downloadMaterial") - public void testDownloadMaterial(String media_id) throws WxErrorException, IOException { - Map materialInfo = this.media_ids.get(media_id); + public void testDownloadMaterial(String mediaId) throws WxErrorException, IOException { + Map materialInfo = this.mediaIds.get(mediaId); assertNotNull(materialInfo); String filename = materialInfo.get("filename").toString(); if (filename.endsWith(".mp3") || filename.endsWith(".jpeg")) { try (InputStream inputStream = this.wxService.getMaterialService() - .materialImageOrVoiceDownload(media_id)) { + .materialImageOrVoiceDownload(mediaId)) { assertNotNull(inputStream); } } if (filename.endsWith("mp4")) { - WxMpMaterialVideoInfoResult wxMaterialVideoInfoResult = this.wxService.getMaterialService().materialVideoInfo(media_id); + WxMpMaterialVideoInfoResult wxMaterialVideoInfoResult = this.wxService.getMaterialService().materialVideoInfo(mediaId); assertNotNull(wxMaterialVideoInfoResult); assertNotNull(wxMaterialVideoInfoResult.getDownUrl()); } @@ -260,9 +246,9 @@ public class WxMpMaterialServiceImplTest { @DataProvider public Object[][] downloadMaterial() { - Object[][] params = new Object[this.media_ids.size()][]; + Object[][] params = new Object[this.mediaIds.size()][]; int index = 0; - for (String mediaId : this.media_ids.keySet()) { + for (String mediaId : this.mediaIds.keySet()) { params[index] = new Object[]{mediaId}; index++; } @@ -272,7 +258,7 @@ public class WxMpMaterialServiceImplTest { @DataProvider public Iterator allTestMaterial() { List params = new ArrayList<>(); - for (String mediaId : this.media_ids.keySet()) { + for (String mediaId : this.mediaIds.keySet()) { params.add(new Object[]{mediaId}); } params.add(new Object[]{this.singleNewsMediaId}); @@ -281,8 +267,8 @@ public class WxMpMaterialServiceImplTest { } // 以下为media接口的测试 - private List mediaIds = new ArrayList<>(); - @Test(dataProvider="uploadMedia") + private List mediaIdsToDownload = new ArrayList<>(); + @Test(dataProvider="mediaFiles") public void testUploadMedia(String mediaType, String fileType, String fileName) throws WxErrorException, IOException { try(InputStream inputStream = ClassLoader.getSystemResourceAsStream(fileName)){ WxMediaUploadResult res = this.wxService.getMaterialService().mediaUpload(mediaType, fileType, inputStream); @@ -290,31 +276,32 @@ public class WxMpMaterialServiceImplTest { assertNotNull(res.getCreatedAt()); assertTrue(res.getMediaId() != null || res.getThumbMediaId() != null); - if (res.getMediaId() != null) { - this.mediaIds.add(res.getMediaId()); + if (res.getMediaId() != null && !mediaType.equals(WxConsts.MEDIA_VIDEO)) { + //video 不支持下载,所以不加入 + this.mediaIdsToDownload.add(res.getMediaId()); } if (res.getThumbMediaId() != null) { - this.mediaIds.add(res.getThumbMediaId()); + this.mediaIdsToDownload.add(res.getThumbMediaId()); } System.out.println(res); } } - @Test(dependsOnMethods = { "testUploadMedia" }, dataProvider="downloadMedia") - public void testDownloadMedia(String media_id) throws WxErrorException { - File file = this.wxService.getMaterialService().mediaDownload(media_id); - assertNotNull(file); - System.out.println(file.getAbsolutePath()); - } - @DataProvider public Object[][] downloadMedia() { - Object[][] params = new Object[this.mediaIds.size()][]; - for (int i = 0; i < this.mediaIds.size(); i++) { - params[i] = new Object[] { this.mediaIds.get(i) }; + Object[][] params = new Object[this.mediaIdsToDownload.size()][]; + for (int i = 0; i < this.mediaIdsToDownload.size(); i++) { + params[i] = new Object[] { this.mediaIdsToDownload.get(i) }; } return params; } + + @Test(dependsOnMethods = { "testUploadMedia" }, dataProvider="downloadMedia") + public void testDownloadMedia(String mediaId) throws WxErrorException { + File file = this.wxService.getMaterialService().mediaDownload(mediaId); + assertNotNull(file); + System.out.println(file.getAbsolutePath()); + } } From 2907d321ecc1c160a3df7d077341278bfd2f1c1c Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 22 Sep 2016 16:57:38 +0800 Subject: [PATCH 15/51] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=BF=E9=97=AE=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/impl/WxMpServiceImpl.java | 42 ++++--------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java index f1c8388e..3e5043fa 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java @@ -12,38 +12,10 @@ import me.chanjar.weixin.common.session.StandardSessionManager; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.common.util.RandomUtils; import me.chanjar.weixin.common.util.crypto.SHA1; -import me.chanjar.weixin.common.util.http.ApacheHttpClientBuilder; -import me.chanjar.weixin.common.util.http.DefaultApacheHttpClientBuilder; -import me.chanjar.weixin.common.util.http.RequestExecutor; -import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor; -import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor; -import me.chanjar.weixin.common.util.http.URIUtil; -import me.chanjar.weixin.mp.api.WxMpCardService; -import me.chanjar.weixin.mp.api.WxMpConfigStorage; -import me.chanjar.weixin.mp.api.WxMpDataCubeService; -import me.chanjar.weixin.mp.api.WxMpGroupService; -import me.chanjar.weixin.mp.api.WxMpKefuService; -import me.chanjar.weixin.mp.api.WxMpMaterialService; -import me.chanjar.weixin.mp.api.WxMpMenuService; -import me.chanjar.weixin.mp.api.WxMpPayService; -import me.chanjar.weixin.mp.api.WxMpQrcodeService; -import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.api.WxMpUserBlacklistService; -import me.chanjar.weixin.mp.api.WxMpUserService; -import me.chanjar.weixin.mp.api.WxMpUserTagService; -import me.chanjar.weixin.mp.bean.WxMpIndustry; -import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage; -import me.chanjar.weixin.mp.bean.WxMpMassNews; -import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage; -import me.chanjar.weixin.mp.bean.WxMpMassPreviewMessage; -import me.chanjar.weixin.mp.bean.WxMpMassVideo; -import me.chanjar.weixin.mp.bean.WxMpSemanticQuery; -import me.chanjar.weixin.mp.bean.WxMpTemplateMessage; -import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult; -import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult; -import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; -import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult; -import me.chanjar.weixin.mp.bean.result.WxMpUser; +import me.chanjar.weixin.common.util.http.*; +import me.chanjar.weixin.mp.api.*; +import me.chanjar.weixin.mp.bean.*; +import me.chanjar.weixin.mp.bean.result.*; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -421,7 +393,9 @@ public class WxMpServiceImpl implements WxMpService { int retryTimes = 0; do { try { - return executeInternal(executor, uri, data); + T result = executeInternal(executor, uri, data); + this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",uri, data, result); + return result; } catch (WxErrorException e) { WxError error = e.getError(); /** @@ -465,7 +439,7 @@ public class WxMpServiceImpl implements WxMpService { if (error.getErrorCode() == 42001 || error.getErrorCode() == 40001) { // 强制设置wxMpConfigStorage它的access token过期了,这样在下一次请求里就会刷新access token this.configStorage.expireAccessToken(); - return execute(executor, uri, data); + return this.execute(executor, uri, data); } if (error.getErrorCode() != 0) { throw new WxErrorException(error); From 26af3c52cf72965f5c34a5a07236d5fe03ec90e3 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Thu, 22 Sep 2016 17:00:10 +0800 Subject: [PATCH 16/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=A4=9A=E5=AA=92=E4=BD=93=E6=96=87=E4=BB=B6=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9Ctoken=E6=AD=A3=E5=A5=BD=E6=97=A0=E6=95=88?= =?UTF-8?q?=E6=97=B6=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?= =?UTF-8?q?token=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/MediaDownloadRequestExecutor.java | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java index 87981142..c81658e2 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/MediaDownloadRequestExecutor.java @@ -1,11 +1,9 @@ package me.chanjar.weixin.common.util.http; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - +import me.chanjar.weixin.common.bean.result.WxError; +import me.chanjar.weixin.common.exception.WxErrorException; +import me.chanjar.weixin.common.util.StringUtils; +import me.chanjar.weixin.common.util.fs.FileUtils; import org.apache.http.Header; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -14,14 +12,15 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.entity.ContentType; import org.apache.http.impl.client.CloseableHttpClient; -import me.chanjar.weixin.common.bean.result.WxError; -import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.util.StringUtils; -import me.chanjar.weixin.common.util.fs.FileUtils; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * 下载媒体文件请求执行器,请求的参数是String, 返回的结果是File - * + * 视频文件不支持下载 * @author Daniel Qian */ public class MediaDownloadRequestExecutor implements RequestExecutor { @@ -29,15 +28,12 @@ public class MediaDownloadRequestExecutor implements RequestExecutor 0) { - // 下载媒体文件出错 - if (ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) { + if (contentTypeHeader[0].getValue().startsWith(ContentType.APPLICATION_JSON.getMimeType())) { + // application/json; encoding=utf-8 下载媒体文件出错 String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response); throw new WxErrorException(WxError.fromJson(responseContent)); } } - // 视频文件不支持下载 + String fileName = getFileName(response); if (StringUtils.isBlank(fileName)) { return null; } - String[] name_ext = fileName.split("\\."); - File localFile = FileUtils.createTmpFile(inputStream, name_ext[0], name_ext[1], this.tmpDirFile); - return localFile; + + String[] nameAndExt = fileName.split("\\."); + return FileUtils.createTmpFile(inputStream, nameAndExt[0], nameAndExt[1], this.tmpDirFile); } finally { httpGet.releaseConnection(); @@ -80,13 +76,18 @@ public class MediaDownloadRequestExecutor implements RequestExecutor Date: Thu, 22 Sep 2016 20:08:13 +0800 Subject: [PATCH 17/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=88=E6=80=80=E7=96=91=E6=98=AF=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=AE=98=E6=96=B9=E5=81=B7=E5=81=B7=E6=94=B9=E4=BA=86=E7=9A=84?= =?UTF-8?q?=EF=BC=9F=EF=BC=9F=EF=BC=81=EF=BC=81=EF=BC=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/api/impl/WxMpKefuServiceImpl.java | 56 ++++--------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java index b65fdeaa..99428348 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImpl.java @@ -1,13 +1,6 @@ package me.chanjar.weixin.mp.api.impl; -import java.io.File; -import java.util.Date; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.gson.JsonObject; - import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.bean.result.WxMediaUploadResult; import me.chanjar.weixin.common.exception.WxErrorException; @@ -17,15 +10,15 @@ import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.WxMpCustomMessage; import me.chanjar.weixin.mp.bean.kefu.request.WxMpKfAccountRequest; import me.chanjar.weixin.mp.bean.kefu.request.WxMpKfSessionRequest; -import me.chanjar.weixin.mp.bean.kefu.result.WxMpKfList; -import me.chanjar.weixin.mp.bean.kefu.result.WxMpKfMsgList; -import me.chanjar.weixin.mp.bean.kefu.result.WxMpKfOnlineList; -import me.chanjar.weixin.mp.bean.kefu.result.WxMpKfSessionGetResult; -import me.chanjar.weixin.mp.bean.kefu.result.WxMpKfSessionList; -import me.chanjar.weixin.mp.bean.kefu.result.WxMpKfSessionWaitCaseList; +import me.chanjar.weixin.mp.bean.kefu.result.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.Date; /** - * + * * @author Binary Wang * */ @@ -33,6 +26,7 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { protected final Logger log = LoggerFactory .getLogger(WxMpKefuServiceImpl.class); private static final String API_URL_PREFIX = "https://api.weixin.qq.com/customservice"; + private static final String API_URL_PREFIX_WITH_CGI_BIN = "https://api.weixin.qq.com/cgi-bin/customservice"; private WxMpService wxMpService; public WxMpKefuServiceImpl(WxMpService wxMpService) { @@ -44,26 +38,20 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { throws WxErrorException { String url = "https://api.weixin.qq.com/cgi-bin/message/custom/send"; String responseContent = this.wxMpService.post(url, message.toJson()); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, message.toJson(), - responseContent); return true; } @Override public WxMpKfList kfList() throws WxErrorException { - String url = API_URL_PREFIX + "/getkflist"; + String url = API_URL_PREFIX_WITH_CGI_BIN + "/getkflist"; String responseContent = this.wxMpService.get(url, null); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, null, - responseContent); return WxMpKfList.fromJson(responseContent); } @Override public WxMpKfOnlineList kfOnlineList() throws WxErrorException { - String url = API_URL_PREFIX + "/getonlinekflist"; + String url = API_URL_PREFIX_WITH_CGI_BIN + "/getonlinekflist"; String responseContent = this.wxMpService.get(url, null); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, null, - responseContent); return WxMpKfOnlineList.fromJson(responseContent); } @@ -72,8 +60,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { throws WxErrorException { String url = API_URL_PREFIX + "/kfaccount/add"; String responseContent = this.wxMpService.post(url, request.toJson()); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, request.toJson(), - responseContent); return true; } @@ -82,8 +68,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { throws WxErrorException { String url = API_URL_PREFIX + "/kfaccount/update"; String responseContent = this.wxMpService.post(url, request.toJson()); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, request.toJson(), - responseContent); return true; } @@ -91,8 +75,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { public boolean kfAccountInviteWorker(WxMpKfAccountRequest request) throws WxErrorException { String url = API_URL_PREFIX + "/kfaccount/inviteworker"; String responseContent = this.wxMpService.post(url, request.toJson()); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, request.toJson(), - responseContent); return true; } @@ -102,9 +84,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { String url = API_URL_PREFIX + "/kfaccount/uploadheadimg?kf_account=" + kfAccount; WxMediaUploadResult responseContent = this.wxMpService .execute(new MediaUploadRequestExecutor(), url, imgFile); - this.log.debug("\nurl:{}\nparams:{}&file:{}\nresponse:{}", url, kfAccount, - imgFile.getAbsolutePath(), - responseContent); return true; } @@ -112,8 +91,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { public boolean kfAccountDel(String kfAccount) throws WxErrorException { String url = API_URL_PREFIX + "/kfaccount/del?kf_account=" + kfAccount; String responseContent = this.wxMpService.get(url, null); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, null, - responseContent); return true; } @@ -123,8 +100,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { WxMpKfSessionRequest request = new WxMpKfSessionRequest(kfAccount, openid); String url = API_URL_PREFIX + "/kfsession/create"; String responseContent = this.wxMpService.post(url, request.toJson()); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, request.toJson(), - responseContent); return true; } @@ -134,8 +109,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { WxMpKfSessionRequest request = new WxMpKfSessionRequest(kfAccount, openid); String url = API_URL_PREFIX + "/kfsession/close"; String responseContent = this.wxMpService.post(url, request.toJson()); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, request.toJson(), - responseContent); return true; } @@ -144,8 +117,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { throws WxErrorException { String url = API_URL_PREFIX + "/kfsession/getsession?openid=" + openid; String responseContent = this.wxMpService.get(url, null); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, null, - responseContent); return WxMpKfSessionGetResult.fromJson(responseContent); } @@ -154,8 +125,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { throws WxErrorException { String url = API_URL_PREFIX + "/kfsession/getsessionlist?kf_account=" + kfAccount; String responseContent = this.wxMpService.get(url, null); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, null, - responseContent); return WxMpKfSessionList.fromJson(responseContent); } @@ -164,8 +133,6 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { throws WxErrorException { String url = API_URL_PREFIX + "/kfsession/getwaitcase"; String responseContent = this.wxMpService.get(url, null); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, null, - responseContent); return WxMpKfSessionWaitCaseList.fromJson(responseContent); } @@ -188,8 +155,7 @@ public class WxMpKefuServiceImpl implements WxMpKefuService { param.addProperty("number", number); //number 每次获取条数,最多10000条 String responseContent = this.wxMpService.post(url, param.toString()); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}", url, param.toString(), - responseContent); + return WxMpKfMsgList.fromJson(responseContent); } From aeea340274b4c09a122991392077e530fd1cc538 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Fri, 23 Sep 2016 14:07:17 +0800 Subject: [PATCH 18/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java index 3e5043fa..a923f485 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java @@ -394,7 +394,7 @@ public class WxMpServiceImpl implements WxMpService { do { try { T result = executeInternal(executor, uri, data); - this.log.debug("\nurl:{}\nparams:{}\nresponse:{}",uri, data, result); + this.log.debug("\n[URL]: {}\n[PARAMS]: {}\n[RESPONSE]: {}",uri, data, result); return result; } catch (WxErrorException e) { WxError error = e.getError(); From fe2a6a65e3956e0dfbe4186fe642c34b7234160d Mon Sep 17 00:00:00 2001 From: YuJian Date: Fri, 23 Sep 2016 15:55:32 +0800 Subject: [PATCH 19/51] =?UTF-8?q?=E5=88=A0=E5=8E=BB@return=EF=BC=8C?= =?UTF-8?q?=E4=B8=8E=E5=B7=B2=E6=9C=89=E4=BB=A3=E7=A0=81=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java | 1 - 1 file changed, 1 deletion(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java index f1ed0fa7..0b126ab5 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCustomMessage.java @@ -195,7 +195,6 @@ public class WxMpCustomMessage implements Serializable { /** * 获得卡券消息builder - * @return */ public static WxCardBuilder WXCARD() { return new WxCardBuilder(); From 3ba6dbb19a5f7f3c81e8d963e4793e1d5994f3aa Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 24 Sep 2016 22:01:45 +0800 Subject: [PATCH 20/51] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AF=B9=E8=B1=A1=E5=8C=85=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpPayService.java | 14 +++++++++----- .../weixin/mp/api/impl/WxMpPayServiceImpl.java | 4 ++++ .../mp/bean/{result => pay}/WxMpPayCallback.java | 2 +- .../bean/{result => pay}/WxMpPayRefundResult.java | 2 +- .../mp/bean/{result => pay}/WxMpPayResult.java | 2 +- .../mp/bean/{result => pay}/WxRedpackResult.java | 2 +- .../weixin/mp/bean/WxRedpackResultTest.java | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/{result => pay}/WxMpPayCallback.java (99%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/{result => pay}/WxMpPayRefundResult.java (99%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/{result => pay}/WxMpPayResult.java (99%) rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/{result => pay}/WxRedpackResult.java (98%) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java index 0db67cb7..2e748d24 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java @@ -1,10 +1,14 @@ package me.chanjar.weixin.mp.api; -import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.mp.bean.result.*; - import java.util.Map; +import me.chanjar.weixin.common.exception.WxErrorException; +import me.chanjar.weixin.mp.bean.pay.WxMpPayCallback; +import me.chanjar.weixin.mp.bean.pay.WxMpPayRefundResult; +import me.chanjar.weixin.mp.bean.pay.WxMpPayResult; +import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; +import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; + /** * 微信支付相关接口 * Created by Binary Wang on 2016/7/28. @@ -116,7 +120,7 @@ public interface WxMpPayService { /** * 发送微信红包给个人用户 - *

+ *

    * 需要传入的必填参数如下:
    * mch_billno//商户订单号
    * send_name//商户名称
@@ -128,8 +132,8 @@ public interface WxMpPayService {
    * act_name//活动名称
    * remark //备注
    * 文档详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_5
-   * 

* 使用现金红包功能需要在xml配置文件中额外设置: + *

* 微信商户平台ID * 商户平台设置的API密钥 * diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index ce7f9517..9ff3c4ab 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -7,6 +7,10 @@ import me.chanjar.weixin.common.util.crypto.WxCryptUtil; import me.chanjar.weixin.common.util.http.Utf8ResponseHandler; import me.chanjar.weixin.common.util.xml.XStreamInitializer; import me.chanjar.weixin.mp.api.WxMpPayService; +import me.chanjar.weixin.mp.bean.pay.WxMpPayCallback; +import me.chanjar.weixin.mp.bean.pay.WxMpPayRefundResult; +import me.chanjar.weixin.mp.bean.pay.WxMpPayResult; +import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; import me.chanjar.weixin.mp.bean.result.*; import org.apache.http.Consts; import org.apache.http.HttpHost; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayCallback.java similarity index 99% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayCallback.java index 6e96f5e2..e32e721e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayCallback.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayCallback.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.result; +package me.chanjar.weixin.mp.bean.pay; import java.io.Serializable; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayRefundResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundResult.java similarity index 99% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayRefundResult.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundResult.java index 4d51e8f4..3f917fe0 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayRefundResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayRefundResult.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.result; +package me.chanjar.weixin.mp.bean.pay; import java.io.Serializable; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayResult.java similarity index 99% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayResult.java index 98bba87f..2978ba17 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPayResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPayResult.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.result; +package me.chanjar.weixin.mp.bean.pay; import java.io.Serializable; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxRedpackResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java similarity index 98% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxRedpackResult.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java index be328668..1792be08 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxRedpackResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.mp.bean.result; +package me.chanjar.weixin.mp.bean.pay; import java.io.Serializable; diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxRedpackResultTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxRedpackResultTest.java index 77e7c172..5a5275d4 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxRedpackResultTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/WxRedpackResultTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import com.thoughtworks.xstream.XStream; import me.chanjar.weixin.common.util.xml.XStreamInitializer; -import me.chanjar.weixin.mp.bean.result.WxRedpackResult; +import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; public class WxRedpackResultTest { From 58d10b7deb5ee1156fb57c2da5c1930d762df081 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 24 Sep 2016 22:38:30 +0800 Subject: [PATCH 21/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86javad?= =?UTF-8?q?oc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/me/chanjar/weixin/mp/api/WxMpPayService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java index 2e748d24..4de8332b 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java @@ -119,7 +119,7 @@ public interface WxMpPayService { boolean checkJSSDKCallbackDataSignature(Map kvm, String signature); /** - * 发送微信红包给个人用户 + * 发送普通微信红包给个人用户 *
    * 需要传入的必填参数如下:
    * mch_billno//商户订单号
@@ -131,7 +131,7 @@ public interface WxMpPayService {
    * client_ip//服务器Ip地址
    * act_name//活动名称
    * remark //备注
-   * 文档详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_5
+   * 文档详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_4&index=3
    * 使用现金红包功能需要在xml配置文件中额外设置:
    * 
* 微信商户平台ID From 748a81b577ff582e2c71a37f271b074b168e1bae Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 24 Sep 2016 22:38:45 +0800 Subject: [PATCH 22/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9toString=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/bean/pay/WxRedpackResult.java | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java index 1792be08..fa9ce561 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java @@ -2,6 +2,9 @@ package me.chanjar.weixin.mp.bean.pay; import java.io.Serializable; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import com.thoughtworks.xstream.annotations.XStreamAlias; /** @@ -13,9 +16,6 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; @XStreamAlias("xml") public class WxRedpackResult implements Serializable { - /** - * - */ private static final long serialVersionUID = -4837415036337132073L; @XStreamAlias("return_code") @@ -100,19 +100,6 @@ public class WxRedpackResult implements Serializable { @Override public String toString() { - return "WxRedpackResult{" + - "returnCode=" + this.returnCode + - ", returnMsg=" + this.returnMsg + - ", sign=" + this.sign + - ", errCode=" + this.errCode + - ", errCodeDes=" + this.errCodeDes + - ", mchBillno=" + this.mchBillno + - ", mchId=" + this.mchId + - ", wxappid=" + this.wxappid + - ", reOpenid=" + this.reOpenid + - ", totalAmount=" + this.totalAmount + - ", sendTime=" + this.sendTime + - ", sendListid=" + this.sendListid + - '}'; + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); } } From d3edb449807e6284f7e8a94dc6f10e68304d96bb Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 24 Sep 2016 22:39:30 +0800 Subject: [PATCH 23/51] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=A5=BD=E5=8F=91=E9=80=81=E7=BA=A2=E5=8C=85=E7=9A=84=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E5=AF=B9=E8=B1=A1=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/bean/pay/WxSendRedpackRequest.java | 159 ++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java new file mode 100644 index 00000000..95ee2bad --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java @@ -0,0 +1,159 @@ +package me.chanjar.weixin.mp.bean.pay; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +/** + * 发送红包请求参数对象 + * Created by Binary Wang on 2016/9/24. + * @author binarywang (https://github.com/binarywang) + */ +@XStreamAlias("xml") +public class WxSendRedpackRequest { + /** + * mch_billno + * 商户订单号(每个订单号必须唯一) 组成:mch_id+yyyymmdd+10位一天内不能重复的数字。 接口根据商户订单号支持重入,如出现超时可再调用。 + */ + @XStreamAlias("mch_billno") + private String mchBillno; + + /** + * send_name + * 商户名称 + * 红包发送者名称 + */ + @XStreamAlias("send_name") + private String sendName; + + /** + * re_openid + * 接受红包的用户 用户在wxappid下的openid + */ + @XStreamAlias("re_openid") + private String reOpenid; + + /** + * total_amount + * 红包总额 + */ + @XStreamAlias("total_amount") + private Integer totalAmount; + + /** + * total_num + * 红包发放总人数 + */ + @XStreamAlias("total_num") + private Integer totalNum; + + /** + * amt_type + * 红包金额设置方式 + * ALL_RAND—全部随机,商户指定总金额和红包发放总人数,由微信支付随机计算出各红包金额 + * 裂变红包必填 + */ + @XStreamAlias("amt_type") + private String amtType; + + /** + * wishing + * 红包祝福语 + */ + @XStreamAlias("wishing") + private String wishing; + + /** + * client_ip + * 服务器Ip地址 + * 调用接口的机器Ip地址 + */ + @XStreamAlias("client_ip") + private String clientIp; + + /** + * act_name + * 活动名称 + */ + @XStreamAlias("act_name") + private String actName; + + /** + * remark + * 备注 + */ + @XStreamAlias("remark") + private String remark; + + /** + * wxappid + * 微信分配的公众账号ID(企业号corpid即为此appId)。接口传入的所有appid应该为公众号的appid(在mp.weixin.qq.com申请的),不能为APP的appid(在open.weixin.qq.com申请的) + */ + @XStreamAlias("wxappid") + private String wxAppid; + + /** + * mch_id + * 微信支付分配的商户号 + */ + @XStreamAlias("mch_id") + private String mchId; + + /** + * nonce_str + * 随机字符串,不长于32位 + */ + @XStreamAlias("nonce_str") + private String nonceStr; + + /** + * sign + * 详见签名生成算法 + */ + @XStreamAlias("sign") + private String sign; + + /** + *
+   * scene_id
+   * 场景id
+   * PRODUCT_1:商品促销
+   * PRODUCT_2:抽奖
+   * PRODUCT_3:虚拟物品兑奖 
+   * PRODUCT_4:企业内部福利
+   * PRODUCT_5:渠道分润
+   * PRODUCT_6:保险回馈
+   * PRODUCT_7:彩票派奖
+   * PRODUCT_8:税务刮奖
+   * 非必填字段
+   * 
+ */ + @XStreamAlias("scene_id") + private String sceneId; + + /** + *
+   * risk_info
+   * 活动信息
+   * posttime:用户操作的时间戳
+   * mobile:业务系统账号的手机号,国家代码-手机号。不需要+号
+   * deviceid :mac 地址或者设备唯一标识 
+   * clientversion :用户操作的客户端版本
+   * 把值为非空的信息用key=value进行拼接,再进行urlencode
+   * urlencode(posttime=xx&mobile=xx&deviceid=xx)
+   *  非必填字段
+   * 
+ */ + @XStreamAlias("risk_info") + private String riskInfo; + + /** + *
+   * consume_mch_id
+   * 资金授权商户号
+   * 资金授权商户号
+   * 服务商替特约商户发放时使用  
+   * 非必填字段
+   * 
+ */ + @XStreamAlias("consume_mch_id") + private String consumeMchId; +} From 06c73ca6abdd0e06c8b4f9b2c3f8debd01b540bc Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 24 Sep 2016 23:45:32 +0800 Subject: [PATCH 24/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=BA=A2=E5=8C=85=E7=9A=84=E9=87=8D=E8=BD=BD=E6=96=B9=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E5=87=86=E5=A4=87=E6=9B=BF=E4=BB=A3=E7=8E=B0=E6=9C=89?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/util/crypto/WxCryptUtil.java | 3 +- weixin-java-mp/pom.xml | 9 +- .../chanjar/weixin/mp/api/WxMpPayService.java | 13 ++ .../mp/api/impl/WxMpPayServiceImpl.java | 98 ++++++++++--- .../mp/bean/pay/WxSendRedpackRequest.java | 137 ++++++++++++++++++ 5 files changed, 234 insertions(+), 26 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java index eb5df7af..19424e0b 100755 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java @@ -85,8 +85,7 @@ public class WxCryptUtil { * @param signKey 加密Key(即 商户Key) * @return 签名字符串 */ - public static String createSign(Map packageParams, - String signKey) { + public static String createSignForPay(Map packageParams, String signKey) { SortedMap sortedMap = new TreeMap<>(); sortedMap.putAll(packageParams); diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 0cfb1048..0e534d0b 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 com.github.binarywang @@ -54,6 +54,11 @@ 2.9.4 test + + org.jooq + joor + 0.9.6 + diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java index 4de8332b..663444a7 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java @@ -7,6 +7,7 @@ import me.chanjar.weixin.mp.bean.pay.WxMpPayCallback; import me.chanjar.weixin.mp.bean.pay.WxMpPayRefundResult; import me.chanjar.weixin.mp.bean.pay.WxMpPayResult; import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; +import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest; import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; /** @@ -138,5 +139,17 @@ public interface WxMpPayService { * 商户平台设置的API密钥 * */ + @Deprecated WxRedpackResult sendRedpack(Map parameters) throws WxErrorException; + + /** + * 发送微信红包给个人用户 + *
 
+   * 文档详见:
+   * 发送普通红包 https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_4&index=3
+   * 发送裂变红包 https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_5&index=4
+   * 
+ */ + WxRedpackResult sendRedpack(WxSendRedpackRequest request) throws WxErrorException; + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index 9ff3c4ab..13ab0781 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -1,6 +1,28 @@ package me.chanjar.weixin.mp.api.impl; +import java.io.IOException; +import java.lang.reflect.Field; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.SortedMap; +import java.util.TreeMap; + +import org.apache.http.Consts; +import org.apache.http.HttpHost; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.joor.Reflect; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.helpers.MessageFormatter; + +import com.beust.jcommander.internal.Maps; import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.annotations.XStreamAlias; + import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.crypto.WxCryptUtil; @@ -11,22 +33,8 @@ import me.chanjar.weixin.mp.bean.pay.WxMpPayCallback; import me.chanjar.weixin.mp.bean.pay.WxMpPayRefundResult; import me.chanjar.weixin.mp.bean.pay.WxMpPayResult; import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; -import me.chanjar.weixin.mp.bean.result.*; -import org.apache.http.Consts; -import org.apache.http.HttpHost; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.helpers.MessageFormatter; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; +import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest; +import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; /** * Created by Binary Wang on 2016/7/28. @@ -77,7 +85,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { packageParams.put("nonce_str", System.currentTimeMillis() + ""); checkParameters(packageParams); - String sign = WxCryptUtil.createSign(packageParams, + String sign = WxCryptUtil.createSignForPay(packageParams, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); packageParams.put("sign", sign); @@ -211,7 +219,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { payInfo.put("codeUrl", wxMpPrepayIdResult.getCode_url()); } - String finalSign = WxCryptUtil.createSign(payInfo, + String finalSign = WxCryptUtil.createSignForPay(payInfo, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); payInfo.put("paySign", finalSign); return payInfo; @@ -238,7 +246,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { } packageParams.put("nonce_str", nonce_str); - packageParams.put("sign", WxCryptUtil.createSign(packageParams, + packageParams.put("sign", WxCryptUtil.createSignForPay(packageParams, this.wxMpService.getWxMpConfigStorage().getPartnerKey())); StringBuilder request = new StringBuilder(""); @@ -295,7 +303,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { refundParams.put("nonce_str", System.currentTimeMillis() + ""); refundParams.put("op_user_id", this.wxMpService.getWxMpConfigStorage().getPartnerId()); - String sign = WxCryptUtil.createSign(refundParams, + String sign = WxCryptUtil.createSignForPay(refundParams, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); refundParams.put("sign", sign); @@ -354,11 +362,12 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override public boolean checkJSSDKCallbackDataSignature(Map kvm, String signature) { - return signature.equals(WxCryptUtil.createSign(kvm, + return signature.equals(WxCryptUtil.createSignForPay(kvm, this.wxMpService.getWxMpConfigStorage().getPartnerKey())); } @Override + @Deprecated public WxRedpackResult sendRedpack(Map parameters) throws WxErrorException { SortedMap packageParams = new TreeMap<>(parameters); @@ -368,7 +377,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { this.wxMpService.getWxMpConfigStorage().getPartnerId()); packageParams.put("nonce_str", System.currentTimeMillis() + ""); - String sign = WxCryptUtil.createSign(packageParams, + String sign = WxCryptUtil.createSignForPay(packageParams, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); packageParams.put("sign", sign); @@ -409,4 +418,49 @@ public class WxMpPayServiceImpl implements WxMpPayService { } } + @Override + public WxRedpackResult sendRedpack(WxSendRedpackRequest request) throws WxErrorException { + XStream xstream = XStreamInitializer.getInstance(); + xstream.processAnnotations(WxRedpackResult.class); + + request.setWxAppid(this.wxMpService.getWxMpConfigStorage().getAppId()); + request.setMchId(this.wxMpService.getWxMpConfigStorage().getPartnerId()); + request.setNonceStr(System.currentTimeMillis() + ""); + + String sign = WxCryptUtil.createSignForPay(xmlBean2Map(request), + this.wxMpService.getWxMpConfigStorage().getPartnerKey()); + request.setSign(sign); + + String url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack"; + if (request.getAmtType() != null) { + //裂变红包 + url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendgroupredpack"; + } + + String responseContent = this.wxMpService.post(url, xstream.toXML(request)); + return (WxRedpackResult) xstream.fromXML(responseContent); + } + + private Map xmlBean2Map(Object bean) { + Map result = Maps.newHashMap(); + for (Entry entry : Reflect.on(bean).fields().entrySet()) { + Reflect reflect = entry.getValue(); + if (reflect.get() == null) { + continue; + } + + try { + Field field = WxSendRedpackRequest.class.getDeclaredField(entry.getKey()); + if (field.isAnnotationPresent(XStreamAlias.class)) { + result.put(reflect.get().toString(), field.getAnnotation(XStreamAlias.class).value()); + } + } catch (NoSuchFieldException | SecurityException e) { + e.printStackTrace(); + } + + } + + return result; + } + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java index 95ee2bad..ccf84ae9 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java @@ -156,4 +156,141 @@ public class WxSendRedpackRequest { */ @XStreamAlias("consume_mch_id") private String consumeMchId; + + public String getMchBillno() { + return mchBillno; + } + + public void setMchBillno(String mchBillno) { + this.mchBillno = mchBillno; + } + + public String getSendName() { + return sendName; + } + + public void setSendName(String sendName) { + this.sendName = sendName; + } + + public String getReOpenid() { + return reOpenid; + } + + public void setReOpenid(String reOpenid) { + this.reOpenid = reOpenid; + } + + public Integer getTotalAmount() { + return totalAmount; + } + + public void setTotalAmount(Integer totalAmount) { + this.totalAmount = totalAmount; + } + + public Integer getTotalNum() { + return totalNum; + } + + public void setTotalNum(Integer totalNum) { + this.totalNum = totalNum; + } + + public String getAmtType() { + return amtType; + } + + public void setAmtType(String amtType) { + this.amtType = amtType; + } + + public String getWishing() { + return wishing; + } + + public void setWishing(String wishing) { + this.wishing = wishing; + } + + public String getClientIp() { + return clientIp; + } + + public void setClientIp(String clientIp) { + this.clientIp = clientIp; + } + + public String getActName() { + return actName; + } + + public void setActName(String actName) { + this.actName = actName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getWxAppid() { + return wxAppid; + } + + public void setWxAppid(String wxAppid) { + this.wxAppid = wxAppid; + } + + public String getMchId() { + return mchId; + } + + public void setMchId(String mchId) { + this.mchId = mchId; + } + + public String getNonceStr() { + return nonceStr; + } + + public void setNonceStr(String nonceStr) { + this.nonceStr = nonceStr; + } + + public String getSign() { + return sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getSceneId() { + return sceneId; + } + + public void setSceneId(String sceneId) { + this.sceneId = sceneId; + } + + public String getRiskInfo() { + return riskInfo; + } + + public void setRiskInfo(String riskInfo) { + this.riskInfo = riskInfo; + } + + public String getConsumeMchId() { + return consumeMchId; + } + + public void setConsumeMchId(String consumeMchId) { + this.consumeMchId = consumeMchId; + } + } From 7f830e2755b6a5bab348907b2510a1f87773122c Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 24 Sep 2016 23:47:50 +0800 Subject: [PATCH 25/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index 13ab0781..f331a143 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -421,6 +421,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override public WxRedpackResult sendRedpack(WxSendRedpackRequest request) throws WxErrorException { XStream xstream = XStreamInitializer.getInstance(); + xstream.processAnnotations(WxSendRedpackRequest.class); xstream.processAnnotations(WxRedpackResult.class); request.setWxAppid(this.wxMpService.getWxMpConfigStorage().getAppId()); From b13d3c9e6d4be16727214b35b3c746d60519884d Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 25 Sep 2016 00:28:58 +0800 Subject: [PATCH 26/51] =?UTF-8?q?=E4=B8=BA=E6=96=B0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=9A=84=E5=8F=91=E9=80=81=E7=BA=A2=E5=8C=85=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=EF=BC=8C=E4=BB=85=E6=B5=8B=E8=AF=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=A0=BC=E5=BC=8F=EF=BC=8C=E6=9C=AA=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/util/crypto/WxCryptUtil.java | 33 --------------- .../util/http/SimplePostRequestExecutor.java | 12 ++++-- .../common/util/xml/XStreamInitializer.java | 9 ++++- .../mp/api/impl/WxMpPayServiceImpl.java | 40 ++++++++++++++----- .../mp/api/impl/WxMpPayServiceImplTest.java | 23 ++++++++++- .../mp/bean/pay/WxSendRedpackRequestTest.java | 33 +++++++++++++++ 6 files changed, 102 insertions(+), 48 deletions(-) create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequestTest.java diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java index 19424e0b..fead486e 100755 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java @@ -19,14 +19,8 @@ package me.chanjar.weixin.common.util.crypto; import java.io.StringReader; import java.nio.charset.Charset; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; import java.util.Random; -import java.util.SortedMap; -import java.util.TreeMap; import javax.crypto.Cipher; import javax.crypto.spec.IvParameterSpec; @@ -36,7 +30,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.codec.digest.DigestUtils; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.InputSource; @@ -79,32 +72,6 @@ public class WxCryptUtil { this.aesKey = Base64.decodeBase64(encodingAesKey + "="); } - /** - * 微信公众号支付签名算法(详见:http://pay.weixin.qq.com/wiki/doc/api/index.php?chapter=4_3) - * @param packageParams 原始参数 - * @param signKey 加密Key(即 商户Key) - * @return 签名字符串 - */ - public static String createSignForPay(Map packageParams, String signKey) { - SortedMap sortedMap = new TreeMap<>(); - sortedMap.putAll(packageParams); - - List keys = new ArrayList<>(packageParams.keySet()); - Collections.sort(keys); - - StringBuffer toSign = new StringBuffer(); - for (String key : keys) { - String value = packageParams.get(key); - if (null != value && !"".equals(value) && !"sign".equals(key) - && !"key".equals(key)) { - toSign.append(key + "=" + value + "&"); - } - } - toSign.append("key=" + signKey); - String sign = DigestUtils.md5Hex(toSign.toString()).toUpperCase(); - return sign; - } - static String extractEncryptPart(String xml) { try { DocumentBuilder db = builderLocal.get(); diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java index ad67bd51..3a137849 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java @@ -1,7 +1,7 @@ package me.chanjar.weixin.common.util.http; -import me.chanjar.weixin.common.bean.result.WxError; -import me.chanjar.weixin.common.exception.WxErrorException; +import java.io.IOException; + import org.apache.http.Consts; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -10,7 +10,8 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; -import java.io.IOException; +import me.chanjar.weixin.common.bean.result.WxError; +import me.chanjar.weixin.common.exception.WxErrorException; /** * 简单的POST请求执行器,请求的参数是String, 返回的结果也是String @@ -34,6 +35,11 @@ public class SimplePostRequestExecutor implements RequestExecutor")) { + //xml格式输出直接返回 + return responseContent; + } + WxError error = WxError.fromJson(responseContent); if (error.getErrorCode() != 0) { throw new WxErrorException(error); diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java index d885327a..ba49528a 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java @@ -1,5 +1,7 @@ package me.chanjar.weixin.common.util.xml; +import java.io.Writer; + import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.core.util.QuickWriter; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; @@ -8,8 +10,6 @@ import com.thoughtworks.xstream.io.xml.XppDriver; import com.thoughtworks.xstream.security.NullPermission; import com.thoughtworks.xstream.security.PrimitiveTypePermission; -import java.io.Writer; - public class XStreamInitializer { public static XStream getInstance() { @@ -34,6 +34,11 @@ public class XStreamInitializer { } } + + @Override + public String encodeNode(String name) { + return name;//防止将_转换成__ + } }; } }); diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index f331a143..979f4a23 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Map.Entry; import java.util.SortedMap; import java.util.TreeMap; +import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.Consts; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; @@ -25,7 +26,6 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.util.crypto.WxCryptUtil; import me.chanjar.weixin.common.util.http.Utf8ResponseHandler; import me.chanjar.weixin.common.util.xml.XStreamInitializer; import me.chanjar.weixin.mp.api.WxMpPayService; @@ -85,7 +85,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { packageParams.put("nonce_str", System.currentTimeMillis() + ""); checkParameters(packageParams); - String sign = WxCryptUtil.createSignForPay(packageParams, + String sign = this.createSign(packageParams, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); packageParams.put("sign", sign); @@ -219,7 +219,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { payInfo.put("codeUrl", wxMpPrepayIdResult.getCode_url()); } - String finalSign = WxCryptUtil.createSignForPay(payInfo, + String finalSign = this.createSign(payInfo, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); payInfo.put("paySign", finalSign); return payInfo; @@ -246,7 +246,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { } packageParams.put("nonce_str", nonce_str); - packageParams.put("sign", WxCryptUtil.createSignForPay(packageParams, + packageParams.put("sign", this.createSign(packageParams, this.wxMpService.getWxMpConfigStorage().getPartnerKey())); StringBuilder request = new StringBuilder(""); @@ -303,7 +303,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { refundParams.put("nonce_str", System.currentTimeMillis() + ""); refundParams.put("op_user_id", this.wxMpService.getWxMpConfigStorage().getPartnerId()); - String sign = WxCryptUtil.createSignForPay(refundParams, + String sign = this.createSign(refundParams, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); refundParams.put("sign", sign); @@ -362,7 +362,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override public boolean checkJSSDKCallbackDataSignature(Map kvm, String signature) { - return signature.equals(WxCryptUtil.createSignForPay(kvm, + return signature.equals(this.createSign(kvm, this.wxMpService.getWxMpConfigStorage().getPartnerKey())); } @@ -377,7 +377,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { this.wxMpService.getWxMpConfigStorage().getPartnerId()); packageParams.put("nonce_str", System.currentTimeMillis() + ""); - String sign = WxCryptUtil.createSignForPay(packageParams, + String sign = this.createSign(packageParams, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); packageParams.put("sign", sign); @@ -428,7 +428,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { request.setMchId(this.wxMpService.getWxMpConfigStorage().getPartnerId()); request.setNonceStr(System.currentTimeMillis() + ""); - String sign = WxCryptUtil.createSignForPay(xmlBean2Map(request), + String sign = this.createSign(xmlBean2Map(request), this.wxMpService.getWxMpConfigStorage().getPartnerKey()); request.setSign(sign); @@ -453,7 +453,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { try { Field field = WxSendRedpackRequest.class.getDeclaredField(entry.getKey()); if (field.isAnnotationPresent(XStreamAlias.class)) { - result.put(reflect.get().toString(), field.getAnnotation(XStreamAlias.class).value()); + result.put(field.getAnnotation(XStreamAlias.class).value(), reflect.get().toString()); } } catch (NoSuchFieldException | SecurityException e) { e.printStackTrace(); @@ -464,4 +464,26 @@ public class WxMpPayServiceImpl implements WxMpPayService { return result; } + /** + * 微信公众号支付签名算法(详见:http://pay.weixin.qq.com/wiki/doc/api/index.php?chapter=4_3) + * @param packageParams 原始参数 + * @param signKey 加密Key(即 商户Key) + * @return 签名字符串 + */ + private String createSign(Map packageParams, String signKey) { + SortedMap sortedMap = new TreeMap<>(packageParams); + + StringBuffer toSign = new StringBuffer(); + for (String key : sortedMap.keySet()) { + String value = packageParams.get(key); + if (null != value && !"".equals(value) && !"sign".equals(key) && !"key".equals(key)) { + toSign.append(key + "=" + value + "&"); + } + } + + toSign.append("key=" + signKey); + + return DigestUtils.md5Hex(toSign.toString()).toUpperCase(); + } + } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java index 79a5a631..b17d1206 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java @@ -1,12 +1,26 @@ package me.chanjar.weixin.mp.api.impl; +import org.testng.annotations.Guice; import org.testng.annotations.Test; +import com.google.inject.Inject; + +import me.chanjar.weixin.mp.api.ApiTestModule; +import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; +import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest; + /** + * 测试支付相关接口 * Created by Binary Wang on 2016/7/28. * @author binarywang (https://github.com/binarywang) */ +@Test +@Guice(modules = ApiTestModule.class) public class WxMpPayServiceImplTest { + + @Inject + protected WxMpServiceImpl wxService; + @Test public void testGetPrepayId() throws Exception { @@ -54,7 +68,14 @@ public class WxMpPayServiceImplTest { @Test public void testSendRedpack() throws Exception { - + WxSendRedpackRequest request = new WxSendRedpackRequest(); + request.setActName("abc"); + request.setClientIp("aaa"); + request.setMchBillno("aaaa"); + request + .setReOpenid(((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid()); + WxRedpackResult redpackResult = this.wxService.getPayService().sendRedpack(request); + System.err.println(redpackResult); } } \ No newline at end of file diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequestTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequestTest.java new file mode 100644 index 00000000..feb50c5a --- /dev/null +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequestTest.java @@ -0,0 +1,33 @@ +package me.chanjar.weixin.mp.bean.pay; + +import java.lang.reflect.Field; +import java.util.Map.Entry; + +import org.joor.Reflect; +import org.testng.annotations.Test; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +@Test +public class WxSendRedpackRequestTest { + + public void test() throws NoSuchFieldException, SecurityException { + + WxSendRedpackRequest request = new WxSendRedpackRequest(); + request.setMchBillno("123"); + request.setActName("ab"); + for (Entry entry : Reflect.on(request).fields().entrySet()) { + Reflect reflect = entry.getValue(); + if (reflect.get() == null) { + continue; + } + + Field field = WxSendRedpackRequest.class.getDeclaredField(entry.getKey()); + if (field.isAnnotationPresent(XStreamAlias.class)) { + System.err.println(reflect.get() + " = " + field.getAnnotation(XStreamAlias.class).value()); + } + } + + } + +} From e70c5394658d53995cff4a3a27c21cd424684aa9 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 25 Sep 2016 00:35:19 +0800 Subject: [PATCH 27/51] =?UTF-8?q?=E5=AF=B9=E7=9B=B8=E5=BA=94=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=EF=BC=8C=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index 979f4a23..09c7f261 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -439,7 +439,13 @@ public class WxMpPayServiceImpl implements WxMpPayService { } String responseContent = this.wxMpService.post(url, xstream.toXML(request)); - return (WxRedpackResult) xstream.fromXML(responseContent); + WxRedpackResult redpackResult = (WxRedpackResult) xstream.fromXML(responseContent); + if("FAIL".equals(redpackResult.getResultCode())){ + throw new WxErrorException( + WxError.newBuilder().setErrorMsg(redpackResult.getErrCode() + ":" + redpackResult.getErrCodeDes()).build()); + } + + return redpackResult; } private Map xmlBean2Map(Object bean) { @@ -465,7 +471,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { } /** - * 微信公众号支付签名算法(详见:http://pay.weixin.qq.com/wiki/doc/api/index.php?chapter=4_3) + * 微信公众号支付签名算法(详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=4_3) * @param packageParams 原始参数 * @param signKey 加密Key(即 商户Key) * @return 签名字符串 From 64ec8a39720e0ce9aae15e11cfdd66904fa53142 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 25 Sep 2016 00:56:14 +0800 Subject: [PATCH 28/51] =?UTF-8?q?=E4=B8=BA=E7=85=A7=E9=A1=BEtravis-ci?= =?UTF-8?q?=EF=BC=8C=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BDaliyun=E7=9A=84rep?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index cb727c46..0bb9677c 100644 --- a/build.gradle +++ b/build.gradle @@ -12,9 +12,9 @@ subprojects { repositories { - mavenLocal() + //mavenLocal() - maven { url "http://maven.aliyun.com/nexus/content/groups/public" } + //maven { url "http://maven.aliyun.com/nexus/content/groups/public" } } From 29c6d14e05ed898bbf5c2b75309ef865df4b5cd5 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 25 Sep 2016 00:57:54 +0800 Subject: [PATCH 29/51] =?UTF-8?q?=E4=B8=BA=E7=85=A7=E9=A1=BEtravis-ci?= =?UTF-8?q?=EF=BC=8C=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BDaliyun=E7=9A=84rep?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0bb9677c..a4fc7018 100644 --- a/build.gradle +++ b/build.gradle @@ -11,11 +11,11 @@ subprojects { targetCompatibility = 1.7 - repositories { + //repositories { //mavenLocal() //maven { url "http://maven.aliyun.com/nexus/content/groups/public" } - } + //} dependencies { From 19cfded2fb3a2fa205e0063edb0706d7d1c5b7c4 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 25 Sep 2016 01:00:54 +0800 Subject: [PATCH 30/51] fix gradle repositories --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a4fc7018..cf7cc8f3 100644 --- a/build.gradle +++ b/build.gradle @@ -11,11 +11,11 @@ subprojects { targetCompatibility = 1.7 - //repositories { - //mavenLocal() - + repositories { + mavenLocal() + maven { url "http://central.maven.org/maven2" } //maven { url "http://maven.aliyun.com/nexus/content/groups/public" } - //} + } dependencies { From b12e52e1c05c1a233f928a3335f736415d71b8f8 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 25 Sep 2016 01:12:01 +0800 Subject: [PATCH 31/51] add guava lib --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 7ca43e66..a4670e35 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,7 @@ 3.6.7 2.9.0 2.7 + 19.0 3.4 2.5 1.10 @@ -111,6 +112,10 @@ ${jedis.version} provided + + com.google.guava + guava + @@ -151,6 +156,11 @@ ${jetty.version} test + + com.google.guava + guava + ${guava.version} + From ea6a9b5de3887e80a4efe2463a0f865dc5a9e755 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 25 Sep 2016 01:12:17 +0800 Subject: [PATCH 32/51] fix package for Maps --- .../java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index 09c7f261..bea7d448 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -20,7 +20,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.helpers.MessageFormatter; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Maps; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; From 15e27003ea6289fd3b22fd4ea688c26f69fdc88a Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sun, 25 Sep 2016 01:17:44 +0800 Subject: [PATCH 33/51] fix gradle and refactor pom --- build.gradle | 2 ++ pom.xml | 10 ++++++++++ weixin-java-mp/pom.xml | 5 ----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index cf7cc8f3..ba705da9 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,8 @@ subprojects { compile group: 'org.apache.httpcomponents', name: 'httpmime', version:'4.5' compile group: 'org.jodd', name: 'jodd-http', version:'3.6.7' compile group: 'com.google.code.gson', name: 'gson', version:'2.7' + compile group: 'com.google.guava', name: 'guava', version:'19.0' + compile group: 'org.jooq', name: 'joor', version:'0.9.6' compile group: 'commons-codec', name: 'commons-codec', version:'1.10' compile group: 'commons-io', name: 'commons-io', version:'2.5' compile group: 'org.apache.commons', name: 'commons-lang3', version:'3.4' diff --git a/pom.xml b/pom.xml index a4670e35..d79f2f72 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,7 @@ 2.9.0 2.7 19.0 + 0.9.6 3.4 2.5 1.10 @@ -116,6 +117,10 @@ com.google.guava guava + + org.jooq + joor + @@ -161,6 +166,11 @@ guava ${guava.version} + + org.jooq + joor + ${joor.version} + diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml index 0e534d0b..33a4f5ab 100644 --- a/weixin-java-mp/pom.xml +++ b/weixin-java-mp/pom.xml @@ -54,11 +54,6 @@ 2.9.4 test - - org.jooq - joor - 0.9.6 - From 6a19062e36a8fbf63397df6d5b2ff1690ad21d7f Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Mon, 26 Sep 2016 00:12:37 +0800 Subject: [PATCH 34/51] =?UTF-8?q?=E5=87=86=E5=A4=87=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=8B=E5=8D=95=E6=8E=A5=E5=8F=A3=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/mp/api/WxMpPayService.java | 23 +- .../mp/api/impl/WxMpPayServiceImpl.java | 3 + .../mp/bean/pay/WxUnifiedOrderRequest.java | 197 ++++++++++++++++++ 3 files changed, 217 insertions(+), 6 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java index 663444a7..06cdde7d 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java @@ -8,6 +8,7 @@ import me.chanjar.weixin.mp.bean.pay.WxMpPayRefundResult; import me.chanjar.weixin.mp.bean.pay.WxMpPayResult; import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest; +import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest; import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; /** @@ -17,7 +18,6 @@ import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; */ public interface WxMpPayService { - /** * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" @@ -39,12 +39,22 @@ public interface WxMpPayService { * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" * * @param parameters All required/optional parameters for weixin payment + * @deprecated use me.chanjar.weixin.mp.api.WxMpPayService.unifiedOrder(WxUnifiedOrderRequest) instead */ + @Deprecated WxMpPrepayIdResult getPrepayId(Map parameters); + /** + * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) + * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" + * 接口地址:https://api.mch.weixin.qq.com/pay/unifiedorder + * + */ + WxMpPrepayIdResult unifiedOrder(WxUnifiedOrderRequest request); + /** * 该接口调用“统一下单”接口,并拼装发起支付请求需要的参数 - * 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82 + * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN * * @param parameters the required or optional parameters */ @@ -52,7 +62,7 @@ public interface WxMpPayService { /** * 该接口调用“统一下单”接口,并拼装NATIVE发起支付请求需要的参数 - * 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82 + * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN * tradeType 交易类型 NATIVE (其他交易类型JSAPI,APP,WAP) * * @param productId 商户商品ID @@ -61,14 +71,14 @@ public interface WxMpPayService { * @param body 商品描述 * @param ip 发起支付的客户端IP * @param notifyUrl 通知地址 - * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPayInfo(Map) instead + * @deprecated Use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(Map) instead */ @Deprecated Map getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; /** * 该接口调用“统一下单”接口,并拼装JSAPI发起支付请求需要的参数 - * 详见http://mp.weixin.qq.com/wiki/7/aaa137b55fb2e0456bf8dd9148dd613f.html#.E5.8F.91.E8.B5.B7.E4.B8.80.E4.B8.AA.E5.BE.AE.E4.BF.A1.E6.94.AF.E4.BB.98.E8.AF.B7.E6.B1.82 + * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN * tradeType 交易类型 JSAPI(其他交易类型NATIVE,APP,WAP) * * @param openId 支付人openId @@ -77,7 +87,7 @@ public interface WxMpPayService { * @param body 商品描述 * @param ip 发起支付的客户端IP * @param notifyUrl 通知地址 - * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPayInfo(Map) instead + * @deprecated Use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(Map) instead */ @Deprecated Map getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; @@ -137,6 +147,7 @@ public interface WxMpPayService { *
* 微信商户平台ID * 商户平台设置的API密钥 + * @deprecated use me.chanjar.weixin.mp.api.WxMpPayService.sendRedpack(WxSendRedpackRequest) instead * */ @Deprecated diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index bea7d448..29d37238 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -56,6 +56,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { } @Override + @Deprecated public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String callbackUrl) { @@ -144,6 +145,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { } @Override + @Deprecated public Map getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String callbackUrl) throws WxErrorException { @@ -164,6 +166,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { } @Override + @Deprecated public Map getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String callbackUrl) throws WxErrorException { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java new file mode 100644 index 00000000..f1c77ff5 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java @@ -0,0 +1,197 @@ +package me.chanjar.weixin.mp.bean.pay; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +/** + * 统一下单请求参数对象 + * Created by Binary Wang on 2016/9/25. + * @author binarywang (https://github.com/binarywang) + */ +@XStreamAlias("xml") +public class WxUnifiedOrderRequest { + /** + *
+   * 公众账号ID 
+   * appid 
+   * 是 
+   * String(32)  
+   * wxd678efh567hg6787  
+   * 微信分配的公众账号ID(企业号corpid即为此appId)
+   * 
+ */ + /** + *
+   * 商户号
+   * mch_id  
+   * 是 
+   * String(32)  
+   * 1230000109  
+   * 微信支付分配的商户号
+   * 
+ */ + /** + *
  
+   * 设备号 
+   * device_info 
+   * 否 
+   * String(32)  
+   * 013467007045764 
+   * 终端设备号(门店号或收银设备ID),注意:PC网页或公众号内支付请传"WEB"
+   * 
+ */ + /** + *
  
+   * 随机字符串 
+   * nonce_str 
+   * 是 
+   * String(32)  
+   * 5K8264ILTKCH16CQ2502SI8ZNMTM67VS  
+   * 随机字符串,不长于32位。推荐随机数生成算法
+   * 
+ */ + /** + *
  
+   * 签名  
+   * sign  
+   * 是
+   *  String(32)  
+   *  C380BEC2BFD727A4B6845133519F3AD6  
+   *  签名,详见签名生成算法
+   * 
+ */ + /** + *
  
+   * 商品描述  
+   * body  
+   * 是
+   * String(128) 
+   * 腾讯充值中心-QQ会员充值
+   * 商品简单描述,该字段须严格按照规范传递,具体请见参数规定
+   * 
+ */ + /** + *
  
+   * 商品详情  
+   * detail  
+   * 否
+   * String(6000) 
+   *  {  "goods_detail":[
+      {
+      "goods_id":"iphone6s_16G",
+      "wxpay_goods_id":"1001",
+      "goods_name":"iPhone6s 16G",
+      "goods_num":1,
+      "price":528800,
+      "goods_category":"123456",
+      "body":"苹果手机"
+      },
+      {
+      "goods_id":"iphone6s_32G",
+      "wxpay_goods_id":"1002",
+      "goods_name":"iPhone6s 32G",
+      "quantity":1,
+      "price":608800,
+      "goods_category":"123789",
+      "body":"苹果手机"
+      }
+      ]
+      } 
+              商品详细列表,使用Json格式,传输签名前请务必使用CDATA标签将JSON文本串保护起来。
+        goods_detail []:
+        └ goods_id String 必填 32 商品的编号
+        └ wxpay_goods_id String 可选 32 微信支付定义的统一商品编号
+        └ goods_name String 必填 256 商品名称
+        └ goods_num Int 必填 商品数量
+        └ price Int 必填 商品单价,单位为分
+        └ goods_category String 可选 32 商品类目ID
+        └ body String 可选 1000 商品描述信息
+   * 
+ */ + /** + *
  
+   * 附加数据  
+   * attach  
+   * 否 
+   * String(127) 
+   * 深圳分店 
+   *  附加数据,在查询API和支付通知中原样返回,该字段主要用于商户携带订单的自定义数据
+   * 
+ */ + /** + *
  
+   * 商户订单号
+   * out_trade_no   
+   * 是 
+   * String(32)  
+   * 20150806125346  
+   * 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
+   * 
+ */ + /** + *
  
+   * 货币类型  
+   * fee_type  
+   * 否 
+   * String(16)  
+   * CNY 
+   * 符合ISO 4217标准的三位字母代码,默认人民币:CNY,其他值列表详见货币类型
+   * 
+ */ + /** + *
  
+   * 总金额 
+   * total_fee 
+   * 是 
+   * Int 
+   * 888 
+   * 订单总金额,单位为分,详见支付金额
+   * 
+ */ + /** + *
  
+   * 终端IP  
+   * spbill_create_ip 
+   * 是 
+   * String(16)  
+   * 123.12.12.123 
+   * APP和网页支付提交用户端ip,Native支付填调用微信支付API的机器IP。
+   * 
+ */ + /** + *
  交易起始时间  time_start  否 String(14)  20091225091010  订单生成时间,格式为yyyyMMddHHmmss,如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
+   * 
+ */ + /** + *
  交易结束时间  time_expire 否 String(14)  20091227091010 
+   * 
+ */ + /** + *
  订单失效时间,格式为yyyyMMddHHmmss,如2009年12月27日9点10分10秒表示为20091227091010。其他详见时间规则
+   *   注意:最短失效时间间隔必须大于5分钟
+   * 
+ */ + /** + *
  商品标记  goods_tag 否 String(32)  WXG 商品标记,代金券或立减优惠功能的参数,说明详见代金券或立减优惠
+   * 
+ */ + /** + *
  通知地址  notify_url  是 String(256) http://www.weixin.qq.com/wxpay/pay.php  接收微信支付异步通知回调地址,通知url必须为直接可访问的url,不能携带参数。
+   * 
+ */ + /** + *
  交易类型  trade_type  是 String(16)  JSAPI 取值如下:JSAPI,NATIVE,APP,详细说明见参数规定
+   * 
+ */ + /** + *
  商品ID  product_id  否 String(32)  12235413214070356458058 trade_type=NATIVE,此参数必传。此id为二维码中包含的商品ID,商户自行定义。
+   * 
+ */ + /** + *
  指定支付方式  limit_pay 否 String(32)  no_credit no_credit--指定不能使用信用卡支付
+   * 
+ */ + /** + *
  用户标识  openid  否 String(128) oUpF8uMuAJO_M2pxb1Q9zNjWeS6o  trade_type=JSAPI,此参数必传,用户在商户appid下的唯一标识。openid如何获取,可参考【获取openid】。企业号请使用【企业号OAuth2.0接口】获取企业号内成员userid,再调用【企业号userid转openid接口】进行转换
+   * 
+ */ +} From fcede8f6480f4292cc8abbb56dec39cbfac8e8f8 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Mon, 26 Sep 2016 09:25:47 +0800 Subject: [PATCH 35/51] add store service --- .../weixin/mp/api/WxMpStoreService.java | 26 ++++++++++ .../weixin/mp/bean/WxMpStoreBaseInfo.java | 52 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java new file mode 100644 index 00000000..3d02cf92 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java @@ -0,0 +1,26 @@ +package me.chanjar.weixin.mp.api; + +import me.chanjar.weixin.common.exception.WxErrorException; + +/** + * 门店管理的相关接口代码 + * @author binarywang(https://github.com/binarywang) + * Created by Binary Wang on 2016-09-23. + */ +public interface WxMpStoreService { + /** + *
+   * 创建门店
+   * 接口说明
+   * 创建门店接口是为商户提供创建自己门店数据的接口,门店数据字段越完整,商户页面展示越丰富,越能够吸引更多用户,并提高曝光度。
+   * 创建门店接口调用成功后会返回errcode 0、errmsg ok,但不会实时返回poi_id。
+   * 成功创建后,会生成poi_id,但该id不一定为最终id。门店信息会经过审核,审核通过后方可获取最终poi_id,该id为门店的唯一id,强烈建议自行存储审核通过后的最终poi_id,并为后续调用使用。
+   * 详情请见: 微信门店接口
+   * 接口格式: http://api.weixin.qq.com/cgi-bin/poi/addpoi?access_token=TOKEN
+   * 
+ * + * @param scene_id 参数。 + * @param expire_seconds 过期秒数,默认60秒,最小60秒,最大1800秒 + */ + void userUpdateRemark(String openid, String remark) throws WxErrorException; +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java new file mode 100644 index 00000000..31ce7ea8 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java @@ -0,0 +1,52 @@ +package me.chanjar.weixin.mp.bean; + +/** + * 门店基础信息 + * @author binarywang(https://github.com/binarywang) + * Created by Binary Wang on 2016-09-23. + */ +public class WxStoreBaseInfo { + /** sid + 商户自己的id,用于后续审核通过收到poi_id 的通知时,做对应关系。请商户自己保证唯一识别性 + 否 + business_name + 门店名称(仅为商户名,如:国美、麦当劳,不应包含地区、地址、分店名等信息,错误示例:北京国美) + 不能为空,15个汉字或30个英文字符内 + 是 + branch_name + 分店名称(不应包含地区信息,不应与门店名有重复,错误示例:北京王府井店) + 10个字以内 + 是 + province + 门店所在的省份(直辖市填城市名,如:北京市) + 10个字以内 + 是 + city + 门店所在的城市 +10个字以内 + 是 + district + 门店所在地区 +10个字以内 + 是 + address + 门店所在的详细街道地址(不要填写省市信息) + 是 +(东莞等没有“区”行政区划的城市,该字段可不必填写。其余城市必填。) + telephone + 门店的电话(纯数字,区号、分机号均由“-”隔开) + 是 + categories + 门店的类型(不同级分类用“,”隔开,如:美食,川菜,火锅。详细分类参见附件:微信门店类目表) + 是 + offset_type + 坐标类型,1 为火星坐标(目前只能选1) + 是 + longitude + 门店所在地理位置的经度 + 是 + latitude + 门店所在地理位置的纬度(经纬度均为火星坐标,最好选用腾讯地图标记的坐标) + 是 + */ +} From e9a21b26b97f9bf264313b0966c8e4a172f48e1c Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Mon, 26 Sep 2016 09:26:27 +0800 Subject: [PATCH 36/51] add store bean --- .../weixin/mp/bean/WxMpStoreBaseInfo.java | 190 ++++++++++++++---- 1 file changed, 147 insertions(+), 43 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java index 31ce7ea8..bcfd2e4f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java @@ -1,52 +1,156 @@ package me.chanjar.weixin.mp.bean; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + /** * 门店基础信息 * @author binarywang(https://github.com/binarywang) * Created by Binary Wang on 2016-09-23. */ -public class WxStoreBaseInfo { - /** sid - 商户自己的id,用于后续审核通过收到poi_id 的通知时,做对应关系。请商户自己保证唯一识别性 - 否 - business_name - 门店名称(仅为商户名,如:国美、麦当劳,不应包含地区、地址、分店名等信息,错误示例:北京国美) - 不能为空,15个汉字或30个英文字符内 - 是 - branch_name - 分店名称(不应包含地区信息,不应与门店名有重复,错误示例:北京王府井店) - 10个字以内 - 是 - province - 门店所在的省份(直辖市填城市名,如:北京市) - 10个字以内 - 是 - city - 门店所在的城市 -10个字以内 - 是 - district - 门店所在地区 -10个字以内 - 是 - address - 门店所在的详细街道地址(不要填写省市信息) - 是 -(东莞等没有“区”行政区划的城市,该字段可不必填写。其余城市必填。) - telephone - 门店的电话(纯数字,区号、分机号均由“-”隔开) - 是 - categories - 门店的类型(不同级分类用“,”隔开,如:美食,川菜,火锅。详细分类参见附件:微信门店类目表) - 是 - offset_type - 坐标类型,1 为火星坐标(目前只能选1) - 是 - longitude - 门店所在地理位置的经度 - 是 - latitude - 门店所在地理位置的纬度(经纬度均为火星坐标,最好选用腾讯地图标记的坐标) - 是 +public class WxMpStoreBaseInfo { + public static class WxMpStorePhoto { + /** + * 照片url + */ + @SerializedName("photo_url") + private String photoUrl; + } + + /** + * sid + * 商户自己的id,用于后续审核通过收到poi_id 的通知时,做对应关系。请商户自己保证唯一识别性 + */ + @SerializedName("sid") + private String sid; + + /** + * business_name + * 门店名称(仅为商户名,如:国美、麦当劳,不应包含地区、地址、分店名等信息,错误示例:北京国美) + * 不能为空,15个汉字或30个英文字符内 + */ + @SerializedName("business_name") + private String businessName; + + /** + * branch_name + * 分店名称(不应包含地区信息,不应与门店名有重复,错误示例:北京王府井店) + * 10个字以内 + */ + @SerializedName("branch_name") + private String branch_name; + + /** + * province + * 门店所在的省份(直辖市填城市名,如:北京市) + * 10个字以内 + */ + @SerializedName("province") + private String province; + + /** + * city + * 门店所在的城市 + * 10个字以内 + */ + @SerializedName("city") + private String city; + + /** + * district + * 门店所在地区 + * 10个字以内 + */ + @SerializedName("district") + private String district; + + /** + * address + * 门店所在的详细街道地址(不要填写省市信息) + * (东莞等没有“区”行政区划的城市,该字段可不必填写。其余城市必填。) + */ + @SerializedName("address") + private String address; + + /** + * telephone + * 门店的电话(纯数字,区号、分机号均由“-”隔开) + */ + @SerializedName("telephone") + private String telephone; + + /** + * categories + * 门店的类型(不同级分类用“,”隔开,如:美食,川菜,火锅。详细分类参见附件:微信门店类目表) + */ + @SerializedName("categories") + private String categories; + + /** + * offset_type + * 坐标类型,1 为火星坐标(目前只能选1) + */ + @SerializedName("offset_type") + private String offset_type; + + /** + * longitude + * 门店所在地理位置的经度 + */ + @SerializedName("longitude") + private String longitude; + + /** + * latitude + * 门店所在地理位置的纬度(经纬度均为火星坐标,最好选用腾讯地图标记的坐标) + */ + @SerializedName("latitude") + private String latitude; + + /** + * photo_list + * 图片列表,url 形式,可以有多张图片,尺寸为 640*340px。必须为上一接口生成的url。 + * 图片内容不允许与门店不相关,不允许为二维码、员工合照(或模特肖像)、营业执照、无门店正门的街景、地图截图、公交地铁站牌、菜单截图等 + */ + @SerializedName("photo_list") + private List photo_list; + + /** + * recommend + * 推荐品,餐厅可为推荐菜;酒店为推荐套房;景点为推荐游玩景点等,针对自己行业的推荐内容 + * 200字以内 + */ + @SerializedName("recommend") + private String recommend; + + /** + * special + * 特色服务,如免费wifi,免费停车,送货上门等商户能提供的特色功能或服务 + */ + @SerializedName("special") + private String special; + + /** + * introduction + * 商户简介,主要介绍商户信息等 + * 300字以内 + */ + @SerializedName("introduction") + private String introduction; + + /** + * open_time + * 营业时间,24 小时制表示,用“-”连接,如 8:00-20:00 + */ + @SerializedName("open_time") + private String open_time; + + /** + * avg_price + * 人均价格,大于0 的整数 */ + @SerializedName("avg_price") + private Integer avg_price; } From b555cc37905ea822d3f9f7090bd1d8ee3422c0c0 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Mon, 26 Sep 2016 11:20:32 +0800 Subject: [PATCH 37/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0annotation=E7=94=A8?= =?UTF-8?q?=E4=BA=8E=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/common/annotation/Required.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java new file mode 100644 index 00000000..9ed249da --- /dev/null +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java @@ -0,0 +1,19 @@ +package me.chanjar.weixin.common.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 标识某个字段是否是必填的 + * + * Created by Binary Wang on 2016/9/25. + * @author binarywang (https://github.com/binarywang) + * + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface Required { + +} \ No newline at end of file From c4838295e55f10c15ee6ef858f118dc3b591748f Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Mon, 26 Sep 2016 11:21:20 +0800 Subject: [PATCH 38/51] add missing @Override --- .../me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java index c7d451ef..8620cd84 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/custombuilder/WxCardBuilder.java @@ -23,6 +23,7 @@ public final class WxCardBuilder extends BaseBuilder { return this; } + @Override public WxMpCustomMessage build() { WxMpCustomMessage m = super.build(); m.setCardId(this.cardId); From 839ecadaa7c0c778c4566e68bd4d67b3e407d89b Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Mon, 26 Sep 2016 12:34:37 +0800 Subject: [PATCH 39/51] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=8B=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=AF=B9=E6=8E=A5=E5=8F=A3=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E7=9A=84=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=9C=AA=E5=AF=B9=E5=AE=9E=E9=99=85=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/http/SimplePostRequestExecutor.java | 6 + .../chanjar/weixin/mp/api/WxMpPayService.java | 7 +- .../mp/api/impl/WxMpPayServiceImpl.java | 272 ++++--- .../mp/bean/pay/WxMpPrepayIdResult.java | 124 ++++ .../weixin/mp/bean/pay/WxRedpackResult.java | 26 +- .../mp/bean/pay/WxSendRedpackRequest.java | 34 +- .../mp/bean/pay/WxUnifiedOrderRequest.java | 691 +++++++++++++++--- .../mp/bean/pay/WxUnifiedOrderResult.java | 155 ++++ .../mp/bean/result/WxMpPrepayIdResult.java | 128 ---- .../mp/api/impl/WxMpPayServiceImplTest.java | 20 +- 10 files changed, 1093 insertions(+), 370 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPrepayIdResult.java create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderResult.java delete mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java index 3a137849..bdea8573 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java @@ -35,6 +35,12 @@ public class SimplePostRequestExecutor implements RequestExecutor")) { //xml格式输出直接返回 return responseContent; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java index 06cdde7d..dae03f43 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java @@ -6,10 +6,11 @@ import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.mp.bean.pay.WxMpPayCallback; import me.chanjar.weixin.mp.bean.pay.WxMpPayRefundResult; import me.chanjar.weixin.mp.bean.pay.WxMpPayResult; +import me.chanjar.weixin.mp.bean.pay.WxMpPrepayIdResult; import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest; import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest; -import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; +import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderResult; /** * 微信支付相关接口 @@ -48,9 +49,11 @@ public interface WxMpPayService { * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" * 接口地址:https://api.mch.weixin.qq.com/pay/unifiedorder + * @throws WxErrorException * */ - WxMpPrepayIdResult unifiedOrder(WxUnifiedOrderRequest request); + WxUnifiedOrderResult unifiedOrder(WxUnifiedOrderRequest request) + throws WxErrorException; /** * 该接口调用“统一下单”接口,并拼装发起支付请求需要的参数 diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index 29d37238..e3e628c7 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.api.impl; import java.io.IOException; import java.lang.reflect.Field; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.SortedMap; @@ -20,10 +21,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.helpers.MessageFormatter; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; +import me.chanjar.weixin.common.annotation.Required; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.common.util.http.Utf8ResponseHandler; @@ -32,9 +35,11 @@ import me.chanjar.weixin.mp.api.WxMpPayService; import me.chanjar.weixin.mp.bean.pay.WxMpPayCallback; import me.chanjar.weixin.mp.bean.pay.WxMpPayRefundResult; import me.chanjar.weixin.mp.bean.pay.WxMpPayResult; +import me.chanjar.weixin.mp.bean.pay.WxMpPrepayIdResult; import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest; -import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; +import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest; +import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderResult; /** * Created by Binary Wang on 2016/7/28. @@ -43,10 +48,12 @@ import me.chanjar.weixin.mp.bean.result.WxMpPrepayIdResult; */ public class WxMpPayServiceImpl implements WxMpPayService { + private static final List TRADE_TYPES = Lists.newArrayList("JSAPI", + "NATIVE", "APP"); private final Logger log = LoggerFactory.getLogger(WxMpPayServiceImpl.class); - private final String[] REQUIRED_ORDER_PARAMETERS = new String[]{"appid", - "mch_id", "body", "out_trade_no", "total_fee", "spbill_create_ip", - "notify_url", "trade_type"}; + private final String[] REQUIRED_ORDER_PARAMETERS = new String[] { "appid", + "mch_id", "body", "out_trade_no", "total_fee", "spbill_create_ip", + "notify_url", "trade_type" }; private HttpHost httpProxy; private WxMpServiceImpl wxMpService; @@ -58,13 +65,13 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override @Deprecated public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, - double amt, String body, String tradeType, String ip, - String callbackUrl) { + double amt, String body, String tradeType, String ip, + String callbackUrl) { Map packageParams = new HashMap<>(); packageParams.put("appid", - this.wxMpService.getWxMpConfigStorage().getAppId()); + this.wxMpService.getWxMpConfigStorage().getAppId()); packageParams.put("mch_id", - this.wxMpService.getWxMpConfigStorage().getPartnerId()); + this.wxMpService.getWxMpConfigStorage().getPartnerId()); packageParams.put("body", body); packageParams.put("out_trade_no", outTradeNo); packageParams.put("total_fee", (int) (amt * 100) + ""); @@ -77,47 +84,48 @@ public class WxMpPayServiceImpl implements WxMpPayService { } @Override + @Deprecated public WxMpPrepayIdResult getPrepayId(final Map parameters) { final SortedMap packageParams = new TreeMap<>(parameters); packageParams.put("appid", - this.wxMpService.getWxMpConfigStorage().getAppId()); + this.wxMpService.getWxMpConfigStorage().getAppId()); packageParams.put("mch_id", - this.wxMpService.getWxMpConfigStorage().getPartnerId()); + this.wxMpService.getWxMpConfigStorage().getPartnerId()); packageParams.put("nonce_str", System.currentTimeMillis() + ""); checkParameters(packageParams); String sign = this.createSign(packageParams, - this.wxMpService.getWxMpConfigStorage().getPartnerKey()); + this.wxMpService.getWxMpConfigStorage().getPartnerKey()); packageParams.put("sign", sign); StringBuilder request = new StringBuilder(""); for (Map.Entry para : packageParams.entrySet()) { request.append(String.format("<%s>%s", para.getKey(), - para.getValue(), para.getKey())); + para.getValue(), para.getKey())); } request.append(""); HttpPost httpPost = new HttpPost( - "https://api.mch.weixin.qq.com/pay/unifiedorder"); + "https://api.mch.weixin.qq.com/pay/unifiedorder"); if (this.httpProxy != null) { RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy) - .build(); + .build(); httpPost.setConfig(config); } StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); httpPost.setEntity(entity); try (CloseableHttpResponse response = this.wxMpService.getHttpclient() - .execute(httpPost)) { + .execute(httpPost)) { String responseContent = Utf8ResponseHandler.INSTANCE - .handleResponse(response); + .handleResponse(response); XStream xstream = XStreamInitializer.getInstance(); xstream.alias("xml", WxMpPrepayIdResult.class); return (WxMpPrepayIdResult) xstream.fromXML(responseContent); } catch (IOException e) { throw new RuntimeException("Failed to get prepay id due to IO exception.", - e); + e); } finally { httpPost.releaseConnection(); } @@ -127,33 +135,33 @@ public class WxMpPayServiceImpl implements WxMpPayService { for (String para : this.REQUIRED_ORDER_PARAMETERS) { if (!parameters.containsKey(para)) { throw new IllegalArgumentException( - "Reqiured argument '" + para + "' is missing."); + "Reqiured argument '" + para + "' is missing."); } } if ("JSAPI".equals(parameters.get("trade_type")) - && !parameters.containsKey("openid")) { + && !parameters.containsKey("openid")) { throw new IllegalArgumentException( - "Reqiured argument 'openid' is missing when trade_type is 'JSAPI'."); + "Reqiured argument 'openid' is missing when trade_type is 'JSAPI'."); } if ("NATIVE".equals(parameters.get("trade_type")) - && !parameters.containsKey("product_id")) { + && !parameters.containsKey("product_id")) { throw new IllegalArgumentException( - "Reqiured argument 'product_id' is missing when trade_type is 'NATIVE'."); + "Reqiured argument 'product_id' is missing when trade_type is 'NATIVE'."); } } @Override @Deprecated public Map getJsapiPayInfo(String openId, String outTradeNo, - double amt, String body, String ip, String callbackUrl) - throws WxErrorException { + double amt, String body, String ip, String callbackUrl) + throws WxErrorException { Map packageParams = new HashMap<>(); packageParams.put("appid", - this.wxMpService.getWxMpConfigStorage().getAppId()); + this.wxMpService.getWxMpConfigStorage().getAppId()); packageParams.put("mch_id", - this.wxMpService.getWxMpConfigStorage().getPartnerId()); + this.wxMpService.getWxMpConfigStorage().getPartnerId()); packageParams.put("body", body); packageParams.put("out_trade_no", outTradeNo); packageParams.put("total_fee", (int) (amt * 100) + ""); @@ -168,13 +176,13 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override @Deprecated public Map getNativePayInfo(String productId, - String outTradeNo, double amt, String body, String ip, String callbackUrl) - throws WxErrorException { + String outTradeNo, double amt, String body, String ip, String callbackUrl) + throws WxErrorException { Map packageParams = new HashMap<>(); packageParams.put("appid", - this.wxMpService.getWxMpConfigStorage().getAppId()); + this.wxMpService.getWxMpConfigStorage().getAppId()); packageParams.put("mch_id", - this.wxMpService.getWxMpConfigStorage().getPartnerId()); + this.wxMpService.getWxMpConfigStorage().getPartnerId()); packageParams.put("body", body); packageParams.put("out_trade_no", outTradeNo); packageParams.put("total_fee", (int) (amt * 100) + ""); @@ -188,27 +196,27 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override public Map getPayInfo(Map parameters) - throws WxErrorException { + throws WxErrorException { WxMpPrepayIdResult wxMpPrepayIdResult = getPrepayId(parameters); if (!"SUCCESS".equalsIgnoreCase(wxMpPrepayIdResult.getReturn_code()) - || !"SUCCESS".equalsIgnoreCase(wxMpPrepayIdResult.getResult_code())) { + || !"SUCCESS".equalsIgnoreCase(wxMpPrepayIdResult.getResult_code())) { WxError error = new WxError(); error.setErrorCode(-1); error.setErrorMsg("return_code:" + wxMpPrepayIdResult.getReturn_code() - + ";return_msg:" + wxMpPrepayIdResult.getReturn_msg() - + ";result_code:" + wxMpPrepayIdResult.getResult_code() + ";err_code" - + wxMpPrepayIdResult.getErr_code() + ";err_code_des" - + wxMpPrepayIdResult.getErr_code_des()); + + ";return_msg:" + wxMpPrepayIdResult.getReturn_msg() + + ";result_code:" + wxMpPrepayIdResult.getResult_code() + ";err_code" + + wxMpPrepayIdResult.getErr_code() + ";err_code_des" + + wxMpPrepayIdResult.getErr_code_des()); throw new WxErrorException(error); } String prepayId = wxMpPrepayIdResult.getPrepay_id(); if (prepayId == null || prepayId.equals("")) { throw new RuntimeException( - String.format("Failed to get prepay id due to error code '%s'(%s).", - wxMpPrepayIdResult.getErr_code(), - wxMpPrepayIdResult.getErr_code_des())); + String.format("Failed to get prepay id due to error code '%s'(%s).", + wxMpPrepayIdResult.getErr_code(), + wxMpPrepayIdResult.getErr_code_des())); } Map payInfo = new HashMap<>(); @@ -223,21 +231,21 @@ public class WxMpPayServiceImpl implements WxMpPayService { } String finalSign = this.createSign(payInfo, - this.wxMpService.getWxMpConfigStorage().getPartnerKey()); + this.wxMpService.getWxMpConfigStorage().getPartnerKey()); payInfo.put("paySign", finalSign); return payInfo; } @Override public WxMpPayResult getJSSDKPayResult(String transactionId, - String outTradeNo) { + String outTradeNo) { String nonce_str = System.currentTimeMillis() + ""; SortedMap packageParams = new TreeMap<>(); packageParams.put("appid", - this.wxMpService.getWxMpConfigStorage().getAppId()); + this.wxMpService.getWxMpConfigStorage().getAppId()); packageParams.put("mch_id", - this.wxMpService.getWxMpConfigStorage().getPartnerId()); + this.wxMpService.getWxMpConfigStorage().getPartnerId()); if (transactionId != null && !"".equals(transactionId.trim())) { packageParams.put("transaction_id", transactionId); @@ -245,40 +253,40 @@ public class WxMpPayServiceImpl implements WxMpPayService { packageParams.put("out_trade_no", outTradeNo); } else { throw new IllegalArgumentException( - "Either 'transactionId' or 'outTradeNo' must be given."); + "Either 'transactionId' or 'outTradeNo' must be given."); } packageParams.put("nonce_str", nonce_str); packageParams.put("sign", this.createSign(packageParams, - this.wxMpService.getWxMpConfigStorage().getPartnerKey())); + this.wxMpService.getWxMpConfigStorage().getPartnerKey())); StringBuilder request = new StringBuilder(""); for (Map.Entry para : packageParams.entrySet()) { request.append(String.format("<%s>%s", para.getKey(), - para.getValue(), para.getKey())); + para.getValue(), para.getKey())); } request.append(""); HttpPost httpPost = new HttpPost( - "https://api.mch.weixin.qq.com/pay/orderquery"); + "https://api.mch.weixin.qq.com/pay/orderquery"); if (this.httpProxy != null) { RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy) - .build(); + .build(); httpPost.setConfig(config); } StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); httpPost.setEntity(entity); try (CloseableHttpResponse response = this.wxMpService.getHttpclient() - .execute(httpPost)) { + .execute(httpPost)) { String responseContent = Utf8ResponseHandler.INSTANCE - .handleResponse(response); + .handleResponse(response); XStream xstream = XStreamInitializer.getInstance(); xstream.alias("xml", WxMpPayResult.class); return (WxMpPayResult) xstream.fromXML(responseContent); } catch (IOException e) { throw new RuntimeException("Failed to query order due to IO exception.", - e); + e); } } @@ -297,66 +305,66 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override public WxMpPayRefundResult refundPay(Map parameters) - throws WxErrorException { + throws WxErrorException { SortedMap refundParams = new TreeMap<>(parameters); refundParams.put("appid", - this.wxMpService.getWxMpConfigStorage().getAppId()); + this.wxMpService.getWxMpConfigStorage().getAppId()); refundParams.put("mch_id", - this.wxMpService.getWxMpConfigStorage().getPartnerId()); + this.wxMpService.getWxMpConfigStorage().getPartnerId()); refundParams.put("nonce_str", System.currentTimeMillis() + ""); refundParams.put("op_user_id", - this.wxMpService.getWxMpConfigStorage().getPartnerId()); + this.wxMpService.getWxMpConfigStorage().getPartnerId()); String sign = this.createSign(refundParams, - this.wxMpService.getWxMpConfigStorage().getPartnerKey()); + this.wxMpService.getWxMpConfigStorage().getPartnerKey()); refundParams.put("sign", sign); StringBuilder request = new StringBuilder(""); for (Map.Entry para : refundParams.entrySet()) { request.append(String.format("<%s>%s", para.getKey(), - para.getValue(), para.getKey())); + para.getValue(), para.getKey())); } request.append(""); HttpPost httpPost = new HttpPost( - "https://api.mch.weixin.qq.com/secapi/pay/refund"); + "https://api.mch.weixin.qq.com/secapi/pay/refund"); if (this.httpProxy != null) { RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy) - .build(); + .build(); httpPost.setConfig(config); } StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); httpPost.setEntity(entity); try (CloseableHttpResponse response = this.wxMpService.getHttpclient() - .execute(httpPost)) { + .execute(httpPost)) { String responseContent = Utf8ResponseHandler.INSTANCE - .handleResponse(response); + .handleResponse(response); XStream xstream = XStreamInitializer.getInstance(); xstream.processAnnotations(WxMpPayRefundResult.class); WxMpPayRefundResult wxMpPayRefundResult = (WxMpPayRefundResult) xstream - .fromXML(responseContent); + .fromXML(responseContent); if (!"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getResultCode()) - || !"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getReturnCode())) { + || !"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getReturnCode())) { WxError error = new WxError(); error.setErrorCode(-1); error.setErrorMsg("return_code:" + wxMpPayRefundResult.getReturnCode() - + ";return_msg:" + wxMpPayRefundResult.getReturnMsg() - + ";result_code:" + wxMpPayRefundResult.getResultCode() - + ";err_code" + wxMpPayRefundResult.getErrCode() + ";err_code_des" - + wxMpPayRefundResult.getErrCodeDes()); + + ";return_msg:" + wxMpPayRefundResult.getReturnMsg() + + ";result_code:" + wxMpPayRefundResult.getResultCode() + + ";err_code" + wxMpPayRefundResult.getErrCode() + ";err_code_des" + + wxMpPayRefundResult.getErrCodeDes()); throw new WxErrorException(error); } return wxMpPayRefundResult; } catch (IOException e) { String message = MessageFormatter - .format("Exception happened when sending refund '{}'.", - request.toString()) - .getMessage(); + .format("Exception happened when sending refund '{}'.", + request.toString()) + .getMessage(); this.log.error(message, e); throw new WxErrorException( - WxError.newBuilder().setErrorMsg(message).build()); + WxError.newBuilder().setErrorMsg(message).build()); } finally { httpPost.releaseConnection(); } @@ -364,65 +372,67 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override public boolean checkJSSDKCallbackDataSignature(Map kvm, - String signature) { + String signature) { return signature.equals(this.createSign(kvm, - this.wxMpService.getWxMpConfigStorage().getPartnerKey())); + this.wxMpService.getWxMpConfigStorage().getPartnerKey())); } @Override @Deprecated public WxRedpackResult sendRedpack(Map parameters) - throws WxErrorException { + throws WxErrorException { SortedMap packageParams = new TreeMap<>(parameters); packageParams.put("wxappid", - this.wxMpService.getWxMpConfigStorage().getAppId()); + this.wxMpService.getWxMpConfigStorage().getAppId()); packageParams.put("mch_id", - this.wxMpService.getWxMpConfigStorage().getPartnerId()); + this.wxMpService.getWxMpConfigStorage().getPartnerId()); packageParams.put("nonce_str", System.currentTimeMillis() + ""); String sign = this.createSign(packageParams, - this.wxMpService.getWxMpConfigStorage().getPartnerKey()); + this.wxMpService.getWxMpConfigStorage().getPartnerKey()); packageParams.put("sign", sign); StringBuilder request = new StringBuilder(""); for (Map.Entry para : packageParams.entrySet()) { request.append(String.format("<%s>%s", para.getKey(), - para.getValue(), para.getKey())); + para.getValue(), para.getKey())); } request.append(""); HttpPost httpPost = new HttpPost( - "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack"); + "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack"); if (this.httpProxy != null) { RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy) - .build(); + .build(); httpPost.setConfig(config); } StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); httpPost.setEntity(entity); try (CloseableHttpResponse response = this.wxMpService.getHttpclient() - .execute(httpPost)) { + .execute(httpPost)) { String responseContent = Utf8ResponseHandler.INSTANCE - .handleResponse(response); + .handleResponse(response); XStream xstream = XStreamInitializer.getInstance(); xstream.processAnnotations(WxRedpackResult.class); return (WxRedpackResult) xstream.fromXML(responseContent); } catch (IOException e) { String message = MessageFormatter - .format("Exception occured when sending redpack '{}'.", - request.toString()) - .getMessage(); + .format("Exception occured when sending redpack '{}'.", + request.toString()) + .getMessage(); this.log.error(message, e); - throw new WxErrorException(WxError.newBuilder().setErrorMsg(message).build()); + throw new WxErrorException( + WxError.newBuilder().setErrorMsg(message).build()); } finally { httpPost.releaseConnection(); } } @Override - public WxRedpackResult sendRedpack(WxSendRedpackRequest request) throws WxErrorException { + public WxRedpackResult sendRedpack(WxSendRedpackRequest request) + throws WxErrorException { XStream xstream = XStreamInitializer.getInstance(); xstream.processAnnotations(WxSendRedpackRequest.class); xstream.processAnnotations(WxRedpackResult.class); @@ -442,10 +452,13 @@ public class WxMpPayServiceImpl implements WxMpPayService { } String responseContent = this.wxMpService.post(url, xstream.toXML(request)); - WxRedpackResult redpackResult = (WxRedpackResult) xstream.fromXML(responseContent); - if("FAIL".equals(redpackResult.getResultCode())){ - throw new WxErrorException( - WxError.newBuilder().setErrorMsg(redpackResult.getErrCode() + ":" + redpackResult.getErrCodeDes()).build()); + WxRedpackResult redpackResult = (WxRedpackResult) xstream + .fromXML(responseContent); + if ("FAIL".equals(redpackResult.getResultCode())) { + throw new WxErrorException(WxError.newBuilder() + .setErrorMsg( + redpackResult.getErrCode() + ":" + redpackResult.getErrCodeDes()) + .build()); } return redpackResult; @@ -460,9 +473,10 @@ public class WxMpPayServiceImpl implements WxMpPayService { } try { - Field field = WxSendRedpackRequest.class.getDeclaredField(entry.getKey()); + Field field = bean.getClass().getDeclaredField(entry.getKey()); if (field.isAnnotationPresent(XStreamAlias.class)) { - result.put(field.getAnnotation(XStreamAlias.class).value(), reflect.get().toString()); + result.put(field.getAnnotation(XStreamAlias.class).value(), + reflect.get().toString()); } } catch (NoSuchFieldException | SecurityException e) { e.printStackTrace(); @@ -485,7 +499,8 @@ public class WxMpPayServiceImpl implements WxMpPayService { StringBuffer toSign = new StringBuffer(); for (String key : sortedMap.keySet()) { String value = packageParams.get(key); - if (null != value && !"".equals(value) && !"sign".equals(key) && !"key".equals(key)) { + if (null != value && !"".equals(value) && !"sign".equals(key) + && !"key".equals(key)) { toSign.append(key + "=" + value + "&"); } } @@ -495,4 +510,73 @@ public class WxMpPayServiceImpl implements WxMpPayService { return DigestUtils.md5Hex(toSign.toString()).toUpperCase(); } + @Override + public WxUnifiedOrderResult unifiedOrder(WxUnifiedOrderRequest request) + throws WxErrorException { + checkParameters(request); + + XStream xstream = XStreamInitializer.getInstance(); + xstream.processAnnotations(WxUnifiedOrderRequest.class); + xstream.processAnnotations(WxUnifiedOrderResult.class); + + request.setAppid(this.wxMpService.getWxMpConfigStorage().getAppId()); + request.setMchId(this.wxMpService.getWxMpConfigStorage().getPartnerId()); + request.setNonceStr(System.currentTimeMillis() + ""); + + String sign = this.createSign(xmlBean2Map(request), + this.wxMpService.getWxMpConfigStorage().getPartnerKey()); + request.setSign(sign); + + String url = "https://api.mch.weixin.qq.com/pay/unifiedorder"; + + String responseContent = this.wxMpService.post(url, xstream.toXML(request)); + WxUnifiedOrderResult result = (WxUnifiedOrderResult) xstream + .fromXML(responseContent); + if ("FAIL".equals(result.getResultCode())) { + throw new WxErrorException(WxError.newBuilder() + .setErrorMsg(result.getErrCode() + ":" + result.getErrCodeDes()) + .build()); + } + + return result; + + } + + private void checkParameters(WxUnifiedOrderRequest request) { + + List nullFields = com.google.common.collect.Lists.newArrayList(); + for (Entry entry : Reflect.on(request).fields() + .entrySet()) { + Reflect reflect = entry.getValue(); + try { + Field field = request.getClass().getDeclaredField(entry.getKey()); + if (field.isAnnotationPresent(Required.class) + && reflect.get() == null) { + nullFields.add(entry.getKey()); + } + } catch (NoSuchFieldException | SecurityException e) { + e.printStackTrace(); + } + } + + if (!nullFields.isEmpty()) { + throw new IllegalArgumentException("必填字段[" + nullFields + "]必须提供值"); + } + + if (!TRADE_TYPES.contains(request.getTradeType())) { + throw new IllegalArgumentException( + "trade_type目前必须为" + TRADE_TYPES + "其中之一"); + + } + + if ("JSAPI".equals(request.getTradeType()) && request.getOpenid() == null) { + throw new IllegalArgumentException("当 trade_type是'JSAPI'时未指定openid"); + } + + if ("NATIVE".equals(request.getTradeType()) + && request.getProductId() == null) { + throw new IllegalArgumentException("当 trade_type是'NATIVE'时未指定product_id"); + } + } + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPrepayIdResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPrepayIdResult.java new file mode 100644 index 00000000..cff9d787 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxMpPrepayIdResult.java @@ -0,0 +1,124 @@ +package me.chanjar.weixin.mp.bean.pay; + +import java.io.Serializable; + +/** + *
+ * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识"返回的结果
+ * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
+ * 
+ * + * @author chanjarster + */ +@Deprecated +public class WxMpPrepayIdResult implements Serializable { + private static final long serialVersionUID = -8970574397788396143L; + 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 prepay_id; + private String trade_type; + private String err_code; + private String err_code_des; + private String code_url; + + public String getReturn_code() { + return this.return_code; + } + + public void setReturn_code(String return_code) { + this.return_code = return_code; + } + + public String getReturn_msg() { + return this.return_msg; + } + + public void setReturn_msg(String return_msg) { + this.return_msg = return_msg; + } + + public String getAppid() { + return this.appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public String getMch_id() { + return this.mch_id; + } + + public void setMch_id(String mch_id) { + this.mch_id = mch_id; + } + + public String getNonce_str() { + return this.nonce_str; + } + + public void setNonce_str(String nonce_str) { + this.nonce_str = nonce_str; + } + + public String getSign() { + return this.sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getResult_code() { + return this.result_code; + } + + public void setResult_code(String result_code) { + this.result_code = result_code; + } + + public String getPrepay_id() { + return this.prepay_id; + } + + public void setPrepay_id(String prepay_id) { + this.prepay_id = prepay_id; + } + + public String getTrade_type() { + return this.trade_type; + } + + public void setTrade_type(String trade_type) { + this.trade_type = trade_type; + } + + public String getErr_code() { + return this.err_code; + } + + public void setErr_code(String err_code) { + this.err_code = err_code; + } + + public String getErr_code_des() { + return this.err_code_des; + } + + public void setErr_code_des(String err_code_des) { + this.err_code_des = err_code_des; + } + + public String getCode_url() { + return this.code_url; + } + + public void setCode_url(String code_url) { + this.code_url = code_url; + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java index fa9ce561..297e07d7 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxRedpackResult.java @@ -19,32 +19,32 @@ public class WxRedpackResult implements Serializable { private static final long serialVersionUID = -4837415036337132073L; @XStreamAlias("return_code") - String returnCode; + private String returnCode; @XStreamAlias("return_msg") - String returnMsg; + private String returnMsg; @XStreamAlias("sign") - String sign; + private String sign; @XStreamAlias("result_code") - String resultCode; + private String resultCode; @XStreamAlias("err_code") - String errCode; + private String errCode; @XStreamAlias("err_code_des") - String errCodeDes; + private String errCodeDes; @XStreamAlias("mch_billno") - String mchBillno; + private String mchBillno; @XStreamAlias("mch_id") - String mchId; + private String mchId; @XStreamAlias("wxappid") - String wxappid; + private String wxappid; @XStreamAlias("re_openid") - String reOpenid; + private String reOpenid; @XStreamAlias("total_amount") - int totalAmount; + private int totalAmount; @XStreamAlias("send_time") - String sendTime; + private String sendTime; @XStreamAlias("send_listid") - String sendListid; + private String sendListid; public String getErrCode() { return this.errCode; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java index ccf84ae9..abe0d68f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxSendRedpackRequest.java @@ -158,7 +158,7 @@ public class WxSendRedpackRequest { private String consumeMchId; public String getMchBillno() { - return mchBillno; + return this.mchBillno; } public void setMchBillno(String mchBillno) { @@ -166,7 +166,7 @@ public class WxSendRedpackRequest { } public String getSendName() { - return sendName; + return this.sendName; } public void setSendName(String sendName) { @@ -174,7 +174,7 @@ public class WxSendRedpackRequest { } public String getReOpenid() { - return reOpenid; + return this.reOpenid; } public void setReOpenid(String reOpenid) { @@ -182,7 +182,7 @@ public class WxSendRedpackRequest { } public Integer getTotalAmount() { - return totalAmount; + return this.totalAmount; } public void setTotalAmount(Integer totalAmount) { @@ -190,7 +190,7 @@ public class WxSendRedpackRequest { } public Integer getTotalNum() { - return totalNum; + return this.totalNum; } public void setTotalNum(Integer totalNum) { @@ -198,7 +198,7 @@ public class WxSendRedpackRequest { } public String getAmtType() { - return amtType; + return this.amtType; } public void setAmtType(String amtType) { @@ -206,7 +206,7 @@ public class WxSendRedpackRequest { } public String getWishing() { - return wishing; + return this.wishing; } public void setWishing(String wishing) { @@ -214,7 +214,7 @@ public class WxSendRedpackRequest { } public String getClientIp() { - return clientIp; + return this.clientIp; } public void setClientIp(String clientIp) { @@ -222,7 +222,7 @@ public class WxSendRedpackRequest { } public String getActName() { - return actName; + return this.actName; } public void setActName(String actName) { @@ -230,7 +230,7 @@ public class WxSendRedpackRequest { } public String getRemark() { - return remark; + return this.remark; } public void setRemark(String remark) { @@ -238,7 +238,7 @@ public class WxSendRedpackRequest { } public String getWxAppid() { - return wxAppid; + return this.wxAppid; } public void setWxAppid(String wxAppid) { @@ -246,7 +246,7 @@ public class WxSendRedpackRequest { } public String getMchId() { - return mchId; + return this.mchId; } public void setMchId(String mchId) { @@ -254,7 +254,7 @@ public class WxSendRedpackRequest { } public String getNonceStr() { - return nonceStr; + return this.nonceStr; } public void setNonceStr(String nonceStr) { @@ -262,7 +262,7 @@ public class WxSendRedpackRequest { } public String getSign() { - return sign; + return this.sign; } public void setSign(String sign) { @@ -270,7 +270,7 @@ public class WxSendRedpackRequest { } public String getSceneId() { - return sceneId; + return this.sceneId; } public void setSceneId(String sceneId) { @@ -278,7 +278,7 @@ public class WxSendRedpackRequest { } public String getRiskInfo() { - return riskInfo; + return this.riskInfo; } public void setRiskInfo(String riskInfo) { @@ -286,7 +286,7 @@ public class WxSendRedpackRequest { } public String getConsumeMchId() { - return consumeMchId; + return this.consumeMchId; } public void setConsumeMchId(String consumeMchId) { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java index f1c77ff5..ccdfff90 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderRequest.java @@ -1,197 +1,666 @@ package me.chanjar.weixin.mp.bean.pay; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import com.thoughtworks.xstream.annotations.XStreamAlias; +import me.chanjar.weixin.common.annotation.Required; + /** - * 统一下单请求参数对象 - * Created by Binary Wang on 2016/9/25. + *
+ * 统一下单请求参数对象
+ * 参考文档:https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
+ * 每个字段描述对应如下:
+ * 
  • 字段名 + *
  • 变量名 + *
  • 是否必填 + *
  • 类型 + *
  • 示例值 + *
  • 描述 + *
  • + * Created by Binary Wang on 2016/9/25. * @author binarywang (https://github.com/binarywang) */ @XStreamAlias("xml") public class WxUnifiedOrderRequest { + /** *
    -   * 公众账号ID 
    -   * appid 
    -   * 是 
    -   * String(32)  
    -   * wxd678efh567hg6787  
    +   * 公众账号ID
    +   * appid
    +   * 是
    +   * String(32)
    +   * wxd678efh567hg6787
        * 微信分配的公众账号ID(企业号corpid即为此appId)
        * 
    */ + @XStreamAlias("appid") + private String appid; + /** *
        * 商户号
    -   * mch_id  
    -   * 是 
    -   * String(32)  
    -   * 1230000109  
    +   * mch_id
    +   * 是
    +   * String(32)
    +   * 1230000109
        * 微信支付分配的商户号
        * 
    */ + @XStreamAlias("mch_id") + private String mchId; + /** - *
      
    -   * 设备号 
    -   * device_info 
    -   * 否 
    -   * String(32)  
    -   * 013467007045764 
    -   * 终端设备号(门店号或收银设备ID),注意:PC网页或公众号内支付请传"WEB"
    +   * 
    +   * 设备号
    +   * device_info
    +   * 否
    +   * String(32)
    +   * 013467007045764
    +   * 终端设备号(门店号或收银设备Id),注意:PC网页或公众号内支付请传"WEB"
        * 
    */ + @XStreamAlias("device_info") + private String deviceInfo; + /** - *
      
    -   * 随机字符串 
    -   * nonce_str 
    -   * 是 
    -   * String(32)  
    -   * 5K8264ILTKCH16CQ2502SI8ZNMTM67VS  
    +   * 
    +   * 随机字符串
    +   * nonce_str
    +   * 是
    +   * String(32)
    +   * 5K8264ILTKCH16CQ2502SI8ZNMTM67VS
        * 随机字符串,不长于32位。推荐随机数生成算法
        * 
    */ + @XStreamAlias("nonce_str") + private String nonceStr; + /** - *
      
    -   * 签名  
    -   * sign  
    +   * 
    +   * 签名
    +   * sign
        * 是
    -   *  String(32)  
    -   *  C380BEC2BFD727A4B6845133519F3AD6  
    -   *  签名,详见签名生成算法
    +   * String(32)
    +   * C380BEC2BFD727A4B6845133519F3AD6
    +   * 签名,详见签名生成算法
        * 
    */ + @XStreamAlias("sign") + private String sign; + /** - *
      
    -   * 商品描述  
    -   * body  
    +   * 
    +   * 商品描述
    +   * body
        * 是
    -   * String(128) 
    +   * String(128)
        * 腾讯充值中心-QQ会员充值
        * 商品简单描述,该字段须严格按照规范传递,具体请见参数规定
        * 
    */ + @Required + @XStreamAlias("body") + private String body; + /** - *
      
    -   * 商品详情  
    -   * detail  
    +   * 
    +   * 商品详情
    +   * detail
        * 否
    -   * String(6000) 
    +   * String(6000)
        *  {  "goods_detail":[
    -      {
    -      "goods_id":"iphone6s_16G",
    -      "wxpay_goods_id":"1001",
    -      "goods_name":"iPhone6s 16G",
    -      "goods_num":1,
    -      "price":528800,
    -      "goods_category":"123456",
    -      "body":"苹果手机"
    -      },
    -      {
    -      "goods_id":"iphone6s_32G",
    -      "wxpay_goods_id":"1002",
    -      "goods_name":"iPhone6s 32G",
    -      "quantity":1,
    -      "price":608800,
    -      "goods_category":"123789",
    -      "body":"苹果手机"
    -      }
    -      ]
    -      } 
    -              商品详细列表,使用Json格式,传输签名前请务必使用CDATA标签将JSON文本串保护起来。
    -        goods_detail []:
    -        └ goods_id String 必填 32 商品的编号
    -        └ wxpay_goods_id String 可选 32 微信支付定义的统一商品编号
    -        └ goods_name String 必填 256 商品名称
    -        └ goods_num Int 必填 商品数量
    -        └ price Int 必填 商品单价,单位为分
    -        └ goods_category String 可选 32 商品类目ID
    -        └ body String 可选 1000 商品描述信息
    -   * 
    - */ - /** - *
      
    -   * 附加数据  
    -   * attach  
    -   * 否 
    -   * String(127) 
    -   * 深圳分店 
    +    {
    +    "goods_id":"iphone6s_16G",
    +    "wxpay_goods_id":"1001",
    +    "goods_name":"iPhone6s 16G",
    +    "goods_num":1,
    +    "price":528800,
    +    "goods_category":"123456",
    +    "body":"苹果手机"
    +    },
    +    {
    +    "goods_id":"iphone6s_32G",
    +    "wxpay_goods_id":"1002",
    +    "goods_name":"iPhone6s 32G",
    +    "quantity":1,
    +    "price":608800,
    +    "goods_category":"123789",
    +    "body":"苹果手机"
    +    }
    +    ]
    +    }
    +            商品详细列表,使用Json格式,传输签名前请务必使用CDATA标签将JSON文本串保护起来。
    +      goods_detail []:
    +      └ goods_id String 必填 32 商品的编号
    +      └ wxpay_goods_id String 可选 32 微信支付定义的统一商品编号
    +      └ goods_name String 必填 256 商品名称
    +      └ goods_num Int 必填 商品数量
    +      └ price Int 必填 商品单价,单位为分
    +      └ goods_category String 可选 32 商品类目Id
    +      └ body String 可选 1000 商品描述信息
    +   * 
    + */ + @XStreamAlias("detail") + private String detail; + + /** + *
    +   * 附加数据
    +   * attach
    +   * 否
    +   * String(127)
    +   * 深圳分店
        *  附加数据,在查询API和支付通知中原样返回,该字段主要用于商户携带订单的自定义数据
        * 
    */ + @XStreamAlias("attach") + private String attach; + /** - *
      
    +   * 
        * 商户订单号
    -   * out_trade_no   
    -   * 是 
    -   * String(32)  
    -   * 20150806125346  
    +   * out_trade_no
    +   * 是
    +   * String(32)
    +   * 20150806125346
        * 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
        * 
    */ + @Required + @XStreamAlias("out_trade_no") + private String outTradeNo; + /** - *
      
    -   * 货币类型  
    -   * fee_type  
    -   * 否 
    -   * String(16)  
    -   * CNY 
    +   * 
    +   * 货币类型
    +   * fee_type
    +   * 否
    +   * String(16)
    +   * CNY
        * 符合ISO 4217标准的三位字母代码,默认人民币:CNY,其他值列表详见货币类型
        * 
    */ + @XStreamAlias("fee_type") + private String feeType; + /** - *
      
    -   * 总金额 
    -   * total_fee 
    -   * 是 
    -   * Int 
    -   * 888 
    +   * 
    +   * 总金额
    +   * total_fee
    +   * 是
    +   * Int
    +   * 888
        * 订单总金额,单位为分,详见支付金额
        * 
    */ + @Required + @XStreamAlias("total_fee") + private Integer totalFee; + /** - *
      
    -   * 终端IP  
    -   * spbill_create_ip 
    -   * 是 
    -   * String(16)  
    -   * 123.12.12.123 
    +   * 
    +   * 终端IP
    +   * spbill_create_ip
    +   * 是
    +   * String(16)
    +   * 123.12.12.123
        * APP和网页支付提交用户端ip,Native支付填调用微信支付API的机器IP。
        * 
    */ + @Required + @XStreamAlias("spbill_create_ip") + private String spbillCreateIp; + /** - *
      交易起始时间  time_start  否 String(14)  20091225091010  订单生成时间,格式为yyyyMMddHHmmss,如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
    +   * 
    +   * 交易起始时间
    +   * time_start
    +   * 否
    +   * String(14)
    +   * 20091225091010
    +   * 订单生成时间,格式为yyyyMMddHHmmss,如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
        * 
    */ + @XStreamAlias("time_start") + private String timeStart; + /** - *
      交易结束时间  time_expire 否 String(14)  20091227091010 
    -   * 
    - */ - /** - *
      订单失效时间,格式为yyyyMMddHHmmss,如2009年12月27日9点10分10秒表示为20091227091010。其他详见时间规则
    +   * 
    +   * 交易结束时间
    +   * time_expire
    +   * 否
    +   * String(14)
    +   * 20091227091010
    +   * 订单失效时间,格式为yyyyMMddHHmmss,如2009年12月27日9点10分10秒表示为20091227091010。其他详见时间规则
        *   注意:最短失效时间间隔必须大于5分钟
        * 
    */ + @XStreamAlias("time_expire") + private String timeExpire; + /** - *
      商品标记  goods_tag 否 String(32)  WXG 商品标记,代金券或立减优惠功能的参数,说明详见代金券或立减优惠
    +   * 
    +   * 商品标记
    +   * goods_tag
    +   * 否
    +   * String(32)
    +   * WXG
    +   * 商品标记,代金券或立减优惠功能的参数,说明详见代金券或立减优惠
        * 
    */ + @XStreamAlias("goods_tag") + private String goodsTag; + /** - *
      通知地址  notify_url  是 String(256) http://www.weixin.qq.com/wxpay/pay.php  接收微信支付异步通知回调地址,通知url必须为直接可访问的url,不能携带参数。
    +   * 
    +   * 通知地址
    +   * notify_url
    +   * 是
    +   * String(256)
    +   * http://www.weixin.qq.com/wxpay/pay.php
    +   * 接收微信支付异步通知回调地址,通知url必须为直接可访问的url,不能携带参数。
        * 
    */ + @Required + @XStreamAlias("notify_url") + private String notifyURL; + /** - *
      交易类型  trade_type  是 String(16)  JSAPI 取值如下:JSAPI,NATIVE,APP,详细说明见参数规定
    +   * 
    +   * 交易类型
    +   * trade_type
    +   * 是
    +   * String(16)
    +   * JSAPI
    +   * 取值如下:JSAPI,NATIVE,APP,详细说明见参数规定:
    +   * JSAPI--公众号支付、NATIVE--原生扫码支付、APP--app支付,统一下单接口trade_type的传参可参考这里
        * 
    */ + @Required + @XStreamAlias("trade_type") + private String tradeType; + /** - *
      商品ID  product_id  否 String(32)  12235413214070356458058 trade_type=NATIVE,此参数必传。此id为二维码中包含的商品ID,商户自行定义。
    +   * 
    +   * 商品Id
    +   * product_id
    +   * 否
    +   * String(32)
    +   * 12235413214070356458058
    +   * trade_type=NATIVE,此参数必传。此id为二维码中包含的商品Id,商户自行定义。
        * 
    */ + @XStreamAlias("product_id") + private String productId; + /** - *
      指定支付方式  limit_pay 否 String(32)  no_credit no_credit--指定不能使用信用卡支付
    +   * 
    +   * 指定支付方式
    +   * limit_pay
    +   * 否
    +   * String(32)
    +   * no_credit no_credit--指定不能使用信用卡支付
        * 
    */ + @XStreamAlias("limit_pay") + private String limitPay; + /** - *
      用户标识  openid  否 String(128) oUpF8uMuAJO_M2pxb1Q9zNjWeS6o  trade_type=JSAPI,此参数必传,用户在商户appid下的唯一标识。openid如何获取,可参考【获取openid】。企业号请使用【企业号OAuth2.0接口】获取企业号内成员userid,再调用【企业号userid转openid接口】进行转换
    +   * 
    +   * 用户标识
    +   * openid
    +   * 否
    +   * String(128)
    +   * oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
    +   * trade_type=JSAPI,此参数必传,用户在商户appid下的唯一标识。
    +   * openid如何获取,可参考【获取openid】。
    +   * 企业号请使用【企业号OAuth2.0接口】获取企业号内成员userid,再调用【企业号userid转openid接口】进行转换
        * 
    */ + @XStreamAlias("openid") + private String openid; + + public String getAppid() { + return this.appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public String getMchId() { + return this.mchId; + } + + public void setMchId(String mchId) { + this.mchId = mchId; + } + + public String getDeviceInfo() { + return this.deviceInfo; + } + + public void setDeviceInfo(String deviceInfo) { + this.deviceInfo = deviceInfo; + } + + public String getNonceStr() { + return this.nonceStr; + } + + public void setNonceStr(String nonceStr) { + this.nonceStr = nonceStr; + } + + public String getSign() { + return this.sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getBody() { + return this.body; + } + + public void setBody(String body) { + this.body = body; + } + + public String getDetail() { + return this.detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } + + public String getAttach() { + return this.attach; + } + + public void setAttach(String attach) { + this.attach = attach; + } + + public String getOutTradeNo() { + return this.outTradeNo; + } + + public void setOutTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; + } + + public String getFeeType() { + return this.feeType; + } + + public void setFeeType(String feeType) { + this.feeType = feeType; + } + + public Integer getTotalFee() { + return this.totalFee; + } + + public void setTotalFee(Integer totalFee) { + this.totalFee = totalFee; + } + + public String getSpbillCreateIp() { + return this.spbillCreateIp; + } + + public void setSpbillCreateIp(String spbillCreateIp) { + this.spbillCreateIp = spbillCreateIp; + } + + public String getTimeStart() { + return this.timeStart; + } + + public void setTimeStart(String timeStart) { + this.timeStart = timeStart; + } + + public String getTimeExpire() { + return this.timeExpire; + } + + public void setTimeExpire(String timeExpire) { + this.timeExpire = timeExpire; + } + + public String getGoodsTag() { + return this.goodsTag; + } + + public void setGoodsTag(String goodsTag) { + this.goodsTag = goodsTag; + } + + public String getNotifyURL() { + return this.notifyURL; + } + + public void setNotifyURL(String notifyURL) { + this.notifyURL = notifyURL; + } + + public String getTradeType() { + return this.tradeType; + } + + public void setTradeType(String tradeType) { + this.tradeType = tradeType; + } + + public String getProductId() { + return this.productId; + } + + public void setProductId(String productId) { + this.productId = productId; + } + + public String getLimitPay() { + return this.limitPay; + } + + public void setLimitPay(String limitPay) { + this.limitPay = limitPay; + } + + public String getOpenid() { + return this.openid; + } + + public void setOpenid(String openid) { + this.openid = openid; + } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } + + public static WxUnifiedOrderRequestBuilder builder() { + return new WxUnifiedOrderRequestBuilder(); + } + + public static class WxUnifiedOrderRequestBuilder { + private String appid; + private String mchId; + private String deviceInfo; + private String nonceStr; + private String sign; + private String body; + private String detail; + private String attach; + private String outTradeNo; + private String feeType; + private Integer totalFee; + private String spbillCreateIp; + private String timeStart; + private String timeExpire; + private String goodsTag; + private String notifyURL; + private String tradeType; + private String productId; + private String limitPay; + private String openid; + + public WxUnifiedOrderRequestBuilder appid(String appid) { + this.appid = appid; + return this; + } + + public WxUnifiedOrderRequestBuilder mchId(String mchId) { + this.mchId = mchId; + return this; + } + + public WxUnifiedOrderRequestBuilder deviceInfo(String deviceInfo) { + this.deviceInfo = deviceInfo; + return this; + } + + public WxUnifiedOrderRequestBuilder nonceStr(String nonceStr) { + this.nonceStr = nonceStr; + return this; + } + + public WxUnifiedOrderRequestBuilder sign(String sign) { + this.sign = sign; + return this; + } + + public WxUnifiedOrderRequestBuilder body(String body) { + this.body = body; + return this; + } + + public WxUnifiedOrderRequestBuilder detail(String detail) { + this.detail = detail; + return this; + } + + public WxUnifiedOrderRequestBuilder attach(String attach) { + this.attach = attach; + return this; + } + + public WxUnifiedOrderRequestBuilder outTradeNo(String outTradeNo) { + this.outTradeNo = outTradeNo; + return this; + } + + public WxUnifiedOrderRequestBuilder feeType(String feeType) { + this.feeType = feeType; + return this; + } + + public WxUnifiedOrderRequestBuilder totalFee(Integer totalFee) { + this.totalFee = totalFee; + return this; + } + + public WxUnifiedOrderRequestBuilder spbillCreateIp(String spbillCreateIp) { + this.spbillCreateIp = spbillCreateIp; + return this; + } + + public WxUnifiedOrderRequestBuilder timeStart(String timeStart) { + this.timeStart = timeStart; + return this; + } + + public WxUnifiedOrderRequestBuilder timeExpire(String timeExpire) { + this.timeExpire = timeExpire; + return this; + } + + public WxUnifiedOrderRequestBuilder goodsTag(String goodsTag) { + this.goodsTag = goodsTag; + return this; + } + + public WxUnifiedOrderRequestBuilder notifyURL(String notifyURL) { + this.notifyURL = notifyURL; + return this; + } + + public WxUnifiedOrderRequestBuilder tradeType(String tradeType) { + this.tradeType = tradeType; + return this; + } + + public WxUnifiedOrderRequestBuilder productId(String productId) { + this.productId = productId; + return this; + } + + public WxUnifiedOrderRequestBuilder limitPay(String limitPay) { + this.limitPay = limitPay; + return this; + } + + public WxUnifiedOrderRequestBuilder openid(String openid) { + this.openid = openid; + return this; + } + + public WxUnifiedOrderRequestBuilder from(WxUnifiedOrderRequest origin) { + this.appid(origin.appid); + this.mchId(origin.mchId); + this.deviceInfo(origin.deviceInfo); + this.nonceStr(origin.nonceStr); + this.sign(origin.sign); + this.body(origin.body); + this.detail(origin.detail); + this.attach(origin.attach); + this.outTradeNo(origin.outTradeNo); + this.feeType(origin.feeType); + this.totalFee(origin.totalFee); + this.spbillCreateIp(origin.spbillCreateIp); + this.timeStart(origin.timeStart); + this.timeExpire(origin.timeExpire); + this.goodsTag(origin.goodsTag); + this.notifyURL(origin.notifyURL); + this.tradeType(origin.tradeType); + this.productId(origin.productId); + this.limitPay(origin.limitPay); + this.openid(origin.openid); + return this; + } + + public WxUnifiedOrderRequest build() { + WxUnifiedOrderRequest m = new WxUnifiedOrderRequest(); + m.appid = this.appid; + m.mchId = this.mchId; + m.deviceInfo = this.deviceInfo; + m.nonceStr = this.nonceStr; + m.sign = this.sign; + m.body = this.body; + m.detail = this.detail; + m.attach = this.attach; + m.outTradeNo = this.outTradeNo; + m.feeType = this.feeType; + m.totalFee = this.totalFee; + m.spbillCreateIp = this.spbillCreateIp; + m.timeStart = this.timeStart; + m.timeExpire = this.timeExpire; + m.goodsTag = this.goodsTag; + m.notifyURL = this.notifyURL; + m.tradeType = this.tradeType; + m.productId = this.productId; + m.limitPay = this.limitPay; + m.openid = this.openid; + return m; + } + } + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderResult.java new file mode 100644 index 00000000..18817461 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/WxUnifiedOrderResult.java @@ -0,0 +1,155 @@ +package me.chanjar.weixin.mp.bean.pay; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.thoughtworks.xstream.annotations.XStreamAlias; + +/** + *
    + * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识"返回的结果
    + * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
    + * 
    + * + * @author chanjarster + */ +@XStreamAlias("xml") +public class WxUnifiedOrderResult { + + @XStreamAlias("return_code") + private String returnCode; + + @XStreamAlias("return_msg") + private String returnMsg; + + @XStreamAlias("appid") + private String appid; + + @XStreamAlias("mch_id") + private String mchId; + + @XStreamAlias("nonce_str") + private String nonceStr; + + @XStreamAlias("sign") + private String sign; + + @XStreamAlias("result_code") + private String resultCode; + + @XStreamAlias("prepay_id") + private String prepayId; + + @XStreamAlias("trade_type") + private String tradeType; + + @XStreamAlias("err_code") + private String errCode; + + @XStreamAlias("err_code_des") + private String errCodeDes; + + @XStreamAlias("code_url") + private String codeURL; + + public String getReturnCode() { + return this.returnCode; + } + + public void setReturnCode(String returnCode) { + this.returnCode = returnCode; + } + + public String getReturnMsg() { + return this.returnMsg; + } + + public void setReturnMsg(String returnMsg) { + this.returnMsg = returnMsg; + } + + public String getAppid() { + return this.appid; + } + + public void setAppid(String appid) { + this.appid = appid; + } + + public String getMchId() { + return this.mchId; + } + + public void setMchId(String mchId) { + this.mchId = mchId; + } + + public String getNonceStr() { + return this.nonceStr; + } + + public void setNonceStr(String nonceStr) { + this.nonceStr = nonceStr; + } + + public String getSign() { + return this.sign; + } + + public void setSign(String sign) { + this.sign = sign; + } + + public String getResultCode() { + return this.resultCode; + } + + public void setResultCode(String resultCode) { + this.resultCode = resultCode; + } + + public String getPrepayId() { + return this.prepayId; + } + + public void setPrepayId(String prepayId) { + this.prepayId = prepayId; + } + + public String getTradeType() { + return this.tradeType; + } + + public void setTradeType(String tradeType) { + this.tradeType = tradeType; + } + + public String getErrCode() { + return this.errCode; + } + + public void setErrCode(String errCode) { + this.errCode = errCode; + } + + public String getErrCodeDes() { + return this.errCodeDes; + } + + public void setErrCodeDes(String errCodeDes) { + this.errCodeDes = errCodeDes; + } + + public String getCodeURL() { + return this.codeURL; + } + + public void setCodeURL(String codeURL) { + this.codeURL = codeURL; + } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java deleted file mode 100644 index e930fc13..00000000 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpPrepayIdResult.java +++ /dev/null @@ -1,128 +0,0 @@ -package me.chanjar.weixin.mp.bean.result; - -import java.io.Serializable; - -/** - *
    - * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识"返回的结果
    - *
    - * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
    - *
    - * 
    - * - * @author chanjarster - */ -public class WxMpPrepayIdResult implements Serializable { - /** - * - */ - private static final long serialVersionUID = -8970574397788396143L; - 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 prepay_id; - private String trade_type; - private String err_code; - private String err_code_des; - private String code_url; - - public String getReturn_code() { - return this.return_code; - } - - public void setReturn_code(String return_code) { - this.return_code = return_code; - } - - public String getReturn_msg() { - return this.return_msg; - } - - public void setReturn_msg(String return_msg) { - this.return_msg = return_msg; - } - - public String getAppid() { - return this.appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getMch_id() { - return this.mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getNonce_str() { - return this.nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return this.sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getResult_code() { - return this.result_code; - } - - public void setResult_code(String result_code) { - this.result_code = result_code; - } - - public String getPrepay_id() { - return this.prepay_id; - } - - public void setPrepay_id(String prepay_id) { - this.prepay_id = prepay_id; - } - - public String getTrade_type() { - return this.trade_type; - } - - public void setTrade_type(String trade_type) { - this.trade_type = trade_type; - } - - public String getErr_code() { - return this.err_code; - } - - public void setErr_code(String err_code) { - this.err_code = err_code; - } - - public String getErr_code_des() { - return this.err_code_des; - } - - public void setErr_code_des(String err_code_des) { - this.err_code_des = err_code_des; - } - - public String getCode_url() { - return this.code_url; - } - - public void setCode_url(String code_url) { - this.code_url = code_url; - } -} diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java index b17d1206..f6e990af 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java @@ -5,9 +5,12 @@ import org.testng.annotations.Test; import com.google.inject.Inject; +import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.mp.api.ApiTestModule; import me.chanjar.weixin.mp.bean.pay.WxRedpackResult; import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest; +import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest; +import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderResult; /** * 测试支付相关接口 @@ -26,11 +29,6 @@ public class WxMpPayServiceImplTest { } - @Test - public void testGetPrepayId1() throws Exception { - - } - @Test public void testGetJsapiPayInfo() throws Exception { @@ -78,4 +76,16 @@ public class WxMpPayServiceImplTest { System.err.println(redpackResult); } + /** + * Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpPayServiceImpl#unifiedOrder(me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest)}. + * @throws WxErrorException + */ + @Test + public void testUnifiedOrder() throws WxErrorException { + WxUnifiedOrderResult result = this.wxService.getPayService() + .unifiedOrder(WxUnifiedOrderRequest.builder().body("1111111") + .totalFee(1).spbillCreateIp("111111").notifyURL("111111") + .tradeType("JSAPI1").openid("122").outTradeNo("111111").build()); + System.err.println(result); + } } \ No newline at end of file From c538f6912db373fbeafffa5e2e5ca49d637e2c32 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Mon, 26 Sep 2016 18:43:30 +0800 Subject: [PATCH 40/51] Update README.md --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index f061f5b0..4c090930 100644 --- a/README.md +++ b/README.md @@ -20,16 +20,16 @@ =========== ## 版本说明 -* 本项目定为每月发布一次正式版,版本号格式为X.X.0(如2.0.0,2.1.0等),月初或月底发布新版本,遇到重大问题需修复会及时提交新版本,欢迎大家随时提交Pull Request。 -* BUG修复和新特性一般会先发布成小版本作为临时版本(如2.0.1,2.0.2等,即尾号不为0,以区别于正式版)。 -* 目前最新版本号为 ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) ,也可以通过访问如下地址查看所有最新的版本: -- [【公众号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) -- [【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22) - +* 本项目定为每月发布一次正式版,版本号格式为X.X.0(如2.0.0,2.1.0等),月初或月底发布新版本,遇到重大问题需修复会及时提交新版本,欢迎大家随时提交Pull Request; +* BUG修复和新特性一般会先发布成小版本作为临时版本(如2.0.1,2.0.2等,即尾号不为0,以区别于正式版); +* 目前最新版本号为 ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) ,也可以通过访问链接[【公众号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) [【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22) +分别查看所有最新的版本。 ## Maven & Gradle * 公众号(订阅号、服务号): + +maven: ```xml com.github.binarywang @@ -37,12 +37,14 @@ 2.1.0 ``` - +gradle: ```groovy compile 'com.github.binarywang:weixin-java-mp:2.1.0' ``` * 企业号: + +maven: ```xml com.github.binarywang @@ -50,7 +52,7 @@ compile 'com.github.binarywang:weixin-java-mp:2.1.0' 2.1.0 ``` - +gradle: ```groovy compile 'com.github.binarywang:weixin-java-cp:2.1.0' ``` @@ -63,16 +65,14 @@ compile 'com.github.binarywang:weixin-java-cp:2.1.0' * https://git.coding.net/binarywang/weixin-java-tools.git -## 目前可参考的Demo项目: -* https://github.com/wechat-group/weixin-java-tools-springmvc -* https://github.com/wechat-group/weixin-mp-demo -* ===========以下为备份仓库,会保持跟主仓库同步 -* http://git.oschina.net/binary/weixin-mp-demo -* https://bitbucket.org/binarywang/weixin-mp-demo +## 目前可参考的Demo项目有两个: +1. https://github.com/wechat-group/weixin-mp-demo +1. https://github.com/wechat-group/weixin-java-tools-springmvc ## 关于代码贡献 +* 非常欢迎和感谢对本项目发起Pull Request的同学,本项目代码风格为使用2个空格代表一个Tab,因此在提交代码时请注意一下,否则很容易在IDE格式化代码后与原代码产生大量diff,这样会给其他人阅读代码带来极大的困扰。 +* 为了便于设置,本项目引入editorconfig插件,请使用eclipse的同学在贡献代码前安装相关插件,IntelliJ IDEA则自带支持,无需额外安装插件。 +* 本项目可以采用两种方式接受代码贡献: -* 非常欢迎和感谢对本项目发起Pull Request的同学,本项目可以采用两种方式接受代码贡献: -* 第一种就是基于[Git Flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)开发流程,因此在发起Pull Request的时候请选择develop分支。 -* 另外一种贡献代码的方式就是加入SDK Developers开发组,如果对自己的代码足够自信,可以随时提交代码,注意要随时进行单元测试,保证提交代码没有明显问题,具体加入方式,请咨询管理员。 -* 本项目代码风格为使用2个空格代表一个Tab,因此在提交代码时请注意一下,否则很容易在IDE格式化代码后与原代码产生大量diff,这样会给其他人阅读代码带来极大的困扰。 +1. 第一种就是基于[Git Flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)开发流程,因此在发起Pull Request的时候请选择develop分支。 +1. 另外一种贡献代码的方式就是加入SDK Developers开发组,如果对自己的代码足够自信,可以随时提交代码,注意要随时进行单元测试,保证提交代码没有明显问题,具体加入方式,请咨询管理员。 From dae8e40dc0c4b4eb0b089569e93b84a03ea5a3e3 Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Mon, 26 Sep 2016 18:56:35 +0800 Subject: [PATCH 41/51] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=B7=B2=E6=9C=89?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/mp/api/WxMpPayService.java | 13 +- .../mp/api/impl/WxMpPayServiceImpl.java | 170 +++++------------- 2 files changed, 51 insertions(+), 132 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java index dae03f43..3a4128fe 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java @@ -30,20 +30,25 @@ public interface WxMpPayService { * @param tradeType 交易类型 JSAPI,NATIVE,APP,WAP * @param ip 发起支付的客户端IP * @param notifyUrl 通知地址 + * @throws WxErrorException * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPrepayId(Map) instead */ @Deprecated - WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl); + WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double amt, + String body, String tradeType, String ip, String notifyUrl) + throws WxErrorException; /** * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" * * @param parameters All required/optional parameters for weixin payment + * @throws WxErrorException * @deprecated use me.chanjar.weixin.mp.api.WxMpPayService.unifiedOrder(WxUnifiedOrderRequest) instead */ @Deprecated - WxMpPrepayIdResult getPrepayId(Map parameters); + WxMpPrepayIdResult getPrepayId(Map parameters) + throws WxErrorException; /** * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) @@ -98,9 +103,11 @@ public interface WxMpPayService { /** * 该接口提供所有微信支付订单的查询,当支付通知处理异常戒丢失的情冴,商户可以通过该接口查询订单支付状态。 * 详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_2 + * @throws WxErrorException * */ - WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo); + WxMpPayResult getJSSDKPayResult(String transactionId, String outTradeNo) + throws WxErrorException; /** * 读取支付结果通知 diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index e3e628c7..b8ec8acb 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -1,6 +1,5 @@ package me.chanjar.weixin.mp.api.impl; -import java.io.IOException; import java.lang.reflect.Field; import java.util.HashMap; import java.util.List; @@ -10,16 +9,9 @@ import java.util.SortedMap; import java.util.TreeMap; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.http.Consts; -import org.apache.http.HttpHost; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; import org.joor.Reflect; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.slf4j.helpers.MessageFormatter; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -29,9 +21,9 @@ import com.thoughtworks.xstream.annotations.XStreamAlias; import me.chanjar.weixin.common.annotation.Required; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; -import me.chanjar.weixin.common.util.http.Utf8ResponseHandler; import me.chanjar.weixin.common.util.xml.XStreamInitializer; import me.chanjar.weixin.mp.api.WxMpPayService; +import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.pay.WxMpPayCallback; import me.chanjar.weixin.mp.bean.pay.WxMpPayRefundResult; import me.chanjar.weixin.mp.bean.pay.WxMpPayResult; @@ -54,19 +46,17 @@ public class WxMpPayServiceImpl implements WxMpPayService { private final String[] REQUIRED_ORDER_PARAMETERS = new String[] { "appid", "mch_id", "body", "out_trade_no", "total_fee", "spbill_create_ip", "notify_url", "trade_type" }; - private HttpHost httpProxy; - private WxMpServiceImpl wxMpService; + private WxMpService wxMpService; - public WxMpPayServiceImpl(WxMpServiceImpl wxMpService) { + public WxMpPayServiceImpl(WxMpService wxMpService) { this.wxMpService = wxMpService; - this.httpProxy = wxMpService.getHttpProxy(); } @Override @Deprecated public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, - String callbackUrl) { + String callbackUrl) throws WxErrorException { Map packageParams = new HashMap<>(); packageParams.put("appid", this.wxMpService.getWxMpConfigStorage().getAppId()); @@ -85,7 +75,8 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override @Deprecated - public WxMpPrepayIdResult getPrepayId(final Map parameters) { + public WxMpPrepayIdResult getPrepayId(final Map parameters) + throws WxErrorException { final SortedMap packageParams = new TreeMap<>(parameters); packageParams.put("appid", this.wxMpService.getWxMpConfigStorage().getAppId()); @@ -106,29 +97,11 @@ public class WxMpPayServiceImpl implements WxMpPayService { request.append(""); - HttpPost httpPost = new HttpPost( - "https://api.mch.weixin.qq.com/pay/unifiedorder"); - if (this.httpProxy != null) { - RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy) - .build(); - httpPost.setConfig(config); - } - - StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); - httpPost.setEntity(entity); - try (CloseableHttpResponse response = this.wxMpService.getHttpclient() - .execute(httpPost)) { - String responseContent = Utf8ResponseHandler.INSTANCE - .handleResponse(response); - XStream xstream = XStreamInitializer.getInstance(); - xstream.alias("xml", WxMpPrepayIdResult.class); - return (WxMpPrepayIdResult) xstream.fromXML(responseContent); - } catch (IOException e) { - throw new RuntimeException("Failed to get prepay id due to IO exception.", - e); - } finally { - httpPost.releaseConnection(); - } + String url = "https://api.mch.weixin.qq.com/pay/unifiedorder"; + String responseContent = this.wxMpService.post(url, request.toString()); + XStream xstream = XStreamInitializer.getInstance(); + xstream.alias("xml", WxMpPrepayIdResult.class); + return (WxMpPrepayIdResult) xstream.fromXML(responseContent); } private void checkParameters(Map parameters) { @@ -238,7 +211,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { @Override public WxMpPayResult getJSSDKPayResult(String transactionId, - String outTradeNo) { + String outTradeNo) throws WxErrorException { String nonce_str = System.currentTimeMillis() + ""; SortedMap packageParams = new TreeMap<>(); @@ -267,27 +240,11 @@ public class WxMpPayServiceImpl implements WxMpPayService { } request.append(""); - HttpPost httpPost = new HttpPost( - "https://api.mch.weixin.qq.com/pay/orderquery"); - if (this.httpProxy != null) { - RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy) - .build(); - httpPost.setConfig(config); - } - - StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); - httpPost.setEntity(entity); - try (CloseableHttpResponse response = this.wxMpService.getHttpclient() - .execute(httpPost)) { - String responseContent = Utf8ResponseHandler.INSTANCE - .handleResponse(response); - XStream xstream = XStreamInitializer.getInstance(); - xstream.alias("xml", WxMpPayResult.class); - return (WxMpPayResult) xstream.fromXML(responseContent); - } catch (IOException e) { - throw new RuntimeException("Failed to query order due to IO exception.", - e); - } + String url = "https://api.mch.weixin.qq.com/pay/orderquery"; + String responseContent = this.wxMpService.post(url, request.toString()); + XStream xstream = XStreamInitializer.getInstance(); + xstream.alias("xml", WxMpPayResult.class); + return (WxMpPayResult) xstream.fromXML(responseContent); } @Override @@ -325,49 +282,26 @@ public class WxMpPayServiceImpl implements WxMpPayService { } request.append(""); - HttpPost httpPost = new HttpPost( - "https://api.mch.weixin.qq.com/secapi/pay/refund"); - if (this.httpProxy != null) { - RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy) - .build(); - httpPost.setConfig(config); - } - - StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); - httpPost.setEntity(entity); - try (CloseableHttpResponse response = this.wxMpService.getHttpclient() - .execute(httpPost)) { - String responseContent = Utf8ResponseHandler.INSTANCE - .handleResponse(response); - XStream xstream = XStreamInitializer.getInstance(); - xstream.processAnnotations(WxMpPayRefundResult.class); - WxMpPayRefundResult wxMpPayRefundResult = (WxMpPayRefundResult) xstream - .fromXML(responseContent); - - if (!"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getResultCode()) - || !"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getReturnCode())) { - WxError error = new WxError(); - error.setErrorCode(-1); - error.setErrorMsg("return_code:" + wxMpPayRefundResult.getReturnCode() - + ";return_msg:" + wxMpPayRefundResult.getReturnMsg() - + ";result_code:" + wxMpPayRefundResult.getResultCode() - + ";err_code" + wxMpPayRefundResult.getErrCode() + ";err_code_des" - + wxMpPayRefundResult.getErrCodeDes()); - throw new WxErrorException(error); - } + String url = "https://api.mch.weixin.qq.com/secapi/pay/refund"; + String responseContent = this.wxMpService.post(url, request.toString()); + XStream xstream = XStreamInitializer.getInstance(); + xstream.processAnnotations(WxMpPayRefundResult.class); + WxMpPayRefundResult wxMpPayRefundResult = (WxMpPayRefundResult) xstream + .fromXML(responseContent); - return wxMpPayRefundResult; - } catch (IOException e) { - String message = MessageFormatter - .format("Exception happened when sending refund '{}'.", - request.toString()) - .getMessage(); - this.log.error(message, e); - throw new WxErrorException( - WxError.newBuilder().setErrorMsg(message).build()); - } finally { - httpPost.releaseConnection(); + if (!"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getResultCode()) + || !"SUCCESS".equalsIgnoreCase(wxMpPayRefundResult.getReturnCode())) { + WxError error = new WxError(); + error.setErrorCode(-1); + error.setErrorMsg("return_code:" + wxMpPayRefundResult.getReturnCode() + + ";return_msg:" + wxMpPayRefundResult.getReturnMsg() + + ";result_code:" + wxMpPayRefundResult.getResultCode() + ";err_code" + + wxMpPayRefundResult.getErrCode() + ";err_code_des" + + wxMpPayRefundResult.getErrCodeDes()); + throw new WxErrorException(error); } + + return wxMpPayRefundResult; } @Override @@ -400,34 +334,12 @@ public class WxMpPayServiceImpl implements WxMpPayService { request.append(""); - HttpPost httpPost = new HttpPost( - "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack"); - if (this.httpProxy != null) { - RequestConfig config = RequestConfig.custom().setProxy(this.httpProxy) - .build(); - httpPost.setConfig(config); - } + String url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack"; - StringEntity entity = new StringEntity(request.toString(), Consts.UTF_8); - httpPost.setEntity(entity); - try (CloseableHttpResponse response = this.wxMpService.getHttpclient() - .execute(httpPost)) { - String responseContent = Utf8ResponseHandler.INSTANCE - .handleResponse(response); - XStream xstream = XStreamInitializer.getInstance(); - xstream.processAnnotations(WxRedpackResult.class); - return (WxRedpackResult) xstream.fromXML(responseContent); - } catch (IOException e) { - String message = MessageFormatter - .format("Exception occured when sending redpack '{}'.", - request.toString()) - .getMessage(); - this.log.error(message, e); - throw new WxErrorException( - WxError.newBuilder().setErrorMsg(message).build()); - } finally { - httpPost.releaseConnection(); - } + String responseContent = this.wxMpService.post(url, request.toString()); + XStream xstream = XStreamInitializer.getInstance(); + xstream.processAnnotations(WxRedpackResult.class); + return (WxRedpackResult) xstream.fromXML(responseContent); } @Override @@ -544,7 +456,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { private void checkParameters(WxUnifiedOrderRequest request) { - List nullFields = com.google.common.collect.Lists.newArrayList(); + List nullFields = Lists.newArrayList(); for (Entry entry : Reflect.on(request).fields() .entrySet()) { Reflect reflect = entry.getValue(); From b7e8f2129d678ab5b099f1da448f1c932c83cd4c Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Mon, 26 Sep 2016 20:06:00 +0800 Subject: [PATCH 42/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=88=9B=E5=BB=BA=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=85=E6=B5=8B=E8=AF=95=E6=A0=BC=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E6=9A=82=E6=9C=AA=E9=80=9A=E8=BF=87=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/chanjar/weixin/mp/api/WxMpService.java | 29 +- .../weixin/mp/api/WxMpStoreService.java | 5 +- .../weixin/mp/api/impl/WxMpServiceImpl.java | 72 +++- .../mp/api/impl/WxMpStoreServiceImpl.java | 67 ++++ .../weixin/mp/bean/WxMpStoreBaseInfo.java | 351 +++++++++++++++++- .../mp/api/impl/WxMpStoreServiceImplTest.java | 42 +++ 6 files changed, 526 insertions(+), 40 deletions(-) create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java index adef735d..3b7f2125 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java @@ -302,28 +302,28 @@ public interface WxMpService { WxMpKefuService getKefuService(); /** - * 返回素材相关接口的方法实现类,以方便调用个其各种接口 + * 返回素材相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpMaterialService */ WxMpMaterialService getMaterialService(); /** - * 返回菜单相关接口的方法实现类,以方便调用个其各种接口 + * 返回菜单相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpMenuService */ WxMpMenuService getMenuService(); /** - * 返回用户相关接口的方法实现类,以方便调用个其各种接口 + * 返回用户相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpUserService */ WxMpUserService getUserService(); /** - * 返回用户分组相关接口的方法实现类,以方便调用个其各种接口 + * 返回用户分组相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpGroupService */ @@ -331,44 +331,51 @@ public interface WxMpService { WxMpGroupService getGroupService(); /** - * 返回用户标签相关接口的方法实现类,以方便调用个其各种接口 + * 返回用户标签相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpUserTagService */ WxMpUserTagService getUserTagService(); /** - * 返回二维码相关接口的方法实现类,以方便调用个其各种接口 + * 返回二维码相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpQrcodeService */ WxMpQrcodeService getQrcodeService(); /** - * 返回卡券相关接口的方法实现类,以方便调用个其各种接口 + * 返回卡券相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpCardService */ WxMpCardService getCardService(); /** - * 返回微信支付相关接口的方法实现类,以方便调用个其各种接口 + * 返回微信支付相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpPayService */ WxMpPayService getPayService(); /** - * 返回数据分析统计相关接口的方法实现类,以方便调用个其各种接口 + * 返回数据分析统计相关接口方法的实现类对象,以方便调用个其各种接口 * * @return WxMpDataCubeService */ WxMpDataCubeService getDataCubeService(); /** - * 返回用户黑名单管理相关接口的方法实现类,以方便调用其各种借口 + * 返回用户黑名单管理相关接口方法的实现类对象,以方便调用其各种接口 * - * @return WxMpUserBlackListService + * @return WxMpUserBlacklistService */ WxMpUserBlacklistService getBlackListService(); + + /** + * 返回门店管理相关接口方法的实现类对象,以方便调用其各种接口 + * + * @return WxMpStoreService + */ + WxMpStoreService getStoreService(); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java index 3d02cf92..3b445791 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java @@ -1,6 +1,7 @@ package me.chanjar.weixin.mp.api; import me.chanjar.weixin.common.exception.WxErrorException; +import me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo; /** * 门店管理的相关接口代码 @@ -19,8 +20,6 @@ public interface WxMpStoreService { * 接口格式: http://api.weixin.qq.com/cgi-bin/poi/addpoi?access_token=TOKEN *
    * - * @param scene_id 参数。 - * @param expire_seconds 过期秒数,默认60秒,最小60秒,最大1800秒 */ - void userUpdateRemark(String openid, String remark) throws WxErrorException; + void add(WxMpStoreBaseInfo request) throws WxErrorException; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java index a923f485..9710697f 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java @@ -1,9 +1,23 @@ package me.chanjar.weixin.mp.api.impl; +import java.io.IOException; + +import org.apache.http.HttpHost; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.conn.ssl.DefaultHostnameVerifier; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.impl.client.BasicResponseHandler; +import org.apache.http.impl.client.CloseableHttpClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; + import me.chanjar.weixin.common.bean.WxAccessToken; import me.chanjar.weixin.common.bean.WxJsapiSignature; import me.chanjar.weixin.common.bean.result.WxError; @@ -12,22 +26,39 @@ import me.chanjar.weixin.common.session.StandardSessionManager; import me.chanjar.weixin.common.session.WxSessionManager; import me.chanjar.weixin.common.util.RandomUtils; import me.chanjar.weixin.common.util.crypto.SHA1; -import me.chanjar.weixin.common.util.http.*; -import me.chanjar.weixin.mp.api.*; -import me.chanjar.weixin.mp.bean.*; -import me.chanjar.weixin.mp.bean.result.*; -import org.apache.http.HttpHost; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.conn.ssl.DefaultHostnameVerifier; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.client.BasicResponseHandler; -import org.apache.http.impl.client.CloseableHttpClient; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; +import me.chanjar.weixin.common.util.http.ApacheHttpClientBuilder; +import me.chanjar.weixin.common.util.http.DefaultApacheHttpClientBuilder; +import me.chanjar.weixin.common.util.http.RequestExecutor; +import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor; +import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor; +import me.chanjar.weixin.common.util.http.URIUtil; +import me.chanjar.weixin.mp.api.WxMpCardService; +import me.chanjar.weixin.mp.api.WxMpConfigStorage; +import me.chanjar.weixin.mp.api.WxMpDataCubeService; +import me.chanjar.weixin.mp.api.WxMpGroupService; +import me.chanjar.weixin.mp.api.WxMpKefuService; +import me.chanjar.weixin.mp.api.WxMpMaterialService; +import me.chanjar.weixin.mp.api.WxMpMenuService; +import me.chanjar.weixin.mp.api.WxMpPayService; +import me.chanjar.weixin.mp.api.WxMpQrcodeService; +import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.api.WxMpStoreService; +import me.chanjar.weixin.mp.api.WxMpUserBlacklistService; +import me.chanjar.weixin.mp.api.WxMpUserService; +import me.chanjar.weixin.mp.api.WxMpUserTagService; +import me.chanjar.weixin.mp.bean.WxMpIndustry; +import me.chanjar.weixin.mp.bean.WxMpMassGroupMessage; +import me.chanjar.weixin.mp.bean.WxMpMassNews; +import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage; +import me.chanjar.weixin.mp.bean.WxMpMassPreviewMessage; +import me.chanjar.weixin.mp.bean.WxMpMassVideo; +import me.chanjar.weixin.mp.bean.WxMpSemanticQuery; +import me.chanjar.weixin.mp.bean.WxMpTemplateMessage; +import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult; +import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult; +import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; +import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult; +import me.chanjar.weixin.mp.bean.result.WxMpUser; public class WxMpServiceImpl implements WxMpService { @@ -65,6 +96,8 @@ public class WxMpServiceImpl implements WxMpService { private WxMpPayService payService = new WxMpPayServiceImpl(this); + private WxMpStoreService storeService = new WxMpStoreServiceImpl(this); + private WxMpDataCubeService dataCubeService = new WxMpDataCubeServiceImpl(this); private WxMpUserBlacklistService blackListService = new WxMpUserBlacklistServiceImpl(this); @@ -442,6 +475,8 @@ public class WxMpServiceImpl implements WxMpService { return this.execute(executor, uri, data); } if (error.getErrorCode() != 0) { + this.log.error("\n[URL]: {}\n[PARAMS]: {}\n[RESPONSE]: {}", uri, data, + error); throw new WxErrorException(error); } return null; @@ -560,4 +595,9 @@ public class WxMpServiceImpl implements WxMpService { return this.blackListService; } + @Override + public WxMpStoreService getStoreService() { + return this.storeService; + } + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java new file mode 100644 index 00000000..9ed28df5 --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java @@ -0,0 +1,67 @@ +package me.chanjar.weixin.mp.api.impl; + +import java.lang.reflect.Field; +import java.util.List; +import java.util.Map.Entry; + +import org.joor.Reflect; + +import com.google.common.collect.Lists; + +import me.chanjar.weixin.common.annotation.Required; +import me.chanjar.weixin.common.bean.result.WxError; +import me.chanjar.weixin.common.exception.WxErrorException; +import me.chanjar.weixin.mp.api.WxMpService; +import me.chanjar.weixin.mp.api.WxMpStoreService; +import me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo; + +/** + * Created by Binary Wang on 2016/9/26. + * @author binarywang (https://github.com/binarywang) + * + */ +public class WxMpStoreServiceImpl implements WxMpStoreService { + + private WxMpService wxMpService; + + public WxMpStoreServiceImpl(WxMpService wxMpService) { + this.wxMpService = wxMpService; + } + + @Override + public void add(WxMpStoreBaseInfo request) throws WxErrorException { + checkParameters(request); + + String url = "http://api.weixin.qq.com/cgi-bin/poi/addpoi"; + // String data = "{\"business\":{\"base_info\":{\"business_name\":\"haha\",\"branch_name\":\"abc\",\"province\":\"aaa\",\"city\":\"aaa\",\"district\":\"aaa\",\"telephone\":\"122\",\"categories\":\"adsdas\",\"offset_type\":\"1\",\"longitude\":\"115.32375\",\"latitude\":\"25.097486\"}}}"; + String response = this.wxMpService.post(url, request.toJson()); + // String response = this.wxMpService.post(url, data); + WxError wxError = WxError.fromJson(response); + if (wxError.getErrorCode() != 0) { + throw new WxErrorException(wxError); + } + } + + private void checkParameters(WxMpStoreBaseInfo request) { + List nullFields = Lists.newArrayList(); + for (Entry entry : Reflect.on(request).fields() + .entrySet()) { + Reflect reflect = entry.getValue(); + try { + Field field = request.getClass().getDeclaredField(entry.getKey()); + if (field.isAnnotationPresent(Required.class) + && reflect.get() == null) { + nullFields.add(entry.getKey()); + } + } catch (NoSuchFieldException | SecurityException e) { + e.printStackTrace(); + } + } + + if (!nullFields.isEmpty()) { + throw new IllegalArgumentException("必填字段[" + nullFields + "]必须提供值"); + } + + } + +} diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java index bcfd2e4f..bb097a69 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java @@ -1,9 +1,14 @@ package me.chanjar.weixin.mp.bean; +import java.math.BigDecimal; +import java.util.List; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; -import java.util.List; +import me.chanjar.weixin.common.annotation.Required; +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; /** * 门店基础信息 @@ -11,6 +16,16 @@ import java.util.List; * Created by Binary Wang on 2016-09-23. */ public class WxMpStoreBaseInfo { + + public String toJson() { + JsonElement base_info = WxMpGsonBuilder.create().toJsonTree(this); + JsonObject jsonObject = new JsonObject(); + jsonObject.add("base_info", base_info); + JsonObject business = new JsonObject(); + business.add("business", jsonObject); + return business.toString(); + } + public static class WxMpStorePhoto { /** * 照片url @@ -31,6 +46,7 @@ public class WxMpStoreBaseInfo { * 门店名称(仅为商户名,如:国美、麦当劳,不应包含地区、地址、分店名等信息,错误示例:北京国美) * 不能为空,15个汉字或30个英文字符内 */ + @Required @SerializedName("business_name") private String businessName; @@ -39,14 +55,16 @@ public class WxMpStoreBaseInfo { * 分店名称(不应包含地区信息,不应与门店名有重复,错误示例:北京王府井店) * 10个字以内 */ + @Required @SerializedName("branch_name") - private String branch_name; + private String branchName; /** * province * 门店所在的省份(直辖市填城市名,如:北京市) * 10个字以内 */ + @Required @SerializedName("province") private String province; @@ -55,6 +73,7 @@ public class WxMpStoreBaseInfo { * 门店所在的城市 * 10个字以内 */ + @Required @SerializedName("city") private String city; @@ -63,6 +82,7 @@ public class WxMpStoreBaseInfo { * 门店所在地区 * 10个字以内 */ + @Required @SerializedName("district") private String district; @@ -71,6 +91,7 @@ public class WxMpStoreBaseInfo { * 门店所在的详细街道地址(不要填写省市信息) * (东莞等没有“区”行政区划的城市,该字段可不必填写。其余城市必填。) */ + @Required @SerializedName("address") private String address; @@ -78,6 +99,7 @@ public class WxMpStoreBaseInfo { * telephone * 门店的电话(纯数字,区号、分机号均由“-”隔开) */ + @Required @SerializedName("telephone") private String telephone; @@ -85,29 +107,33 @@ public class WxMpStoreBaseInfo { * categories * 门店的类型(不同级分类用“,”隔开,如:美食,川菜,火锅。详细分类参见附件:微信门店类目表) */ + @Required @SerializedName("categories") - private String categories; + private String[] categories; /** - * offset_type + * offsetType * 坐标类型,1 为火星坐标(目前只能选1) */ + @Required @SerializedName("offset_type") - private String offset_type; + private Integer offsetType = 1; /** * longitude * 门店所在地理位置的经度 */ + @Required @SerializedName("longitude") - private String longitude; + private BigDecimal longitude; /** * latitude * 门店所在地理位置的纬度(经纬度均为火星坐标,最好选用腾讯地图标记的坐标) */ + @Required @SerializedName("latitude") - private String latitude; + private BigDecimal latitude; /** * photo_list @@ -115,7 +141,7 @@ public class WxMpStoreBaseInfo { * 图片内容不允许与门店不相关,不允许为二维码、员工合照(或模特肖像)、营业执照、无门店正门的街景、地图截图、公交地铁站牌、菜单截图等 */ @SerializedName("photo_list") - private List photo_list; + private List photos; /** * recommend @@ -145,12 +171,317 @@ public class WxMpStoreBaseInfo { * 营业时间,24 小时制表示,用“-”连接,如 8:00-20:00 */ @SerializedName("open_time") - private String open_time; + private String openTime; /** * avg_price * 人均价格,大于0 的整数 */ @SerializedName("avg_price") - private Integer avg_price; + private Integer avgPrice; + + public String getSid() { + return this.sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getBusinessName() { + return this.businessName; + } + + public void setBusinessName(String businessName) { + this.businessName = businessName; + } + + public String getBranchName() { + return this.branchName; + } + + public void setBranchName(String branchName) { + this.branchName = branchName; + } + + public String getProvince() { + return this.province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getCity() { + return this.city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getDistrict() { + return this.district; + } + + public void setDistrict(String district) { + this.district = district; + } + + public String getAddress() { + return this.address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getTelephone() { + return this.telephone; + } + + public void setTelephone(String telephone) { + this.telephone = telephone; + } + + public String[] getCategories() { + return this.categories; + } + + public void setCategories(String[] categories) { + this.categories = categories; + } + + public Integer getOffsetType() { + return this.offsetType; + } + + public void setOffsetType(Integer offsetType) { + this.offsetType = offsetType; + } + + public BigDecimal getLongitude() { + return this.longitude; + } + + public void setLongitude(BigDecimal longitude) { + this.longitude = longitude; + } + + public BigDecimal getLatitude() { + return this.latitude; + } + + public void setLatitude(BigDecimal latitude) { + this.latitude = latitude; + } + + public List getPhotos() { + return this.photos; + } + + public void setPhotos(List photos) { + this.photos = photos; + } + + public String getRecommend() { + return this.recommend; + } + + public void setRecommend(String recommend) { + this.recommend = recommend; + } + + public String getSpecial() { + return this.special; + } + + public void setSpecial(String special) { + this.special = special; + } + + public String getIntroduction() { + return this.introduction; + } + + public void setIntroduction(String introduction) { + this.introduction = introduction; + } + + public String getOpenTime() { + return this.openTime; + } + + public void setOpenTime(String openTime) { + this.openTime = openTime; + } + + public Integer getAvgPrice() { + return this.avgPrice; + } + + public void setAvgPrice(Integer avgPrice) { + this.avgPrice = avgPrice; + } + + public static WxMpStoreBaseInfoBuilder builder() { + return new WxMpStoreBaseInfoBuilder(); + } + + public static class WxMpStoreBaseInfoBuilder { + private String sid; + private String businessName; + private String branchName; + private String province; + private String city; + private String district; + private String address; + private String telephone; + private String[] categories; + private Integer offsetType; + private BigDecimal longitude; + private BigDecimal latitude; + private List photos; + private String recommend; + private String special; + private String introduction; + private String openTime; + private Integer avgPrice; + + public WxMpStoreBaseInfoBuilder sid(String sid) { + this.sid = sid; + return this; + } + + public WxMpStoreBaseInfoBuilder businessName(String businessName) { + this.businessName = businessName; + return this; + } + + public WxMpStoreBaseInfoBuilder branchName(String branchName) { + this.branchName = branchName; + return this; + } + + public WxMpStoreBaseInfoBuilder province(String province) { + this.province = province; + return this; + } + + public WxMpStoreBaseInfoBuilder city(String city) { + this.city = city; + return this; + } + + public WxMpStoreBaseInfoBuilder district(String district) { + this.district = district; + return this; + } + + public WxMpStoreBaseInfoBuilder address(String address) { + this.address = address; + return this; + } + + public WxMpStoreBaseInfoBuilder telephone(String telephone) { + this.telephone = telephone; + return this; + } + + public WxMpStoreBaseInfoBuilder categories(String[] categories) { + this.categories = categories; + return this; + } + + public WxMpStoreBaseInfoBuilder offsetType(Integer offsetType) { + this.offsetType = offsetType; + return this; + } + + public WxMpStoreBaseInfoBuilder longitude(BigDecimal longitude) { + this.longitude = longitude; + return this; + } + + public WxMpStoreBaseInfoBuilder latitude(BigDecimal latitude) { + this.latitude = latitude; + return this; + } + + public WxMpStoreBaseInfoBuilder photos(List photos) { + this.photos = photos; + return this; + } + + public WxMpStoreBaseInfoBuilder recommend(String recommend) { + this.recommend = recommend; + return this; + } + + public WxMpStoreBaseInfoBuilder special(String special) { + this.special = special; + return this; + } + + public WxMpStoreBaseInfoBuilder introduction(String introduction) { + this.introduction = introduction; + return this; + } + + public WxMpStoreBaseInfoBuilder openTime(String openTime) { + this.openTime = openTime; + return this; + } + + public WxMpStoreBaseInfoBuilder avgPrice(Integer avgPrice) { + this.avgPrice = avgPrice; + return this; + } + + public WxMpStoreBaseInfoBuilder from(WxMpStoreBaseInfo origin) { + this.sid(origin.sid); + this.businessName(origin.businessName); + this.branchName(origin.branchName); + this.province(origin.province); + this.city(origin.city); + this.district(origin.district); + this.address(origin.address); + this.telephone(origin.telephone); + this.categories(origin.categories); + this.offsetType(origin.offsetType); + this.longitude(origin.longitude); + this.latitude(origin.latitude); + this.photos(origin.photos); + this.recommend(origin.recommend); + this.special(origin.special); + this.introduction(origin.introduction); + this.openTime(origin.openTime); + this.avgPrice(origin.avgPrice); + return this; + } + + public WxMpStoreBaseInfo build() { + WxMpStoreBaseInfo m = new WxMpStoreBaseInfo(); + m.sid = this.sid; + m.businessName = this.businessName; + m.branchName = this.branchName; + m.province = this.province; + m.city = this.city; + m.district = this.district; + m.address = this.address; + m.telephone = this.telephone; + m.categories = this.categories; + m.offsetType = this.offsetType; + m.longitude = this.longitude; + m.latitude = this.latitude; + m.photos = this.photos; + m.recommend = this.recommend; + m.special = this.special; + m.introduction = this.introduction; + m.openTime = this.openTime; + m.avgPrice = this.avgPrice; + return m; + } + } + } diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java new file mode 100644 index 00000000..1e1ed49c --- /dev/null +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java @@ -0,0 +1,42 @@ +/** + * Copyright(c) 2011-2016 by UCredit Inc. + * All Rights Reserved + */ +package me.chanjar.weixin.mp.api.impl; + +import java.math.BigDecimal; + +import org.testng.annotations.Guice; +import org.testng.annotations.Test; + +import com.google.inject.Inject; + +import me.chanjar.weixin.common.exception.WxErrorException; +import me.chanjar.weixin.mp.api.ApiTestModule; +import me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo; + +/** + * @author 王彬 (Binary Wang) + * + */ +@Test +@Guice(modules = ApiTestModule.class) +public class WxMpStoreServiceImplTest { + @Inject + private WxMpServiceImpl wxMpService; + + /** + * Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpStoreServiceImpl#add(me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo)}. + * @throws WxErrorException + */ + public void testAdd() throws WxErrorException { + this.wxMpService.getStoreService() + .add(WxMpStoreBaseInfo.builder().businessName("haha").branchName("abc") + .province("aaa").district("aaa").telephone("122").address("abc") + .categories(new String[] { "美食,川菜,火锅" }) + .longitude(new BigDecimal("115.32375")) + .latitude(new BigDecimal("25.097486")).city("aaa").offsetType(1) + .build()); + } + +} From 8619430ae50d3e93f21c041f178e1a06946128d4 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Mon, 26 Sep 2016 22:43:24 +0800 Subject: [PATCH 43/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B0=E7=9A=84=E9=87=8D=E8=BD=BD?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=87=86=E5=A4=87=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=8E=9F=E6=9C=89=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/mp/api/WxMpPayService.java | 13 ++++++- .../mp/api/impl/WxMpPayServiceImpl.java | 39 ++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java index 3a4128fe..8308c1d8 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java @@ -65,9 +65,18 @@ public interface WxMpPayService { * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN * * @param parameters the required or optional parameters + * @deprecated use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(WxUnifiedOrderRequest) instead. */ + @Deprecated Map getPayInfo(Map parameters) throws WxErrorException; + /** + * 该接口调用“统一下单”接口,并拼装发起支付请求需要的参数 + * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN + * + */ + Map getPayInfo(WxUnifiedOrderRequest request) throws WxErrorException; + /** * 该接口调用“统一下单”接口,并拼装NATIVE发起支付请求需要的参数 * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN @@ -79,7 +88,7 @@ public interface WxMpPayService { * @param body 商品描述 * @param ip 发起支付的客户端IP * @param notifyUrl 通知地址 - * @deprecated Use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(Map) instead + * @deprecated Use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(WxUnifiedOrderRequest) instead */ @Deprecated Map getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; @@ -95,7 +104,7 @@ public interface WxMpPayService { * @param body 商品描述 * @param ip 发起支付的客户端IP * @param notifyUrl 通知地址 - * @deprecated Use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(Map) instead + * @deprecated Use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(WxUnifiedOrderRequest) instead */ @Deprecated Map getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java index b8ec8acb..637b6fd5 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java @@ -9,6 +9,7 @@ import java.util.SortedMap; import java.util.TreeMap; import org.apache.commons.codec.digest.DigestUtils; +import org.apache.commons.lang3.StringUtils; import org.joor.Reflect; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -168,6 +169,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { } @Override + @Deprecated public Map getPayInfo(Map parameters) throws WxErrorException { WxMpPrepayIdResult wxMpPrepayIdResult = getPrepayId(parameters); @@ -477,7 +479,7 @@ public class WxMpPayServiceImpl implements WxMpPayService { if (!TRADE_TYPES.contains(request.getTradeType())) { throw new IllegalArgumentException( - "trade_type目前必须为" + TRADE_TYPES + "其中之一"); +"trade_type目前必须为" + TRADE_TYPES + "其中之一"); } @@ -491,4 +493,39 @@ public class WxMpPayServiceImpl implements WxMpPayService { } } + @Override + public Map getPayInfo(WxUnifiedOrderRequest request) throws WxErrorException { + WxUnifiedOrderResult unifiedOrderResult = this.unifiedOrder(request); + + if (!"SUCCESS".equalsIgnoreCase(unifiedOrderResult.getReturnCode()) + || !"SUCCESS".equalsIgnoreCase(unifiedOrderResult.getResultCode())) { + throw new WxErrorException(WxError.newBuilder().setErrorCode(-1) + .setErrorMsg("return_code:" + unifiedOrderResult.getReturnCode() + ";return_msg:" + + unifiedOrderResult.getReturnMsg() + ";result_code:" + unifiedOrderResult.getResultCode() + ";err_code" + + unifiedOrderResult.getErrCode() + ";err_code_des" + unifiedOrderResult.getErrCodeDes()) + .build()); + } + + String prepayId = unifiedOrderResult.getPrepayId(); + if (StringUtils.isBlank(prepayId)) { + throw new RuntimeException(String.format("Failed to get prepay id due to error code '%s'(%s).", + unifiedOrderResult.getErrCode(), unifiedOrderResult.getErrCodeDes())); + } + + Map payInfo = new HashMap<>(); + payInfo.put("appId", this.wxMpService.getWxMpConfigStorage().getAppId()); + // 支付签名时间戳,注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符 + payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000)); + payInfo.put("nonceStr", System.currentTimeMillis() + ""); + payInfo.put("package", "prepay_id=" + prepayId); + payInfo.put("signType", "MD5"); + if ("NATIVE".equals(request.getTradeType())) { + payInfo.put("codeUrl", unifiedOrderResult.getCodeURL()); + } + + String finalSign = this.createSign(payInfo, this.wxMpService.getWxMpConfigStorage().getPartnerKey()); + payInfo.put("paySign", finalSign); + return payInfo; + } + } From 435eb1250ad4e1d92b0d4ca4d92088943d8bc5af Mon Sep 17 00:00:00 2001 From: BinaryWang Date: Tue, 27 Sep 2016 11:11:47 +0800 Subject: [PATCH 44/51] =?UTF-8?q?=E6=9E=9C=E6=96=AD=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=97=A7=E6=9C=89=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/mp/api/WxMpPayService.java | 96 --------- .../mp/api/impl/WxMpPayServiceImpl.java | 192 ------------------ .../mp/api/impl/WxMpPayServiceImplTest.java | 2 +- 3 files changed, 1 insertion(+), 289 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java index 8308c1d8..72eabd08 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpPayService.java @@ -19,37 +19,6 @@ import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderResult; */ public interface WxMpPayService { - /** - * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) - * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" - * - * @param openId 支付人openId - * @param outTradeNo 商户端对应订单号 - * @param amt 金额(单位元) - * @param body 商品描述 - * @param tradeType 交易类型 JSAPI,NATIVE,APP,WAP - * @param ip 发起支付的客户端IP - * @param notifyUrl 通知地址 - * @throws WxErrorException - * @deprecated Use me.chanjar.weixin.mp.api.WxMpService.getPrepayId(Map) instead - */ - @Deprecated - WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double amt, - String body, String tradeType, String ip, String notifyUrl) - throws WxErrorException; - - /** - * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) - * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" - * - * @param parameters All required/optional parameters for weixin payment - * @throws WxErrorException - * @deprecated use me.chanjar.weixin.mp.api.WxMpPayService.unifiedOrder(WxUnifiedOrderRequest) instead - */ - @Deprecated - WxMpPrepayIdResult getPrepayId(Map parameters) - throws WxErrorException; - /** * 统一下单(详见http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1) * 在发起微信支付前,需要调用统一下单接口,获取"预支付交易会话标识" @@ -60,16 +29,6 @@ public interface WxMpPayService { WxUnifiedOrderResult unifiedOrder(WxUnifiedOrderRequest request) throws WxErrorException; - /** - * 该接口调用“统一下单”接口,并拼装发起支付请求需要的参数 - * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN - * - * @param parameters the required or optional parameters - * @deprecated use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(WxUnifiedOrderRequest) instead. - */ - @Deprecated - Map getPayInfo(Map parameters) throws WxErrorException; - /** * 该接口调用“统一下单”接口,并拼装发起支付请求需要的参数 * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN @@ -77,37 +36,6 @@ public interface WxMpPayService { */ Map getPayInfo(WxUnifiedOrderRequest request) throws WxErrorException; - /** - * 该接口调用“统一下单”接口,并拼装NATIVE发起支付请求需要的参数 - * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN - * tradeType 交易类型 NATIVE (其他交易类型JSAPI,APP,WAP) - * - * @param productId 商户商品ID - * @param outTradeNo 商户端对应订单号 - * @param amt 金额(单位元) - * @param body 商品描述 - * @param ip 发起支付的客户端IP - * @param notifyUrl 通知地址 - * @deprecated Use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(WxUnifiedOrderRequest) instead - */ - @Deprecated - Map getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; - - /** - * 该接口调用“统一下单”接口,并拼装JSAPI发起支付请求需要的参数 - * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN - * tradeType 交易类型 JSAPI(其他交易类型NATIVE,APP,WAP) - * - * @param openId 支付人openId - * @param outTradeNo 商户端对应订单号 - * @param amt 金额(单位元) - * @param body 商品描述 - * @param ip 发起支付的客户端IP - * @param notifyUrl 通知地址 - * @deprecated Use me.chanjar.weixin.mp.api.WxMpPayService.getPayInfo(WxUnifiedOrderRequest) instead - */ - @Deprecated - Map getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl) throws WxErrorException; /** * 该接口提供所有微信支付订单的查询,当支付通知处理异常戒丢失的情冴,商户可以通过该接口查询订单支付状态。 @@ -148,30 +76,6 @@ public interface WxMpPayService { */ boolean checkJSSDKCallbackDataSignature(Map kvm, String signature); - /** - * 发送普通微信红包给个人用户 - *
    -   * 需要传入的必填参数如下:
    -   * mch_billno//商户订单号
    -   * send_name//商户名称
    -   * re_openid//用户openid
    -   * total_amount//红包总额
    -   * total_num//红包发放总人数
    -   * wishing//红包祝福语
    -   * client_ip//服务器Ip地址
    -   * act_name//活动名称
    -   * remark //备注
    -   * 文档详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_4&index=3
    -   * 使用现金红包功能需要在xml配置文件中额外设置:
    -   * 
    - * 微信商户平台ID - * 商户平台设置的API密钥 - * @deprecated use me.chanjar.weixin.mp.api.WxMpPayService.sendRedpack(WxSendRedpackRequest) instead - * - */ - @Deprecated - WxRedpackResult sendRedpack(Map parameters) throws WxErrorException; - /** * 发送微信红包给个人用户 *
     
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java
    index 637b6fd5..475f5406 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImpl.java
    @@ -44,173 +44,12 @@ public class WxMpPayServiceImpl implements WxMpPayService {
       private static final List TRADE_TYPES = Lists.newArrayList("JSAPI",
           "NATIVE", "APP");
       private final Logger log = LoggerFactory.getLogger(WxMpPayServiceImpl.class);
    -  private final String[] REQUIRED_ORDER_PARAMETERS = new String[] { "appid",
    -      "mch_id", "body", "out_trade_no", "total_fee", "spbill_create_ip",
    -      "notify_url", "trade_type" };
       private WxMpService wxMpService;
     
       public WxMpPayServiceImpl(WxMpService wxMpService) {
         this.wxMpService = wxMpService;
       }
     
    -  @Override
    -  @Deprecated
    -  public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo,
    -      double amt, String body, String tradeType, String ip,
    -      String callbackUrl) throws WxErrorException {
    -    Map packageParams = new HashMap<>();
    -    packageParams.put("appid",
    -        this.wxMpService.getWxMpConfigStorage().getAppId());
    -    packageParams.put("mch_id",
    -        this.wxMpService.getWxMpConfigStorage().getPartnerId());
    -    packageParams.put("body", body);
    -    packageParams.put("out_trade_no", outTradeNo);
    -    packageParams.put("total_fee", (int) (amt * 100) + "");
    -    packageParams.put("spbill_create_ip", ip);
    -    packageParams.put("notify_url", callbackUrl);
    -    packageParams.put("trade_type", tradeType);
    -    packageParams.put("openid", openId);
    -
    -    return getPrepayId(packageParams);
    -  }
    -
    -  @Override
    -  @Deprecated
    -  public WxMpPrepayIdResult getPrepayId(final Map parameters)
    -      throws WxErrorException {
    -    final SortedMap packageParams = new TreeMap<>(parameters);
    -    packageParams.put("appid",
    -        this.wxMpService.getWxMpConfigStorage().getAppId());
    -    packageParams.put("mch_id",
    -        this.wxMpService.getWxMpConfigStorage().getPartnerId());
    -    packageParams.put("nonce_str", System.currentTimeMillis() + "");
    -    checkParameters(packageParams);
    -
    -    String sign = this.createSign(packageParams,
    -        this.wxMpService.getWxMpConfigStorage().getPartnerKey());
    -    packageParams.put("sign", sign);
    -
    -    StringBuilder request = new StringBuilder("");
    -    for (Map.Entry para : packageParams.entrySet()) {
    -      request.append(String.format("<%s>%s", para.getKey(),
    -          para.getValue(), para.getKey()));
    -    }
    -
    -    request.append("");
    -
    -    String url = "https://api.mch.weixin.qq.com/pay/unifiedorder";
    -    String responseContent = this.wxMpService.post(url, request.toString());
    -    XStream xstream = XStreamInitializer.getInstance();
    -    xstream.alias("xml", WxMpPrepayIdResult.class);
    -    return (WxMpPrepayIdResult) xstream.fromXML(responseContent);
    -  }
    -
    -  private void checkParameters(Map parameters) {
    -    for (String para : this.REQUIRED_ORDER_PARAMETERS) {
    -      if (!parameters.containsKey(para)) {
    -        throw new IllegalArgumentException(
    -            "Reqiured argument '" + para + "' is missing.");
    -      }
    -    }
    -
    -    if ("JSAPI".equals(parameters.get("trade_type"))
    -        && !parameters.containsKey("openid")) {
    -      throw new IllegalArgumentException(
    -          "Reqiured argument 'openid' is missing when trade_type is 'JSAPI'.");
    -    }
    -
    -    if ("NATIVE".equals(parameters.get("trade_type"))
    -        && !parameters.containsKey("product_id")) {
    -      throw new IllegalArgumentException(
    -          "Reqiured argument 'product_id' is missing when trade_type is 'NATIVE'.");
    -    }
    -  }
    -
    -  @Override
    -  @Deprecated
    -  public Map getJsapiPayInfo(String openId, String outTradeNo,
    -      double amt, String body, String ip, String callbackUrl)
    -      throws WxErrorException {
    -    Map packageParams = new HashMap<>();
    -    packageParams.put("appid",
    -        this.wxMpService.getWxMpConfigStorage().getAppId());
    -    packageParams.put("mch_id",
    -        this.wxMpService.getWxMpConfigStorage().getPartnerId());
    -    packageParams.put("body", body);
    -    packageParams.put("out_trade_no", outTradeNo);
    -    packageParams.put("total_fee", (int) (amt * 100) + "");
    -    packageParams.put("spbill_create_ip", ip);
    -    packageParams.put("notify_url", callbackUrl);
    -    packageParams.put("trade_type", "JSAPI");
    -    packageParams.put("openid", openId);
    -
    -    return getPayInfo(packageParams);
    -  }
    -
    -  @Override
    -  @Deprecated
    -  public Map getNativePayInfo(String productId,
    -      String outTradeNo, double amt, String body, String ip, String callbackUrl)
    -      throws WxErrorException {
    -    Map packageParams = new HashMap<>();
    -    packageParams.put("appid",
    -        this.wxMpService.getWxMpConfigStorage().getAppId());
    -    packageParams.put("mch_id",
    -        this.wxMpService.getWxMpConfigStorage().getPartnerId());
    -    packageParams.put("body", body);
    -    packageParams.put("out_trade_no", outTradeNo);
    -    packageParams.put("total_fee", (int) (amt * 100) + "");
    -    packageParams.put("spbill_create_ip", ip);
    -    packageParams.put("notify_url", callbackUrl);
    -    packageParams.put("trade_type", "NATIVE");
    -    packageParams.put("product_id", productId);
    -
    -    return getPayInfo(packageParams);
    -  }
    -
    -  @Override
    -  @Deprecated
    -  public Map getPayInfo(Map parameters)
    -      throws WxErrorException {
    -    WxMpPrepayIdResult wxMpPrepayIdResult = getPrepayId(parameters);
    -
    -    if (!"SUCCESS".equalsIgnoreCase(wxMpPrepayIdResult.getReturn_code())
    -        || !"SUCCESS".equalsIgnoreCase(wxMpPrepayIdResult.getResult_code())) {
    -      WxError error = new WxError();
    -      error.setErrorCode(-1);
    -      error.setErrorMsg("return_code:" + wxMpPrepayIdResult.getReturn_code()
    -          + ";return_msg:" + wxMpPrepayIdResult.getReturn_msg()
    -          + ";result_code:" + wxMpPrepayIdResult.getResult_code() + ";err_code"
    -          + wxMpPrepayIdResult.getErr_code() + ";err_code_des"
    -          + wxMpPrepayIdResult.getErr_code_des());
    -      throw new WxErrorException(error);
    -    }
    -
    -    String prepayId = wxMpPrepayIdResult.getPrepay_id();
    -    if (prepayId == null || prepayId.equals("")) {
    -      throw new RuntimeException(
    -          String.format("Failed to get prepay id due to error code '%s'(%s).",
    -              wxMpPrepayIdResult.getErr_code(),
    -              wxMpPrepayIdResult.getErr_code_des()));
    -    }
    -
    -    Map payInfo = new HashMap<>();
    -    payInfo.put("appId", this.wxMpService.getWxMpConfigStorage().getAppId());
    -    // 支付签名时间戳,注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
    -    payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
    -    payInfo.put("nonceStr", System.currentTimeMillis() + "");
    -    payInfo.put("package", "prepay_id=" + prepayId);
    -    payInfo.put("signType", "MD5");
    -    if ("NATIVE".equals(parameters.get("trade_type"))) {
    -      payInfo.put("codeUrl", wxMpPrepayIdResult.getCode_url());
    -    }
    -
    -    String finalSign = this.createSign(payInfo,
    -        this.wxMpService.getWxMpConfigStorage().getPartnerKey());
    -    payInfo.put("paySign", finalSign);
    -    return payInfo;
    -  }
    -
       @Override
       public WxMpPayResult getJSSDKPayResult(String transactionId,
           String outTradeNo) throws WxErrorException {
    @@ -313,37 +152,6 @@ public class WxMpPayServiceImpl implements WxMpPayService {
             this.wxMpService.getWxMpConfigStorage().getPartnerKey()));
       }
     
    -  @Override
    -  @Deprecated
    -  public WxRedpackResult sendRedpack(Map parameters)
    -      throws WxErrorException {
    -    SortedMap packageParams = new TreeMap<>(parameters);
    -    packageParams.put("wxappid",
    -        this.wxMpService.getWxMpConfigStorage().getAppId());
    -    packageParams.put("mch_id",
    -        this.wxMpService.getWxMpConfigStorage().getPartnerId());
    -    packageParams.put("nonce_str", System.currentTimeMillis() + "");
    -
    -    String sign = this.createSign(packageParams,
    -        this.wxMpService.getWxMpConfigStorage().getPartnerKey());
    -    packageParams.put("sign", sign);
    -
    -    StringBuilder request = new StringBuilder("");
    -    for (Map.Entry para : packageParams.entrySet()) {
    -      request.append(String.format("<%s>%s", para.getKey(),
    -          para.getValue(), para.getKey()));
    -    }
    -
    -    request.append("");
    -
    -    String url = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack";
    -
    -    String responseContent = this.wxMpService.post(url, request.toString());
    -    XStream xstream = XStreamInitializer.getInstance();
    -    xstream.processAnnotations(WxRedpackResult.class);
    -    return (WxRedpackResult) xstream.fromXML(responseContent);
    -  }
    -
       @Override
       public WxRedpackResult sendRedpack(WxSendRedpackRequest request)
           throws WxErrorException {
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
    index f6e990af..f246032d 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
    @@ -85,7 +85,7 @@ public class WxMpPayServiceImplTest {
         WxUnifiedOrderResult result = this.wxService.getPayService()
             .unifiedOrder(WxUnifiedOrderRequest.builder().body("1111111")
                 .totalFee(1).spbillCreateIp("111111").notifyURL("111111")
    -            .tradeType("JSAPI1").openid("122").outTradeNo("111111").build());
    +            .tradeType("JSAPI").openid("122").outTradeNo("111111").build());
         System.err.println(result);
       }
     }
    \ No newline at end of file
    
    From bda5ab01e5220d94f78693d2041eb5ff4d0468e3 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Tue, 27 Sep 2016 19:58:58 +0800
    Subject: [PATCH 45/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=97=A8=E5=BA=97?=
     =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?=
     =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E9=97=A8?=
     =?UTF-8?q?=E5=BA=97=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=20for=20issue=20#?=
     =?UTF-8?q?17?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../weixin/mp/api/WxMpStoreService.java       | 27 +++++-
     .../mp/api/impl/WxMpStoreServiceImpl.java     | 56 ++++++++++++-
     .../bean/{ => store}/WxMpStoreBaseInfo.java   | 75 ++++++++++++++++-
     .../weixin/mp/bean/store/WxMpStoreInfo.java   | 29 +++++++
     .../mp/bean/store/WxMpStoreListResult.java    | 84 +++++++++++++++++++
     .../mp/api/impl/WxMpStoreServiceImplTest.java | 24 +++++-
     6 files changed, 286 insertions(+), 9 deletions(-)
     rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/{ => store}/WxMpStoreBaseInfo.java (84%)
     create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java
     create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java
    
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java
    index 3b445791..421204e6 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java
    @@ -1,7 +1,10 @@
     package me.chanjar.weixin.mp.api;
     
    +import java.util.List;
    +
     import me.chanjar.weixin.common.exception.WxErrorException;
    -import me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo;
    +import me.chanjar.weixin.mp.bean.store.WxMpStoreBaseInfo;
    +import me.chanjar.weixin.mp.bean.store.WxMpStoreInfo;
     
     /**
      * 门店管理的相关接口代码
    @@ -22,4 +25,26 @@ public interface WxMpStoreService {
        *
        */
       void add(WxMpStoreBaseInfo request) throws WxErrorException;
    +
    +  /**
    +   * 
    +   * 查询门店列表(指定查询起始位置和个数)
    +   * 商户可以通过该接口,批量查询自己名下的门店list,并获取已审核通过的poi_id(所有状态均会返回poi_id,但该poi_id不一定为最终id)、商户自身sid 用于对应、商户名、分店名、地址字段。
    +   * 详情请见: 微信门店接口
    +   * 
    + * @param begin 开始位置,0 即为从第一条开始查询 + * @param limit 返回数据条数,最大允许50,默认为20 + * @throws WxErrorException + */ + List list(int begin, int limit) throws WxErrorException; + + /** + *
    +   * 查询门店列表(所有)
    +   * 商户可以通过该接口,批量查询自己名下的门店list,并获取已审核通过的poi_id(所有状态均会返回poi_id,但该poi_id不一定为最终id)、商户自身sid 用于对应、商户名、分店名、地址字段。
    +   * 详情请见: 微信门店接口
    +   * 
    + * @throws WxErrorException + */ + List listAll() throws WxErrorException; } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java index 9ed28df5..83d6a0f0 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java @@ -7,13 +7,16 @@ import java.util.Map.Entry; import org.joor.Reflect; import com.google.common.collect.Lists; +import com.google.gson.JsonObject; import me.chanjar.weixin.common.annotation.Required; import me.chanjar.weixin.common.bean.result.WxError; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.WxMpStoreService; -import me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo; +import me.chanjar.weixin.mp.bean.store.WxMpStoreBaseInfo; +import me.chanjar.weixin.mp.bean.store.WxMpStoreInfo; +import me.chanjar.weixin.mp.bean.store.WxMpStoreListResult; /** * Created by Binary Wang on 2016/9/26. @@ -21,6 +24,7 @@ import me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo; * */ public class WxMpStoreServiceImpl implements WxMpStoreService { + private static final String API_BASE_URL = "http://api.weixin.qq.com/cgi-bin/poi"; private WxMpService wxMpService; @@ -32,10 +36,8 @@ public class WxMpStoreServiceImpl implements WxMpStoreService { public void add(WxMpStoreBaseInfo request) throws WxErrorException { checkParameters(request); - String url = "http://api.weixin.qq.com/cgi-bin/poi/addpoi"; - // String data = "{\"business\":{\"base_info\":{\"business_name\":\"haha\",\"branch_name\":\"abc\",\"province\":\"aaa\",\"city\":\"aaa\",\"district\":\"aaa\",\"telephone\":\"122\",\"categories\":\"adsdas\",\"offset_type\":\"1\",\"longitude\":\"115.32375\",\"latitude\":\"25.097486\"}}}"; + String url = API_BASE_URL + "/addpoi"; String response = this.wxMpService.post(url, request.toJson()); - // String response = this.wxMpService.post(url, data); WxError wxError = WxError.fromJson(response); if (wxError.getErrorCode() != 0) { throw new WxErrorException(wxError); @@ -64,4 +66,50 @@ public class WxMpStoreServiceImpl implements WxMpStoreService { } + @Override + public List list(int begin, int limit) + throws WxErrorException { + String url = API_BASE_URL + "/getpoilist"; + JsonObject params = new JsonObject(); + params.addProperty("begin", begin); + params.addProperty("limit", limit); + String response = this.wxMpService.post(url, params.toString()); + + WxError wxError = WxError.fromJson(response); + if (wxError.getErrorCode() != 0) { + throw new WxErrorException(wxError); + } + + return WxMpStoreListResult.fromJson(response).getBusinessList(); + } + + @Override + public List listAll() throws WxErrorException { + int limit = 10; + String url = API_BASE_URL + "/getpoilist"; + JsonObject params = new JsonObject(); + params.addProperty("begin", 0); + params.addProperty("limit", limit);//返回数据条数,最大允许50,默认为20 + String response = this.wxMpService.post(url, params.toString()); + + WxError wxError = WxError.fromJson(response); + if (wxError.getErrorCode() != 0) { + throw new WxErrorException(wxError); + } + + WxMpStoreListResult listResult = WxMpStoreListResult.fromJson(response); + List stores = Lists + .newArrayList(listResult.getBusinessList()); + if (listResult.getTotalCount() > limit) { + params = new JsonObject(); + params.addProperty("begin", limit); + params.addProperty("limit", listResult.getTotalCount() - limit); + stores.addAll(WxMpStoreListResult + .fromJson(this.wxMpService.post(url, params.toString())) + .getBusinessList()); + } + + return stores; + } + } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java similarity index 84% rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java index bb097a69..06a5b178 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpStoreBaseInfo.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java @@ -1,8 +1,11 @@ -package me.chanjar.weixin.mp.bean; +package me.chanjar.weixin.mp.bean.store; import java.math.BigDecimal; import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; @@ -16,6 +19,10 @@ import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; * Created by Binary Wang on 2016-09-23. */ public class WxMpStoreBaseInfo { + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } public String toJson() { JsonElement base_info = WxMpGsonBuilder.create().toJsonTree(this); @@ -180,6 +187,24 @@ public class WxMpStoreBaseInfo { @SerializedName("avg_price") private Integer avgPrice; + /** + * 门店是否可用状态。1 表示系统错误、2 表示审核中、3 审核通过、4 审核驳回。当该字段为1、2、4 状态时,poi_id 为空 + */ + @SerializedName("available_state") + private Integer availableState; + + /** + * 扩展字段是否正在更新中。1 表示扩展字段正在更新中,尚未生效,不允许再次更新; 0 表示扩展字段没有在更新中或更新已生效,可以再次更新 + */ + @SerializedName("update_status") + private Integer updateStatus; + + /** + * 门店poi id + */ + @SerializedName("poi_id") + private String poiId; + public String getSid() { return this.sid; } @@ -324,6 +349,30 @@ public class WxMpStoreBaseInfo { this.avgPrice = avgPrice; } + public Integer getAvailableState() { + return this.availableState; + } + + public void setAvailableState(Integer availableState) { + this.availableState = availableState; + } + + public Integer getUpdateStatus() { + return this.updateStatus; + } + + public void setUpdateStatus(Integer updateStatus) { + this.updateStatus = updateStatus; + } + + public String getPoiId() { + return this.poiId; + } + + public void setPoiId(String poiId) { + this.poiId = poiId; + } + public static WxMpStoreBaseInfoBuilder builder() { return new WxMpStoreBaseInfoBuilder(); } @@ -347,6 +396,9 @@ public class WxMpStoreBaseInfo { private String introduction; private String openTime; private Integer avgPrice; + private Integer availableState; + private Integer updateStatus; + private String poiId; public WxMpStoreBaseInfoBuilder sid(String sid) { this.sid = sid; @@ -438,6 +490,21 @@ public class WxMpStoreBaseInfo { return this; } + public WxMpStoreBaseInfoBuilder availableState(Integer availableState) { + this.availableState = availableState; + return this; + } + + public WxMpStoreBaseInfoBuilder updateStatus(Integer updateStatus) { + this.updateStatus = updateStatus; + return this; + } + + public WxMpStoreBaseInfoBuilder poiId(String poiId) { + this.poiId = poiId; + return this; + } + public WxMpStoreBaseInfoBuilder from(WxMpStoreBaseInfo origin) { this.sid(origin.sid); this.businessName(origin.businessName); @@ -457,6 +524,9 @@ public class WxMpStoreBaseInfo { this.introduction(origin.introduction); this.openTime(origin.openTime); this.avgPrice(origin.avgPrice); + this.availableState(origin.availableState); + this.updateStatus(origin.updateStatus); + this.poiId(origin.poiId); return this; } @@ -480,6 +550,9 @@ public class WxMpStoreBaseInfo { m.introduction = this.introduction; m.openTime = this.openTime; m.avgPrice = this.avgPrice; + m.availableState = this.availableState; + m.updateStatus = this.updateStatus; + m.poiId = this.poiId; return m; } } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java new file mode 100644 index 00000000..eae6dc6e --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java @@ -0,0 +1,29 @@ +/** + * Copyright(c) 2011-2016 by UCredit Inc. + * All Rights Reserved + */ +package me.chanjar.weixin.mp.bean.store; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.google.gson.annotations.SerializedName; + +public class WxMpStoreInfo { + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } + + @SerializedName("base_info") + private WxMpStoreBaseInfo baseInfo; + + public WxMpStoreBaseInfo getBaseInfo() { + return this.baseInfo; + } + + public void setBaseInfo(WxMpStoreBaseInfo baseInfo) { + this.baseInfo = baseInfo; + } + +} \ No newline at end of file diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java new file mode 100644 index 00000000..2bc514ed --- /dev/null +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java @@ -0,0 +1,84 @@ +package me.chanjar.weixin.mp.bean.store; + +import java.util.List; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import com.google.gson.annotations.SerializedName; + +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder; + +/** + * 门店列表结果类 + * @author binarywang(https://github.com/binarywang) + * Created by Binary Wang on 2016-09-27. + * + */ +public class WxMpStoreListResult { + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE); + } + + public static WxMpStoreListResult fromJson(String json) { + return WxMpGsonBuilder.create().fromJson(json, WxMpStoreListResult.class); + } + + /** + * 错误码,0为正常 + */ + @SerializedName("errcode") + private Integer errCode; + + /** + * 错误信息 + */ + @SerializedName("errmsg") + private String errMsg; + + /** + * 门店信息列表 + */ + @SerializedName("business_list") + private List businessList; + + /** + * 门店信息总数 + */ + @SerializedName("total_count") + private Integer totalCount; + + public Integer getTotalCount() { + return this.totalCount; + } + + public void setTotalCount(Integer totalCount) { + this.totalCount = totalCount; + } + + public Integer getErrCode() { + return this.errCode; + } + + public void setErrCode(Integer errCode) { + this.errCode = errCode; + } + + public String getErrMsg() { + return this.errMsg; + } + + public void setErrMsg(String errMsg) { + this.errMsg = errMsg; + } + + public List getBusinessList() { + return this.businessList; + } + + public void setBusinessList(List businessList) { + this.businessList = businessList; + } + +} diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java index 1e1ed49c..6f655232 100644 --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java @@ -4,7 +4,10 @@ */ package me.chanjar.weixin.mp.api.impl; +import static org.junit.Assert.assertNotNull; + import java.math.BigDecimal; +import java.util.List; import org.testng.annotations.Guice; import org.testng.annotations.Test; @@ -13,7 +16,8 @@ import com.google.inject.Inject; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.mp.api.ApiTestModule; -import me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo; +import me.chanjar.weixin.mp.bean.store.WxMpStoreBaseInfo; +import me.chanjar.weixin.mp.bean.store.WxMpStoreInfo; /** * @author 王彬 (Binary Wang) @@ -26,17 +30,31 @@ public class WxMpStoreServiceImplTest { private WxMpServiceImpl wxMpService; /** - * Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpStoreServiceImpl#add(me.chanjar.weixin.mp.bean.WxMpStoreBaseInfo)}. + * Test method for {@link me.chanjar.weixin.mp.api.impl.WxMpStoreServiceImpl#add(me.chanjar.weixin.mp.bean.store.WxMpStoreBaseInfo)}. * @throws WxErrorException */ public void testAdd() throws WxErrorException { this.wxMpService.getStoreService() .add(WxMpStoreBaseInfo.builder().businessName("haha").branchName("abc") .province("aaa").district("aaa").telephone("122").address("abc") - .categories(new String[] { "美食,川菜,火锅" }) + .categories(new String[] { "美食,江浙菜" }) .longitude(new BigDecimal("115.32375")) .latitude(new BigDecimal("25.097486")).city("aaa").offsetType(1) .build()); } + public void testList() throws WxErrorException { + List list = this.wxMpService.getStoreService().list(0, 10); + assertNotNull(list); + System.err.println(list.size()); + System.err.println(list); + } + + public void testListAll() throws WxErrorException { + List list = this.wxMpService.getStoreService().listAll(); + assertNotNull(list); + System.err.println(list.size()); + System.err.println(list); + } + } From c7a04d5fe41a5e0d4f216a656cd37a250d398835 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 27 Sep 2016 20:06:47 +0800 Subject: [PATCH 46/51] Update README.md --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4c090930..3c9b94c4 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,12 @@ ## [![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badge/) ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) [![Build Status](https://travis-ci.org/wechat-group/weixin-java-tools.svg?branch=develop)](https://travis-ci.org/wechat-group/weixin-java-tools) -### 声明:本项目Fork自chanjarster/weixin-java-tools,但由于原项目已停止维护,故单独维护和发布,且发布到maven上的groupId也会不同,详细信息见下文。 +### 注意: +1. ***本项目Fork自chanjarster/weixin-java-tools,但由于原项目已停止维护,故单独维护和发布,且发布到maven上的groupId也会不同,详细信息见下文。*** +2. ***自2.0.0版本以来,主要是公众号的接口调整比较大,主要是为了解决主接口类过于庞大不方便管理的问题,将接口实现代码按模块进行拆分。*** ### 最新更新:2.1.0版发布!!! on 2016-08-31 -#### ***自2.0.0版本以来,接口调整比较大,主要是公众号的调整,企业号无过多调整,主要是为了解决主接口类过于庞大不方便管理的问题,将接口实现代码按模块进行拆分。所以如果习惯于1.X.X版本的同学不想做过多更改的话,请慎重考虑升级到2.X.X版本.*** ---- - ### 详细开发文档请看 [wiki](https://github.com/chanjarster/weixin-java-tools/wiki)。 =========== ## 开发交流工具: @@ -22,7 +21,7 @@ ## 版本说明 * 本项目定为每月发布一次正式版,版本号格式为X.X.0(如2.0.0,2.1.0等),月初或月底发布新版本,遇到重大问题需修复会及时提交新版本,欢迎大家随时提交Pull Request; * BUG修复和新特性一般会先发布成小版本作为临时版本(如2.0.1,2.0.2等,即尾号不为0,以区别于正式版); -* 目前最新版本号为 ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) ,也可以通过访问链接[【公众号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) [【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22) +* 目前最新版本号为 ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) ,也可以通过访问链接[【公众号】]、(http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) [【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22) 分别查看所有最新的版本。 ## Maven & Gradle From 94b42ee9ae8bb472dfe4c43e35728f42b19298ae Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Tue, 27 Sep 2016 23:51:29 +0800 Subject: [PATCH 47/51] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=20for=20issue=20#17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/api/WxMpStoreService.java | 3 +- .../mp/api/impl/WxMpStoreServiceImpl.java | 40 ++++++++----------- .../mp/api/impl/WxMpStoreServiceImplTest.java | 10 ++--- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java index 421204e6..f4f3ccb6 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpStoreService.java @@ -5,6 +5,7 @@ import java.util.List; import me.chanjar.weixin.common.exception.WxErrorException; import me.chanjar.weixin.mp.bean.store.WxMpStoreBaseInfo; import me.chanjar.weixin.mp.bean.store.WxMpStoreInfo; +import me.chanjar.weixin.mp.bean.store.WxMpStoreListResult; /** * 门店管理的相关接口代码 @@ -36,7 +37,7 @@ public interface WxMpStoreService { * @param limit 返回数据条数,最大允许50,默认为20 * @throws WxErrorException */ - List list(int begin, int limit) throws WxErrorException; + WxMpStoreListResult list(int begin, int limit) throws WxErrorException; /** *
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java
    index 83d6a0f0..99740d45 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImpl.java
    @@ -67,7 +67,7 @@ public class WxMpStoreServiceImpl implements WxMpStoreService {
       }
     
       @Override
    -  public List list(int begin, int limit)
    +  public WxMpStoreListResult list(int begin, int limit)
           throws WxErrorException {
         String url = API_BASE_URL + "/getpoilist";
         JsonObject params = new JsonObject();
    @@ -80,33 +80,25 @@ public class WxMpStoreServiceImpl implements WxMpStoreService {
           throw new WxErrorException(wxError);
         }
     
    -    return WxMpStoreListResult.fromJson(response).getBusinessList();
    +    return WxMpStoreListResult.fromJson(response);
       }
     
       @Override
       public List listAll() throws WxErrorException {
    -    int limit = 10;
    -    String url = API_BASE_URL + "/getpoilist";
    -    JsonObject params = new JsonObject();
    -    params.addProperty("begin", 0);
    -    params.addProperty("limit", limit);//返回数据条数,最大允许50,默认为20
    -    String response = this.wxMpService.post(url, params.toString());
    -
    -    WxError wxError = WxError.fromJson(response);
    -    if (wxError.getErrorCode() != 0) {
    -      throw new WxErrorException(wxError);
    -    }
    -
    -    WxMpStoreListResult listResult = WxMpStoreListResult.fromJson(response);
    -    List stores = Lists
    -        .newArrayList(listResult.getBusinessList());
    -    if (listResult.getTotalCount() > limit) {
    -      params = new JsonObject();
    -      params.addProperty("begin", limit);
    -      params.addProperty("limit", listResult.getTotalCount() - limit);
    -      stores.addAll(WxMpStoreListResult
    -          .fromJson(this.wxMpService.post(url, params.toString()))
    -          .getBusinessList());
    +    int limit = 50;
    +    WxMpStoreListResult list = this.list(0, limit);
    +    List stores = list.getBusinessList();
    +    if (list.getTotalCount() > limit) {
    +      int begin = limit;
    +      WxMpStoreListResult followingList = this.list(begin, limit);
    +      while (followingList.getBusinessList().size() > 0) {
    +        stores.addAll(followingList.getBusinessList());
    +        begin += limit;
    +        if (begin >= list.getTotalCount()) {
    +          break;
    +        }
    +        followingList = this.list(begin, limit);
    +      }
         }
     
         return stores;
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java
    index 6f655232..9c01c431 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpStoreServiceImplTest.java
    @@ -18,6 +18,7 @@ import me.chanjar.weixin.common.exception.WxErrorException;
     import me.chanjar.weixin.mp.api.ApiTestModule;
     import me.chanjar.weixin.mp.bean.store.WxMpStoreBaseInfo;
     import me.chanjar.weixin.mp.bean.store.WxMpStoreInfo;
    +import me.chanjar.weixin.mp.bean.store.WxMpStoreListResult;
     
     /**
      * @author 王彬 (Binary Wang)
    @@ -37,17 +38,16 @@ public class WxMpStoreServiceImplTest {
         this.wxMpService.getStoreService()
             .add(WxMpStoreBaseInfo.builder().businessName("haha").branchName("abc")
                 .province("aaa").district("aaa").telephone("122").address("abc")
    -            .categories(new String[] { "美食,江浙菜" })
    +.categories(new String[] { "美食,江浙菜" })
                 .longitude(new BigDecimal("115.32375"))
                 .latitude(new BigDecimal("25.097486")).city("aaa").offsetType(1)
                 .build());
       }
     
       public void testList() throws WxErrorException {
    -    List list = this.wxMpService.getStoreService().list(0, 10);
    -    assertNotNull(list);
    -    System.err.println(list.size());
    -    System.err.println(list);
    +    WxMpStoreListResult result = this.wxMpService.getStoreService().list(0, 10);
    +    assertNotNull(result);
    +    System.err.println(result);
       }
     
       public void testListAll() throws WxErrorException {
    
    From c4a4119ec77826abcbc2d01edc4886f1151f2001 Mon Sep 17 00:00:00 2001
    From: Binary Wang 
    Date: Wed, 28 Sep 2016 10:09:40 +0800
    Subject: [PATCH 48/51] Update README.md
    
    ---
     README.md | 19 +++++++++----------
     1 file changed, 9 insertions(+), 10 deletions(-)
    
    diff --git a/README.md b/README.md
    index 3c9b94c4..0e259433 100644
    --- a/README.md
    +++ b/README.md
    @@ -4,18 +4,17 @@
     
     ### 注意:
     1. ***本项目Fork自chanjarster/weixin-java-tools,但由于原项目已停止维护,故单独维护和发布,且发布到maven上的groupId也会不同,详细信息见下文。***
    -2. ***自2.0.0版本以来,主要是公众号的接口调整比较大,主要是为了解决主接口类过于庞大不方便管理的问题,将接口实现代码按模块进行拆分。***
    +1. ***自2.0.0版本以来,主要是公众号的接口调整比较大,主要是为了解决主接口类过于庞大不方便管理的问题,将接口实现代码按模块进行拆分。***
    +1. 最新更新:2016-08-31 发布2.1.0正式版!
     
    -### 最新更新:2.1.0版发布!!! on 2016-08-31
    -
    -### 详细开发文档请看 [wiki](https://github.com/chanjarster/weixin-java-tools/wiki)。
     ===========
    -## 开发交流工具:
    -* 微信群: 因二维码有时间限制,如有想加入微信群的,请入QQ群后咨询获取最新入群二维码。
    -* QQ群:343954419 [![Join QQ Group](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=078f7a153d243853e24cf2b542e7a6ccbf2a592bc138080f84d11297f736ec46)
    -* ***注意:为保证入群成员质量,请申请入群前,先Star本项目,然后在申请入群时,输入您的Github帐号ID,以便管理员核对,ID即你的github主页地址https://github.com/XXXX 中最后的部分XXXX的内容,或者在github网页右上角点击头像查看,如下图Signed in as下方黄色标识内容即是:***
    -* ![github_id](https://raw.githubusercontent.com/wechat-group/weixin-java-tools/develop/res/github_id.png)
    - 
    +
    +## 开发交流方式:
    +1. ***入群须知:为保证入群成员质量,请申请入群前,先Star本项目,然后在申请入群时,输入您的Github帐号ID,以便管理员核对,ID即你的github主页地址https://github.com/XXXX 中最后的部分XXXX的内容,或者在github网页右上角点击头像后查看Signed in as后方内容。***
    +1. QQ群:343954419 [![Join QQ Group](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=078f7a153d243853e24cf2b542e7a6ccbf2a592bc138080f84d11297f736ec46)
    +1. 微信群: 因二维码有时间限制,如有想加入微信群的,请入QQ群后咨询获取最新入群二维码。
    +1. 有功能需求或由于微信官方接口调整导致的代码问题,可以直接提出issue,便于讨论追踪问题。
    +1. 详细开发文档请看 [Wiki](https://github.com/wechat-group/weixin-java-tools/wiki)。
     ===========
     
     ## 版本说明
    
    From 721df6ffb2dfde844af0d11fb0784e765d015b3a Mon Sep 17 00:00:00 2001
    From: Binary Wang 
    Date: Wed, 28 Sep 2016 10:11:26 +0800
    Subject: [PATCH 49/51] Update README.md
    
    ---
     README.md | 7 ++++---
     1 file changed, 4 insertions(+), 3 deletions(-)
    
    diff --git a/README.md b/README.md
    index 0e259433..93da5c67 100644
    --- a/README.md
    +++ b/README.md
    @@ -12,15 +12,16 @@
     ## 开发交流方式:
     1. ***入群须知:为保证入群成员质量,请申请入群前,先Star本项目,然后在申请入群时,输入您的Github帐号ID,以便管理员核对,ID即你的github主页地址https://github.com/XXXX 中最后的部分XXXX的内容,或者在github网页右上角点击头像后查看Signed in as后方内容。***
     1. QQ群:343954419 [![Join QQ Group](http://pub.idqqimg.com/wpa/images/group.png)](http://shang.qq.com/wpa/qunwpa?idkey=078f7a153d243853e24cf2b542e7a6ccbf2a592bc138080f84d11297f736ec46)
    -1. 微信群: 因二维码有时间限制,如有想加入微信群的,请入QQ群后咨询获取最新入群二维码。
    -1. 有功能需求或由于微信官方接口调整导致的代码问题,可以直接提出issue,便于讨论追踪问题。
    +1. 微信群: 因二维码有时间限制,如有想加入微信群的,请入QQ群后咨询获取最新入群二维码;
    +1. 有功能需求或由于微信官方接口调整导致的代码问题,可以直接提出issue,便于讨论追踪问题;
     1. 详细开发文档请看 [Wiki](https://github.com/wechat-group/weixin-java-tools/wiki)。
    +
     ===========
     
     ## 版本说明
     * 本项目定为每月发布一次正式版,版本号格式为X.X.0(如2.0.0,2.1.0等),月初或月底发布新版本,遇到重大问题需修复会及时提交新版本,欢迎大家随时提交Pull Request;
     * BUG修复和新特性一般会先发布成小版本作为临时版本(如2.0.1,2.0.2等,即尾号不为0,以区别于正式版);
    -* 目前最新版本号为 ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) ,也可以通过访问链接[【公众号】]、(http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) [【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22)
    +* 目前最新版本号为 ![Maven Central](https://img.shields.io/maven-central/v/com.github.binarywang/weixin-java-parent.svg) ,也可以通过访问链接[【公众号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-mp%22) 、[【企业号】](http://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22com.github.binarywang%22%20AND%20a%3A%22weixin-java-cp%22)
     分别查看所有最新的版本。 
     
     ## Maven & Gradle
    
    From a5757774cbcdf6332358a9e84b907312397828a4 Mon Sep 17 00:00:00 2001
    From: Binary Wang 
    Date: Wed, 28 Sep 2016 10:13:01 +0800
    Subject: [PATCH 50/51] Delete github_id.png
    
    ---
     res/github_id.png | Bin 4006 -> 0 bytes
     1 file changed, 0 insertions(+), 0 deletions(-)
     delete mode 100644 res/github_id.png
    
    diff --git a/res/github_id.png b/res/github_id.png
    deleted file mode 100644
    index dc2aefcf92f1f622aefae965ec9753ec8f03ebfc..0000000000000000000000000000000000000000
    GIT binary patch
    literal 0
    HcmV?d00001
    
    literal 4006
    zcmaKvcQ~6}*uZ12s#MXUh?c0@1TUpVgV-%t@9c6}Jsj4CInBZ!%i
    zIzL4^P^f~&&rDAnP(5^Ijk=(B)-u)t0P0fNP98B(*DT&J8$STxeAk~r^U3S&699nY
    zran~5BG_T`HN}gI#2a@oJa6uI>~JKPIBMW=ukqbWC1d!-WmFoFnZ8q0C>=>z0E{OJW-{iB@mCE74meAL)$L)^~G6ly63w8_Z
    z{0r5cok(Ec#a?z=06iO&4nz;)0|*1~0A`waMonf-2tXTvq5;wZ*`t6_a6k+I%9ckV
    z)ksv^HsetcZc@KdGk_Ma
    zt@&9YaGtdlSCQm!a@|BGVruR1h@4~p4&f<7q$RRI*)F#l*tdotEF-duoM&&E47WyJ
    zT_h<77Fv4XI4m2->8Kh~6TcU__MX@?sXtApxDC3p;hio4r5;*eb{g683^}RVZ<)h>
    zKw9`=eO879jt*Cl{a)`GNg2J@m8n`7*;G&0Vm)QSFUOSo7Z5$y18&?^iszBF%?%i9
    zB_WkC1R;`8|6wC}cf?N@<1WFAbW;c(aR%2DZ$i{Xa+Ve!l5r{d8RdV&!Z)EMqSCo%@(}ccr7zg
    zZ|1B}aHb^=dnMV!N^;Au|1sDs;4fNKmV!Va
    z_P*Zc5J&GWYYuGv0(jgCl#|MJ(&@Th#b0bMBzF8SYnyw7J
    zHeVPG2bSn%hv{&%PiS(~xbKC9`x@S4FOjamCR>m=h@goBfoaV8*CIW6o{bk(vxF0!
    zS1wti6P>NC{1a4vS+t@Oc30Pp71tUiDKr_~XxU~`T#!FpNb
    zssMeDf|63HrJOk=_UVX(opf}_?@B)C@f=L!i`~gBscNC`eb}S#z}EVMO55o%%>5#b
    z$iSGfQ}3y*wPY$<0*py($9)njrJgrk8>OhI=-Qc@k`l6XqvT;&*BU+(_E(TAKdQA
    z?r@oypY*R=ChzXD1~X*!4)$hC*%3~Es+V^ESpF>Fc-Zm!w2aB+GoGsz(~c}W{tjyW
    zFh7flI1I(izd&F@@3Qw;d7^FxZR01heL~hNM)vlGuK6#LJ(>@U&~>@$QgnM2C2`QP
    zt$#%K#ThQFfvyX>Oy;sUOr!ZqKGwjKMeM{y9j6Y#a@sPHc&%AAZ0>}R9d!2e=>~5VIqo$Zdt4gb_vzR&9}8?S6;QZ_C`o_9W+o5*v5)$EyUbJ6Bq`
    zA)*6J5pZE5YqV?ddN9iCCC|2smVo*-|N5Z#eSuAMLek8^XIER9uM~i2C)dFW_f+8l5v^Lj=g?KmB0N
    zONQ3l4|e{M46uH@^6$+D$kpOYZ5oC(O(tgB%i{Sh&vJSt=T*&>SBtSCM8$)zhj{(w
    z05X;IVmuE>t&Xz3eg(EkmN(n?2NR2r+rxRwQeQQ@xEU&MY7q65J)h0WeCBeg^rgkq
    z#^@+Cz0^|2RXCw5)xEQM&b(93LKh0c(ck~xCVP?=)8u-Bms~r!ulHg2L->mHbis`?
    z<(i!&B;fr=q&xs5Vx8=63fyHUy@mE){y!@E|5Nk_U4L;9_xJY`S32oY&u!QYvyH$m
    zzP|Mv_1q%)XAMMvh3d6y*C4X845oXP+U?QBO#H_>AckACI`m9HjPYu
    z2r%^7B^&pcYMi3ejI!LBK<-lqPjCxu&Y5Iv;lTvm=8Lt&eX&ah829Kkt)C2ehVL-`
    zRLqtSPbQ_ESU>khmK%}eRorKiJyFB
    zMP=9zDd5d!_1677-l+c@d27qFQN-^yeO}T$ZuopHTgVHArz2-e8O8}<{oZ3ML4X#}
    zO#1siy{L*q|Er9N`Kx>mXXp
    z65437*&;9DBzy7oC9kQQ-P
    zXV7z~d)8qIy<$J(5)U0kPoC>X95gQ>10W7xN{DXc%QaCmR(^^J_9&J0w@0=j<-PvM
    zHO|B2d4z~9*{$yyi=n5K)0^=0uZzcm2%SX}Nxn;u@CJdY*CkPB$LvFhc+v9LKq6FbJ}##3k#u?KEzM4+rgB+9@^8&VmED7
    zaBT*f3-#1S;Lnjrl<{mu2)1IYs`On)=Tlq+T5?B}uf}OA*Gge)@WA=LWG%OG&tX(|
    zGwPX`L{q;Vrt;#9frDf4q9G(;NIaF(uBGf%wYmb28Ou&<03>oPGbtH?$TEQxKCJG)
    z*&3do=TD&DZ~3uX5!QyXxl8y5j3tVxnw!5KR*h9Y(@_{IkK`vkL}-{BzD2xLrv_52
    zBwx@dhqg5)HkPruW%ipLm}$r=aD|@yt$uBPELj3hfjiq`d0F|p_#dEb@*p0>KnowDwlY!JY
    zI#}MK9c1gH01lAU8|mCajrFFmv~%S#zc{~~f@0W2Z#^p@e|hEnCnc$hrwPDQ`0u%a
    zV-R2T`vpS`lTcWiVDKDGj~l!5+KAXz+40uDaOMS*eyE+_dw!HKEcO@IW`HYJ)yMg?
    zdk26`VP4Qru*9^F>{q|!tP(^C$BR)7W)e1bD{D$Qs8K-+ZpO*jqPsz`HS_vV48vqI
    zEvIqDn<)_NkvIZgBVdX2xgsc7y43HnH)$hdD-4P^#lNTf>#gU{X%c%L2R>_`=it_Z
    zC+I+gjUOjj#JFxM$x%Y(y|r@!95I*_PFM(g@YJa{VW^dmBzL@s$qk6}PqWd0eDY&h0$(FWQD7CnHDjm9r!Dd@>mAYjV=ZP4pA8D7_~~3&Cg+EwcC|UtktRQ`XuYaJfLZ{3x*KSZUpXP
    z5c%r;A*8q-y2mm4pP%tEy~S)me9n1@OWu2zhL_v&gXxBq+rm}3mmlhdJo
    zYDN9bRDWw?WUm@`;sBhMAlo6>MSpBm40k+_H9EoG1@wpk^+M34Glxy2QWI0Jn}6~s
    zn!0J3o{s*`W;XPva|lzLi#9X0VF1lq;O2XgufElvj&kq7sBde4zK#jBTKi%2{{XAO
    By2}6n
    
    
    From cb9380cc4f3344cba8da2e4b5f7989750baf9f91 Mon Sep 17 00:00:00 2001
    From: BinaryWang 
    Date: Wed, 28 Sep 2016 11:12:01 +0800
    Subject: [PATCH 51/51] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E5=8F=91?=
     =?UTF-8?q?=E9=80=81=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF=E7=9A=84=E5=8D=95?=
     =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
    MIME-Version: 1.0
    Content-Type: text/plain; charset=UTF-8
    Content-Transfer-Encoding: 8bit
    
    ---
     .../weixin/mp/api/impl/WxMpServiceImpl.java   |  5 +-
     .../weixin/mp/bean/WxMpTemplateData.java      |  4 +-
     .../weixin/mp/bean/WxMpTemplateMessage.java   | 66 +++++++++++++++++--
     .../chanjar/weixin/mp/api/ApiTestModule.java  | 50 ++------------
     .../weixin/mp/api/WxMpMassMessageAPITest.java |  4 +-
     .../mp/api/WxXmlMpInMemoryConfigStorage.java  | 57 ++++++++++++++++
     .../mp/api/impl/WxMpGroupServiceImplTest.java |  5 +-
     .../mp/api/impl/WxMpKefuServiceImplTest.java  |  6 +-
     .../mp/api/impl/WxMpPayServiceImplTest.java   |  3 +-
     .../mp/api/impl/WxMpServiceImplTest.java      | 23 +++++--
     .../WxMpUserBlacklistServiceImplTest.java     |  7 +-
     .../mp/api/impl/WxMpUserServiceImplTest.java  |  5 +-
     .../api/impl/WxMpUserTagServiceImplTest.java  |  5 +-
     .../src/test/resources/test-config.sample.xml |  1 +
     14 files changed, 164 insertions(+), 77 deletions(-)
     create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java
    
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
    index 9710697f..ba3fcdfc 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImpl.java
    @@ -257,9 +257,8 @@ public class WxMpServiceImpl implements WxMpService {
       @Override
       public String templateSend(WxMpTemplateMessage templateMessage) throws WxErrorException {
         String url = "https://api.weixin.qq.com/cgi-bin/message/template/send";
    -    String responseContent = execute(new SimplePostRequestExecutor(), url, templateMessage.toJson());
    -    JsonElement tmpJsonElement = JSON_PARSER.parse(responseContent);
    -    final JsonObject jsonObject = tmpJsonElement.getAsJsonObject();
    +    String responseContent = this.post(url, templateMessage.toJson());
    +    final JsonObject jsonObject = JSON_PARSER.parse(responseContent).getAsJsonObject();
         if (jsonObject.get("errcode").getAsInt() == 0){
           return jsonObject.get("msgid").getAsString();
         }
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java
    index ff83baa9..d46ae24b 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateData.java
    @@ -7,9 +7,6 @@ import java.io.Serializable;
      */
     public class WxMpTemplateData implements Serializable {
     
    -  /**
    -   * 
    -   */
       private static final long serialVersionUID = 6301835292940277870L;
       private String name;
       private String value;
    @@ -48,6 +45,7 @@ public class WxMpTemplateData implements Serializable {
       public String getColor() {
         return this.color;
       }
    +
       public void setColor(String color) {
         this.color = color;
       }
    diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java
    index eec25eda..408abb50 100644
    --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java
    +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpTemplateMessage.java
    @@ -1,17 +1,14 @@
     package me.chanjar.weixin.mp.bean;
     
    -import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
    -
     import java.io.Serializable;
     import java.util.ArrayList;
     import java.util.List;
     
    -public class WxMpTemplateMessage implements Serializable {
    +import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
     
    -  /**
    -   * 
    -   */
    +public class WxMpTemplateMessage implements Serializable {
       private static final long serialVersionUID = 5063374783759519418L;
    +
       private String toUser;
       private String templateId;
       private String url;
    @@ -65,4 +62,61 @@ public class WxMpTemplateMessage implements Serializable {
       public String toJson() {
         return WxMpGsonBuilder.INSTANCE.create().toJson(this);
       }
    +
    +  public static WxMpTemplateMessageBuilder builder() {
    +    return new WxMpTemplateMessageBuilder();
    +  }
    +
    +  public static class WxMpTemplateMessageBuilder {
    +    private String toUser;
    +    private String templateId;
    +    private String url;
    +    private String topColor;
    +    private List data = new ArrayList<>();
    +
    +    public WxMpTemplateMessageBuilder toUser(String toUser) {
    +      this.toUser = toUser;
    +      return this;
    +    }
    +
    +    public WxMpTemplateMessageBuilder templateId(String templateId) {
    +      this.templateId = templateId;
    +      return this;
    +    }
    +
    +    public WxMpTemplateMessageBuilder url(String url) {
    +      this.url = url;
    +      return this;
    +    }
    +
    +    public WxMpTemplateMessageBuilder topColor(String topColor) {
    +      this.topColor = topColor;
    +      return this;
    +    }
    +
    +    public WxMpTemplateMessageBuilder data(List data) {
    +      this.data = data;
    +      return this;
    +    }
    +
    +    public WxMpTemplateMessageBuilder from(WxMpTemplateMessage origin) {
    +      this.toUser(origin.toUser);
    +      this.templateId(origin.templateId);
    +      this.url(origin.url);
    +      this.topColor(origin.topColor);
    +      this.data(origin.data);
    +      return this;
    +    }
    +
    +    public WxMpTemplateMessage build() {
    +      WxMpTemplateMessage m = new WxMpTemplateMessage();
    +      m.toUser = this.toUser;
    +      m.templateId = this.templateId;
    +      m.url = this.url;
    +      m.topColor = this.topColor;
    +      m.data = this.data;
    +      return m;
    +    }
    +  }
    +
     }
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
    index f4b79ae2..4ec12cbd 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java
    @@ -3,15 +3,12 @@ package me.chanjar.weixin.mp.api;
     import java.io.IOException;
     import java.io.InputStream;
     
    -import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
    -import org.apache.commons.lang3.builder.ToStringBuilder;
    -
     import com.google.inject.Binder;
     import com.google.inject.Module;
     import com.thoughtworks.xstream.XStream;
    -import com.thoughtworks.xstream.annotations.XStreamAlias;
     
     import me.chanjar.weixin.common.util.xml.XStreamInitializer;
    +import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
     
     public class ApiTestModule implements Module {
     
    @@ -19,8 +16,8 @@ public class ApiTestModule implements Module {
       public void configure(Binder binder) {
         try (InputStream is1 = ClassLoader
             .getSystemResourceAsStream("test-config.xml")) {
    -      WxXmlMpInMemoryConfigStorage config = fromXml(
    -          WxXmlMpInMemoryConfigStorage.class, is1);
    +      WxXmlMpInMemoryConfigStorage config = this
    +          .fromXml(WxXmlMpInMemoryConfigStorage.class, is1);
           WxMpServiceImpl wxService = new WxMpServiceImpl();
           wxService.setWxMpConfigStorage(config);
     
    @@ -32,50 +29,11 @@ public class ApiTestModule implements Module {
       }
     
       @SuppressWarnings("unchecked")
    -  public static  T fromXml(Class clazz, InputStream is) {
    +  private  T fromXml(Class clazz, InputStream is) {
         XStream xstream = XStreamInitializer.getInstance();
         xstream.alias("xml", clazz);
         xstream.processAnnotations(clazz);
         return (T) xstream.fromXML(is);
       }
     
    -  @XStreamAlias("xml")
    -  public static class WxXmlMpInMemoryConfigStorage
    -      extends WxMpInMemoryConfigStorage {
    -
    -    private String openid;
    -    private String kfAccount;
    -    private String qrconnectRedirectUrl;
    -
    -    public String getOpenid() {
    -      return this.openid;
    -    }
    -
    -    public void setOpenid(String openid) {
    -      this.openid = openid;
    -    }
    -
    -    @Override
    -    public String toString() {
    -      return ToStringBuilder.reflectionToString(this);
    -    }
    -
    -    public String getKfAccount() {
    -      return this.kfAccount;
    -    }
    -
    -    public void setKfAccount(String kfAccount) {
    -      this.kfAccount = kfAccount;
    -    }
    -
    -    public String getQrconnectRedirectUrl() {
    -      return this.qrconnectRedirectUrl;
    -    }
    -
    -    public void setQrconnectRedirectUrl(String qrconnectRedirectUrl) {
    -      this.qrconnectRedirectUrl = qrconnectRedirectUrl;
    -    }
    -
    -  }
    -
     }
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
    index ee99b6e1..3f2c28b8 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
    @@ -36,7 +36,7 @@ public class WxMpMassMessageAPITest {
       @Test
       public void testTextMassOpenIdsMessageSend() throws WxErrorException {
         // 发送群发消息
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
    +    WxXmlMpInMemoryConfigStorage configProvider = (WxXmlMpInMemoryConfigStorage) this.wxService
             .getWxMpConfigStorage();
         WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
         massMessage.setMsgType(WxConsts.MASS_MSG_TEXT);
    @@ -53,7 +53,7 @@ public class WxMpMassMessageAPITest {
       public void testMediaMassOpenIdsMessageSend(String massMsgType,
           String mediaId) throws WxErrorException {
         // 发送群发消息
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
    +    WxXmlMpInMemoryConfigStorage configProvider = (WxXmlMpInMemoryConfigStorage) this.wxService
             .getWxMpConfigStorage();
         WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
         massMessage.setMsgType(massMsgType);
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java
    new file mode 100644
    index 00000000..6b28f196
    --- /dev/null
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxXmlMpInMemoryConfigStorage.java
    @@ -0,0 +1,57 @@
    +/**
    + * Copyright(c) 2011-2016 by UCredit Inc.
    + * All Rights Reserved
    + */
    +package me.chanjar.weixin.mp.api;
    +
    +import org.apache.commons.lang3.builder.ToStringBuilder;
    +
    +import com.thoughtworks.xstream.annotations.XStreamAlias;
    +
    +@XStreamAlias("xml")
    +public class WxXmlMpInMemoryConfigStorage
    +    extends WxMpInMemoryConfigStorage {
    +
    +  private String openid;
    +  private String kfAccount;
    +  private String qrconnectRedirectUrl;
    +  private String templateId;
    +
    +  public String getOpenid() {
    +    return this.openid;
    +  }
    +
    +  public void setOpenid(String openid) {
    +    this.openid = openid;
    +  }
    +
    +  @Override
    +  public String toString() {
    +    return ToStringBuilder.reflectionToString(this);
    +  }
    +
    +  public String getKfAccount() {
    +    return this.kfAccount;
    +  }
    +
    +  public void setKfAccount(String kfAccount) {
    +    this.kfAccount = kfAccount;
    +  }
    +
    +  public String getQrconnectRedirectUrl() {
    +    return this.qrconnectRedirectUrl;
    +  }
    +
    +  public void setQrconnectRedirectUrl(String qrconnectRedirectUrl) {
    +    this.qrconnectRedirectUrl = qrconnectRedirectUrl;
    +  }
    +
    +  public String getTemplateId() {
    +    return this.templateId;
    +  }
    +
    +  public void setTemplateId(String templateId) {
    +    this.templateId = templateId;
    +  }
    +
    +}
    \ No newline at end of file
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
    index 5d114cc4..2216e553 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpGroupServiceImplTest.java
    @@ -3,6 +3,7 @@ package me.chanjar.weixin.mp.api.impl;
     import com.google.inject.Inject;
     import me.chanjar.weixin.common.exception.WxErrorException;
     import me.chanjar.weixin.mp.api.ApiTestModule;
    +import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
     import me.chanjar.weixin.mp.bean.WxMpGroup;
     import org.testng.Assert;
     import org.testng.annotations.Guice;
    @@ -48,13 +49,13 @@ public class WxMpGroupServiceImplTest {
       }
     
       public void testGroupQueryUserGroup() throws WxErrorException {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
    +    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
         long groupid = this.wxService.getGroupService().userGetGroup(configStorage.getOpenid());
         Assert.assertTrue(groupid != -1l);
       }
     
       public void testGroupMoveUser() throws WxErrorException {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
    +    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
         this.wxService.getGroupService().userUpdateGroup(configStorage.getOpenid(), this.wxService.getGroupService().groupGet().get(3).getId());
       }
     
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java
    index 66ff3c30..32a0118f 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java
    @@ -14,7 +14,7 @@ import com.google.inject.Inject;
     import me.chanjar.weixin.common.api.WxConsts;
     import me.chanjar.weixin.common.exception.WxErrorException;
     import me.chanjar.weixin.mp.api.ApiTestModule;
    -import me.chanjar.weixin.mp.api.ApiTestModule.WxXmlMpInMemoryConfigStorage;
    +import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
     import me.chanjar.weixin.mp.bean.WxMpCustomMessage;
     import me.chanjar.weixin.mp.bean.kefu.request.WxMpKfAccountRequest;
     import me.chanjar.weixin.mp.bean.kefu.result.WxMpKfInfo;
    @@ -38,7 +38,7 @@ public class WxMpKefuServiceImplTest {
       protected WxMpServiceImpl wxService;
     
       public void testSendCustomMessage() throws WxErrorException {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
    +    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
             .getWxMpConfigStorage();
         WxMpCustomMessage message = new WxMpCustomMessage();
         message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
    @@ -50,7 +50,7 @@ public class WxMpKefuServiceImplTest {
       }
     
       public void testSendCustomMessageWithKfAccount() throws WxErrorException {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
    +    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
             .getWxMpConfigStorage();
         WxMpCustomMessage message = new WxMpCustomMessage();
         message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
    index f246032d..1982f948 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpPayServiceImplTest.java
    @@ -7,6 +7,7 @@ import com.google.inject.Inject;
     
     import me.chanjar.weixin.common.exception.WxErrorException;
     import me.chanjar.weixin.mp.api.ApiTestModule;
    +import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
     import me.chanjar.weixin.mp.bean.pay.WxRedpackResult;
     import me.chanjar.weixin.mp.bean.pay.WxSendRedpackRequest;
     import me.chanjar.weixin.mp.bean.pay.WxUnifiedOrderRequest;
    @@ -71,7 +72,7 @@ public class WxMpPayServiceImplTest {
         request.setClientIp("aaa");
         request.setMchBillno("aaaa");
         request
    -        .setReOpenid(((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid());
    +        .setReOpenid(((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid());
         WxRedpackResult redpackResult = this.wxService.getPayService().sendRedpack(request);
         System.err.println(redpackResult);
       }
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
    index 33242ba4..c108d575 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
    @@ -1,5 +1,8 @@
     package me.chanjar.weixin.mp.api.impl;
     
    +import java.text.SimpleDateFormat;
    +import java.util.Date;
    +
     import org.testng.Assert;
     import org.testng.annotations.Guice;
     import org.testng.annotations.Test;
    @@ -7,8 +10,11 @@ import org.testng.annotations.Test;
     import com.google.inject.Inject;
     
     import me.chanjar.weixin.common.api.WxConsts;
    +import me.chanjar.weixin.common.exception.WxErrorException;
     import me.chanjar.weixin.mp.api.ApiTestModule;
    -import me.chanjar.weixin.mp.api.ApiTestModule.WxXmlMpInMemoryConfigStorage;
    +import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
    +import me.chanjar.weixin.mp.bean.WxMpTemplateData;
    +import me.chanjar.weixin.mp.bean.WxMpTemplateMessage;
     
     @Test
     @Guice(modules = ApiTestModule.class)
    @@ -82,9 +88,18 @@ public class WxMpServiceImplTest {
         Assert.fail("Not yet implemented");
       }
     
    -  @Test
    -  public void testTemplateSend() {
    -    Assert.fail("Not yet implemented");
    +  @Test(invocationCount = 100, threadPoolSize = 30)
    +  public void testTemplateSend() throws WxErrorException {
    +    SimpleDateFormat dateFormat = new SimpleDateFormat(
    +        "yyyy-MM-dd HH:mm:ss.SSS");
    +    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
    +        .getWxMpConfigStorage();
    +    WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
    +        .toUser(configStorage.getOpenid())
    +        .templateId(configStorage.getTemplateId()).build();
    +    templateMessage.addWxMpTemplateData(
    +        new WxMpTemplateData("first", dateFormat.format(new Date())));
    +    this.wxService.templateSend(templateMessage);
       }
     
       @Test
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java
    index 6d31ea97..aebf6926 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserBlacklistServiceImplTest.java
    @@ -1,6 +1,7 @@
     package me.chanjar.weixin.mp.api.impl;
     
     import me.chanjar.weixin.mp.api.ApiTestModule;
    +import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
     import me.chanjar.weixin.mp.bean.result.WxMpUserBlacklistGetResult;
     import org.testng.Assert;
     import org.testng.annotations.Guice;
    @@ -21,7 +22,7 @@ public class WxMpUserBlacklistServiceImplTest {
     
       @Test
       public void testGetBlacklist() throws Exception {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
    +    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
           .getWxMpConfigStorage();
         WxMpUserBlacklistGetResult wxMpUserBlacklistGetResult = this.wxService.getBlackListService().getBlacklist(configStorage.getOpenid());
         Assert.assertNotNull(wxMpUserBlacklistGetResult);
    @@ -33,7 +34,7 @@ public class WxMpUserBlacklistServiceImplTest {
     
       @Test
       public void testPushToBlacklist() throws Exception {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
    +    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
           .getWxMpConfigStorage();
         List openidList = new ArrayList<>();
         openidList.add(configStorage.getOpenid());
    @@ -42,7 +43,7 @@ public class WxMpUserBlacklistServiceImplTest {
     
       @Test
       public void testPullFromBlacklist() throws Exception {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configStorage = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService
    +    WxXmlMpInMemoryConfigStorage configStorage = (WxXmlMpInMemoryConfigStorage) this.wxService
           .getWxMpConfigStorage();
         List openidList = new ArrayList<>();
         openidList.add(configStorage.getOpenid());
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
    index 95671b40..4167a852 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserServiceImplTest.java
    @@ -8,6 +8,7 @@ import com.google.inject.Inject;
     
     import me.chanjar.weixin.common.exception.WxErrorException;
     import me.chanjar.weixin.mp.api.ApiTestModule;
    +import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
     import me.chanjar.weixin.mp.bean.result.WxMpUser;
     import me.chanjar.weixin.mp.bean.result.WxMpUserList;
     
    @@ -25,12 +26,12 @@ public class WxMpUserServiceImplTest {
       protected WxMpServiceImpl wxService;
     
       public void testUserUpdateRemark() throws WxErrorException {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
    +    WxXmlMpInMemoryConfigStorage configProvider = (WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
         this.wxService.getUserService().userUpdateRemark(configProvider.getOpenid(), "测试备注名");
       }
     
       public void testUserInfo() throws WxErrorException {
    -    ApiTestModule.WxXmlMpInMemoryConfigStorage configProvider = (ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
    +    WxXmlMpInMemoryConfigStorage configProvider = (WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage();
         WxMpUser user = this.wxService.getUserService().userInfo(configProvider.getOpenid(), null);
         Assert.assertNotNull(user);
         System.out.println(user);
    diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java
    index 5ccae195..74a6cfc4 100644
    --- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java
    +++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpUserTagServiceImplTest.java
    @@ -2,6 +2,7 @@ package me.chanjar.weixin.mp.api.impl;
     
     import com.google.inject.Inject;
     import me.chanjar.weixin.mp.api.ApiTestModule;
    +import me.chanjar.weixin.mp.api.WxXmlMpInMemoryConfigStorage;
     import me.chanjar.weixin.mp.bean.tag.WxTagListUser;
     import me.chanjar.weixin.mp.bean.tag.WxUserTag;
     import org.testng.Assert;
    @@ -63,7 +64,7 @@ public class WxMpUserTagServiceImplTest {
     
       @Test
       public void testBatchUntagging() throws Exception {
    -    String[] openids = new String[]{((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid()};
    +    String[] openids = new String[]{((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid()};
         boolean res = this.wxService.getUserTagService().batchUntagging(this.tagId, openids);
         System.out.println(res);
         Assert.assertTrue(res);
    @@ -72,7 +73,7 @@ public class WxMpUserTagServiceImplTest {
       @Test
       public void testUserTagList() throws Exception {
         List res = this.wxService.getUserTagService().userTagList(
    -        ((ApiTestModule.WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid());
    +        ((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getOpenid());
         System.out.println(res);
         Assert.assertNotNull(res);
       }
    diff --git a/weixin-java-mp/src/test/resources/test-config.sample.xml b/weixin-java-mp/src/test/resources/test-config.sample.xml
    index 0df87b09..ad46a19e 100644
    --- a/weixin-java-mp/src/test/resources/test-config.sample.xml
    +++ b/weixin-java-mp/src/test/resources/test-config.sample.xml
    @@ -6,6 +6,7 @@
         可以不填写
         可以不填写
         某个加你公众号的用户的openId
    +    模版消息的模版ID
         网页授权获取用户信息回调地址
         网页应用授权登陆回调地址
         完整客服账号,格式为:账号前缀@公众号微信号