fix some javadoc warnings

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

View File

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

View File

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

View File

@ -1,13 +1,12 @@
package me.chanjar.weixin.mp.bean.pay.result; 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.math.BigDecimal;
import java.util.Map; 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> * <pre>
* 微信支付结果共用属性类 * 微信支付结果共用属性类
@ -146,16 +145,15 @@ public abstract class WxPayBaseResult {
public void setSign(String sign) { public void setSign(String sign) {
this.sign = sign; this.sign = sign;
} }
/** /**
* 将单位分转换成单位圆 * 将单位分转换成单位圆
* @param fee * @param fee 将要被转换为元的分的数值
* @return
*/ */
public static String feeToYuan(Integer fee) { public static String feeToYuan(Integer fee) {
return new BigDecimal(Double.valueOf(fee) / 100).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString(); return new BigDecimal(Double.valueOf(fee) / 100).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString();
} }
public Map<String,String> toMap(){ public Map<String,String> toMap(){
return BeanUtils.xmlBean2Map(this); return BeanUtils.xmlBean2Map(this);
} }

View File

@ -1,403 +1,381 @@
package me.chanjar.weixin.mp.bean.pay.result; package me.chanjar.weixin.mp.bean.pay.result;
import java.io.Serializable; import com.thoughtworks.xstream.annotations.XStreamAlias;
import java.util.List; import me.chanjar.weixin.common.util.BeanUtils;
import java.util.Map; import me.chanjar.weixin.mp.bean.pay.WxPayOrderNotifyCoupon;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.io.Serializable;
import com.thoughtworks.xstream.annotations.XStreamAlias; import java.util.List;
import java.util.Map;
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
* 支付结果通用通知 文档见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7 * @since 2.5.0
* @author aimilin6688 */
* @since 2.5.0 @XStreamAlias("xml")
*/ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializable {
@XStreamAlias("xml")
public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializable { private static final long serialVersionUID = 5389718115223345496L;
/**
* @fields serialVersionUID /**
*/ * <pre>
private static final long serialVersionUID = 5389718115223345496L; * 设备号
* device_info
*
/** * String(32)
* <pre> * 013467007045764
* 设备号 * 微信支付分配的终端设备号
* device_info * </pre>
* */
* String(32) @XStreamAlias("device_info")
* 013467007045764 private String deviceInfo;
* 微信支付分配的终端设备号
* </pre> /**
* @fields deviceInfo * <pre>
*/ * 用户标识
@XStreamAlias("device_info") * openid
private String deviceInfo; *
* String(128)
/** * wxd930ea5d5a258f4f
* <pre> * 用户在商户appid下的唯一标识
* 用户标识 * </pre>
* openid */
* @XStreamAlias("openid")
* String(128) private String openid;
* wxd930ea5d5a258f4f
* 用户在商户appid下的唯一标识 /**
* </pre> * <pre>
* @fields openid * 是否关注公众账号
*/ * is_subscribe
@XStreamAlias("openid") *
private String openid; * String(1)
* Y
/** * 用户是否关注公众账号Y-关注N-未关注仅在公众账号类型支付有效
* <pre> * </pre>
* 是否关注公众账号 */
* is_subscribe @XStreamAlias("is_subscribe")
* private String isSubscribe;
* String(1)
* Y
* 用户是否关注公众账号Y-关注N-未关注仅在公众账号类型支付有效 /**
* </pre> * <pre>
* @fields isSubscribe * 交易类型
*/ * trade_type
@XStreamAlias("is_subscribe") *
private String isSubscribe; * String(16)
* JSAPI JSAPINATIVEAPP
* </pre>
/** */
* <pre> @XStreamAlias("trade_type")
* 交易类型 private String tradeType;
* trade_type
*
* String(16) /**
* JSAPI JSAPINATIVEAPP * <pre>
* </pre> * 付款银行
* @fields tradeType * bank_type
*/ *
@XStreamAlias("trade_type") * String(16)
private String tradeType; * CMC
* 银行类型采用字符串类型的银行标识银行类型见银行列表
* </pre>
/** */
* <pre> @XStreamAlias("bank_type")
* 付款银行 private String bankType;
* bank_type
*
* String(16) /**
* CMC * <pre>
* 银行类型采用字符串类型的银行标识银行类型见银行列表 * 订单金额
* </pre> * total_fee
* @fields bankType *
*/ * Int
@XStreamAlias("bank_type") * 100
private String bankType; * 订单总金额单位为分
* </pre>
*/
/** @XStreamAlias("total_fee")
* <pre> private Integer totalFee;
* 订单金额 /**
* total_fee * <pre>
* * 应结订单金额
* Int * settlement_total_fee
* 100 *
* 订单总金额单位为分 * Int
* </pre> * 100
* @fields totalFee * 应结订单金额=订单金额-非充值代金券金额应结订单金额<=订单金额
*/ * </pre>
@XStreamAlias("total_fee") */
private Integer totalFee; @XStreamAlias("settlement_total_fee")
/** private Integer settlementTotalFee;
* <pre> /**
* 应结订单金额 * <pre>
* settlement_total_fee * 货币种类
* * fee_type
* Int *
* 100 * String(8)
* 应结订单金额=订单金额-非充值代金券金额应结订单金额<=订单金额 * CNY
* </pre> * 货币类型符合ISO4217标准的三位字母代码默认人民币CNY其他值列表详见货币类型
* @fields settlementTotalFee * </pre>
*/ */
@XStreamAlias("settlement_total_fee") @XStreamAlias("fee_type")
private Integer settlementTotalFee; private String feeType;
/** /**
* <pre> * <pre>
* 货币种类 * 现金支付金额
* fee_type * cash_fee
* *
* String(8) * Int
* CNY * 100
* 货币类型符合ISO4217标准的三位字母代码默认人民币CNY其他值列表详见货币类型 * 现金支付金额订单现金支付金额详见支付金额
* </pre> * </pre>
* @fields feeType */
*/ @XStreamAlias("cash_fee")
@XStreamAlias("fee_type") private Integer cashFee;
private String feeType; /**
/** * <pre>
* <pre> * 现金支付货币类型
* 现金支付金额 * cash_fee_type
* cash_fee *
* * String(16)
* Int * CNY
* 100 * 货币类型符合ISO4217标准的三位字母代码默认人民币CNY其他值列表详见货币类型
* 现金支付金额订单现金支付金额详见支付金额 * </pre>
* </pre> */
* @fields cashFee @XStreamAlias("cash_fee_type")
*/ private String cashFeeType;
@XStreamAlias("cash_fee") /**
private Integer cashFee; * <pre>
/** * 总代金券金额
* <pre> * coupon_fee
* 现金支付货币类型 *
* cash_fee_type * Int
* * 10
* String(16) * 代金券金额<=订单金额订单金额-代金券金额=现金支付金额详见支付金额
* CNY * </pre>
* 货币类型符合ISO4217标准的三位字母代码默认人民币CNY其他值列表详见货币类型 */
* </pre> @XStreamAlias("coupon_fee")
* @fields cashFeeType private Integer couponFee;
*/
@XStreamAlias("cash_fee_type") /**
private String cashFeeType; * <pre>
/** * 代金券使用数量
* <pre> * coupon_count
* 总代金券金额 *
* coupon_fee * Int
* * 1
* Int * 代金券使用数量
* 10 * </pre>
* 代金券金额<=订单金额订单金额-代金券金额=现金支付金额详见支付金额 */
* </pre> @XStreamAlias("coupon_count")
* @fields couponFee private Integer couponCount;
*/
@XStreamAlias("coupon_fee") private List<WxPayOrderNotifyCoupon> couponList;
private Integer couponFee;
/**
/** * <pre>
* <pre> * 微信支付订单号
* 代金券使用数量 * transaction_id
* coupon_count *
* * String(32)
* Int * 1217752501201407033233368018
* 1 * 微信支付订单号
* 代金券使用数量 * </pre>
*/ */
@XStreamAlias("coupon_count") @XStreamAlias("transaction_id")
private Integer couponCount; private String transactionId;
private List<WxPayOrderNotifyCoupon> couponList; /**
* <pre>
* 商户订单号
* out_trade_no
/** *
* <pre> * String(32)
* 微信支付订单号 * 1212321211201407033568112322
* transaction_id * 商户系统的订单号与请求一致
* * </pre>
* String(32) */
* 1217752501201407033233368018 @XStreamAlias("out_trade_no")
* 微信支付订单号 private String outTradeNo;
* </pre> /**
* @fields transactionId * <pre>
*/ * 商家数据包
@XStreamAlias("transaction_id") * attach
private String transactionId; *
* String(128)
/** * 123456
* <pre> * 商家数据包原样返回
* 商户订单号 * </pre>
* out_trade_no */
* @XStreamAlias("attach")
* String(32) private String attach;
* 1212321211201407033568112322 /**
* 商户系统的订单号与请求一致 * <pre>
* </pre> * 支付完成时间
* @fields outTradeNo * time_end
*/ *
@XStreamAlias("out_trade_no") * String(14)
private String outTradeNo; * 20141030133525
/** * 支付完成时间格式为yyyyMMddHHmmss如2009年12月25日9点10分10秒表示为20091225091010其他详见时间规则
* <pre> * </pre>
* 商家数据包 */
* attach @XStreamAlias("time_end")
* private String timeEnd;
* String(128)
* 123456 public Integer getCouponCount() {
* 商家数据包原样返回 return couponCount;
* </pre> }
* @fields
*/ public void setCouponCount(Integer couponCount) {
@XStreamAlias("attach") this.couponCount = couponCount;
private String attach; }
/**
* <pre> public List<WxPayOrderNotifyCoupon> getCouponList() {
* 支付完成时间 return couponList;
* time_end }
*
* String(14) public void setCouponList(List<WxPayOrderNotifyCoupon> couponList) {
* 20141030133525 this.couponList = couponList;
* 支付完成时间格式为yyyyMMddHHmmss如2009年12月25日9点10分10秒表示为20091225091010其他详见时间规则 }
* </pre>
* @fields timeEnd public String getDeviceInfo() {
*/ return deviceInfo;
@XStreamAlias("time_end") }
private String timeEnd;
public void setDeviceInfo(String deviceInfo) {
this.deviceInfo = deviceInfo;
public Integer getCouponCount() { }
return couponCount;
} public String getOpenid() {
return openid;
public void setCouponCount(Integer couponCount) { }
this.couponCount = couponCount;
} public void setOpenid(String openid) {
this.openid = openid;
public List<WxPayOrderNotifyCoupon> getCouponList() { }
return couponList;
} public String getIsSubscribe() {
return isSubscribe;
public void setCouponList(List<WxPayOrderNotifyCoupon> couponList) { }
this.couponList = couponList;
} public void setIsSubscribe(String isSubscribe) {
this.isSubscribe = isSubscribe;
public String getDeviceInfo() { }
return deviceInfo;
} public String getTradeType() {
return tradeType;
public void setDeviceInfo(String deviceInfo) { }
this.deviceInfo = deviceInfo;
} public void setTradeType(String tradeType) {
this.tradeType = tradeType;
public String getOpenid() { }
return openid;
} public String getBankType() {
return bankType;
public void setOpenid(String openid) { }
this.openid = openid;
} public void setBankType(String bankType) {
this.bankType = bankType;
public String getIsSubscribe() { }
return isSubscribe;
} public Integer getTotalFee() {
return totalFee;
public void setIsSubscribe(String isSubscribe) { }
this.isSubscribe = isSubscribe;
} public void setTotalFee(Integer totalFee) {
this.totalFee = totalFee;
public String getTradeType() { }
return tradeType;
} public Integer getSettlementTotalFee() {
return settlementTotalFee;
public void setTradeType(String tradeType) { }
this.tradeType = tradeType;
} public void setSettlementTotalFee(Integer settlementTotalFee) {
this.settlementTotalFee = settlementTotalFee;
public String getBankType() { }
return bankType;
} public String getFeeType() {
return feeType;
public void setBankType(String bankType) { }
this.bankType = bankType;
} public void setFeeType(String feeType) {
this.feeType = feeType;
public Integer getTotalFee() { }
return totalFee;
} public Integer getCashFee() {
return cashFee;
public void setTotalFee(Integer totalFee) { }
this.totalFee = totalFee;
} public void setCashFee(Integer cashFee) {
this.cashFee = cashFee;
public Integer getSettlementTotalFee() { }
return settlementTotalFee;
} public String getCashFeeType() {
return cashFeeType;
public void setSettlementTotalFee(Integer settlementTotalFee) { }
this.settlementTotalFee = settlementTotalFee;
} public void setCashFeeType(String cashFeeType) {
this.cashFeeType = cashFeeType;
public String getFeeType() { }
return feeType;
} public Integer getCouponFee() {
return couponFee;
public void setFeeType(String feeType) { }
this.feeType = feeType;
} public void setCouponFee(Integer couponFee) {
this.couponFee = couponFee;
public Integer getCashFee() { }
return cashFee;
} public String getTransactionId() {
return transactionId;
public void setCashFee(Integer cashFee) { }
this.cashFee = cashFee;
} public void setTransactionId(String transactionId) {
this.transactionId = transactionId;
public String getCashFeeType() { }
return cashFeeType;
} public String getOutTradeNo() {
return outTradeNo;
public void setCashFeeType(String cashFeeType) { }
this.cashFeeType = cashFeeType;
} public void setOutTradeNo(String outTradeNo) {
this.outTradeNo = outTradeNo;
public Integer getCouponFee() { }
return couponFee;
} public String getAttach() {
return attach;
public void setCouponFee(Integer couponFee) { }
this.couponFee = couponFee;
} public void setAttach(String attach) {
this.attach = attach;
public String getTransactionId() { }
return transactionId;
} public String getTimeEnd() {
return timeEnd;
public void setTransactionId(String transactionId) { }
this.transactionId = transactionId;
} public void setTimeEnd(String timeEnd) {
this.timeEnd = timeEnd;
public String getOutTradeNo() { }
return outTradeNo;
} @Override
public Map<String,String> toMap(){
public void setOutTradeNo(String outTradeNo) { Map<String,String> resultMap = BeanUtils.xmlBean2Map(this);
this.outTradeNo = outTradeNo; if(this.getCouponCount() != null && this.getCouponCount() > 0){
} for (int i = 0; i < this.getCouponCount(); i++) {
WxPayOrderNotifyCoupon coupon = couponList.get(i);
public String getAttach() { resultMap.putAll(coupon.toMap(i));
return attach; }
} }
return resultMap;
public void setAttach(String attach) { }
this.attach = attach;
} @Override
public String toString() {
public String getTimeEnd() { return ToStringBuilder.reflectionToString(this,ToStringStyle.MULTI_LINE_STYLE);
return timeEnd; }
} }
public void setTimeEnd(String timeEnd) {
this.timeEnd = timeEnd;
}
@Override
public Map<String,String> toMap(){
Map<String,String> resultMap = BeanUtils.xmlBean2Map(this);
if(this.getCouponCount() != null && this.getCouponCount() > 0){
for (int i = 0; i < this.getCouponCount(); i++) {
WxPayOrderNotifyCoupon coupon = couponList.get(i);
resultMap.putAll(coupon.toMap(i));
}
}
return resultMap;
}
@Override
public String toString() {
return ToStringBuilder.reflectionToString(this,ToStringStyle.MULTI_LINE_STYLE);
}
}