From b6e85f897f0725bb6d08a08da4bb32ebd352e7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 19 Nov 2024 13:41:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=E4=B8=BAdecimal?=
 =?UTF-8?q?=EF=BC=8Cjpa=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/TbOrderDetailRepository.java        |  4 ++--
 .../service/impl/SummaryServiceImpl.java      |  2 +-
 .../vo/TbOrderSalesCountByDayV2Vo.java        |  6 +++---
 .../cashier/vo/TbOrderSalesCountByDayVo.java  | 20 +++++++++----------
 .../cashier/vo/TbOrderSalesCountByTable.java  | 12 +++++------
 5 files changed, 22 insertions(+), 22 deletions(-)

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<TbOrderDetail, In
 
 
     @Query("SELECT new cn.ysk.cashier.vo.TbOrderSalesCountByDayVo(" +
-            "COALESCE(CAST(SUM(CASE WHEN orders.orderType!='return' THEN info.num ELSE 0 END) as long),0), " +
-            "COALESCE(CAST(SUM(CASE WHEN orders.orderType='return' THEN info.num ELSE 0 END) as long),0))" +
+            "COALESCE(SUM(CASE WHEN orders.orderType!='return' THEN info.num ELSE 0 END),0), " +
+            "COALESCE(SUM(CASE WHEN orders.orderType='return' THEN info.num ELSE 0 END),0))" +
             "FROM TbOrderInfo orders " +
             "LEFT JOIN TbOrderDetail info on orders.id=info.orderId " +
             "WHERE info.shopId = :shopId " +
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
index 2868aee6..f131747b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
@@ -310,7 +310,7 @@ public class SummaryServiceImpl implements SummaryService {
         }
 
         TbOrderSalesCountByDayVo tbOrderSalesCountByDayVo = detailRepository.queryTbOrderSalesCountByDaysummaryCount(Integer.valueOf(summaryDto.getShopId()), summaryDto.getCateId(), summaryDto.getProName(), summaryDto.getStartTime(), summaryDto.getEndTime());
-        TbOrderPayCountVo zongShuLiang = new TbOrderPayCountVo("el-icon-goods", "总数量", "0", tbOrderSalesCountByDayVo.getSalesNum() + tbOrderSalesCountByDayVo.getRefNum());
+        TbOrderPayCountVo zongShuLiang = new TbOrderPayCountVo("el-icon-goods", "总数量", "0", tbOrderSalesCountByDayVo.getSalesNum().add(tbOrderSalesCountByDayVo.getRefNum()));
         TbOrderPayCountVo zong = new TbOrderPayCountVo("el-icon-coin", "总金额", "1", tbOrderSalesCountByDayVo.getSalesAmount());
         TbOrderPayCountVo tuidan = new TbOrderPayCountVo("el-icon-goods", "退单量", "0", tbOrderSalesCountByDayVo.getRefNum());
         TbOrderPayCountVo tuikuan = new TbOrderPayCountVo("el-icon-money", "退款金额", "1", tbOrderSalesCountByDayVo.getRefAmount());
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayV2Vo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayV2Vo.java
index adf50e80..46e17bb5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayV2Vo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/TbOrderSalesCountByDayV2Vo.java
@@ -14,14 +14,14 @@ public class TbOrderSalesCountByDayV2Vo {
     private String cateName;
     private String typeEnum;
 
-    private Long salesNum;
-    private Long refNum;
+    private BigDecimal salesNum;
+    private BigDecimal refNum;
     private BigDecimal salesAmount;
     private BigDecimal refAmount;
 
     List<TbOrderSalesCountByDayV2Vo> 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);
     }