From da752bb02d671bd24def19addc6aeb3264a8b0ef Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Tue, 11 Mar 2025 16:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ShopOrderStatisticMapper.java      |  5 ++-
 .../impl/ShopOrderStatisticServiceImpl.java   | 11 +++---
 .../mapper/ShopOrderStatisticMapper.xml       | 35 +++++++++++++++++++
 .../impl/ConsStockFlowServiceImpl.java        |  4 +--
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
index 9ea52681..8b13ae02 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
@@ -1,7 +1,8 @@
 package com.czg.service.order.mapper;
 
-import com.mybatisflex.core.BaseMapper;
 import com.czg.order.entity.ShopOrderStatistic;
+import com.czg.order.param.DataSummaryTradeParam;
+import com.mybatisflex.core.BaseMapper;
 
 /**
  *  映射层。
@@ -11,4 +12,6 @@ import com.czg.order.entity.ShopOrderStatistic;
  */
 public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic> {
 
+    ShopOrderStatistic getTradeData(DataSummaryTradeParam param);
+
 }
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 9d5b0360..d4eb2303 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
@@ -4,15 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.czg.order.entity.OrderInfo;
-import com.czg.order.service.OrderInfoService;
-import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.order.entity.ShopOrderStatistic;
+import com.czg.order.service.OrderInfoService;
 import com.czg.order.service.ShopOrderStatisticService;
 import com.czg.service.order.mapper.ShopOrderStatisticMapper;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 
@@ -90,7 +92,8 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
                 if (statistic == null) {
                     statistic = new ShopOrderStatistic();
                     statistic.setShopId(shopId);
-                    statistic.setCreateDay(DateUtil.date().toSqlDate());
+                    statistic.setCreateDay(LocalDate.now());
+                    statistic.setUpdateTime(LocalDateTime.now());
                 }
                 BeanUtil.copyProperties(info, statistic);
                 saveOrUpdate(statistic);
diff --git a/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml b/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
index d4bd4fa2..1834ac6a 100644
--- a/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
+++ b/cash-service/order-service/src/main/resources/mapper/ShopOrderStatisticMapper.xml
@@ -4,4 +4,39 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.czg.service.order.mapper.ShopOrderStatisticMapper">
 
+    <select id="getTradeData" resultType="com.czg.order.entity.ShopOrderStatistic">
+        select
+        sum(sale_amount) as sale_amount,
+        count(sale_count) as sale_count,
+        sum(discount_amount) as discount_amount,
+        count(discount_count) as discount_count,
+        sum(refund_amount) as refund_amount,
+        count(refund_count) as refund_count,
+        count(wechat_pay_count) as wechat_pay_count,
+        sum(wechat_pay_amount) as wechat_pay_amount,
+        count(ali_pay_count) as ali_pay_count,
+        sum(ali_pay_amount) as ali_pay_amount,
+        count(credit_pay_count) as credit_pay_count,
+        sum(credit_pay_amount) as credit_pay_amount,
+        count(member_pay_count) as member_pay_count,
+        sum(member_pay_amount) as member_pay_amount,
+        count(scan_pay_count) as scan_pay_count,
+        sum(scan_pay_amount) as scan_pay_amount,
+        count(cash_pay_count) as cash_pay_count,
+        sum(cash_pay_amount) as cash_pay_amount,
+        sum(recharge_amount) as recharge_amount,
+        avg(customer_unit_price) as customer_unit_price,
+        avg(table_turnover_rate) as table_turnover_rate
+        from tb_shop_order_statistic
+        where shop_id = #{shopId}
+        <if test="beginTime != null">
+            and create_day >= str_to_date(#{beginTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null">
+            <![CDATA[
+            and create_day <= str_to_date(#{endTime}, '%Y-%m-%d')
+            ]]>
+        </if>
+        group by shop_id
+    </select>
 </mapper>
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
index a9134429..7013234b 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
@@ -161,13 +161,13 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
     @Override
     public Page<ConsCheckStockRecordVo> getCheckStockRecordPage(Long conId) {
         Long shopId = StpKit.USER.getShopId(0L);
-        return super.pageAs(PageUtil.buildPage(), query().eq(ConsStockFlow::getShopId, shopId).eq(ConsStockFlow::getConId, conId).orderBy(ConsStockFlow::getId, true), ConsCheckStockRecordVo.class);
+        return super.pageAs(PageUtil.buildPage(), query().eq(ConsStockFlow::getShopId, shopId).eq(ConsStockFlow::getConId, conId).orderBy(ConsStockFlow::getId, false), ConsCheckStockRecordVo.class);
     }
 
     @Override
     public List<ConsCheckStockRecordVo> getCheckStockRecordList(Long conId) {
         Long shopId = StpKit.USER.getShopId(0L);
-        return super.mapper.selectListByQueryAs(query().eq(ConsStockFlow::getShopId, shopId).eq(ConsStockFlow::getConId, conId).orderBy(ConsStockFlow::getId, true), ConsCheckStockRecordVo.class);
+        return super.mapper.selectListByQueryAs(query().eq(ConsStockFlow::getShopId, shopId).eq(ConsStockFlow::getConId, conId).orderBy(ConsStockFlow::getId, false), ConsCheckStockRecordVo.class);
     }
 
     @Override