lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-08-24 16:18:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some javadoc warnings

Browse Source
This commit is contained in:
Binary Wang 2016-12-26 17:42:26 +08:00
parent 76f4e0b120
commit 87770f4b3f
4 changed files with 395 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpConfigStorage.java
View File

@ -89,7 +89,6 @@ public interface WxMpConfigStorage {
/**
* 微信支付异步回掉地址，通知url必须为直接可访问的url，不能携带参数。
*
* @return
* @since 2.5.0
*/
String getNotifyURL();
@ -100,7 +99,6 @@ public interface WxMpConfigStorage {
* JSAPI--公众号支付、NATIVE--原生扫码支付、APP--app支付
* </pre>
*
* @return
* @since 2.5.0
*/
String getTradeType();

13
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java
View File

@ -1,10 +1,10 @@
package me.chanjar.weixin.mp.bean.pay.request;
import java.math.BigDecimal;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import me.chanjar.weixin.common.util.ToStringUtils;
import java.math.BigDecimal;
/**
* <pre>
* Created by Binary Wang on 2016-10-24.
@ -75,7 +75,7 @@ public abstract class WxPayBaseRequest {
/**
* 如果配置中已经设置，可以不设置值
* @param appid
* @param appid 微信公众号appid
*/
public void setAppid(String appid) {
this.appid = appid;
@ -87,7 +87,7 @@ public abstract class WxPayBaseRequest {
/**
* 如果配置中已经设置，可以不设置值
* @param mchId
* @param mchId 微信商户号
*/
public void setMchId(String mchId) {
this.mchId = mchId;
@ -99,7 +99,7 @@ public abstract class WxPayBaseRequest {
/**
* 默认采用时间戳为随机字符串，可以不设置
* @param nonceStr
* @param nonceStr 随机字符串
*/
public void setNonceStr(String nonceStr) {
this.nonceStr = nonceStr;
@ -116,8 +116,7 @@ public abstract class WxPayBaseRequest {
/**
* 将单位为元转换为单位为分
*
* @param yuan
* @return
* @param yuan 将要转换的元的数值字符串
*/
public static Integer yuanToFee(String yuan) {
return new BigDecimal(yuan).setScale(2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).intValue();

12
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java
View File

@ -1,13 +1,12 @@
package me.chanjar.weixin.mp.bean.pay.result;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import me.chanjar.weixin.common.util.BeanUtils;
import me.chanjar.weixin.common.util.ToStringUtils;
import java.math.BigDecimal;
import java.util.Map;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import me.chanjar.weixin.common.util.BeanUtils;
import me.chanjar.weixin.common.util.ToStringUtils;
/**
* <pre>
* 微信支付结果共用属性类
@ -149,8 +148,7 @@ public abstract class WxPayBaseResult {
/**
* 将单位分转换成单位圆
* @param fee
* @return
* @param fee 将要被转换为元的分的数值
*/
public static String feeToYuan(Integer fee) {
return new BigDecimal(Double.valueOf(fee) / 100).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString();

36
weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java
View File

@ -1,17 +1,15 @@
package me.chanjar.weixin.mp.bean.pay.result;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import me.chanjar.weixin.common.util.BeanUtils;
import me.chanjar.weixin.mp.bean.pay.WxPayOrderNotifyCoupon;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
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.util.BeanUtils;
import me.chanjar.weixin.mp.bean.pay.WxPayOrderNotifyCoupon;
/**
* 支付结果通用通知 ，文档见：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7
* @author aimilin6688
@ -20,9 +18,6 @@ import me.chanjar.weixin.mp.bean.pay.WxPayOrderNotifyCoupon;
@XStreamAlias("xml")
public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializable {
/**
* @fields serialVersionUID
*/
private static final long serialVersionUID = 5389718115223345496L;
@ -35,7 +30,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 013467007045764
* 微信支付分配的终端设备号，
* </pre>
* @fields deviceInfo
*/
@XStreamAlias("device_info")
private String deviceInfo;
@ -49,7 +43,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* wxd930ea5d5a258f4f
* 用户在商户appid下的唯一标识
* </pre>
* @fields openid
*/
@XStreamAlias("openid")
private String openid;
@ -63,7 +56,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* Y
* 用户是否关注公众账号，Y-关注，N-未关注，仅在公众账号类型支付有效
* </pre>
* @fields isSubscribe
*/
@XStreamAlias("is_subscribe")
private String isSubscribe;
@ -77,7 +69,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* String(16)
* JSAPI JSAPI、NATIVE、APP
* </pre>
* @fields tradeType
*/
@XStreamAlias("trade_type")
private String tradeType;
@ -92,7 +83,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* CMC
* 银行类型，采用字符串类型的银行标识，银行类型见银行列表
* </pre>
* @fields bankType
*/
@XStreamAlias("bank_type")
private String bankType;
@ -107,7 +97,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 100
* 订单总金额，单位为分
* </pre>
* @fields totalFee
*/
@XStreamAlias("total_fee")
private Integer totalFee;
@ -120,7 +109,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 100
* 应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
* </pre>
* @fields settlementTotalFee
*/
@XStreamAlias("settlement_total_fee")
private Integer settlementTotalFee;
@ -133,7 +121,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* CNY
* 货币类型，符合ISO4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
* </pre>
* @fields feeType
*/
@XStreamAlias("fee_type")
private String feeType;
@ -146,7 +133,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 100
* 现金支付金额订单现金支付金额，详见支付金额
* </pre>
* @fields cashFee
*/
@XStreamAlias("cash_fee")
private Integer cashFee;
@ -159,7 +145,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* CNY
* 货币类型，符合ISO4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
* </pre>
* @fields cashFeeType
*/
@XStreamAlias("cash_fee_type")
private String cashFeeType;
@ -172,7 +157,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 10
* 代金券金额<=订单金额，订单金额-代金券金额=现金支付金额，详见支付金额
* </pre>
* @fields couponFee
*/
@XStreamAlias("coupon_fee")
private Integer couponFee;
@ -185,14 +169,13 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* Int
* 1
* 代金券使用数量
* </pre>
*/
@XStreamAlias("coupon_count")
private Integer couponCount;
private List<WxPayOrderNotifyCoupon> couponList;
/**
* <pre>
* 微信支付订单号
@ -202,7 +185,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 1217752501201407033233368018
* 微信支付订单号
* </pre>
* @fields transactionId
*/
@XStreamAlias("transaction_id")
private String transactionId;
@ -216,7 +198,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 1212321211201407033568112322
* 商户系统的订单号，与请求一致。
* </pre>
* @fields outTradeNo
*/
@XStreamAlias("out_trade_no")
private String outTradeNo;
@ -229,7 +210,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 123456
* 商家数据包，原样返回
* </pre>
* @fields
*/
@XStreamAlias("attach")
private String attach;
@ -242,12 +222,10 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ
* 20141030133525
* 支付完成时间，格式为yyyyMMddHHmmss，如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
* </pre>
* @fields timeEnd
*/
@XStreamAlias("time_end")
private String timeEnd;
public Integer getCouponCount() {
return couponCount;
}