修复代码

2025-05-05 13:17:46 +08:00 · 2017-05-24 10:46:04 +08:00 · 2017-05-24 10:46:04 +08:00 · d108366736
commit d108366736
parent 9d2fb9fe3d
3 changed files with 336 additions and 291 deletions
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillBaseResult
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillBaseResult
@ -1,257 +0,0 @@
-package com.github.binarywang.wxpay.bean.result;
-import java.io.Serializable;
-
-public class WxPayBillBaseResult implements Serializable
-{
-    /*
-     * 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
-     * 交易状态:REFUND 付款银行:CFT 货币种类:CNY 总金额:0.00 企业红包金额:0.00 微信退款单号: 商户退款单号:20170406010000933 退款金额:0.01 企业红包退款金额:0.00
-     * 退款类型:ORIGINAL 退款状态:SUCCESS 商品名称: 商户数据包: 手续费:0.00000 费率 :0.60%
-     */
-  private static final long serialVersionUID = 1L;
-  /**交易时间*/
-  private String tradeTime;
-  /**公众账号ID*/
-  private String appId;
-  /**商户号*/
-  private String mchId;
-  /**子商户号*/
-  private String subMchId;
-  /**设备号*/
-  private String deviceInfo;
-  /**微信订单号*/
-  private String transationId;
-  /**商户订单号*/
-  private String outTradeNo;
-  /**用户标识*/
-  private String openId;
-  /**交易类型*/
-  private String tradeType;
-  /**交易状态*/
-  private String tradeState ;
-  /**付款银行*/
-  private String bankType;
-  /**货币种类*/
-  private String feeType;
-  /**总金额*/
-  private String totalFee;
-  /**企业红包金额*/
-  private String couponFee;
-  /**微信退款单号*/
-  private String refundId;
-  /**商户退款单号*/
-  private String outRefundNo;
-  /**退款金额*/
-  private String settlementRefundFee;
-  /**企业红包退款金额*/
-  private String couponRefundFee;
-  /**退款类型*/
-  private String refundChannel;
-  /**退款状态*/
-  private String refundState;
-  /**商品名称*/
-  private String body;
-  /**商户数据包*/
-  private String attach;
-  /**手续费*/
-  private String poundage;
-  /**费率*/
-  private String poundageRate;
-  public String getTradeTime()
-  {
-    return tradeTime;
-  }
-  public void setTradeTime(String tradeTime)
-  {
-    this.tradeTime = tradeTime;
-  }
-  public String getAppId()
-  {
-    return appId;
-  }
-  public void setAppId(String appId)
-  {
-    this.appId = appId;
-  }
-  public String getMchId()
-  {
-    return mchId;
-  }
-  public void setMchId(String mchId)
-  {
-    this.mchId = mchId;
-  }
-  public String getSubMchId()
-  {
-    return subMchId;
-  }
-  public void setSubMchId(String subMchId)
-  {
-    this.subMchId = subMchId;
-  }
-  public String getDeviceInfo()
-  {
-    return deviceInfo;
-  }
-  public void setDeviceInfo(String deviceInfo)
-  {
-    this.deviceInfo = deviceInfo;
-  }
-  public String getTransationId()
-  {
-    return transationId;
-  }
-  public void setTransationId(String transationId)
-  {
-    this.transationId = transationId;
-  }
-  public String getOutTradeNo()
-  {
-    return outTradeNo;
-  }
-  public void setOutTradeNo(String outTradeNo)
-  {
-    this.outTradeNo = outTradeNo;
-  }
-  public String getOpenId()
-  {
-    return openId;
-  }
-  public void setOpenId(String openId)
-  {
-    this.openId = openId;
-  }
-  public String getTradeType()
-  {
-    return tradeType;
-  }
-  public void setTradeType(String tradeType)
-  {
-    this.tradeType = tradeType;
-  }
-  public String getTradeState()
-  {
-    return tradeState;
-  }
-  public void setTradeState(String tradeState)
-  {
-    this.tradeState = tradeState;
-  }
-  public String getBankType()
-  {
-    return bankType;
-  }
-  public void setBankType(String bankType)
-  {
-    this.bankType = bankType;
-  }
-  public String getFeeType()
-  {
-    return feeType;
-  }
-  public void setFeeType(String feeType)
-  {
-    this.feeType = feeType;
-  }
-  public String getTotalFee()
-  {
-    return totalFee;
-  }
-  public void setTotalFee(String totalFee)
-  {
-    this.totalFee = totalFee;
-  }
-  public String getCouponFee()
-  {
-    return couponFee;
-  }
-  public void setCouponFee(String couponFee)
-  {
-    this.couponFee = couponFee;
-  }
-  public String getRefundId()
-  {
-    return refundId;
-  }
-  public void setRefundId(String refundId)
-  {
-    this.refundId = refundId;
-  }
-  public String getOutRefundNo()
-  {
-    return outRefundNo;
-  }
-  public void setOutRefundNo(String outRefundNo)
-  {
-    this.outRefundNo = outRefundNo;
-  }
-  public String getSettlementRefundFee()
-  {
-    return settlementRefundFee;
-  }
-  public void setSettlementRefundFee(String settlementRefundFee)
-  {
-    this.settlementRefundFee = settlementRefundFee;
-  }
-  public String getCouponRefundFee()
-  {
-    return couponRefundFee;
-  }
-  public void setCouponRefundFee(String couponRefundFee)
-  {
-    this.couponRefundFee = couponRefundFee;
-  }
-  public String getRefundChannel()
-  {
-    return refundChannel;
-  }
-  public void setRefundChannel(String refundChannel)
-  {
-    this.refundChannel = refundChannel;
-  }
-  public String getRefundState()
-  {
-    return refundState;
-  }
-  public void setRefundState(String refundState)
-  {
-    this.refundState = refundState;
-  }
-  public String getBody()
-  {
-    return body;
-  }
-  public void setBody(String body)
-  {
-    this.body = body;
-  }
-  public String getAttach()
-  {
-    return attach;
-  }
-  public void setAttach(String attach)
-  {
-    this.attach = attach;
-  }
-  public String getPoundage()
-  {
-    return poundage;
-  }
-  public void setPoundage(String poundage)
-  {
-    this.poundage = poundage;
-  }
-  public String getPoundageRate()
-  {
-    return poundageRate;
-  }
-  public void setPoundageRate(String poundageRate)
-  {
-    this.poundageRate = poundageRate;
-  }
-  public static long getSerialversionuid()
-  {
-    return serialVersionUID;
-  }
-  
-}
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillBaseResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillBaseResult.java
@ -0,0 +1,305 @@
+package com.github.binarywang.wxpay.bean.result;
+
+import java.io.Serializable;
+
+public class WxPayBillBaseResult implements Serializable {
+  /*
+   * 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
+   * 交易状态:REFUND 付款银行:CFT 货币种类:CNY 总金额:0.00 企业红包金额:0.00 微信退款单号: 商户退款单号:20170406010000933 退款金额:0.01 企业红包退款金额:0.00
+   * 退款类型:ORIGINAL 退款状态:SUCCESS 商品名称: 商户数据包: 手续费:0.00000 费率 :0.60%
+   */
+  private static final long serialVersionUID = 1L;
+  /**
+   * 交易时间
+   */
+  private String tradeTime;
+  /**
+   * 公众账号ID
+   */
+  private String appId;
+  /**
+   * 商户号
+   */
+  private String mchId;
+  /**
+   * 子商户号
+   */
+  private String subMchId;
+  /**
+   * 设备号
+   */
+  private String deviceInfo;
+  /**
+   * 微信订单号
+   */
+  private String transationId;
+  /**
+   * 商户订单号
+   */
+  private String outTradeNo;
+  /**
+   * 用户标识
+   */
+  private String openId;
+  /**
+   * 交易类型
+   */
+  private String tradeType;
+  /**
+   * 交易状态
+   */
+  private String tradeState;
+  /**
+   * 付款银行
+   */
+  private String bankType;
+  /**
+   * 货币种类
+   */
+  private String feeType;
+  /**
+   * 总金额
+   */
+  private String totalFee;
+  /**
+   * 企业红包金额
+   */
+  private String couponFee;
+  /**
+   * 微信退款单号
+   */
+  private String refundId;
+  /**
+   * 商户退款单号
+   */
+  private String outRefundNo;
+  /**
+   * 退款金额
+   */
+  private String settlementRefundFee;
+  /**
+   * 企业红包退款金额
+   */
+  private String couponRefundFee;
+  /**
+   * 退款类型
+   */
+  private String refundChannel;
+  /**
+   * 退款状态
+   */
+  private String refundState;
+  /**
+   * 商品名称
+   */
+  private String body;
+  /**
+   * 商户数据包
+   */
+  private String attach;
+  /**
+   * 手续费
+   */
+  private String poundage;
+  /**
+   * 费率
+   */
+  private String poundageRate;
+
+  public static long getSerialversionuid() {
+    return serialVersionUID;
+  }
+
+  public String getTradeTime() {
+    return tradeTime;
+  }
+
+  public void setTradeTime(String tradeTime) {
+    this.tradeTime = tradeTime;
+  }
+
+  public String getAppId() {
+    return appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public String getMchId() {
+    return mchId;
+  }
+
+  public void setMchId(String mchId) {
+    this.mchId = mchId;
+  }
+
+  public String getSubMchId() {
+    return subMchId;
+  }
+
+  public void setSubMchId(String subMchId) {
+    this.subMchId = subMchId;
+  }
+
+  public String getDeviceInfo() {
+    return deviceInfo;
+  }
+
+  public void setDeviceInfo(String deviceInfo) {
+    this.deviceInfo = deviceInfo;
+  }
+
+  public String getTransationId() {
+    return transationId;
+  }
+
+  public void setTransationId(String transationId) {
+    this.transationId = transationId;
+  }
+
+  public String getOutTradeNo() {
+    return outTradeNo;
+  }
+
+  public void setOutTradeNo(String outTradeNo) {
+    this.outTradeNo = outTradeNo;
+  }
+
+  public String getOpenId() {
+    return openId;
+  }
+
+  public void setOpenId(String openId) {
+    this.openId = openId;
+  }
+
+  public String getTradeType() {
+    return tradeType;
+  }
+
+  public void setTradeType(String tradeType) {
+    this.tradeType = tradeType;
+  }
+
+  public String getTradeState() {
+    return tradeState;
+  }
+
+  public void setTradeState(String tradeState) {
+    this.tradeState = tradeState;
+  }
+
+  public String getBankType() {
+    return bankType;
+  }
+
+  public void setBankType(String bankType) {
+    this.bankType = bankType;
+  }
+
+  public String getFeeType() {
+    return feeType;
+  }
+
+  public void setFeeType(String feeType) {
+    this.feeType = feeType;
+  }
+
+  public String getTotalFee() {
+    return totalFee;
+  }
+
+  public void setTotalFee(String totalFee) {
+    this.totalFee = totalFee;
+  }
+
+  public String getCouponFee() {
+    return couponFee;
+  }
+
+  public void setCouponFee(String couponFee) {
+    this.couponFee = couponFee;
+  }
+
+  public String getRefundId() {
+    return refundId;
+  }
+
+  public void setRefundId(String refundId) {
+    this.refundId = refundId;
+  }
+
+  public String getOutRefundNo() {
+    return outRefundNo;
+  }
+
+  public void setOutRefundNo(String outRefundNo) {
+    this.outRefundNo = outRefundNo;
+  }
+
+  public String getSettlementRefundFee() {
+    return settlementRefundFee;
+  }
+
+  public void setSettlementRefundFee(String settlementRefundFee) {
+    this.settlementRefundFee = settlementRefundFee;
+  }
+
+  public String getCouponRefundFee() {
+    return couponRefundFee;
+  }
+
+  public void setCouponRefundFee(String couponRefundFee) {
+    this.couponRefundFee = couponRefundFee;
+  }
+
+  public String getRefundChannel() {
+    return refundChannel;
+  }
+
+  public void setRefundChannel(String refundChannel) {
+    this.refundChannel = refundChannel;
+  }
+
+  public String getRefundState() {
+    return refundState;
+  }
+
+  public void setRefundState(String refundState) {
+    this.refundState = refundState;
+  }
+
+  public String getBody() {
+    return body;
+  }
+
+  public void setBody(String body) {
+    this.body = body;
+  }
+
+  public String getAttach() {
+    return attach;
+  }
+
+  public void setAttach(String attach) {
+    this.attach = attach;
+  }
+
+  public String getPoundage() {
+    return poundage;
+  }
+
+  public void setPoundage(String poundage) {
+    this.poundage = poundage;
+  }
+
+  public String getPoundageRate() {
+    return poundageRate;
+  }
+
+  public void setPoundageRate(String poundageRate) {
+    this.poundageRate = poundageRate;
+  }
+
+}
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBillResult.java
@ -1,86 +1,83 @@
 package com.github.binarywang.wxpay.bean.result;

+import java.io.Serializable;
 import java.util.List;

-public class WxPayBillResult implements Serializable
-{
+public class WxPayBillResult implements Serializable {
  /**
   * 对账返回对象
   */
  private static final long serialVersionUID = 1L;
-  
+
  private List<WxPayBillBaseResult> wxPayBillBaseResultLst;
-  /**总交易单数*/
+  /**
+   * 总交易单数
+   */
  private String totalRecord;
-  /**总交易额*/
+  /**
+   * 总交易额
+   */
  private String totalFee;
-  /**总退款金额*/
+  /**
+   * 总退款金额
+   */
  private String totalRefundFee;
-  /**总代金券或立减优惠退款金额*/
+  /**
+   * 总代金券或立减优惠退款金额
+   */
  private String totalCouponFee;
-  /**手续费总金额 */
+  /**
+   * 手续费总金额
+   */
  private String totalPoundageFee;

-  public List<WxPayBillBaseResult> getWxPayBillBaseResultLst()
-  {
+  public List<WxPayBillBaseResult> getWxPayBillBaseResultLst() {
    return wxPayBillBaseResultLst;
  }

-  public void setWxPayBillBaseResultLst(List<WxPayBillBaseResult> wxPayBillBaseResultLst)
-  {
+  public void setWxPayBillBaseResultLst(List<WxPayBillBaseResult> wxPayBillBaseResultLst) {
    this.wxPayBillBaseResultLst = wxPayBillBaseResultLst;
  }

-  public String getTotalRecord()
-  {
+  public String getTotalRecord() {
    return totalRecord;
  }

-  public void setTotalRecord(String totalRecord)
-  {
+  public void setTotalRecord(String totalRecord) {
    this.totalRecord = totalRecord;
  }

-  public String getTotalFee()
-  {
+  public String getTotalFee() {
    return totalFee;
  }

-  public void setTotalFee(String totalFee)
-  {
+  public void setTotalFee(String totalFee) {
    this.totalFee = totalFee;
  }

-  public String getTotalRefundFee()
-  {
+  public String getTotalRefundFee() {
    return totalRefundFee;
  }

-  public void setTotalRefundFee(String totalRefundFee)
-  {
+  public void setTotalRefundFee(String totalRefundFee) {
    this.totalRefundFee = totalRefundFee;
  }

-  public String getTotalCouponFee()
-  {
+  public String getTotalCouponFee() {
    return totalCouponFee;
  }

-  public void setTotalCouponFee(String totalCouponFee)
-  {
+  public void setTotalCouponFee(String totalCouponFee) {
    this.totalCouponFee = totalCouponFee;
  }

-  public String getTotalPoundageFee()
-  {
+  public String getTotalPoundageFee() {
    return totalPoundageFee;
  }

-  public void setTotalPoundageFee(String totalPoundageFee)
-  {
+  public void setTotalPoundageFee(String totalPoundageFee) {
    this.totalPoundageFee = totalPoundageFee;
  }
-  
-  
+

 }