From 95af5b0f0ae188e2bdd3e27344b9cd752df13b53 Mon Sep 17 00:00:00 2001
From: xyiege <xc@xyiege.com>
Date: Fri, 15 Jul 2022 15:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../szwh/controller/admin/AdminOrderController.java    | 10 +++++++---
 src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java    |  6 ++++++
 src/main/resources/mapper/szwh/OrderMapper.xml         |  5 +++++
 .../java/cn/chjyj/szwh/mapper/OrderMapperTest.java     |  6 ++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
index b5dc247..7ce39c5 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java
@@ -2,6 +2,7 @@ package cn.chjyj.szwh.controller.admin;
 
 import cn.chjyj.szwh.bean.Order;
 import cn.chjyj.szwh.bean.OrderGoodsDetail;
+import cn.chjyj.szwh.constant.ChConstant;
 import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.OrderGoodsDetailService;
 import cn.chjyj.szwh.service.OrderService;
@@ -27,9 +28,12 @@ public class AdminOrderController extends BaseController {
     private OrderGoodsDetailService orderGoodsDetailService;
 
     @PostMapping("/list")
-    public JSONObject olist(@RequestParam(value = "page",defaultValue = "1") String spage){
+    public JSONObject olist(@RequestParam(value = "current_page",defaultValue = "1") String spage){
         int ipage = Integer.valueOf(spage);
         List<Order> orderList=orderService.getAllOrderList(ipage);
+        jsonObject.put("current_page",spage);
+        jsonObject.put("per_page", ChConstant.PAGESIZE);
+        jsonObject.put("total",0);
         jsonObject.put("code",200);
         jsonObject.put("data",orderList);
         jsonObject.put("msg","成功");
@@ -57,7 +61,7 @@ public class AdminOrderController extends BaseController {
                             @RequestParam(value = "buy_name",defaultValue = "") String buyName,
                             @RequestParam(value = "goods_ame",defaultValue = "") String goodsName,
                             @RequestParam(value = "order_type",defaultValue = "") String orderType,
-                            @RequestParam("transaction_status") String transactionStatus,
+                            @RequestParam(value = "transaction_status",defaultValue = "0") String transactionStatus,
                             @RequestParam(value = "createtime",defaultValue = "") String createtime,
                             @RequestParam(value = "goods_isli",defaultValue = "")String goodsIsli,
                             @RequestParam(value = "charges_type",defaultValue = "") String chargesType,
@@ -69,7 +73,7 @@ public class AdminOrderController extends BaseController {
         qmap.put("entrust_name",entrustName);
         qmap.put("goods_name",goodsName);
         qmap.put("order_type",orderType);
-        qmap.put("transaction_status",transactionStatus);
+//        qmap.put("transaction_status",transactionStatus);
         qmap.put("createtime",createtime);
         qmap.put("godos_isli",goodsIsli);
         qmap.put("charges_type",chargesType);
diff --git a/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java b/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java
index cada867..b005e8d 100644
--- a/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java
+++ b/src/main/java/cn/chjyj/szwh/mapper/OrderMapper.java
@@ -84,4 +84,10 @@ public interface OrderMapper {
      * @return
      */
     BigDecimal sumOrderByMap(@Param("cmap") Map cmap);
+
+    /**
+     * 统计所有的订单数量
+     * @return
+     */
+    int countAllOrder();
 }
diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml
index 2764440..b9a9c48 100644
--- a/src/main/resources/mapper/szwh/OrderMapper.xml
+++ b/src/main/resources/mapper/szwh/OrderMapper.xml
@@ -43,6 +43,11 @@
         where batchcode=#{batchcode} limit 1;
     </select>
 
+    <!-- 统计订单总数 -->
+    <select id="countAllOrder" resultType="java.lang.Integer">
+        select count(*) from <include refid="tbName"/> ;
+    </select>
+
     <!--订单条件查询-->
     <select id="getOrderList" parameterType="java.util.Map" resultType="cn.chjyj.szwh.bean.Order">
         select
diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java
index 046eba9..e722743 100644
--- a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java
+++ b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java
@@ -111,4 +111,10 @@ public class OrderMapperTest {
         BigDecimal bd= orderMapper.sumOrderByMap(xmap);
         System.out.println(bd);
     }
+
+    @Test
+    public void countAllOrder(){
+        int total = orderMapper.countAllOrder();
+        System.out.println(total);
+    }
 }
\ No newline at end of file