diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java index 41ee7359..01cd41ed 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java @@ -171,8 +171,8 @@ public interface TbOrderDetailRepository extends JpaRepository skus = new ArrayList<>(); - public TbOrderSalesCountByDayV2Vo(String name, Integer productId, String cateName,String typeEnum, Long salesNum, Long refNum, BigDecimal salesAmount, BigDecimal refAmount) { + public TbOrderSalesCountByDayV2Vo(String name, Integer productId, String cateName,String typeEnum, BigDecimal salesNum, BigDecimal refNum, BigDecimal salesAmount, BigDecimal refAmount) { this.name = name; this.productId = productId; this.typeEnum = typeEnum; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java index 6635bad5..601d0387 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayVo.java @@ -12,21 +12,21 @@ public class TbOrderSalesCountByDayVo { private String cateName; private String unitName; private BigDecimal price; - private Long salesNum; - private Long refNum; + private BigDecimal salesNum; + private BigDecimal refNum; private BigDecimal salesAmount; private BigDecimal refAmount; - private Long num; + private BigDecimal num; private Integer productId; private Integer productSkuId; - public TbOrderSalesCountByDayVo(Long salesNum, Long refNum) { + public TbOrderSalesCountByDayVo(BigDecimal salesNum, BigDecimal refNum) { this.salesNum = salesNum; this.refNum = refNum; } public TbOrderSalesCountByDayVo(String productName, String productSkuName, String cateName,String unitName,BigDecimal price, - Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount) { + BigDecimal salesNum, BigDecimal refNum, BigDecimal num, BigDecimal salesAmount, BigDecimal refAmount) { this.productName = productName; this.productSkuName = productSkuName; this.cateName = cateName; @@ -42,7 +42,7 @@ public class TbOrderSalesCountByDayVo { public TbOrderSalesCountByDayVo(String productName, String productSkuName, String cateName,String unitName,BigDecimal price, - Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount, Integer productId, Integer productSkuId) { + BigDecimal salesNum, BigDecimal refNum, BigDecimal num, BigDecimal salesAmount, BigDecimal refAmount, Integer productId, Integer productSkuId) { this.productName = productName; this.productSkuName = productSkuName; this.cateName = cateName; @@ -58,7 +58,7 @@ public class TbOrderSalesCountByDayVo { count(); } - public TbOrderSalesCountByDayVo(Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount) { + public TbOrderSalesCountByDayVo(BigDecimal salesNum, BigDecimal refNum, BigDecimal num, BigDecimal salesAmount, BigDecimal refAmount) { this.salesNum = salesNum; this.refNum = refNum; this.salesAmount = salesAmount; @@ -68,9 +68,9 @@ public class TbOrderSalesCountByDayVo { } public void count(){ - if (salesNum == null) salesNum = 0l; - if (refNum == null) refNum = 0l; - salesNum = salesNum - refNum; + if (salesNum == null) salesNum = BigDecimal.ZERO; + if (refNum == null) refNum = BigDecimal.ZERO; + salesNum = salesNum.subtract(refNum); if (salesAmount == null) salesAmount = BigDecimal.ZERO; if (refAmount == null) refAmount = BigDecimal.ZERO; salesAmount = salesAmount.subtract(refAmount); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java index b1b8a8ed..da84cd35 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByTable.java @@ -14,17 +14,17 @@ public class TbOrderSalesCountByTable { private String cateName; private String unitName; private BigDecimal price; - private Long salesNum; - private Long refNum; + private BigDecimal salesNum; + private BigDecimal refNum; private BigDecimal salesAmount; private BigDecimal refAmount; - private Long num; + private BigDecimal num; private Integer productId; private Integer productSkuId; private String tableId; public TbOrderSalesCountByTable(String productName, String productSkuName, String cateName,String unitName,BigDecimal price, - Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount) { + BigDecimal salesNum, BigDecimal refNum, BigDecimal num, BigDecimal salesAmount, BigDecimal refAmount) { this.productName = productName; this.productSkuName = productSkuName; this.cateName = cateName; @@ -39,7 +39,7 @@ public class TbOrderSalesCountByTable { } public TbOrderSalesCountByTable(String productName, String productSkuName, String cateName,String unitName,BigDecimal price, - Long salesNum, Long refNum, Long num, BigDecimal salesAmount, BigDecimal refAmount, + BigDecimal salesNum, BigDecimal refNum, BigDecimal num, BigDecimal salesAmount, BigDecimal refAmount, Integer productId, Integer productSkuId, String tableId) { this.productName = productName; this.productSkuName = productSkuName; @@ -58,7 +58,7 @@ public class TbOrderSalesCountByTable { } public void count(){ - salesNum=salesNum-refNum; + salesNum= salesNum.subtract(refNum); salesAmount=salesAmount.subtract(refAmount); }