From e73ae7154fd4ac8489c83b1499e421b7dc04e3fe Mon Sep 17 00:00:00 2001 From: xyiege Date: Sun, 17 Jul 2022 20:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chjyj/szwh/controller/BaseController.java | 12 ++-- .../admin/AdminOrderController.java | 8 ++- .../szwh/service/impl/OrderServiceImpl.java | 2 + .../resources/mapper/szwh/OrderMapper.xml | 49 +++++++++++----- .../cn/chjyj/szwh/mapper/OrderMapperTest.java | 4 +- .../chjyj/szwh/service/OrderServiceTest.java | 58 +++++++++++++++++++ 6 files changed, 107 insertions(+), 26 deletions(-) create mode 100644 src/test/java/cn/chjyj/szwh/service/OrderServiceTest.java diff --git a/src/main/java/cn/chjyj/szwh/controller/BaseController.java b/src/main/java/cn/chjyj/szwh/controller/BaseController.java index 98cb90f..e95cfd0 100644 --- a/src/main/java/cn/chjyj/szwh/controller/BaseController.java +++ b/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"); 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 84ec220..507f8ff 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminOrderController.java +++ b/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); diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java index e546f9c..631a668 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/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 orderList=orderMapper.getOrderList(qumap,starrs,limit); // 存放结果list diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml index 29b6f09..ff5a573 100644 --- a/src/main/resources/mapper/szwh/OrderMapper.xml +++ b/src/main/resources/mapper/szwh/OrderMapper.xml @@ -37,7 +37,8 @@ - select count(*) from ; + select count(*) from + + ; @@ -55,32 +58,43 @@ from - - - - ${k} = #{v} - - - ${k}>#{v} - - + + + + + ${k} = #{v} + + + ${k}>#{v} + + + + + id>#{start} + limit #{pageSize} @@ -104,7 +118,8 @@ - update + update + @@ -117,6 +132,8 @@ - update set `status`=5,shuttime=#{shuttime} where batchcode=#{batchcode} + update + + set `status`=5,shuttime=#{shuttime} where batchcode=#{batchcode} \ No newline at end of file diff --git a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java index e722743..10900b0 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java +++ b/src/test/java/cn/chjyj/szwh/mapper/OrderMapperTest.java @@ -36,8 +36,8 @@ public class OrderMapperTest { public void getOrderList() { // 查询条件 Map 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; diff --git a/src/test/java/cn/chjyj/szwh/service/OrderServiceTest.java b/src/test/java/cn/chjyj/szwh/service/OrderServiceTest.java new file mode 100644 index 0000000..c31b5b2 --- /dev/null +++ b/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 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() { + } +} \ No newline at end of file