From 80034e50869836ca3df8fd1c0e84a38b3fa16e32 Mon Sep 17 00:00:00 2001 From: aimilin6688 Date: Fri, 9 Dec 2016 17:00:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=83=E8=BD=AC=E5=88=86=EF=BC=8C=E5=88=86=E8=BD=AC?= =?UTF-8?q?=E5=85=83=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/bean/pay/request/WxPayBaseRequest.java | 12 ++++++++++++ .../weixin/mp/bean/pay/result/WxPayBaseResult.java | 10 ++++++++++ .../mp/bean/pay/result/WxPayOrderNotifyResult.java | 10 ---------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java index 9ede16ec..d6926d0e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java @@ -1,5 +1,7 @@ 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; @@ -110,6 +112,16 @@ public abstract class WxPayBaseRequest { public void setSign(String sign) { this.sign = sign; } + + /** + * 将单位为元转换为单位为分 + * + * @param yuan + * @return + */ + public static Integer yuanToFee(String yuan) { + return new BigDecimal(yuan).setScale(2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).intValue(); + } @Override public String toString() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java index d7455377..b719e333 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java @@ -1,5 +1,6 @@ package me.chanjar.weixin.mp.bean.pay.result; +import java.math.BigDecimal; import java.util.Map; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -146,6 +147,15 @@ public abstract class WxPayBaseResult { this.sign = sign; } + /** + * 将单位分转换成单位圆 + * @param fee + * @return + */ + public static String feeToYuan(Integer fee) { + return new BigDecimal(Double.valueOf(fee) / 100).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + public Map toMap(){ return BeanUtils.xmlBean2Map(this); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java index 60a25c19..eae67a36 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java @@ -397,16 +397,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ return resultMap; } - - /** - * 将单位分转换成单位圆 - * @param fee - * @return - */ - public static String feeToYuan(Integer fee) { - return new BigDecimal(Double.valueOf(fee) / 100).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString(); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this,ToStringStyle.MULTI_LINE_STYLE); From fd9898eec9f8111cbfc7b484d5f46a7151a34056 Mon Sep 17 00:00:00 2001 From: aimilin6688 Date: Fri, 9 Dec 2016 17:00:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=83=E8=BD=AC=E5=88=86=EF=BC=8C=E5=88=86=E8=BD=AC?= =?UTF-8?q?=E5=85=83=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/mp/bean/pay/request/WxPayBaseRequest.java | 12 ++++++++++++ .../weixin/mp/bean/pay/result/WxPayBaseResult.java | 10 ++++++++++ .../mp/bean/pay/result/WxPayOrderNotifyResult.java | 11 ----------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java index 9ede16ec..d6926d0e 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/request/WxPayBaseRequest.java @@ -1,5 +1,7 @@ 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; @@ -110,6 +112,16 @@ public abstract class WxPayBaseRequest { public void setSign(String sign) { this.sign = sign; } + + /** + * 将单位为元转换为单位为分 + * + * @param yuan + * @return + */ + public static Integer yuanToFee(String yuan) { + return new BigDecimal(yuan).setScale(2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).intValue(); + } @Override public String toString() { diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java index d7455377..b719e333 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayBaseResult.java @@ -1,5 +1,6 @@ package me.chanjar.weixin.mp.bean.pay.result; +import java.math.BigDecimal; import java.util.Map; import com.thoughtworks.xstream.annotations.XStreamAlias; @@ -146,6 +147,15 @@ public abstract class WxPayBaseResult { this.sign = sign; } + /** + * 将单位分转换成单位圆 + * @param fee + * @return + */ + public static String feeToYuan(Integer fee) { + return new BigDecimal(Double.valueOf(fee) / 100).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString(); + } + public Map toMap(){ return BeanUtils.xmlBean2Map(this); } diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java index 60a25c19..3c782477 100644 --- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java +++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/pay/result/WxPayOrderNotifyResult.java @@ -1,7 +1,6 @@ package me.chanjar.weixin.mp.bean.pay.result; import java.io.Serializable; -import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -397,16 +396,6 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializ return resultMap; } - - /** - * 将单位分转换成单位圆 - * @param fee - * @return - */ - public static String feeToYuan(Integer fee) { - return new BigDecimal(Double.valueOf(fee) / 100).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString(); - } - @Override public String toString() { return ToStringBuilder.reflectionToString(this,ToStringStyle.MULTI_LINE_STYLE);