Browse Source

Merge pull request #94 from aimilin6688/develop

元转分、分转元接口添加
Binary Wang 8 years ago
parent
commit
79bee7dbee

+ 12 - 0
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() {

+ 10 - 0
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<String,String> toMap(){
   	return BeanUtils.xmlBean2Map(this);
   }

+ 0 - 11
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);