商品模块bug修复

cash-api/order-server/src/main/java/com/czg/controller/admin/DataSummaryController.java

@@ -1,13 +1,13 @@
 package com.czg.controller.admin;
 
 import com.czg.log.annotation.OperationLog;
+import com.czg.order.entity.ShopOrderStatistic;
 import com.czg.order.param.DataSummaryProductSaleParam;
 import com.czg.order.param.DataSummaryTradeParam;
 import com.czg.order.service.DataSummaryService;
 import com.czg.order.vo.DataSummaryDateAmountVo;
 import com.czg.order.vo.DataSummaryPayTypeVo;
 import com.czg.order.vo.DataSummaryProductSaleVo;
-import com.czg.order.vo.DataSummaryTradeVo;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import lombok.AllArgsConstructor;
@@ -35,10 +35,10 @@ public class DataSummaryController {
     @GetMapping("trade")
     @OperationLog("营业板块-上半部分")
     //@SaAdminCheckPermission("dataSummary:trade")
-    public CzgResult<DataSummaryTradeVo> getTradeData(DataSummaryTradeParam param) {
+    public CzgResult<ShopOrderStatistic> getTradeData(DataSummaryTradeParam param) {
         Long shopId = StpKit.USER.getShopId(0L);
         param.setShopId(shopId);
-        DataSummaryTradeVo data = dataSummaryService.getTradeData(param);
+        ShopOrderStatistic data = dataSummaryService.getTradeData(param);
         return CzgResult.success(data);
     }
 

cash-common/cash-common-service/src/main/java/com/czg/order/service/DataSummaryService.java

@@ -1,11 +1,11 @@
 package com.czg.order.service;
 
+import com.czg.order.entity.ShopOrderStatistic;
 import com.czg.order.param.DataSummaryProductSaleParam;
 import com.czg.order.param.DataSummaryTradeParam;
 import com.czg.order.vo.DataSummaryDateAmountVo;
 import com.czg.order.vo.DataSummaryPayTypeVo;
 import com.czg.order.vo.DataSummaryProductSaleVo;
-import com.czg.order.vo.DataSummaryTradeVo;
 
 /**
  * 数据统计Service接口
@@ -15,7 +15,7 @@ import com.czg.order.vo.DataSummaryTradeVo;
  */
 public interface DataSummaryService {
 
-    DataSummaryTradeVo getTradeData(DataSummaryTradeParam param);
+    ShopOrderStatistic getTradeData(DataSummaryTradeParam param);
 
     DataSummaryProductSaleVo getProductSaleData(DataSummaryProductSaleParam param);
 

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DataSummaryServiceImpl.java

@@ -1,24 +1,35 @@
 package com.czg.service.order.service.impl;
 
+import com.czg.order.entity.ShopOrderStatistic;
 import com.czg.order.param.DataSummaryProductSaleParam;
 import com.czg.order.param.DataSummaryTradeParam;
 import com.czg.order.service.DataSummaryService;
 import com.czg.order.vo.DataSummaryDateAmountVo;
 import com.czg.order.vo.DataSummaryPayTypeVo;
 import com.czg.order.vo.DataSummaryProductSaleVo;
-import com.czg.order.vo.DataSummaryTradeVo;
+import com.czg.service.order.mapper.ShopOrderStatisticMapper;
+import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 
 /**
  * 数据统计Service实现类
+ *
  * @author tankaikai
  * @since 2025-03-07 15:32
  */
 @Service
 public class DataSummaryServiceImpl implements DataSummaryService {
+
+    @Resource
+    private ShopOrderStatisticMapper shopOrderStatisticMapper;
+
     @Override
-    public DataSummaryTradeVo getTradeData(DataSummaryTradeParam param) {
+    public ShopOrderStatistic getTradeData(DataSummaryTradeParam param) {
-        return new DataSummaryTradeVo();
+        ShopOrderStatistic shopOrderStatistic = shopOrderStatisticMapper.getTradeData(param);
+        if (shopOrderStatistic == null) {
+            shopOrderStatistic = new ShopOrderStatistic();
+        }
+        return shopOrderStatistic;
     }
 
     @Override