是否隐藏商家

src/main/java/com/sqx/modules/exportExecl/controller/ExportExeclController.java

@@ -2,6 +2,7 @@ package com.sqx.modules.exportExecl.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jcraft.jsch.SftpException;
 import com.sqx.common.utils.PageUtils;
@@ -59,6 +60,7 @@ public class ExportExeclController {
     @GetMapping("excelOrder")
     @ApiOperation("导出订单列表")
     public Result excelOrder(OrderQueryDto queryDto) throws Exception{
+//        log.info("导出订单参数"+queryDto);
         if(!StringUtils.hasText(queryDto.getUserId())){
             return Result.error("用户id不能为空");
         }

src/main/java/com/sqx/modules/goods/controller/GoodsShopController.java

@@ -121,11 +121,13 @@ public class GoodsShopController {
         return goodsShopService.selectGoodsShop(phone,msg);
     }
 
-    @ApiOperation("修改商户信息")
+        @ApiOperation("修改商户信息")
     @PostMapping("/updateGoodsShop")
     public Result updateGoodsShop(@RequestBody GoodsShop goodsShop){
         goodsShop.setStatus(0);
         goodsShop.setIsSupplier(1);
+        //        默认不隐藏
+        goodsShop.setIsConceal(0);
         goodsShopService.updateById(goodsShop);
         return Result.success();
     }

src/main/java/com/sqx/modules/goods/entity/GoodsShop.java

@@ -266,4 +266,7 @@ public class GoodsShop implements Serializable {
 
     @ApiModelProperty("消息配置  0开启  1关闭")
     private Integer messageConfiguration;
+
+    @ApiModelProperty("是否隐藏 0不隐藏 1是隐藏")
+    private Integer isConceal;
 }

src/main/java/com/sqx/modules/goods/service/impl/GoodsShopServiceImpl.java

@@ -148,6 +148,8 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
         }
         //        默认不是供应商
         goodsShop.setIsSupplier(1);
+        //        默认不隐藏
+        goodsShop.setIsConceal(0);
 //        默认开启消息配置
         goodsShop.setMessageConfiguration(0);
 
@@ -500,6 +502,8 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
         BeanUtils.copyProperties(goodsShopVo, shop);
 //        默认不是供应商
         shop.setIsSupplier(1);
+        //        默认不隐藏
+        shop.setIsConceal(0);
 //        默认开启消息配置
         shop.setMessageConfiguration(0);
         baseMapper.insert(shop);

src/main/resources/mapper/goods/GoodsShopMapper.xml

@@ -221,7 +221,7 @@
         distance
         from goods_shop gs
         left join shop_type st on gs.shop_type_id = st.id
-        where gs.status = 1 and gs.city = #{city} and gs.putaway_flag = 0 and gs.is_supplier=1
+        where gs.status = 1 and gs.city = #{city} and gs.putaway_flag = 0 and gs.is_supplier=1 and (gs.is_conceal =0 or gs.is_conceal is NULL)
         <if test="impotr!=null and impotr!=''">
             AND (gs.shop_name LIKE concat('%',#{impotr},'%') or
             st.shop_type_name like concat('%',#{impotr},'%') or
@@ -236,7 +236,7 @@
             and gs.activity_id = #{activityId}
         </if>
         <if test="shopTypeId!=null">
-            and  FIND_IN_SET(#{shopTypeId},gs.shop_type_id)
+            and FIND_IN_SET(#{shopTypeId},gs.shop_type_id)
         </if>
         order by gs.is_recommend desc
         <if test="screen==1">