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<GoodsListVo> goodsListVoList = goodsMapper.getGoodsVoList(gmap,null,"DESC",limit,start);
+        List<GoodsListVo> 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<OrderGoodsDetail> 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 @@
             <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'">
+                    <if test="v != null and v != '' and k!='id' and k!='charges_type'">
                         ${k} = #{v}
                     </if>
                     <if test="k=='id'">