修复订单相关错误

src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +26,16 @@ public class AdminOrderController extends BaseController {
     @Autowired
     private OrderGoodsDetailService orderGoodsDetailService;
 
+    @PostMapping("/list")
+    public JSONObject olist(@RequestParam(value = "page",defaultValue = "1") String spage){
+        int ipage = Integer.valueOf(spage);
+        List<Order> orderList=orderService.getAllOrderList(ipage);
+        jsonObject.put("code",200);
+        jsonObject.put("data",orderList);
+        jsonObject.put("msg","成功");
+        return jsonObject;
+    }
+
     /**
      * 订单列列表
      * @param batchacode
@@ -40,18 +51,19 @@ public class AdminOrderController extends BaseController {
      * @param slimit
      * @return
      */
-    @PostMapping("/list")
+    @PostMapping("/so")
-    public JSONObject olist(String batchacode,
+    public JSONObject solist(@RequestParam(value = "batchcode",defaultValue = "") String batchacode,
-                            @RequestParam("entrust_name") String entrustName,
+                            @RequestParam(value = "entrust_name",defaultValue = "") String entrustName,
-                            @RequestParam("buy_name") String buyName,
+                            @RequestParam(value = "buy_name",defaultValue = "") String buyName,
-                            @RequestParam("goods_ame") String goodsName,
+                            @RequestParam(value = "goods_ame",defaultValue = "") String goodsName,
-                            @RequestParam("order_type") String orderType,
+                            @RequestParam(value = "order_type",defaultValue = "") String orderType,
                             @RequestParam("transaction_status") String transactionStatus,
-                            @RequestParam("createtime") String createtime,
+                            @RequestParam(value = "createtime",defaultValue = "") String createtime,
-                            @RequestParam("goods_isli")String goodsIsli,
+                            @RequestParam(value = "goods_isli",defaultValue = "")String goodsIsli,
-                            @RequestParam("charges_type") String chargesType,
+                            @RequestParam(value = "charges_type",defaultValue = "") String chargesType,
                             @RequestParam(value = "page",defaultValue = "1") String spage,
                             @RequestParam(value = "limit",defaultValue = "20") String slimit){
+
         Map<String,Object> qmap=new HashMap<>();
         qmap.put("batchcode",batchacode);
         qmap.put("entrust_name",entrustName);
@@ -65,7 +77,13 @@ public class AdminOrderController extends BaseController {
         //
         int page= Integer.valueOf(spage);
         int limit = Integer.valueOf(slimit);
-        List<Order> orderList =orderService.getOrderList(qmap,page,limit);
+        List<Order> orderList = new ArrayList<>();
+        // 如果条件为空
+        if(qmap.isEmpty()){
+            orderList=orderService.getAllOrderList(page);
+        }else {
+            orderList=orderService.getOrderList(qmap, page, limit);
+        }
         jsonObject.put("code",200);
         jsonObject.put("msg","操作成功");
         jsonObject.put("data",orderList);

src/main/java/cn/chjyj/szwh/service/OrderService.java

@@ -12,11 +12,10 @@ import java.util.Map;
 public interface OrderService {
     /**
      * 分页查询订单
-     * @param startrs
+     * @param page
-     * @param pageSize
      * @return
      */
-    List<Order> getAllOrderList(@Param("startRs") int startrs, @Param("pageSize") int pageSize);
+    List<Order> getAllOrderList(int page);
     /**
      * 根据条件查询订单列表
      * @param qumap

src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.chjyj.szwh.service.impl;
 
 import cn.chjyj.szwh.bean.Order;
+import cn.chjyj.szwh.constant.ChConstant;
 import cn.chjyj.szwh.mapper.OrderMapper;
 import cn.chjyj.szwh.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +21,9 @@ public class OrderServiceImpl implements OrderService {
     private OrderMapper orderMapper;
 
     @Override
-    public List<Order> getAllOrderList(int startrs, int pageSize) {
+    public List<Order> getAllOrderList(int page) {
+        int startrs = page>0?(page-1)* ChConstant.PAGESIZE:0;
+        int pageSize =ChConstant.PAGESIZE;
         return orderMapper.getAllOrderList(startrs,pageSize);
     }
 

src/main/resources/mapper/szwh/OrderMapper.xml

@@ -17,13 +17,13 @@
 
     <!--查询记录列表-->
     <select id="getAllOrderList" parameterType="java.lang.Integer" resultType="cn.chjyj.szwh.bean.Order">
-        WITH mm as (
+        select * from (
         select
         <include refid="column"/>
         from
         <include refid="tbName"/>
         where id>#{startRs} limit #{pageSize}
-        )SELECT * FROM mm ORDER BY id DESC;
+        ) as mm ORDER BY mm.id DESC;
     </select>
 
     <!--id查询-->