From 0fdb91b3a553e6408af167552cb7e72f5c9cb7c7 Mon Sep 17 00:00:00 2001 From: xyiege Date: Thu, 21 Jul 2022 01:10:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=A7=8D=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/AdminGoodsController.java | 10 ++++++++++ .../chjyj/szwh/service/impl/GoodsServiceImpl.java | 14 ++++++++++---- .../chjyj/szwh/service/impl/OrderServiceImpl.java | 4 ++++ src/main/resources/mapper/szwh/OrderMapper.xml | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java index ece835d..f0dbda5 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java @@ -103,6 +103,16 @@ public class AdminGoodsController extends BaseController { // qmap.put("transaction",transaction); qmap.put("gd.goods_entrust",transaction); } + // 是否展示 + String show = request.getString("show"); + if(StringUtils.isNotBlank(show)){ + qmap.put("g.is_recommend",show); + } + //排序方式 + String orderStatus=request.getString("order_status"); + if(StringUtils.isNotBlank(orderStatus)){ + qmap.put("orderway",orderStatus); + } // 查询返回的结果 Map retmap = goodsService.getGoodsByMap(qmap,ipage,ilimit); diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java index 0b18b54..5b08371 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java @@ -146,16 +146,22 @@ public class GoodsServiceImpl implements GoodsService { int start = page>1?(page-1)*limit:0; int end =page*limit; + //排序方式 + String ordway = (String) gmap.get("orderway"); + String orderkey=""; + switch (ordway){ + case "1":orderkey="g.sale_count";break; + case "2":orderkey="gd.price";break; + case "3":orderkey="g.click_count";break; + } + List nglist= new ArrayList(); - List goodsListVoList = goodsMapper.getGoodsVoList(gmap,null,"DESC",limit,start); + List goodsListVoList = goodsMapper.getGoodsVoList(gmap,orderkey,"DESC",limit,start); retmap.put("data",goodsListVoList); // 总的记录 - //int total = goodsMapper.countAllGoods(); int total = goodsMapper.countGoodsListVo(gmap); retmap.put("total",total); - - // 总的页 // int totalpage = (int)Math.ceil(total/limit); // retmap.put("last_page",totalpage); 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 9f1e794..ac797fb 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -93,6 +93,10 @@ public class OrderServiceImpl implements OrderService { List ogdlist = orderGoodsDetailMapper.getOrderGoodsDetailByBatchCode(od.getBatchcode()); // 遍历 for(OrderGoodsDetail ogd:ogdlist){ + // 收费类型 + if(StringUtils.isNotBlank((String)qumap.get("charges_type"))){ + + } // 取订单商品的人 OrderUser ogdu=orderUserMapper.getUserOrder(ogd.getBatchcode().toString(),ogd.getEntrustIslicode()); // 如果已经有记录了 diff --git a/src/main/resources/mapper/szwh/OrderMapper.xml b/src/main/resources/mapper/szwh/OrderMapper.xml index fa255a4..9283927 100644 --- a/src/main/resources/mapper/szwh/OrderMapper.xml +++ b/src/main/resources/mapper/szwh/OrderMapper.xml @@ -61,7 +61,7 @@ - + ${k} = #{v}