From 34887bccedc7b113ab2865bb3440da6dbcf1a891 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 24 Oct 2019 16:42:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BA=BF=E4=B8=8A=E4=BA=A4=E6=98=93][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E5=AF=BC=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxOrder.java | 2 +- .../iformall/service/impl/WxMerchantSubsidyServiceImpl.java | 2 +- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java index 16a10c509..609f2ee6c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrder.java @@ -122,7 +122,7 @@ public class WxOrder extends BaseEntity { } public String getPaymentStr() { - return payment != null ? new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString() : payStr; + return payment != null ? new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString() : paymentStr; } @Excel(name = "订单金额(元)", width = 20, orderNum = "6") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 62292345b..1c53e92c8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -83,7 +83,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { Long subsidy = summary.get("subsidy"); String subsidyStr = new BigDecimal(subsidy).divide(new BigDecimal(100)).toPlainString(); WxMerchantSubsidyVo merchantSubsidy = new WxMerchantSubsidyVo(); - merchantSubsidy.setSubsidyStr(subsidyStr); + merchantSubsidy.setSubsidyStr("承付总金额(元): " + subsidyStr); merchantSubsidy.setSource(-1); merchantSubsidy.setType(-1); merchantSubsidy.setFreeze(-1); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index ec4991a12..5ccf892eb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1058,8 +1058,8 @@ public class WxOrderServiceImpl implements WxOrderService { String paymentStr = new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString(); String payStr = new BigDecimal(pay).divide(new BigDecimal(100)).toPlainString(); WxOrder order = new WxOrder(); - order.setPayStr(payStr); - order.setPaymentStr(paymentStr); + order.setPayStr("支付总金额(元): " + payStr); + order.setPaymentStr("订单总金额(元): " + paymentStr); order.setOrderStatus(-1); order.setAttribute(-1); list.add(order);