niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed something

Browse Source
This commit is contained in:
jinyu 2017-06-07 17:10:17 +08:00
parent 6326ee1c03
commit 309022b44b
4 changed files with 863 additions and 885 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CouponApi.java
View File

@ -19,98 +19,96 @@ import com.foxinmy.weixin4j.xml.XmlStream;
* @author jinyu(foxinmy@gmail.com) * @author jinyu(foxinmy@gmail.com)
* @date 2015年3月25日 * @date 2015年3月25日
* @since JDK 1.6 * @since JDK 1.6
* @see <a * @see <a href=
* href="https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_1">代金券</a> * "https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_1">代金券</a>
*/ */
public class CouponApi extends MchApi { public class CouponApi extends MchApi {
public CouponApi(WeixinPayAccount weixinAccount) { public CouponApi(WeixinPayAccount weixinAccount) {
super(weixinAccount); super(weixinAccount);
} }
/** /**
* 发放代金券(需要证书) * 发放代金券(需要证书)
* *
* @param couponStockId * @param couponStockId
* 代金券批次id * 代金券批次id
* @param partnerTradeNo * @param partnerTradeNo
* 商户发放凭据号（格式：商户id+日期+流水号），商户侧需保持唯一性 * 商户发放凭据号（格式：商户id+日期+流水号），商户侧需保持唯一性
* @param openId * @param openId
* 用户的openid * 用户的openid
* @param opUserId * @param opUserId
* 操作员帐号, 默认为商户号 可在商户平台配置操作员对应的api权限 可为空 * 操作员帐号, 默认为商户号 可在商户平台配置操作员对应的api权限 可为空
* @return 发放结果 * @return 发放结果
* @see com.foxinmy.weixin4j.payment.coupon.CouponResult * @see com.foxinmy.weixin4j.payment.coupon.CouponResult
* @see <a * @see <a href=
* href="https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_3">发放代金券接口</a> * "https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_3">发放代金券接口</a>
* @throws WeixinException * @throws WeixinException
*/ */
public CouponResult sendCoupon(String couponStockId, String partnerTradeNo, public CouponResult sendCoupon(String couponStockId, String partnerTradeNo, String openId, String opUserId)
String openId, String opUserId) throws WeixinException { throws WeixinException {
Map<String, String> map = createBaseRequestMap(null); Map<String, String> map = createBaseRequestMap(null);
map.put("coupon_stock_id", couponStockId); map.put("coupon_stock_id", couponStockId);
map.put("partner_trade_no", partnerTradeNo); map.put("partner_trade_no", partnerTradeNo);
map.put("openid", openId); map.put("openid", openId);
// openid记录数（目前支持num=1） // openid记录数（目前支持num=1）
map.put("openid_count", "1"); map.put("openid_count", "1");
// 操作员帐号, 默认为商户号 可在商户平台配置操作员对应的api权限 // 操作员帐号, 默认为商户号 可在商户平台配置操作员对应的api权限
if (StringUtil.isBlank(opUserId)) { if (StringUtil.isBlank(opUserId)) {
opUserId = weixinAccount.getMchId(); opUserId = weixinAccount.getMchId();
} }
map.put("op_user_id", opUserId); map.put("op_user_id", opUserId);
map.put("version", "1.0"); map.put("version", "1.0");
map.put("type", "XML"); map.put("type", "XML");
map.put("sign", weixinSignature.sign(map)); map.put("sign", weixinSignature.sign(map));
String param = XmlStream.map2xml(map); String param = XmlStream.map2xml(map);
WeixinResponse response = getWeixinSSLExecutor().post( WeixinResponse response = getWeixinSSLExecutor().post(getRequestUri("coupon_send_uri"), param);
getRequestUri("coupon_send_uri"), param); return response.getAsObject(new TypeReference<CouponResult>() {
return response.getAsObject(new TypeReference<CouponResult>() { });
}); }
}
/** /**
* 查询代金券批次 * 查询代金券批次
* *
* @param couponStockId * @param couponStockId
* 代金券批次ID * 代金券批次ID
* @return 代金券批次信息 * @return 代金券批次信息
* @see com.foxinmy.weixin4j.payment.coupon.CouponStock * @see com.foxinmy.weixin4j.payment.coupon.CouponStock
* @see <a * @see <a href=
* href="https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_4">查询代金券批次信息接口</a> * "https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_4">查询代金券批次信息接口</a>
* @throws WeixinException * @throws WeixinException
*/ */
public CouponStock queryCouponStock(String couponStockId) public CouponStock queryCouponStock(String couponStockId) throws WeixinException {
throws WeixinException { Map<String, String> map = createBaseRequestMap(null);
Map<String, String> map = createBaseRequestMap(null); map.put("coupon_stock_id", couponStockId);
map.put("coupon_stock_id", couponStockId); map.put("sign", weixinSignature.sign(map));
map.put("sign", weixinSignature.sign(map)); String param = XmlStream.map2xml(map);
String param = XmlStream.map2xml(map); WeixinResponse response = weixinExecutor.post(getRequestUri("couponstock_query_uri"), param);
WeixinResponse response = weixinExecutor.post( return response.getAsObject(new TypeReference<CouponStock>() {
getRequestUri("couponstock_query_uri"), param); });
return response.getAsObject(new TypeReference<CouponStock>() { }
});
}
/** /**
* 查询代金券详细 * 查询代金券详细
* *
* @param couponId * @param openId
* 代金券ID * 用户ID
* @return 代金券详细信息 * @param couponId
* @see com.foxinmy.weixin4j.payment.coupon.CouponDetail * 代金券ID
* @see <a * @return 代金券详细信息
* href="https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_5">查询代金券详细信息接口</a> * @see com.foxinmy.weixin4j.payment.coupon.CouponDetail
* @throws WeixinException * @see <a href=
*/ * "https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_5">查询代金券详细信息接口</a>
public CouponDetail queryCouponDetail(String couponId) * @throws WeixinException
throws WeixinException { */
Map<String, String> map = createBaseRequestMap(null); public CouponDetail queryCouponDetail(String openId, String couponId) throws WeixinException {
map.put("coupon_id", couponId); Map<String, String> map = createBaseRequestMap(null);
map.put("sign", weixinSignature.sign(map)); map.put("openid", openId);
String param = XmlStream.map2xml(map); map.put("coupon_id", couponId);
WeixinResponse response = weixinExecutor.post( map.put("sign", weixinSignature.sign(map));
getRequestUri("coupondetail_query_uri"), param); String param = XmlStream.map2xml(map);
return response.getAsObject(new TypeReference<CouponDetail>() { WeixinResponse response = weixinExecutor.post(getRequestUri("coupondetail_query_uri"), param);
}); return response.getAsObject(new TypeReference<CouponDetail>() {
} });
}
} }

1552
weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java
View File

File diff suppressed because it is too large Load Diff

2
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java
View File

@ -225,5 +225,5 @@ public class WeixinComponentProxy {
authAppId), component(componentId).getTokenManager()); authAppId), component(componentId).getTokenManager());
} }
public final static String VERSION = "1.7.5"; public final static String VERSION = "1.7.6";
} }

2
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java
View File

@ -285,5 +285,5 @@ public class WeixinSuiteProxy {
suite(suiteId).getTokenManager()); suite(suiteId).getTokenManager());
} }
public final static String VERSION = "1.7.5"; public final static String VERSION = "1.7.6";
} }