| @@ -122,7 +122,7 @@ public class WxOrder extends BaseEntity { | |||||
| } | } | ||||
| public String getPaymentStr() { | 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") | @Excel(name = "订单金额(元)", width = 20, orderNum = "6") | ||||
| @@ -83,7 +83,7 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { | |||||
| Long subsidy = summary.get("subsidy"); | Long subsidy = summary.get("subsidy"); | ||||
| String subsidyStr = new BigDecimal(subsidy).divide(new BigDecimal(100)).toPlainString(); | String subsidyStr = new BigDecimal(subsidy).divide(new BigDecimal(100)).toPlainString(); | ||||
| WxMerchantSubsidyVo merchantSubsidy = new WxMerchantSubsidyVo(); | WxMerchantSubsidyVo merchantSubsidy = new WxMerchantSubsidyVo(); | ||||
| merchantSubsidy.setSubsidyStr(subsidyStr); | |||||
| merchantSubsidy.setSubsidyStr("承付总金额(元): " + subsidyStr); | |||||
| merchantSubsidy.setSource(-1); | merchantSubsidy.setSource(-1); | ||||
| merchantSubsidy.setType(-1); | merchantSubsidy.setType(-1); | ||||
| merchantSubsidy.setFreeze(-1); | merchantSubsidy.setFreeze(-1); | ||||
| @@ -1058,8 +1058,8 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| String paymentStr = new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString(); | String paymentStr = new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString(); | ||||
| String payStr = new BigDecimal(pay).divide(new BigDecimal(100)).toPlainString(); | String payStr = new BigDecimal(pay).divide(new BigDecimal(100)).toPlainString(); | ||||
| WxOrder order = new WxOrder(); | WxOrder order = new WxOrder(); | ||||
| order.setPayStr(payStr); | |||||
| order.setPaymentStr(paymentStr); | |||||
| order.setPayStr("支付总金额(元): " + payStr); | |||||
| order.setPaymentStr("订单总金额(元): " + paymentStr); | |||||
| order.setOrderStatus(-1); | order.setOrderStatus(-1); | ||||
| order.setAttribute(-1); | order.setAttribute(-1); | ||||
| list.add(order); | list.add(order); | ||||