|
@@ -81,7 +81,7 @@ public class LiveOrder extends BaseEntity {
|
|
|
private BigDecimal payMoney;
|
|
private BigDecimal payMoney;
|
|
|
|
|
|
|
|
@Excel(name = "物流代收金额",cellType= Excel.ColumnType.NUMERIC)
|
|
@Excel(name = "物流代收金额",cellType= Excel.ColumnType.NUMERIC)
|
|
|
- private BigDecimal payDelivery;
|
|
|
|
|
|
|
+ private BigDecimal payDelivery = BigDecimal.ZERO;
|
|
|
|
|
|
|
|
@Excel(name = "支付邮费", cellType= Excel.ColumnType.NUMERIC)
|
|
@Excel(name = "支付邮费", cellType= Excel.ColumnType.NUMERIC)
|
|
|
private BigDecimal payPostage;
|
|
private BigDecimal payPostage;
|
|
@@ -188,7 +188,7 @@ public class LiveOrder extends BaseEntity {
|
|
|
private String cartId;
|
|
private String cartId;
|
|
|
|
|
|
|
|
/** 订单商品总数 */
|
|
/** 订单商品总数 */
|
|
|
-// @Excel(name = "订单商品总数")
|
|
|
|
|
|
|
+ @Excel(name = "订单商品总数")
|
|
|
private String totalNum;
|
|
private String totalNum;
|
|
|
|
|
|
|
|
|
|
|