修正map中g.isrecommend中错误

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

@@ -115,7 +115,7 @@ public class AdminGoodsController extends BaseController {
         String show = request.getString("show");
         if(StringUtils.isNotBlank(show)){
             Integer ishow =Integer.valueOf(show)>1?0:1;
-            qmap.put("g.is_recommend",ishow);
+            qmap.put("ishow",ishow);
         }
         //排序方式
         String orderStatus=request.getString("order_status");

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

@@ -154,7 +154,6 @@ public class GoodsServiceImpl implements GoodsService {
     @Override
     public Map<String,Object> getGoodsByMap(Map gmap, int page,int limit) {
         Map retmap =new HashMap();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         int start = page>1?(page-1)*limit:0;
         int end =page*limit;
@@ -185,9 +184,6 @@ public class GoodsServiceImpl implements GoodsService {
         List<GoodsListVo> goodsListVoList = goodsMapper.getGoodsVoList(gmap,orderkey,"DESC",limit,start);
         for(GoodsListVo gl:goodsListVoList){
             Map glmap = new HashMap();
-            if(ishow!=null && gl.getIsRecommend()!=ishow){
-                continue;
-            }
             glmap.put("id",gl.getId());
             glmap.put("createtime",gl.getCreatetime());
             glmap.put("goods_islicode",gl.getGoods_islicode());

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

@@ -66,9 +66,13 @@
             <if test="map!=null">
                 <foreach collection="map" item="v" index="k" separator="and">
                     <if test="v != null and v != '' and k!='orderway' and k!='id'
-                    and k!='gd.goods_name' and k!='g.entrust_name' and k!='createtime'">
+                    and k!='gd.goods_name' and k!='g.entrust_name'
+                     and k!='createtime' and k!='ishow'">
                         ${k} = #{v}
                     </if>
+                    <if test="k=='ishow'">
+                        g.is_recommend=#{v}
+                    </if>
                     <if test="k=='gd.goods_name'">
                         gd.goods_name like concat('%',#{v},'%')
                         OR g.goods_islicode like concat('%',#{v},'%')
@@ -98,9 +102,13 @@
                 <if test="map!=null">
                     <foreach collection="map" item="v" index="k" separator="and">
                         <if test="v != null and v != '' and k!='orderway' and k!='id' and k!='gd.goods_name'
-                        and k!='g.entrust_name' and k!='createtime'">
+                         and k!='g.entrust_name' and k!='createtime'
+                         and k!='ishow'">
                             ${k} = #{v}
                         </if>
+                        <if test="k=='ishow'">
+                            g.is_recommend=#{v}
+                        </if>
                         <if test="k=='gd.goods_name'">
                             gd.goods_name like concat('%',#{v},'%')
                             OR g.goods_islicode like concat('%',#{v},'%')

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

@@ -90,11 +90,12 @@ public class GoodsMapperTest {
     public void getGoodsListTest() {
         Map map =new HashMap();
         map.put("gd.goods_entrust",1);
+        map.put("ishow",0); //不推荐的
         String odkey ="g.sale_count";
         String odval="DESC";
-        List<GoodsListVo> goodsListVoList = goodsMapper.getGoodsVoList(map,odkey,odval,10,0);
+        List<GoodsListVo> goodsListVoList = goodsMapper.getGoodsVoList(map,odkey,odval,100,0);
         for (GoodsListVo gv:goodsListVoList){
-            System.out.println(gv.getGoods_name());
+            System.out.println(gv.getGoods_name()+" | "+gv.getIsRecommend()+" | "+gv.getId());
         }
     }