需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CommonMapper.java

@@ -53,6 +53,7 @@ public interface CommonMapper {
             @Param("lng") String lng,
             @Param("lat") String lat,
             @Param("websitIds") List<String> websitIds,
+            @Param("websitIdsQuchu") List<String> websitIdsQuchu,
             @Param("isIncre") Boolean isIncre,
             @Param("companyWechatId") String companyWechatId);
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -232,7 +232,7 @@ public class UserController {
     @GetMapping("/apply/websit")
     @ApiOperation("入驻的网点列表")
     public ResponseHelper<List<AdminWebsitApplyBean>> applyWebsitList(
-            @ApiParam(value = "是否查询所有可入驻网点(包含未入驻的)",required = false) @RequestParam(required = false) Boolean isAll,
+            @ApiParam(value = "是否查询所有可入驻网点(不包含入驻网点)",required = false) @RequestParam(required = false) Boolean isAll,
             @ApiParam(value = "是否为增置服务网点",required = false) @RequestParam(required = false) Boolean isIncre,
             @ApiParam(value = "(WAIT=入驻待审核 WAIT_WORKER 待师傅购买  POLICY_WAIT 保险待审核  OK=通过 FAIL=驳回EXPIRED 证件快过期  OVERDUE 证件已过期 STOP 暂停 QUIT 已离职)",required = false)
             @RequestParam(required = false) List<String> examineStatus,

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1174,9 +1174,11 @@ public class UserLogic {
 
         //非查询所有，只取已入驻成功的网点
         List<String> websitIds = null;
-        if (isAll == null || !isAll) {
+
+        //得所有网点，筛选掉
+        List<String> websitIdsQuchu = null;
+        if (!CollectionUtils.isEmpty(examineStatus)) {
             websitIds = websitUserList.stream()
-                    .filter(v -> StringUtils.equals(v.getExamineStatus(), ExamineStatusEnum.OK.getKey()))
                     .map(WebsitUser::getWebsitId).collect(Collectors.toList());
 
             if (CollectionUtils.isEmpty(websitIds)) {
@@ -1184,6 +1186,15 @@ public class UserLogic {
             }
         }
 
+        if (isAll != null && isAll ){
+            List<WebsitUser> websitUsers = websitUserService.lambdaQuery()
+                    .eq(WebsitUser::getUserId, currentCompanyWechat.getUserId())
+                    .list();
+
+            websitIdsQuchu = websitUsers.stream()
+                    .map(WebsitUser::getWebsitId).collect(Collectors.toList());
+        }
+
         //延保筛选对应网点
         if (!StringUtil.isEmpty(increId)) {
             List<String> websitIncre = pgIncreWebsitService.lambdaQuery().eq(PgIncreWebsit::getPgIncreId, increId)
@@ -1198,7 +1209,7 @@ public class UserLogic {
 
         }
 
-        List<WebsitVO> list = commonMapper.websitList(lng, lat, websitIds, isIncre, currentCompanyWechat.getCompanyWechatId());
+        List<WebsitVO> list = commonMapper.websitList(lng, lat, websitIds,websitIdsQuchu, isIncre, currentCompanyWechat.getCompanyWechatId());
 
         List<AdminWebsitApplyBean> adminWebsitApplyBeans = BeanUtil.copyToList(list, AdminWebsitApplyBean.class);
         for (AdminWebsitApplyBean bean : adminWebsitApplyBeans) {

mall-miniapp-service/src/main/resources/mapper/CommonMapper.xml

@@ -85,8 +85,15 @@
                     #{item}
                 </foreach>
             </if>
+        <if test="websitIdsQuchu != null and websitIdsQuchu.size > 0">
+                AND a.websit_id not IN
+                <foreach item="item" index="index" collection="websitIdsQuchu" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+
             and a.company_wechat_id = #{companyWechatId}
-        <if test="lng != '0'.toString() and lat != '0'.toString()">
+        <if test="websitIdsQuchu != null and websitIdsQuchu.size > 0 and lng != '0'.toString() and lat != '0'.toString()">
             HAVING distance &lt; 50000
         </if>
         ORDER BY distance