From fdb089cb8bee6099efcbd7b0ca2672c63cbb6784 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 11 十一月 2019 09:33:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java
index 2d54dc5..01118cd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/shop/BanLiShopOrderGoodsVOFactory.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.util.factory.shop;
import com.yeshi.fanli.entity.shop.BanLiShopOrder;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.shop.BanLiShopOrderGoodsVO;
import com.yeshi.fanli.vo.shop.BanLiShopOrderVO;
@@ -63,9 +64,9 @@
private static String getPaidMoney(BanLiShopOrder order) {
if (order.getMoneyPaymentState() == null || order.getMoneyPaymentState() == BanLiShopOrder.PAY_STATE_NOPAY
|| order.getMoneyPaymentState() == BanLiShopOrder.PAY_STATE_REFUND) {
- return "0";
+ return "0.00";
} else
- return order.getMoneyPayment().toString();
+ return order.getMoneyPayment().setScale(2).toString();
}
}
--
Gitblit v1.8.0