#66 and cleanup with Metrics plugin

weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java

@@ -82,7 +82,8 @@ public class PayApi extends MchApi {
 		payPackage.declareWeixinPayAccount(weixinAccount);
 		payPackage.setSign(weixinSignature.sign(payPackage));
 		String payJsRequestXml = XmlStream.toXML(payPackage);
-		WeixinResponse response = weixinExecutor.post(getRequestUri("order_create_uri"), payJsRequestXml);
+		WeixinResponse response = weixinExecutor.post(
+				getRequestUri("order_create_uri"), payJsRequestXml);
 		return response.getAsObject(new TypeReference<PrePay>() {
 		});
 	}
@@ -100,85 +101,34 @@ public class PayApi extends MchApi {
 	 * @see com.foxinmy.weixin4j.payment.mch.WAPPayRequest WAP支付
 	 * @throws WeixinException
 	 */
-	public MchPayRequest createPayRequest(MchPayPackage payPackage) throws WeixinException {
+	public MchPayRequest createPayRequest(MchPayPackage payPackage)
-		PrePay prePay = createPrePay(payPackage);
+			throws WeixinException {
 		String tradeType = payPackage.getTradeType();
+		if (TradeType.MICROPAY.name().equalsIgnoreCase(tradeType)) {
+			String para = XmlStream.toXML(payPackage);
+			WeixinResponse response = weixinExecutor.post(
+					getRequestUri("micropay_uri"), para);
+			MICROPayRequest microPayRequest = response
+					.getAsObject(new TypeReference<MICROPayRequest>() {
+					});
+			microPayRequest.setPaymentAccount(weixinAccount);
+			return microPayRequest;
+		}
+		PrePay prePay = createPrePay(payPackage);
 		if (TradeType.APP.name().equalsIgnoreCase(tradeType)) {
 			return new APPPayRequest(prePay.getPrepayId(), weixinAccount);
 		} else if (TradeType.JSAPI.name().equalsIgnoreCase(tradeType)) {
 			return new JSAPIPayRequest(prePay.getPrepayId(), weixinAccount);
 		} else if (TradeType.NATIVE.name().equalsIgnoreCase(tradeType)) {
-			return new NATIVEPayRequest(prePay.getPrepayId(), prePay.getCodeUrl(), weixinAccount);
+			return new NATIVEPayRequest(prePay.getPrepayId(),
+					prePay.getCodeUrl(), weixinAccount);
 		} else if (TradeType.WAP.name().equalsIgnoreCase(tradeType)) {
 			return new WAPPayRequest(prePay.getPrepayId(), weixinAccount);
-		} else if (TradeType.MICROPAY.name().equalsIgnoreCase(tradeType)) {
-			String para = XmlStream.toXML(payPackage);
-			WeixinResponse response = weixinExecutor.post(getRequestUri("micropay_uri"), para);
-			MICROPayRequest microPayRequest = response.getAsObject(new TypeReference<MICROPayRequest>() {
-			});
-			microPayRequest.setPaymentAccount(weixinAccount);
-			return microPayRequest;
 		} else {
 			throw new WeixinException("unknown tradeType:" + tradeType);
 		}
 	}
 
-	/**
-	 * 创建支付请求对象【完整参数】
-	 * 
-	 * @param body
-	 *            商品描述 <font color="red">必填项</font>
-	 * @param detail
-	 *            商品名称明细列表 非必填项
-	 * @param outTradeNo
-	 *            商户内部唯一订单号 <font color="red">必填项</font>
-	 * @param totalFee
-	 *            商品总额 单位元 <font color="red">必填项</font>
-	 * @param notifyUrl
-	 *            支付回调URL <font color="red">必填项</font>
-	 * @param createIp
-	 *            订单生成的机器IP <font color="red">必填项</font>
-	 * @param tradeType
-	 *            交易类型 <font color="red">必填项</font>
-	 * @param openId
-	 *            用户ID <font color="red">tradeType=JSAPI时必填</font>
-	 * @param productId
-	 *            产品ID <font color="red">tradeType=NATIVE时必填</font>
-	 * @param attach
-	 *            附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据 非必填项
-	 * @param timeStart
-	 *            订单生成时间，格式为yyyyMMddHHmmss 非必填项
-	 * @param timeExpire
-	 *            订单失效时间，格式为yyyyMMddHHmmss;注意：最短失效时间间隔必须大于5分钟 非必填项
-	 * @param goodsTag
-	 *            商品标记，代金券或立减优惠功能的参数 非必填项
-	 * @param limitPay
-	 *            指定支付方式:no_credit--指定不能使用信用卡支付 非必填项
-	 * @param subOpenId
-	 *            用户在子商户appid下的唯一标识 非必填
-	 *            openid和sub_openid可以选传其中之一，如果选择传sub_openid ,则必须传sub_appid
-	 * @see com.foxinmy.weixin4j.payment.mch.JSAPIPayRequest JS支付
-	 * @see com.foxinmy.weixin4j.payment.mch.NATIVEPayRequest 扫码支付
-	 * @see com.foxinmy.weixin4j.payment.mch.MICROPayRequest 刷卡支付
-	 * @see com.foxinmy.weixin4j.payment.mch.APPPayRequest APP支付
-	 * @see com.foxinmy.weixin4j.payment.mch.WAPPayRequest WAP支付
-	 * @throws WeixinException
-	 */
-	public MchPayRequest createPayRequest(String body, String detail, String outTradeNo, double totalFee,
-			String notifyUrl, String createIp, TradeType tradeType, String openId, String productId, String attach,
-			Date timeStart, Date timeExpire, String goodsTag, String limitPay, String subOpenId)
-			throws WeixinException {
-		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo, totalFee, notifyUrl, createIp, tradeType, openId,
-				null, productId, attach);
-		payPackage.setTimeStart(timeStart);
-		payPackage.setTimeExpire(timeExpire);
-		payPackage.setGoodsTag(goodsTag);
-		payPackage.setLimitPay(limitPay);
-		payPackage.setDetail(detail);
-		payPackage.setSubOpenId(subOpenId);
-		return createPayRequest(payPackage);
-	}
-
 	/**
 	 * 创建JSAPI支付请求对象
 	 *
@@ -189,7 +139,7 @@ public class PayApi extends MchApi {
 	 * @param outTradeNo
 	 *            订单号
 	 * @param totalFee
-	 *            订单总额 按实际金额传入即可(元) 构造函数会转换为分
+	 *            订单总额(元)
 	 * @param notifyUrl
 	 *            支付通知地址
 	 * @param createIp
@@ -200,10 +150,12 @@ public class PayApi extends MchApi {
 	 * @return JSAPI支付对象
 	 * @throws WeixinException
 	 */
-	public MchPayRequest createJSPayRequest(String openId, String body, String outTradeNo, double totalFee,
+	public MchPayRequest createJSPayRequest(String openId, String body,
-			String notifyUrl, String createIp, String attach) throws WeixinException {
+			String outTradeNo, double totalFee, String notifyUrl,
-		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo, totalFee, notifyUrl, createIp, TradeType.JSAPI,
+			String createIp, String attach) throws WeixinException {
-				openId, null, null, attach);
+		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo,
+				totalFee, notifyUrl, createIp, TradeType.JSAPI, openId, null,
+				null, attach);
 		return createPayRequest(payPackage);
 	}
 
@@ -212,16 +164,11 @@ public class PayApi extends MchApi {
 	 * 生成编辑地址请求
 	 * </p>
 	 *
-	 * err_msg edit_address:ok获取编辑收货地址成功</br>
+	 * err_msg edit_address:ok获取编辑收货地址成功</br> edit_address:fail获取编辑收货地址失败</br>
-	 * edit_address:fail获取编辑收货地址失败</br>
+	 * userName 收货人姓名</br> telNumber 收货人电话</br> addressPostalCode 邮编</br>
-	 * userName 收货人姓名</br>
+	 * proviceFirstStageName 国标收货地址第一级地址</br> addressCitySecondStageName
-	 * telNumber 收货人电话</br>
+	 * 国标收货地址第二级地址</br> addressCountiesThirdStageName 国标收货地址第三级地址</br>
-	 * addressPostalCode 邮编</br>
+	 * addressDetailInfo 详细收货地址信息</br> nationalCode 收货地址国家码</br>
-	 * proviceFirstStageName 国标收货地址第一级地址</br>
-	 * addressCitySecondStageName 国标收货地址第二级地址</br>
-	 * addressCountiesThirdStageName 国标收货地址第三级地址</br>
-	 * addressDetailInfo 详细收货地址信息</br>
-	 * nationalCode 收货地址国家码</br>
 	 *
 	 * @param url
 	 *            当前访问页的URL
@@ -271,8 +218,9 @@ public class PayApi extends MchApi {
 		map.put("nonce_str", noncestr);
 		map.put("product_id", productId);
 		String sign = weixinSignature.sign(map);
-		return String.format(getRequestUri("native_pay_uri"), sign, weixinAccount.getId(), weixinAccount.getMchId(),
+		return String.format(getRequestUri("native_pay_uri"), sign,
-				productId, timestamp, noncestr);
+				weixinAccount.getId(), weixinAccount.getMchId(), productId,
+				timestamp, noncestr);
 	}
 
 	/**
@@ -302,10 +250,12 @@ public class PayApi extends MchApi {
 	 *      </a>
 	 * @throws WeixinException
 	 */
-	public NativePayResponse createNativePayResponse(String productId, String body, String outTradeNo, double totalFee,
+	public NativePayResponse createNativePayResponse(String productId,
-			String notifyUrl, String createIp, String attach) throws WeixinException {
+			String body, String outTradeNo, double totalFee, String notifyUrl,
-		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo, totalFee, notifyUrl, createIp, TradeType.NATIVE,
+			String createIp, String attach) throws WeixinException {
-				null, null, productId, attach);
+		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo,
+				totalFee, notifyUrl, createIp, TradeType.NATIVE, null, null,
+				productId, attach);
 		PrePay prePay = createPrePay(payPackage);
 		return new NativePayResponse(weixinAccount, prePay.getPrepayId());
 	}
@@ -337,10 +287,12 @@ public class PayApi extends MchApi {
 	 *      </a>
 	 * @throws WeixinException
 	 */
-	public MchPayRequest createNativePayRequest(String productId, String body, String outTradeNo, double totalFee,
+	public MchPayRequest createNativePayRequest(String productId, String body,
-			String notifyUrl, String createIp, String attach) throws WeixinException {
+			String outTradeNo, double totalFee, String notifyUrl,
-		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo, totalFee, notifyUrl, createIp, TradeType.NATIVE,
+			String createIp, String attach) throws WeixinException {
-				null, null, productId, attach);
+		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo,
+				totalFee, notifyUrl, createIp, TradeType.NATIVE, null, null,
+				productId, attach);
 		return createPayRequest(payPackage);
 	}
 
@@ -366,10 +318,12 @@ public class PayApi extends MchApi {
 	 *      APP支付</a>
 	 * @throws WeixinException
 	 */
-	public MchPayRequest createAppPayRequest(String body, String outTradeNo, double totalFee, String notifyUrl,
+	public MchPayRequest createAppPayRequest(String body, String outTradeNo,
-			String createIp, String attach) throws WeixinException {
+			double totalFee, String notifyUrl, String createIp, String attach)
-		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo, totalFee, notifyUrl, createIp, TradeType.APP,
+			throws WeixinException {
-				null, null, null, attach);
+		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo,
+				totalFee, notifyUrl, createIp, TradeType.APP, null, null, null,
+				attach);
 		return createPayRequest(payPackage);
 	}
 
@@ -395,10 +349,12 @@ public class PayApi extends MchApi {
 	 *      </a>
 	 * @throws WeixinException
 	 */
-	public MchPayRequest createWAPPayRequest(String body, String outTradeNo, double totalFee, String notifyUrl,
+	public MchPayRequest createWapPayRequest(String body, String outTradeNo,
-			String createIp, String attach) throws WeixinException {
+			double totalFee, String notifyUrl, String createIp, String attach)
-		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo, totalFee, notifyUrl, createIp, TradeType.WAP,
+			throws WeixinException {
-				null, null, null, attach);
+		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo,
+				totalFee, notifyUrl, createIp, TradeType.WAP, null, null, null,
+				attach);
 		return createPayRequest(payPackage);
 	}
 
@@ -425,20 +381,20 @@ public class PayApi extends MchApi {
 	 *      提交被扫支付API</a>
 	 * @throws WeixinException
 	 */
-	public MchPayRequest createMICROPayRequest(String authCode, String body, String outTradeNo, double totalFee,
+	public MchPayRequest createMicroPayRequest(String authCode, String body,
-			String createIp, String attach) throws WeixinException {
+			String outTradeNo, double totalFee, String createIp, String attach)
-		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo, totalFee, null, createIp, TradeType.MICROPAY,
+			throws WeixinException {
-				null, null, null, attach);
+		MchPayPackage payPackage = new MchPayPackage(body, outTradeNo,
+				totalFee, null, createIp, TradeType.MICROPAY, null, null, null,
+				attach);
 		return createPayRequest(payPackage);
 	}
 
 	/**
 	 * 订单查询
 	 * <p>
-	 * 当商户后台、网络、服务器等出现异常，商户系统最终未接收到支付通知；</br>
+	 * 当商户后台、网络、服务器等出现异常，商户系统最终未接收到支付通知；</br> 调用支付接口后，返回系统错误或未知交易状态情况；</br>
-	 * 调用支付接口后，返回系统错误或未知交易状态情况；</br>
+	 * 调用被扫支付API，返回USERPAYING的状态；</br> 调用关单或撤销接口API之前，需确认支付状态；
-	 * 调用被扫支付API，返回USERPAYING的状态；</br>
-	 * 调用关单或撤销接口API之前，需确认支付状态；
 	 * </P>
 	 *
 	 * @param idQuery
@@ -456,8 +412,10 @@ public class PayApi extends MchApi {
 		Map<String, String> map = createBaseRequestMap(idQuery);
 		map.put("sign", weixinSignature.sign(map));
 		String param = XmlStream.map2xml(map);
-		WeixinResponse response = weixinExecutor.post(getRequestUri("order_query_uri"), param);
+		WeixinResponse response = weixinExecutor.post(
-		return ListsuffixResultDeserializer.deserialize(response.getAsString(), Order.class);
+				getRequestUri("order_query_uri"), param);
+		return ListsuffixResultDeserializer.deserialize(response.getAsString(),
+				Order.class);
 	}
 
 	/**
@@ -495,8 +453,9 @@ public class PayApi extends MchApi {
 	 * @since V3
 	 * @throws WeixinException
 	 */
-	public RefundResult applyRefund(InputStream certificate, IdQuery idQuery, String outRefundNo, double totalFee,
+	public RefundResult applyRefund(InputStream certificate, IdQuery idQuery,
-			double refundFee, CurrencyType refundFeeType, String opUserId) throws WeixinException {
+			String outRefundNo, double totalFee, double refundFee,
+			CurrencyType refundFeeType, String opUserId) throws WeixinException {
 		WeixinResponse response = null;
 		try {
 			Map<String, String> map = createBaseRequestMap(idQuery);
@@ -513,7 +472,8 @@ public class PayApi extends MchApi {
 			map.put("refund_fee_type", refundFeeType.name());
 			map.put("sign", weixinSignature.sign(map));
 			String param = XmlStream.map2xml(map);
-			response = createSSLRequestExecutor(certificate).post(getRequestUri("refund_apply_uri"), param);
+			response = createSSLRequestExecutor(certificate).post(
+					getRequestUri("refund_apply_uri"), param);
 		} finally {
 			if (certificate != null) {
 				try {
@@ -541,18 +501,17 @@ public class PayApi extends MchApi {
 	 *            订单总金额,单位为元
 	 * @see {@link #applyRefund(InputStream, IdQuery, String, double, double,CurrencyType, String)}
 	 */
-	public RefundResult applyRefund(InputStream certificate, IdQuery idQuery, String outRefundNo, double totalFee)
+	public RefundResult applyRefund(InputStream certificate, IdQuery idQuery,
-			throws WeixinException {
+			String outRefundNo, double totalFee) throws WeixinException {
-		return applyRefund(certificate, idQuery, outRefundNo, totalFee, totalFee, null, null);
+		return applyRefund(certificate, idQuery, outRefundNo, totalFee,
+				totalFee, null, null);
 	}
 
 	/**
-	 * 冲正订单(需要证书)</br>
+	 * 冲正订单(需要证书)</br> 当支付返回失败,或收银系统超时需要取消交易,可以调用该接口</br> 接口逻辑:支
-	 * 当支付返回失败,或收银系统超时需要取消交易,可以调用该接口</br>
+	 * 付失败的关单,支付成功的撤销支付</br> <font color="red">7天以内的单可撤销,其他正常支付的单
-	 * 接口逻辑:支 付失败的关单,支付成功的撤销支付</br>
+	 * 如需实现相同功能请调用退款接口</font></br> <font
-	 * <font color="red">7天以内的单可撤销,其他正常支付的单 如需实现相同功能请调用退款接口</font></br>
+	 * color="red">调用扣款接口后请勿立即调用撤销,需要等待5秒以上。先调用查单接口,如果没有确切的返回,再调用撤销</font> </br>
-	 * <font color="red">调用扣款接口后请勿立即调用撤销,需要等待5秒以上。先调用查单接口,如果没有确切的返回,再调用撤销</font>
-	 * </br>
 	 *
 	 * @param certificate
 	 *            后缀为*.p12的证书文件
@@ -563,13 +522,14 @@ public class PayApi extends MchApi {
 	 * @since V3
 	 * @throws WeixinException
 	 */
-	public MerchantResult reverseOrder(InputStream certificate, IdQuery idQuery) throws WeixinException {
+	public MerchantResult reverseOrder(InputStream certificate, IdQuery idQuery)
+			throws WeixinException {
 		try {
 			Map<String, String> map = createBaseRequestMap(idQuery);
 			map.put("sign", weixinSignature.sign(map));
 			String param = XmlStream.map2xml(map);
-			WeixinResponse response = createSSLRequestExecutor(certificate).post(getRequestUri("order_reverse_uri"),
+			WeixinResponse response = createSSLRequestExecutor(certificate)
-					param);
+					.post(getRequestUri("order_reverse_uri"), param);
 			return response.getAsObject(new TypeReference<MerchantResult>() {
 			});
 		} finally {
@@ -604,7 +564,8 @@ public class PayApi extends MchApi {
 		}
 		map.put("sign", weixinSignature.sign(map));
 		String param = XmlStream.map2xml(map);
-		WeixinResponse response = weixinExecutor.post(getRequestUri("longurl_convert_uri"), param);
+		WeixinResponse response = weixinExecutor.post(
+				getRequestUri("longurl_convert_uri"), param);
 		map = XmlStream.xml2map(response.getAsString());
 		return map.get("short_url");
 	}
@@ -626,10 +587,12 @@ public class PayApi extends MchApi {
 	 *      关闭订单API</a>
 	 */
 	public MerchantResult closeOrder(String outTradeNo) throws WeixinException {
-		Map<String, String> map = createBaseRequestMap(new IdQuery(outTradeNo, IdType.TRADENO));
+		Map<String, String> map = createBaseRequestMap(new IdQuery(outTradeNo,
+				IdType.TRADENO));
 		map.put("sign", weixinSignature.sign(map));
 		String param = XmlStream.map2xml(map);
-		WeixinResponse response = weixinExecutor.post(getRequestUri("order_close_uri"), param);
+		WeixinResponse response = weixinExecutor.post(
+				getRequestUri("order_close_uri"), param);
 		return response.getAsObject(new TypeReference<MerchantResult>() {
 		});
 	}
@@ -655,7 +618,8 @@ public class PayApi extends MchApi {
 	 *      下载对账单API</a>
 	 * @throws WeixinException
 	 */
-	public File downloadBill(Date billDate, BillType billType, String billPath) throws WeixinException {
+	public File downloadBill(Date billDate, BillType billType, String billPath)
+			throws WeixinException {
 		if (billDate == null) {
 			Calendar now = Calendar.getInstance();
 			now.add(Calendar.DAY_OF_MONTH, -1);
@@ -665,7 +629,8 @@ public class PayApi extends MchApi {
 			billType = BillType.ALL;
 		}
 		String formatBillDate = DateUtil.fortmat2yyyyMMdd(billDate);
-		String fileName = String.format("weixin4j_bill_%s_%s_%s.txt", formatBillDate, billType.name().toLowerCase(),
+		String fileName = String.format("weixin4j_bill_%s_%s_%s.txt",
+				formatBillDate, billType.name().toLowerCase(),
 				weixinAccount.getId());
 		File file = new File(String.format("%s/%s", billPath, fileName));
 		if (file.exists()) {
@@ -676,14 +641,16 @@ public class PayApi extends MchApi {
 		map.put("bill_type", billType.name());
 		map.put("sign", weixinSignature.sign(map));
 		String param = XmlStream.map2xml(map);
-		WeixinResponse response = weixinExecutor.post(getRequestUri("downloadbill_uri"), param);
+		WeixinResponse response = weixinExecutor.post(
+				getRequestUri("downloadbill_uri"), param);
 
 		BufferedReader reader = null;
 		BufferedWriter writer = null;
 		try {
-			writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), Consts.UTF_8));
+			writer = new BufferedWriter(new OutputStreamWriter(
-			reader = new BufferedReader(
+					new FileOutputStream(file), Consts.UTF_8));
-					new InputStreamReader(response.getBody(), Consts.UTF_8));
+			reader = new BufferedReader(new InputStreamReader(
+					response.getBody(), Consts.UTF_8));
 			String line = null;
 			while ((line = reader.readLine()) != null) {
 				writer.write(line);
@@ -730,8 +697,10 @@ public class PayApi extends MchApi {
 		Map<String, String> map = createBaseRequestMap(idQuery);
 		map.put("sign", weixinSignature.sign(map));
 		String param = XmlStream.map2xml(map);
-		WeixinResponse response = weixinExecutor.post(getRequestUri("refund_query_uri"), param);
+		WeixinResponse response = weixinExecutor.post(
-		return ListsuffixResultDeserializer.deserialize(response.getAsString(), RefundRecord.class);
+				getRequestUri("refund_query_uri"), param);
+		return ListsuffixResultDeserializer.deserialize(response.getAsString(),
+				RefundRecord.class);
 	}
 
 	/**
@@ -757,8 +726,9 @@ public class PayApi extends MchApi {
 	 *      接口测试上报API</a>
 	 */
 	@SuppressWarnings("unchecked")
-	public XmlResult interfaceReport(String interfaceUrl, int executeTime, String outTradeNo, String ip, Date time,
+	public XmlResult interfaceReport(String interfaceUrl, int executeTime,
-			XmlResult returnXml) throws WeixinException {
+			String outTradeNo, String ip, Date time, XmlResult returnXml)
+			throws WeixinException {
 		Map<String, String> map = createBaseRequestMap(null);
 		map.put("interface_url", interfaceUrl);
 		map.put("execute_time_", Integer.toString(executeTime));
@@ -768,7 +738,8 @@ public class PayApi extends MchApi {
 		map.putAll((Map<String, String>) JSON.toJSON(returnXml));
 		map.put("sign", weixinSignature.sign(map));
 		String param = XmlStream.map2xml(map);
-		WeixinResponse response = weixinExecutor.post(getRequestUri("interface_report_uri"), param);
+		WeixinResponse response = weixinExecutor.post(
+				getRequestUri("interface_report_uri"), param);
 		return response.getAsXmlResult();
 	}
 
@@ -789,7 +760,8 @@ public class PayApi extends MchApi {
 		map.put("auth_code", authCode);
 		map.put("sign", weixinSignature.sign(map));
 		String param = XmlStream.map2xml(map);
-		WeixinResponse response = weixinExecutor.post(getRequestUri("authcode_openid_uri"), param);
+		WeixinResponse response = weixinExecutor.post(
+				getRequestUri("authcode_openid_uri"), param);
 		return response.getAsObject(new TypeReference<OpenIdResult>() {
 		});
 	}

weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinException.java

@@ -59,7 +59,10 @@ public class WeixinException extends Exception {
 			buf.append(" >> ").append(desc);
 		}
 		if (buf.length() > 0) {
-			buf.append(" >> ").append(WeixinErrorUtil.getText(code));
+			String text = getErrorText();
+			if (StringUtil.isNotBlank(text)) {
+				buf.append(" >> ").append(text);
+			}
 			return buf.toString();
 		} else {
 			return super.getMessage();

weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/WeixinRequestExecutor.java

@@ -103,8 +103,7 @@ public class WeixinRequestExecutor {
 			HttpHeaders headers = httpResponse.getHeaders();
 			WeixinResponse response = new WeixinResponse(httpResponse);
 			logger.info("weixin response << " + httpResponse.getProtocol()
-					+ httpResponse.getStatus().toString() + ":"
+					+ httpResponse.getStatus() + ":" + response.getAsString());
-					+ response.getAsString());
 			String contentType = headers.getFirst(HttpHeaders.CONTENT_TYPE);
 			String disposition = headers
 					.getFirst(HttpHeaders.CONTENT_DISPOSITION);

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

@@ -40,7 +40,6 @@ import com.foxinmy.weixin4j.type.BillType;
 import com.foxinmy.weixin4j.type.CurrencyType;
 import com.foxinmy.weixin4j.type.CustomsCity;
 import com.foxinmy.weixin4j.type.IdQuery;
-import com.foxinmy.weixin4j.type.TradeType;
 import com.foxinmy.weixin4j.util.Weixin4jSettings;
 
 /**
@@ -143,59 +142,6 @@ public class WeixinPayProxy {
 		return payApi.createPayRequest(payPackage);
 	}
 
-	/**
-	 * 创建支付请求对象【完整参数】
-	 *
-	 * @param body
-	 *            商品描述 <font color="red">必填项</font>
-	 * @param detail
-	 *            商品名称明细列表 非必填项
-	 * @param outTradeNo
-	 *            商户内部唯一订单号 <font color="red">必填项</font>
-	 * @param totalFee
-	 *            商品总额 单位元 <font color="red">必填项</font>
-	 * @param notifyUrl
-	 *            支付回调URL <font color="red">必填项</font>
-	 * @param createIp
-	 *            订单生成的机器IP <font color="red">必填项</font>
-	 * @param tradeType
-	 *            交易类型 <font color="red">必填项</font>
-	 * @param openId
-	 *            用户ID <font color="red">tradeType=JSAPI时必填</font>
-	 * @param productId
-	 *            产品ID <font color="red">tradeType=NATIVE时必填</font>
-	 * @param attach
-	 *            附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据 非必填项
-	 * @param timeStart
-	 *            订单生成时间，格式为yyyyMMddHHmmss 非必填项
-	 * @param timeExpire
-	 *            订单失效时间，格式为yyyyMMddHHmmss;注意：最短失效时间间隔必须大于5分钟 非必填项
-	 * @param goodsTag
-	 *            商品标记，代金券或立减优惠功能的参数 非必填项
-	 * @param limitPay
-	 *            指定支付方式:no_credit--指定不能使用信用卡支付 非必填项
-	 * @param subOpenId
-	 *            用户在子商户appid下的唯一标识 非必填
-	 *            openid和sub_openid可以选传其中之一，如果选择传sub_openid ,则必须传sub_appid
-	 * @see com.foxinmy.weixin4j.api.PayApi
-	 * @see com.foxinmy.weixin4j.payment.mch.JSAPIPayRequest JS支付
-	 * @see com.foxinmy.weixin4j.payment.mch.NATIVEPayRequest 扫码支付
-	 * @see com.foxinmy.weixin4j.payment.mch.MICROPayRequest 刷卡支付
-	 * @see com.foxinmy.weixin4j.payment.mch.APPPayRequest APP支付
-	 * @see com.foxinmy.weixin4j.payment.mch.WAPPayRequest WAP支付
-	 * @throws WeixinException
-	 */
-	public MchPayRequest createPayRequest(String body, String detail,
-			String outTradeNo, double totalFee, String notifyUrl,
-			String createIp, TradeType tradeType, String openId,
-			String productId, String attach, Date timeStart, Date timeExpire,
-			String goodsTag, String limitPay, String subOpenId)
-			throws WeixinException {
-		return payApi.createPayRequest(body, detail, outTradeNo, totalFee,
-				notifyUrl, createIp, tradeType, openId, productId, attach,
-				timeStart, timeExpire, goodsTag, limitPay, subOpenId);
-	}
-
 	/**
 	 * 创建JSAPI支付请求对象
 	 *
@@ -206,7 +152,7 @@ public class WeixinPayProxy {
 	 * @param outTradeNo
 	 *            订单号
 	 * @param totalFee
-	 *            订单总额 按实际金额传入即可(元) 构造函数会转换为分
+	 *            订单总额(元)
 	 * @param notifyUrl
 	 *            支付通知地址
 	 * @param createIp
@@ -391,10 +337,10 @@ public class WeixinPayProxy {
 	 *      </a>
 	 * @throws WeixinException
 	 */
-	public MchPayRequest createWAPPayRequest(String body, String outTradeNo,
+	public MchPayRequest createWapPayRequest(String body, String outTradeNo,
 			double totalFee, String notifyUrl, String createIp, String attach)
 			throws WeixinException {
-		return payApi.createWAPPayRequest(body, outTradeNo, totalFee,
+		return payApi.createWapPayRequest(body, outTradeNo, totalFee,
 				notifyUrl, createIp, attach);
 	}
 
@@ -422,10 +368,10 @@ public class WeixinPayProxy {
 	 *      提交被扫支付API</a>
 	 * @throws WeixinException
 	 */
-	public MchPayRequest createMICROPayRequest(String authCode, String body,
+	public MchPayRequest createMicroPayRequest(String authCode, String body,
 			String outTradeNo, double totalFee, String createIp, String attach)
 			throws WeixinException {
-		return payApi.createMICROPayRequest(authCode, body, outTradeNo,
+		return payApi.createMicroPayRequest(authCode, body, outTradeNo,
 				totalFee, createIp, attach);
 	}
 

weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java

@@ -105,37 +105,35 @@ public class MchPayPackage extends PayPackage {
 	 * 完整参数
 	 *
 	 * @param body
-	 *            支付详情 必填
+	 *            商品描述 <font color="red">必填项</font>
 	 * @param detail
-	 *            订单详情 非必填
+	 *            商品名称明细列表 非必填项
 	 * @param outTradeNo
-	 *            商户侧订单号 必填
+	 *            商户内部唯一订单号 <font color="red">必填项</font>
 	 * @param totalFee
-	 *            支付金额(单位元) 必填
+	 *            商品总额 单位元 <font color="red">必填项</font>
 	 * @param notifyUrl
-	 *            支付回调URL 必填
+	 *            支付回调URL <font color="red">必填项</font>
 	 * @param createIp
-	 *            发起支付的IP地址 必填
+	 *            订单生成的机器IP <font color="red">必填项</font>
 	 * @param tradeType
-	 *            支付类型 必填
+	 *            交易类型 <font color="red">必填项</font>
 	 * @param openId
-	 *            用户唯一标识 公众号JSAPI支付必填
+	 *            用户ID <font color="red">tradeType=JSAPI时必填</font>
 	 * @param authCode
-	 *            支付授权码 刷卡MICROPAY支付必填
+	 *            刷卡支付授权码 <font color="red">tradeType=MICROPAY时必填</font>
 	 * @param productId
-	 *            商品ID 扫码NATIVE支付必填
+	 *            产品ID <font color="red">tradeType=NATIVE时必填</font>
 	 * @param attach
-	 *            支付时附加信息 非必填
+	 *            附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据 非必填项
 	 * @param timeStart
-	 *            订单生成时间 非必填
+	 *            订单生成时间，格式为yyyyMMddHHmmss 非必填项
 	 * @param timeExpire
-	 *            订单失效时间 非必填
+	 *            订单失效时间，格式为yyyyMMddHHmmss;注意：最短失效时间间隔必须大于5分钟 非必填项
 	 * @param goodsTag
-	 *            商品标记 非必填
+	 *            商品标记，代金券或立减优惠功能的参数 非必填项
-	 * @param productId
-	 *            商品ID native支付必填
 	 * @param limitPay
-	 *            指定支付方式 非必填
+	 *            指定支付方式:no_credit--指定不能使用信用卡支付 非必填项
 	 * @param subOpenId
 	 *            用户在子商户appid下的唯一标识 非必填
 	 *            openid和sub_openid可以选传其中之一，如果选择传sub_openid ,则必须传sub_appid

weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java

@@ -126,42 +126,6 @@ public class Redpacket extends MerchantResult {
 	public Redpacket(String outTradeNo, String sendName, String openId,
 			double totalAmount, int totalNum, String wishing, String clientIp,
 			String actName, String remark) {
-		this(null, null, outTradeNo, sendName, openId, totalAmount, totalNum,
-				wishing, clientIp, actName, remark);
-	}
-
-	/**
-	 * 红包 完整参数
-	 *
-	 * @param msgAppId
-	 *            触达用户appid 服务商模式下触达用户时的appid(可填服务商自己的appid或子商户的appid)，服务商模式下必填，
-	 *            服务商模式下填入的子商户appid必须在微信支付商户平台中先录入，否则会校验不过。
-	 * @param consumeMchId
-	 *            常规模式下无效，服务商模式下选填，服务商模式下不填默认扣子商户的钱
-	 * @param outTradeNo
-	 *            商户侧一天内不可重复的订单号 接口根据商户订单号支持重入 如出现超时可再调用 必填
-	 * @param sendName
-	 *            红包发送者名称 必填
-	 * @param openid
-	 *            接受收红包的用户的openid 必填
-	 * @param totalAmount
-	 *            付款金额 <font color="red">单位为元,自动格式化为分</font> 必填
-	 * @param totalNum
-	 *            红包发放总人数 大于1视为裂变红包 必填
-	 * @param wishing
-	 *            红包祝福语 必填
-	 * @param clientIp
-	 *            Ip地址 必填
-	 * @param actName
-	 *            活动名称 必填
-	 * @param remark
-	 *            备注 必填
-	 */
-	public Redpacket(String msgAppId, String consumeMchId, String outTradeNo,
-			String sendName, String openId, double totalAmount, int totalNum,
-			String wishing, String clientIp, String actName, String remark) {
-		this.msgAppId = msgAppId;
-		this.consumeMchId = consumeMchId;
 		this.outTradeNo = outTradeNo;
 		this.sendName = sendName;
 		this.openId = openId;
@@ -214,6 +178,22 @@ public class Redpacket extends MerchantResult {
 		return remark;
 	}
 
+	public String getMsgAppId() {
+		return msgAppId;
+	}
+
+	public void setMsgAppId(String msgAppId) {
+		this.msgAppId = msgAppId;
+	}
+
+	public String getConsumeMchId() {
+		return consumeMchId;
+	}
+
+	public void setConsumeMchId(String consumeMchId) {
+		this.consumeMchId = consumeMchId;
+	}
+
 	@Override
 	public String toString() {
 		return "Redpacket [msgAppId=" + msgAppId + ", consumeMchId="

weixin4j-base/src/test/java/com/foxinmy/weixin4j/base/test/PayTest.java

@@ -15,6 +15,7 @@ import com.foxinmy.weixin4j.http.weixin.XmlResult;
 import com.foxinmy.weixin4j.model.WeixinPayAccount;
 import com.foxinmy.weixin4j.payment.WeixinPayProxy;
 import com.foxinmy.weixin4j.payment.mch.MchPayPackage;
+import com.foxinmy.weixin4j.payment.mch.MchPayRequest;
 import com.foxinmy.weixin4j.payment.mch.MerchantResult;
 import com.foxinmy.weixin4j.payment.mch.Order;
 import com.foxinmy.weixin4j.payment.mch.PrePay;
@@ -150,4 +151,16 @@ public class PayTest {
 				ip, time, returnXml);
 		System.err.println(returnXml);
 	}
+
+	@Test
+	public void testMicroPay() throws WeixinException {
+		String authCode = "扫描码";
+		String body = "商品描述";
+		String outTradeNo = "M001";
+		double totalFee = 1d;
+		String createIp = "127.0.0.1";
+		MchPayRequest request = PAY.createMicroPayRequest(authCode, body,
+				outTradeNo, totalFee, createIp, null);
+		System.err.println(request);
+	}
 }

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/PayOldApi.java

@@ -117,7 +117,7 @@ public class PayOldApi extends MpApi {
 	 * @param outTradeNo
 	 *            订单号
 	 * @param totalFee
-	 *            订单总额 按实际金额传入即可(元) 构造函数会转换为分
+	 *            订单总额(元)
 	 * @param notifyUrl
 	 *            支付回调URL
 	 * @param createIp
@@ -126,50 +126,20 @@ public class PayOldApi extends MpApi {
 	 */
 	public String createPayJsRequestJson(String body, String outTradeNo,
 			double totalFee, String notifyUrl, String createIp) {
-		return createPayJsRequestJson(body, outTradeNo, totalFee, notifyUrl,
+		PayPackageV2 payPackage = new PayPackageV2(getPayAccount()
-				createIp, null, null, null, 0d, 0d, null);
+				.getPartnerId(), body, outTradeNo, totalFee, notifyUrl,
+				createIp);
+		return createPayJsRequestJson(payPackage);
 	}
 
 	/**
 	 * 生成V2.x版本JSAPI支付字符串
 	 *
-	 * @param body
+	 * @param payPackage
-	 *            支付详情
+	 *            支付信息
-	 * @param outTradeNo
-	 *            订单号
-	 * @param totalFee
-	 *            订单总额 按实际金额传入即可(元) 构造函数会转换为分
-	 * @param notifyUrl
-	 *            支付回调URL
-	 * @param createIp
-	 *            订单生成的机器 IP
-	 * @param attach
-	 *            附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据
-	 * @param timeStart
-	 *            订单生成时间，格式为yyyyMMddHHmmss
-	 * @param timeExpire
-	 *            订单失效时间，格式为yyyyMMddHHmmss;注意：最短失效时间间隔必须大于5分钟
-	 * @param transportFee
-	 *            物流费用 如有值 必须保证 transportFee+productFee=totalFee
-	 * @param transportFee
-	 *            商品费用 如有值 必须保证 transportFee+productFee=totalFee
-	 * @param goodsTag
-	 *            商品标记，代金券或立减优惠功能的参数
 	 * @return 支付json串
 	 */
-	public String createPayJsRequestJson(String body, String outTradeNo,
+	public String createPayJsRequestJson(PayPackageV2 payPackage) {
-			double totalFee, String notifyUrl, String createIp, String attach,
-			Date timeStart, Date timeExpire, double transportFee,
-			double productFee, String goodsTag) {
-		PayPackageV2 payPackage = new PayPackageV2(getPayAccount()
-				.getPartnerId(), body, outTradeNo, totalFee, notifyUrl,
-				createIp);
-		payPackage.setAttach(attach);
-		payPackage.setTimeStart(timeStart);
-		payPackage.setTimeExpire(timeExpire);
-		payPackage.setTransportFee(transportFee);
-		payPackage.setProductFee(productFee);
-		payPackage.setGoodsTag(goodsTag);
 		PayRequest payRequest = new PayRequest(getPayAccount().getId(),
 				weixinOldSignature.sign(payPackage, getPayAccount()
 						.getPartnerKey()));
@@ -475,8 +445,9 @@ public class PayOldApi extends MpApi {
 			billType = BillType.ALL;
 		}
 		String formatBillDate = DateUtil.fortmat2yyyyMMdd(billDate);
-		String fileName = String.format("weixin4j_bill_%s_%s_%s.txt", formatBillDate,
+		String fileName = String.format("weixin4j_bill_%s_%s_%s.txt",
-				billType.name().toLowerCase(), getPayAccount().getId());
+				formatBillDate, billType.name().toLowerCase(), getPayAccount()
+						.getId());
 		File file = new File(String.format("%s/%s", billPath, fileName));
 		if (file.exists()) {
 			return file;

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/oldpayment/PayPackageV2.java

@@ -65,12 +65,56 @@ public class PayPackageV2 extends PayPackage {
 		// jaxb required
 	}
 
+	/**
+	 * 支付信息
+	 *
+	 * @param partner
+	 *            商户号 <font color="red">必填</font>
+	 * @param body
+	 *            支付详情 <font color="red">必填</font>
+	 * @param outTradeNo
+	 *            订单号 <font color="red">必填</font>
+	 * @param totalFee
+	 *            订单总额(元) <font color="red">必填</font>
+	 * @param notifyUrl
+	 *            支付回调URL <font color="red">必填</font>
+	 * @param createIp
+	 *            订单生成的机器 IP <font color="red">必填</font>
+	 */
 	public PayPackageV2(String partner, String body, String outTradeNo,
 			double totalFee, String notifyUrl, String createIp) {
 		this(partner, body, outTradeNo, totalFee, notifyUrl, createIp, null,
 				null, null, 0d, 0d, null);
 	}
 
+	/**
+	 * 支付信息 完整参数
+	 *
+	 * @param partner
+	 *            商户号 <font color="red">必填</font>
+	 * @param body
+	 *            支付详情 <font color="red">必填</font>
+	 * @param outTradeNo
+	 *            订单号 <font color="red">必填</font>
+	 * @param totalFee
+	 *            订单总额(元) <font color="red">必填</font>
+	 * @param notifyUrl
+	 *            支付回调URL <font color="red">必填</font>
+	 * @param createIp
+	 *            订单生成的机器 IP <font color="red">必填</font>
+	 * @param attach
+	 *            附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据
+	 * @param timeStart
+	 *            订单生成时间，格式为yyyyMMddHHmmss
+	 * @param timeExpire
+	 *            订单失效时间，格式为yyyyMMddHHmmss;注意：最短失效时间间隔必须大于5分钟
+	 * @param transportFee
+	 *            物流费用 如有值 必须保证 transportFee+productFee=totalFee
+	 * @param transportFee
+	 *            商品费用 如有值 必须保证 transportFee+productFee=totalFee
+	 * @param goodsTag
+	 *            商品标记，代金券或立减优惠功能的参数
+	 */
 	public PayPackageV2(String partner, String body, String outTradeNo,
 			double totalFee, String notifyUrl, String createIp, String attach,
 			Date timeStart, Date timeExpire, double transportFee,
@@ -80,7 +124,7 @@ public class PayPackageV2 extends PayPackage {
 		setTotalFee(totalFee);
 		setNotifyUrl(notifyUrl);
 		setCreateIp(createIp);
-		setAttach(attach);;
+		setAttach(attach);
 		setTimeStart(timeStart);
 		setTimeExpire(timeExpire);
 		setGoodsTag(goodsTag);