|
|
@@ -165,21 +165,21 @@ public class OrderMainVo implements Serializable {
|
|
|
*/
|
|
|
@ExcelProperty(value = "运费", converter = ExcelDictConvert.class)
|
|
|
@ExcelDictFormat(readConverterExp = "元=")
|
|
|
- private Long shippingFee;
|
|
|
+ private BigDecimal shippingFee;
|
|
|
|
|
|
/**
|
|
|
* 订单总金额(元)
|
|
|
*/
|
|
|
@ExcelProperty(value = "订单总金额", converter = ExcelDictConvert.class)
|
|
|
@ExcelDictFormat(readConverterExp = "元=")
|
|
|
- private Long totalAmount;
|
|
|
+ private BigDecimal totalAmount;
|
|
|
|
|
|
/**
|
|
|
* 应付金额(元)
|
|
|
*/
|
|
|
@ExcelProperty(value = "应付金额", converter = ExcelDictConvert.class)
|
|
|
@ExcelDictFormat(readConverterExp = "元=")
|
|
|
- private Long payableAmount;
|
|
|
+ private BigDecimal payableAmount;
|
|
|
|
|
|
/**
|
|
|
* 支付状态
|