From 1e0e8f251ca36a10ac2a1d466ada8cc99a361194 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, 18 Mar 2025 09:52:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/task/StatisticTask.java    |  1 +
 .../com/czg/order/entity/ShopOrderStatistic.java     |  2 ++
 .../service/impl/ShopOrderStatisticServiceImpl.java  | 12 ++++++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java b/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java
index 9850e2fbb..a4405a9a4 100644
--- a/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java
@@ -21,6 +21,7 @@ public class StatisticTask {
     @Resource
     private ShopOrderStatisticService shopOrderStatisticService;
 
+//    @Scheduled(cron = "1/6 * * * * ? ")
     @Scheduled(cron = "0 0 9 * * ?")
     public void run() {
         long start = System.currentTimeMillis();
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
index 278a98195..ef79ef2f7 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
@@ -1,6 +1,7 @@
 package com.czg.order.entity;
 
 import com.alibaba.fastjson2.annotation.JSONField;
+import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
@@ -136,6 +137,7 @@ public class ShopOrderStatistic implements Serializable {
     /**
      * 新增会员数
      */
+    @Column(ignore = true)
     private Long newMemberCount = 0L;
     /**
      * 店铺id
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
index 2753dc769..ada652695 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
@@ -60,8 +60,8 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
 
         // 统计充值记录
         Map<Long, BigDecimal> flowMap = shopUserFlowService.list(new QueryWrapper()
-                        .ge(ShopUserFlow::getCreateTime, startOfDay)
-                        .le(ShopUserFlow::getCreateTime, endOfDay)
+                        .ge(ShopUserFlow::getCreateTime, startOfDay.toLocalDateTime())
+                        .le(ShopUserFlow::getCreateTime, endOfDay.toLocalDateTime())
                         .in(ShopUserFlow::getBizCode, CollUtil.newArrayList("cashIn", "wechatIn", "alipayIn", "awardIn"))).stream()
                 .collect(Collectors.groupingBy(
                         ShopUserFlow::getShopId,
@@ -138,13 +138,17 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
 //            充值金额
 //            statistic.setRechargeAmount(BigDecimal.ZERO);
             //客单价
-            statistic.setCustomerUnitPrice(totalAmount.divide(totalCount, 2, RoundingMode.DOWN));
+            if (totalAmount.compareTo(BigDecimal.ZERO) != 0) {
+                statistic.setCustomerUnitPrice(totalAmount.divide(totalCount, 2, RoundingMode.DOWN));
+            }
 
             // 查询台桌数量
             long count = shopTableService.count(new QueryWrapper().eq(ShopTable::getShopId, shopId));
 
             //翻台率
-            statistic.setTableTurnoverRate(totalCount.subtract(BigDecimal.valueOf(count)).divide(BigDecimal.valueOf(count), 2, RoundingMode.DOWN).multiply(BigDecimal.valueOf(100)));
+            if (count > 0) {
+                statistic.setTableTurnoverRate(totalCount.subtract(BigDecimal.valueOf(count)).divide(BigDecimal.valueOf(count), 2, RoundingMode.DOWN).multiply(BigDecimal.valueOf(100)));
+            }
             statistic.setUpdateTime(LocalDateTime.now());
             BeanUtil.copyProperties(info, statistic);
             saveOrUpdate(statistic);

From 7b70803999b94742d63f81099b1ba098aff9ee2d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 18 Mar 2025 09:54:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E8=B0=83=20=E8=B5=A0=E9=80=81?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=20=E7=8A=B6=E6=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/service/order/service/impl/OrderInfoServiceImpl.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 24f458a8d..f4cb26368 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -714,7 +714,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         couponService.use(coupons, shopUser.getId(), orderInfo.getId());
                     }
                 }
-                if (!payType.equals(PayEnums.VIP_PAY)) {
+                if ((orderInfo.getPayType() != null && orderInfo.getPayType().equals(PayEnums.VIP_PAY.getValue()))
+                        || (payType != null && !payType.equals(PayEnums.VIP_PAY))) {
                     //下单赠送积分
                     pointsService.consumeAwardPoints(shopUser.getId(), orderInfo);
                 }