|
|
@@ -1895,23 +1895,23 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
// 订单金额
|
|
|
BigDecimal orderAmount = tbOrder.getPayMoney().add(couponMoney).add(activityDiscountAmount);
|
|
|
|
|
|
- contentBuffer.append("订单金额:").append(orderAmount.setScale(BigDecimal.ROUND_DOWN));
|
|
|
+ contentBuffer.append("订单金额:").append(orderAmount.setScale(2, BigDecimal.ROUND_DOWN));
|
|
|
if (!couponMoney.equals(BigDecimal.ZERO)) {
|
|
|
- contentBuffer.append(",优惠券金额:").append(couponMoney.setScale(BigDecimal.ROUND_DOWN));
|
|
|
+ contentBuffer.append(",优惠券金额:").append(couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
|
|
|
}
|
|
|
if (!activityDiscountAmount.equals(BigDecimal.ZERO)) {
|
|
|
- contentBuffer.append(",活动优惠金额:").append(activityDiscountAmount.setScale(BigDecimal.ROUND_DOWN));
|
|
|
+ contentBuffer.append(",活动优惠金额:").append(activityDiscountAmount.setScale(2, BigDecimal.ROUND_DOWN));
|
|
|
}
|
|
|
|
|
|
contentBuffer.append(",用户实付金额:").append(tbOrder.getPayMoney()).append(",其中");
|
|
|
|
|
|
if (tbOrder.getOrderType() != 1) {
|
|
|
- contentBuffer.append("跑腿费:").append(errandMoney.setScale(BigDecimal.ROUND_DOWN)).append("(").append(tbOrder.getErrandMoneyIsShop()).append(")").append(",");
|
|
|
+ contentBuffer.append("跑腿费:").append(errandMoney.setScale(2, BigDecimal.ROUND_DOWN)).append("(").append(tbOrder.getErrandMoneyIsShop()).append(")").append(",");
|
|
|
}
|
|
|
|
|
|
- contentBuffer.append("平台服务费:").append(pingRate.setScale(BigDecimal.ROUND_DOWN)).append(",");
|
|
|
- contentBuffer.append("短信服务费:").append(smsSendMoney.setScale(BigDecimal.ROUND_DOWN)).append(",");
|
|
|
- contentBuffer.append("到账金额:").append(shopMoney.setScale(BigDecimal.ROUND_DOWN));
|
|
|
+ contentBuffer.append("平台服务费:").append(pingRate.setScale(2, BigDecimal.ROUND_DOWN)).append(",");
|
|
|
+ contentBuffer.append("短信服务费:").append(smsSendMoney.setScale(2, BigDecimal.ROUND_DOWN)).append(",");
|
|
|
+ contentBuffer.append("到账金额:").append(shopMoney.setScale(2, BigDecimal.ROUND_DOWN));
|
|
|
|
|
|
if (shopIds == 0) {
|
|
|
contentBuffer.append("(本单为平台优惠券,平台补贴)");
|