From d76ccdfbb070af919f981c1e5d6557fabb2cfb96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Thu, 10 Apr 2025 09:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=97=E6=9D=90=E8=AE=B0=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/product/dto/ConsStockFlowDTO.java |  3 ++-
 .../product/mapper/ConsStockFlowMapper.java   |  3 +++
 .../impl/ConsStockFlowServiceImpl.java        | 19 +++++--------------
 .../resources/mapper/ConsStockFlowMapper.xml  | 15 +++++++++++++++
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ConsStockFlowDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ConsStockFlowDTO.java
index c0b0cedf..80bf8892 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ConsStockFlowDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ConsStockFlowDTO.java
@@ -97,6 +97,7 @@ public class ConsStockFlowDTO implements Serializable {
      * 商品id
      */
     private Long productId;
+    private String productName;
     /**
      * sku id
      */
@@ -127,4 +128,4 @@ public class ConsStockFlowDTO implements Serializable {
      */
     private String remark;
 
-}
\ No newline at end of file
+}
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ConsStockFlowMapper.java b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ConsStockFlowMapper.java
index 5ea8a4d1..787d2c66 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ConsStockFlowMapper.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ConsStockFlowMapper.java
@@ -1,5 +1,6 @@
 package com.czg.service.product.mapper;
 
+import com.czg.product.dto.ConsStockFlowDTO;
 import com.czg.product.entity.ConsStockFlow;
 import com.czg.product.param.ConsInfoParam;
 import com.czg.product.vo.ConsStatisticsVo;
@@ -24,4 +25,6 @@ public interface ConsStockFlowMapper extends BaseMapper<ConsStockFlow> {
     List<ShopVendorBillRecordVO> selectByVendorId(@Param("shopId") Long shopId, @Param("vendorId") Integer vendorId, @Param("key") String key);
 
     List<ConsStockFlow> selectUnPaid(@Param("shopId") Long shopId, @Param("vendorIds") @NotEmpty List<Long> vendorIds);
+
+    List<ConsStockFlowDTO> findConsStockFlowPage(@Param("shopId") Long shopId, @Param("inOutType") String inOutType, @Param("inOutItem") String inOutItem, @Param("conId") Long conId);
 }
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 7d18798e..935a9d17 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
@@ -26,6 +26,8 @@ import com.czg.service.product.mapper.ConsStockFlowMapper;
 import com.czg.service.product.mapper.ProductMapper;
 import com.czg.service.product.util.WxAccountUtil;
 import com.czg.utils.PageUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
@@ -217,19 +219,8 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
     @Override
     public Page<ConsStockFlowDTO> findConsStockFlowPage(ConsStockFlowParam param) {
         Long shopId = StpKit.USER.getShopId(0L);
-        QueryWrapper queryWrapper = QueryWrapper.create();
-        queryWrapper.eq(ConsStockFlow::getShopId, shopId);
-        if (StrUtil.isNotBlank(param.getInOutType())) {
-            queryWrapper.eq(ConsStockFlow::getInOutType, param.getInOutType());
-        }
-        if (StrUtil.isNotBlank(param.getInOutItem())) {
-            queryWrapper.eq(ConsStockFlow::getInOutItem, param.getInOutItem());
-        }
-        if (ObjUtil.isNotNull(param.getConId())) {
-            queryWrapper.eq(ConsStockFlow::getConId, param.getConId());
-        }
-        queryWrapper.orderBy(ConsStockFlow::getId, false);
-        return pageAs(PageUtil.buildPage(), queryWrapper, ConsStockFlowDTO.class);
+        PageHelper.startPage(PageUtil.buildPageHelp());
+        return PageUtil.convert(new PageInfo<>(mapper.findConsStockFlowPage(shopId, param.getInOutType(), param.getInOutItem(), param.getConId())));
     }
 
     @Override
@@ -264,4 +255,4 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml b/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
index 86dd3ea6..bee545ca 100644
--- a/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ConsStockFlowMapper.xml
@@ -60,4 +60,19 @@
             #{id}
         </foreach>
     </select>
+    <select id="findConsStockFlowPage" resultType="com.czg.product.dto.ConsStockFlowDTO">
+        select a.*, b.name as productName from tb_cons_stock_flow as a
+        left join tb_product as b on a.product_id = b.id
+                 where a.shop_id=#{shopId}
+        <if test="inOutType != null and inOutType != ''">
+            and a.in_out_type = #{inOutType}
+        </if>
+        <if test="inOutItem != null and inOutItem != ''">
+            and a.in_out_item = #{inOutItem}
+        </if>
+        <if test="conId != null">
+            and a.con_id = #{conId}
+        </if>
+        order by a.id desc
+    </select>
 </mapper>