From a5805426672ef5b28f1d829232527a55792d7250 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 二月 2024 10:40:39 +0800
Subject: [PATCH] 2024-02-02 朱宝民 优化交易汇总视图和交易明细视图

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml                         |    6 +++---
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java |    5 +++++
 pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java   |    3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
index 826c8f0..3a9f834 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -271,7 +271,7 @@
       SUM(count) AS totalCount,
       SUM(received) AS totalReceived,
       SUM(gift) AS totalGift
-    FROM v_transactionstatistics2
+    FROM v_trade_summary
     <where>
       <if test = "tradeDate != null and tradeDate !=''">
         AND tradeDate = #{tradeDate}
@@ -287,7 +287,7 @@
   <select id="getToAuditRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
     SELECT
     COUNT(*) AS recordCount
-    FROM v_transactionstatistics2
+    FROM v_trade_summary
     <where>
       <if test = "cashierId != null and cashierId > 0">
         AND cashierId = ${cashierId}
@@ -301,7 +301,7 @@
 
   <!--璐㈠姟瀵硅处瀹℃牳椤碉紝鏀堕摱鍛�+鏃ユ湡+绫诲瀷鍒嗙粍锛屾帓闄や氦鏄撶被鍨嬪垎缁�-->
   <select id="getToAudit" resultType="com.dy.pipIrrGlobal.voSe.VoTransactionStatistics">
-    SELECT * FROM v_transactionstatistics2
+    SELECT * FROM v_trade_summary
     <where>
       <if test = "cashierId != null and cashierId > 0">
         AND cashierId = ${cashierId}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
index 8007fda..b50c13e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
@@ -166,6 +166,11 @@
         return BaseResponseUtils.buildSuccess() ;
     }
 
+    /**
+     * 鑾峰緱寰呭鏍镐氦鏄撴眹鎬昏褰�
+     * @param vo
+     * @return
+     */
     @Operation(summary = "鑾峰緱寰呭鏍镐氦鏄撴眹鎬昏褰�", description = "杩斿洖寰呭鏍镐氦鏄撴眹鎬昏褰�")
     @ApiResponses(value = {
             @ApiResponse(
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
index e074e82..21a1123 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
@@ -198,14 +198,13 @@
         rsVo.pageSize = queryVo.pageSize ;
         rsVo.pageCurr = queryVo.pageCurr ;
 
-
         rsVo.calculateAndSet(itemTotal, params);
-        //rsVo.obj = seGeneralMapper.getTradeDetails(params);
         List<VoTradeDetails> list = Optional.ofNullable(seGeneralMapper.getTradeDetails(params)).orElse(new ArrayList<>());
         if(list.size() == 0) {
             return new HashMap();
         }
 
+        // 閬嶅巻浜ゆ槗鏄庣粏璁板綍锛屾眹鎬讳氦鏄撻噾棰�
         Double totalTradeAmount = 0.0;
         JSONArray array= JSONArray.parseArray(JSON.toJSONString(list));
         for(int i = 0; i < array.size(); i++) {

--
Gitblit v1.8.0