From b6e186a2f9cced2e32d646e389f382864e611f06 Mon Sep 17 00:00:00 2001
From: xioayue <xc@xyiege.com>
Date: Sun, 24 Jul 2022 00:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=86=E9=A1=B5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/AdminAccountCloseController.java    |  4 +-
 .../cn/chjyj/szwh/mapper/OrderUserMapper.java |  9 ++-
 .../service/impl/AccountCloseServiceImpl.java |  7 +-
 .../resources/mapper/szwh/OrderUserMapper.xml | 71 +++++++++++++------
 .../szwh/mapper/OrderUserMapperTest.java      |  2 +-
 5 files changed, 65 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
index 4532de9..dd22f49 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java
@@ -62,11 +62,11 @@ public class AdminAccountCloseController extends BaseController {
 
         //每页大小
         String limit = request.getParameter("limit");
-        int ilimit = StringUtils.isNotBlank(limit)?20:Integer.valueOf(limit);
+        int ilimit = StringUtils.isBlank(limit)?10:Integer.valueOf(limit);
 
         // 当前页码
         String page = request.getParameter("page");
-        int ipage = StringUtils.isNotBlank(page)?1:Integer.valueOf(page);
+        int ipage = StringUtils.isBlank(page)?1:Integer.valueOf(page);
 
         //执行搜索查询
         Map rmap =accountCloseService.closeList(qmap,ilimit,ipage);
diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java
index fff6f2c..2806a72 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/OrderUserMapper.java
@@ -34,5 +34,12 @@ public interface OrderUserMapper {
      * 订单结算
      * @return
      */
-    List<SettleVo> ordercs(@Param("map") Map map);
+    List<SettleVo> ordercs(@Param("map") Map map,@Param("start") int start,@Param("limit") Integer limit);
+
+    /**
+     * 统计结算结果数量
+     * @param map
+     * @return
+     */
+    int countOrderCs(@Param("map") Map map);
 }
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java
index d2eae06..948dee1 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java
@@ -90,13 +90,16 @@ public class AccountCloseServiceImpl implements AccountCloseService {
         Map retmap =new HashMap();
         int start = page>1?(page-1)*limit:0;
 
-        retmap.put("start",start);
+
+        retmap.put("start",start+1);
         retmap.put("end",page*limit);
         retmap.put("page",page);
         retmap.put("per_page",limit);
         // 按照用户isli 分组
 
-        List<SettleVo> xlist = orderUserMapper.ordercs(qmap);
+        List<SettleVo> xlist = orderUserMapper.ordercs(qmap,start,limit);
+        int total = orderUserMapper.countOrderCs(qmap);
+        retmap.put("total",total);
         retmap.put("data",xlist);
         return retmap;
     }
diff --git a/src/main/resources/mapper/szwh/OrderUserMapper.xml b/src/main/resources/mapper/szwh/OrderUserMapper.xml
index 9bf6d8c..c3c94fd 100644
--- a/src/main/resources/mapper/szwh/OrderUserMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderUserMapper.xml
@@ -29,29 +29,56 @@
 
     <!-- 订单结算 -->
     <select id="ordercs" resultType="cn.chjyj.szwh.vo.SettleVo" parameterType="java.util.Map">
-    SELECT u.islicode as islicode,u.`name`,u.publicAccount,
-    u.bankName,u.userType,o.close_status FROM order_user u
-    INNER JOIN `order` o ON u.batchcode=o.batchcode
-    <where>
-        <if test="map!=null">
-            <foreach collection="map" item="v" index="k" separator="and">
-                <if test="v != null and v != '' and k!='u.name'">
-                    ${k} = #{v}
-                </if>
-                <if test="k=='u.publicAccount'">
-                    u.publicAccount like concat('%',#{v},'%')
-                </if>
-                <if test="k=='u.name'">
-                    u.`name` like concat('%',#{v},'%')
-                </if>
-            </foreach>
+        SELECT u.islicode as islicode,u.`name`,u.publicAccount,
+        u.bankName,u.userType,o.close_status FROM order_user u
+        INNER JOIN `order` o ON u.batchcode=o.batchcode
+        <where>
+            <if test="map!=null">
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != '' and k!='u.name'">
+                        ${k} = #{v}
+                    </if>
+                    <if test="k=='u.publicAccount'">
+                        u.publicAccount like concat('%',#{v},'%')
+                    </if>
+                    <if test="k=='u.name'">
+                        u.`name` like concat('%',#{v},'%')
+                    </if>
+                </foreach>
 
-        </if>
-        <if test="map==null">
-            u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
-        </if>
-    </where>
-    ORDER BY u.id DESC
+            </if>
+            <if test="map==null">
+                u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
+            </if>
+        </where>
+        ORDER BY u.id DESC
+        Limit #{start},#{limit}
+    </select>
+
+    <!-- 统计结算数量 -->
+    <select id="countOrderCs" parameterType="java.util.Map" resultType="java.lang.Integer">
+        SELECT count(*)
+        FROM order_user u
+        INNER JOIN `order` o ON u.batchcode=o.batchcode
+        <where>
+            <if test="map!=null">
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != '' and k!='u.name'">
+                        ${k} = #{v}
+                    </if>
+                    <if test="k=='u.publicAccount'">
+                        u.publicAccount like concat('%',#{v},'%')
+                    </if>
+                    <if test="k=='u.name'">
+                        u.`name` like concat('%',#{v},'%')
+                    </if>
+                </foreach>
+
+            </if>
+            <if test="map==null">
+                u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
+            </if>
+        </where>
     </select>
 
     <!--查询用户-->
diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java
index 5f776a4..183365c 100644
--- a/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java
+++ b/src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java
@@ -41,7 +41,7 @@ public class OrderUserMapperTest {
     public void ordcs(){
         Map query = new HashMap();
         query.put("name","测试");
-        List<SettleVo> xxlist = orderUserMapper.ordercs(query);
+        List<SettleVo> xxlist = orderUserMapper.ordercs(query,0,10);
         for(SettleVo sl:xxlist){
             System.out.println(sl.getBankName());
         }