修复错误

src/main/java/cn/chjyj/szwh/controller/BaseController.java

@@ -55,9 +55,9 @@ public abstract class BaseController {
         }
 
         //商品名称
-        String goodsName=request.getParameter("goods_ame");
+        String goodsName=request.getParameter("goods_name");
         if(StringUtils.isNotBlank(goodsName)){
-            rqmap.put("goods_ame",goodsName);
+            rqmap.put("goods_name",goodsName);
         }
         // 订单类型
         String orderType= request.getParameter("order_type");
@@ -71,10 +71,10 @@ public abstract class BaseController {
         }
 
         //创建时间,拆分
-        String createtime=request.getParameter("createtime");
-        if(StringUtils.isNotBlank(createtime)){
-            rqmap.put("createtime",createtime);
-        }
+//        String createtime=request.getParameter("createtime");
+//        if(StringUtils.isNotBlank(createtime)){
+//            rqmap.put("createtime",createtime);
+//        }
 
         //
         String goodsIsli = request.getParameter("goods_isli");

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

@@ -7,6 +7,7 @@ import cn.chjyj.szwh.controller.BaseController;
 import cn.chjyj.szwh.service.OrderGoodsDetailService;
 import cn.chjyj.szwh.service.OrderService;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,12 +57,15 @@ public class AdminOrderController extends BaseController {
     @PostMapping("/list")
     public JSONObject solist(HttpServletRequest request){
         Map odmap = orderMap(request);
+        if(odmap.size()==0){
+            odmap.put("1",1);
+        }
         String spage=request.getParameter("page");
         //
-        int page= Integer.valueOf(spage);
+        int page= StringUtils.isNotBlank(spage)?Integer.valueOf(spage):1;
 
         String slimit=request.getParameter("limit");
-        int limit = Integer.valueOf(slimit);
+        int limit = StringUtils.isNotBlank(slimit)?Integer.valueOf(slimit):10;
 
         Map map = orderService.getOrderList(odmap,page,limit);
 

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

@@ -57,6 +57,8 @@ public class OrderServiceImpl implements OrderService {
         SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map retmap =new HashMap();
         int starrs = page>1?(page-1)*limit:0;
+
+        qumap.put("startrs",starrs);
         List<Order> orderList=orderMapper.getOrderList(qumap,starrs,limit);
 
         // 存放结果list

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

@@ -37,7 +37,8 @@
 
     <!--订单号-->
     <select id="getOrderByBatchcode" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.Order">
-        select<include refid="column"/>
+        select
+        <include refid="column"/>
         from
         <include refid="tbName"/>
         where batchcode=#{batchcode} limit 1;
@@ -45,7 +46,9 @@
 
     <!-- 统计订单总数 -->
     <select id="countAllOrder" resultType="java.lang.Integer">
-        select count(*) from <include refid="tbName"/> ;
+        select count(*) from
+        <include refid="tbName"/>
+        ;
     </select>
 
     <!--订单条件查询-->
@@ -55,32 +58,43 @@
         from
         <include refid="tbName"/>
         <where>
-            <!-- 查询条件封装在map中，以k-v形式进行查询-->
-            <foreach collection="map" item="v" index="k" separator="and">
-                <if test="v != null and v != '' and k!='id'">
-                    ${k} = #{v}
-                </if>
-                <if test="k=='id'">
-                    ${k}>#{v}
-                </if>
-            </foreach>
+            <if test="map!=null">
+                <!-- 查询条件封装在map中，以k-v形式进行查询-->
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != '' and k!='id'">
+                        ${k} = #{v}
+                    </if>
+                    <if test="k=='id'">
+                        ${k}>#{v}
+                    </if>
+                </foreach>
+            </if>
+            <if test="map==null">
+                id>#{start}
+            </if>
         </where>
         limit #{pageSize}
     </select>
 
     <!-- 根据不同状态代码统计 -->
     <select id="countOrderByStatus" resultType="java.lang.Integer" parameterType="java.lang.Integer">
-        select count(*) from <include refid="tbName"/> where `status`=#{status}
+        select count(*) from
+        <include refid="tbName"/>
+        where `status`=#{status}
     </select>
 
     <!--统计某个时间段订单数量-->
     <select id="countOrderTimeSection" resultType="java.lang.Integer">
-        select count(*) from <include refid="tbName"/> where #{key} between #{startTime} and #{endTime}
+        select count(*) from
+        <include refid="tbName"/>
+        where #{key} between #{startTime} and #{endTime}
     </select>
 
     <!-- 条件订单总额 -->
     <select id="sumOrderByMap" parameterType="java.util.Map" resultType="java.lang.Double">
-        select sum(#{cmap.field}) from <include refid="tbName"/> where #{cmap.wherestr};
+        select sum(#{cmap.field}) from
+        <include refid="tbName"/>
+        where #{cmap.wherestr};
     </select>
 
     <!--新增用户-->
@@ -104,7 +118,8 @@
 
     <!--更新-->
     <update id="updateOrderStatus">
-        update <include refid="tbName"/>
+        update
+        <include refid="tbName"/>
         <set>
             <foreach collection="map" item="v" index="k" separator="and">
                 <if test="v != null and v != ''">
@@ -117,6 +132,8 @@
 
     <!-- 订单关闭    -->
     <update id="shutOrder" parameterType="java.lang.String">
-        update <include refid="tbName"/> set `status`=5,shuttime=#{shuttime} where batchcode=#{batchcode}
+        update
+        <include refid="tbName"/>
+        set `status`=5,shuttime=#{shuttime} where batchcode=#{batchcode}
     </update>
 </mapper>

src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java

@@ -36,8 +36,8 @@ public class OrderMapperTest {
     public void getOrderList() {
         // 查询条件
         Map<String,Object> wcon=new HashMap<>();
-        wcon.put("buy_islicode","999998-000000001923-9");
-        wcon.put("status",5);
+        //wcon.put("buy_islicode","999998-000000001923-9");
+        //wcon.put("status",5);
 
         int starrs=0;
         int pagesize=10;

src/test/java/cn/chjyj/szwh/service/OrderServiceTest.java

@@ -0,0 +1,58 @@
+package cn.chjyj.szwh.service;
+
+import cn.chjyj.szwh.bean.Order;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.*;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class OrderServiceTest {
+    @Autowired
+    private OrderService orderService;
+
+    @Test
+    public void getAllOrderList() {
+    }
+
+    @Test
+    public void getOrderList() {
+        Map mp = new HashMap<>();
+        int page =1;
+        int limit =10;
+        Map<String,String> orderList = orderService.getOrderList(mp,page,limit);
+        System.out.println(orderList);
+    }
+
+    @Test
+    public void getOrderById() {
+    }
+
+    @Test
+    public void getOrderByBatchcode() {
+    }
+
+    @Test
+    public void orderInfo() {
+    }
+
+    @Test
+    public void updateOrderStatus() {
+    }
+
+    @Test
+    public void shutOrder() {
+    }
+
+    @Test
+    public void countAllOrder() {
+    }
+}