niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formaFee2Fen rename to formatFee2Fen

Browse Source
This commit is contained in:
jinyu 2016-08-01 13:44:47 +08:00
parent 92cc725f41
commit bbdd8980af
7 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/PayApi.java
View File

@ -465,8 +465,8 @@ public class PayApi extends MchApi {
try { try {
Map<String, String> map = createBaseRequestMap(idQuery); Map<String, String> map = createBaseRequestMap(idQuery);
map.put("out_refund_no", outRefundNo); map.put("out_refund_no", outRefundNo);
map.put("total_fee", DateUtil.formaFee2Fen(totalFee)); map.put("total_fee", DateUtil.formatFee2Fen(totalFee));
map.put("refund_fee", DateUtil.formaFee2Fen(refundFee)); map.put("refund_fee", DateUtil.formatFee2Fen(refundFee));
if (StringUtil.isBlank(opUserId)) { if (StringUtil.isBlank(opUserId)) {
opUserId = weixinAccount.getMchId(); opUserId = weixinAccount.getMchId();
} }

4
weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/PayPackage.java
View File

@ -117,7 +117,7 @@ public class PayPackage extends MerchantResult {
this.body = body; this.body = body;
this.detail = detail; this.detail = detail;
this.outTradeNo = outTradeNo; this.outTradeNo = outTradeNo;
this.totalFee = DateUtil.formaFee2Fen(totalFee); this.totalFee = DateUtil.formatFee2Fen(totalFee);
this.notifyUrl = notifyUrl; this.notifyUrl = notifyUrl;
this.createIp = createIp; this.createIp = createIp;
this.attach = attach; this.attach = attach;
@ -163,7 +163,7 @@ public class PayPackage extends MerchantResult {
* 订单总额 单位为元 * 订单总额 单位为元
*/ */
public void setTotalFee(double totalFee) { public void setTotalFee(double totalFee) {
this.totalFee = DateUtil.formaFee2Fen(totalFee); this.totalFee = DateUtil.formatFee2Fen(totalFee);
} }
public String getNotifyUrl() { public String getNotifyUrl() {

2
weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/CorpPayment.java
View File

@ -91,7 +91,7 @@ public class CorpPayment extends MerchantResult {
this.openId = openId; this.openId = openId;
this.checkNameType = checkNameType; this.checkNameType = checkNameType;
this.desc = desc; this.desc = desc;
this.amount = DateUtil.formaFee2Fen(amount); this.amount = DateUtil.formatFee2Fen(amount);
this.clientIp = clientIp; this.clientIp = clientIp;
} }

2
weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java
View File

@ -134,7 +134,7 @@ public class Redpacket extends MerchantResult {
this.clientIp = clientIp; this.clientIp = clientIp;
this.actName = actName; this.actName = actName;
this.remark = remark; this.remark = remark;
this.totalAmount = DateUtil.formaFee2Fen(totalAmount); this.totalAmount = DateUtil.formatFee2Fen(totalAmount);
this.amtType = totalNum > 1 ? "ALL_RAND" : null; this.amtType = totalNum > 1 ? "ALL_RAND" : null;
} }

10
weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DateUtil.java
View File

@ -1,5 +1,6 @@
package com.foxinmy.weixin4j.util; package com.foxinmy.weixin4j.util;
import java.math.BigDecimal;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
@ -73,10 +74,13 @@ public class DateUtil {
* *
* @param fee * @param fee
* 金额 单位为分 * 金额 单位为分
* @return * @return 四舍五入后的字符串形式金额
*/ */
public static String formaFee2Fen(double fee) { public static String formatFee2Fen(double fee) {
return new DecimalFormat("#").format(fee * 100); BigDecimal _fee = new BigDecimal(Double.toString(fee));
fee = _fee.multiply(new BigDecimal("100"))
.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
return new DecimalFormat("#").format(fee);
} }
/** /**

4
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/PayOldApi.java
View File

@ -261,8 +261,8 @@ public class PayOldApi extends MpApi {
map.put("service_version", "1.1"); map.put("service_version", "1.1");
map.put("partner", weixinAccount.getPartnerId()); map.put("partner", weixinAccount.getPartnerId());
map.put("out_refund_no", outRefundNo); map.put("out_refund_no", outRefundNo);
map.put("total_fee", DateUtil.formaFee2Fen(totalFee)); map.put("total_fee", DateUtil.formatFee2Fen(totalFee));
map.put("refund_fee", DateUtil.formaFee2Fen(refundFee)); map.put("refund_fee", DateUtil.formatFee2Fen(refundFee));
map.put(idQuery.getType().getName(), idQuery.getId()); map.put(idQuery.getType().getName(), idQuery.getId());
if (StringUtil.isBlank(opUserId)) { if (StringUtil.isBlank(opUserId)) {
opUserId = weixinAccount.getPartnerId(); opUserId = weixinAccount.getPartnerId();

8
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/oldpayment/PayPackageV2.java
View File

@ -133,8 +133,8 @@ public class PayPackageV2 extends PayPackage {
this.inputCharset = "UTF-8"; this.inputCharset = "UTF-8";
this.partner = partner; this.partner = partner;
this.transportFee = transportFee > 0d ? DateUtil this.transportFee = transportFee > 0d ? DateUtil
.formaFee2Fen(transportFee) : null; .formatFee2Fen(transportFee) : null;
this.productFee = productFee > 0 ? DateUtil.formaFee2Fen(productFee) this.productFee = productFee > 0 ? DateUtil.formatFee2Fen(productFee)
: null; : null;
} }
@ -165,7 +165,7 @@ public class PayPackageV2 extends PayPackage {
* 物流费用 单位为元 * 物流费用 单位为元
*/ */
public void setTransportFee(double transportFee) { public void setTransportFee(double transportFee) {
this.transportFee = DateUtil.formaFee2Fen(transportFee); this.transportFee = DateUtil.formatFee2Fen(transportFee);
} }
public String getProductFee() { public String getProductFee() {
@ -179,7 +179,7 @@ public class PayPackageV2 extends PayPackage {
* 商品 单位为元 * 商品 单位为元
*/ */
public void setProductFee(double productFee) { public void setProductFee(double productFee) {
this.productFee = DateUtil.formaFee2Fen(productFee); this.productFee = DateUtil.formatFee2Fen(productFee);
} }
public String getInputCharset() { public String getInputCharset() {