群活码-链接调整

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmLinkApiServiceImpl.java

@@ -238,32 +238,33 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                         break;
                     }
                 }else if(type==3) {
-                    Page<StoreDTO> page = new Page<>() ;
-                    Map<String, Object> params = new HashMap<String, Object>();
-                    params.put("latitude", qdto.getLatitude());
-                    params.put("longitude", qdto.getLongitude());
-                    params.put("enterpriseId",enterpriseId) ;
-                    params.put("areaId",qdto.getDistrictCode()) ;
-                    params.put("brandType", 1);
-                    page.setParams(params);
-                    page.setPageSize(1000);
-                    page.setCurrentPage(1);
-                    page = this.wechatStoreService.getActiveStoresByPage(page) ;
-                    if (CollectionUtils.isEmpty(page.getResult())) {
-                        break;
-                    }
-                    List<String> storeIds = page.getResult().stream().map(StoreDTO::getStoreId).collect(Collectors.toList());
-                    //获取storeId对应活码
-                    Map<String, List<GroupChatHmBO>> storeToHmMap = this.joinRuleManager.getStoreIdToGroupChatHmBOMap(enterpriseId, wxEnterpriseId, storeIds);
-                    if (MapUtil.isEmpty(storeToHmMap)) {
-                        break;
-                    }
-                    if(storeToHmMap.size()==1) {
-                        hmId = storeToHmMap.values().iterator().next().get(0).getChatHmId();
-                        break;
-                    }else {
-
-                        return ServiceResponse.success(retDTO);
+                    if(StringUtils.isNotEmpty(qdto.getLatitude()) && StringUtils.isNotEmpty(qdto.getLongitude()) && StringUtils.isNotEmpty(qdto.getDistrictCode())) {
+                        Page<StoreDTO> page = new Page<>() ;
+                        Map<String, Object> params = new HashMap<String, Object>();
+                        params.put("latitude", qdto.getLatitude());
+                        params.put("longitude", qdto.getLongitude());
+                        params.put("enterpriseId",enterpriseId) ;
+                        params.put("areaId",qdto.getDistrictCode()) ;
+                        params.put("brandType", 1);
+                        page.setParams(params);
+                        page.setPageSize(1000);
+                        page.setCurrentPage(1);
+                        page = this.wechatStoreService.getActiveStoresByPage(page) ;
+                        if (CollectionUtils.isEmpty(page.getResult())) {
+                            break;
+                        }
+                        List<String> storeIds = page.getResult().stream().map(StoreDTO::getStoreId).collect(Collectors.toList());
+                        //获取storeId对应活码
+                        Map<String, List<GroupChatHmBO>> storeToHmMap = this.joinRuleManager.getStoreIdToGroupChatHmBOMap(enterpriseId, wxEnterpriseId, storeIds);
+                        if (MapUtil.isEmpty(storeToHmMap)) {
+                            break;
+                        }
+                        if(storeToHmMap.size()==1) {
+                            hmId = storeToHmMap.values().iterator().next().get(0).getChatHmId();
+                            break;
+                        }else {
+                            return ServiceResponse.success(retDTO);
+                        }
                     }
                 }else if(type==4) {
                     List<HmLinkChatDTO> hmList = this.hmLinkChatService.listByLinkId(wxEnterpriseId, enterpriseId, linkId);

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatHmMapper.xml

@@ -196,7 +196,7 @@
 	</select>
 
 	<select id="hasManyOwnerStore" resultType="com.gic.haoban.manage.service.pojo.HmStoreNumBO">
-		SELECT chat_hm_id , COUNT(1) FROM (
+		SELECT chat_hm_id chatHmId , COUNT(1) num FROM (
 		SELECT a.chat_hm_id , c.store_id FROM `tab_haoban_group_chat_hm_relation` a
 		LEFT JOIN tab_haoban_group_chat b ON a.group_chat_id = b.group_chat_id
 		LEFT JOIN  `tab_haoban_staff_clerk_relation` c ON c.staff_id = b.staff_id AND c.status_flag = 1