From 4d15bb49610bff77f832ff3ca24d4e896e08cd04 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Wed, 12 Mar 2025 16:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/ConsStockFlowController.java    | 12 ++++++++++++
 .../com/czg/order/dto/ShopOrderStatisticDTO.java     | 11 ++++++-----
 .../com/czg/order/entity/ShopOrderStatistic.java     |  2 +-
 .../czg/product/service/ConsStockFlowService.java    |  8 +++++++-
 .../service/impl/ConsStockFlowServiceImpl.java       |  6 ++++++
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
index e2dc9e4b..04623ec5 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
@@ -1,6 +1,7 @@
 package com.czg.controller.admin;
 
 import com.czg.log.annotation.OperationLog;
+import com.czg.product.dto.ConsStockFlowDTO;
 import com.czg.product.param.ConsCheckStockParam;
 import com.czg.product.param.ConsInOutStockHeadParam;
 import com.czg.product.param.ConsReportDamageParam;
@@ -89,4 +90,15 @@ public class ConsStockFlowController {
         consStockFlowService.reportDamage(param);
         return CzgResult.success();
     }
+
+    /**
+     * 耗材库存变动记录
+     */
+    @GetMapping("flow")
+    @OperationLog("耗材库存变动记录")
+    //@SaAdminCheckPermission("consStockFlow:flow")
+    public CzgResult<Page<ConsStockFlowDTO>> stockFlow(@RequestParam Long conId) {
+        Page<ConsStockFlowDTO> data = consStockFlowService.findConsStockFlowPage(conId);
+        return CzgResult.success(data);
+    }
 }
\ No newline at end of file
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java
index 34815c6c..e8450ce9 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/ShopOrderStatisticDTO.java
@@ -1,14 +1,15 @@
 
 package com.czg.order.dto;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.sql.Date;
-import java.io.Serial;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+
 /**
  *  实体类。
  *
@@ -62,7 +63,7 @@ public class ShopOrderStatisticDTO implements Serializable {
     private Long wechatPayCount;
 
     /**
-     * 位置支付金额
+     * 微信支付金额
      */
     private BigDecimal wechatPayAmount;
 
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 cd5bdc13..044d32c4 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
@@ -69,7 +69,7 @@ public class ShopOrderStatistic implements Serializable {
     private Long wechatPayCount = 0L;
 
     /**
-     * 位置支付金额
+     * 微信支付金额
      */
     private BigDecimal wechatPayAmount = BigDecimal.ZERO;
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
index 17793e91..1aa17ec8 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
@@ -1,5 +1,6 @@
 package com.czg.product.service;
 
+import com.czg.product.dto.ConsStockFlowDTO;
 import com.czg.product.entity.ConsStockFlow;
 import com.czg.product.param.ConsCheckStockParam;
 import com.czg.product.param.ConsInOutStockHeadParam;
@@ -62,5 +63,10 @@ public interface ConsStockFlowService extends IService<ConsStockFlow> {
      */
     void reportDamage(ConsReportDamageParam param);
 
-
+    /**
+     * 获取耗材库存变动记录
+     * @param conId 耗材id
+     * @return 分页数据
+     */
+    Page<ConsStockFlowDTO> findConsStockFlowPage(Long conId);
 }
\ No newline at end of file
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 5354c0ba..0ce030d8 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
@@ -202,4 +202,10 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
         consInfoMapper.update(consInfo);
     }
 
+    @Override
+    public Page<ConsStockFlowDTO> findConsStockFlowPage(Long conId) {
+        Long shopId = StpKit.USER.getShopId(0L);
+        return pageAs(PageUtil.buildPage(), query().eq(ConsStockFlow::getShopId, shopId).eq(ConsStockFlow::getConId, conId).orderBy(ConsStockFlow::getId, false), ConsStockFlowDTO.class);
+    }
+
 }
\ No newline at end of file