Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

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

@@ -1299,16 +1299,17 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
-    public List<String> getHaoBanStoreRolesByClerkId(String clerkId,String wxEnterpriseId) {
+    public List<String> getHaoBanStoreRolesByClerkId(String clerkId, String wxEnterpriseId) {
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         if (clerkDTO == null) {
-            logger.info("导购不存在：clerkId:{}",clerkId);
+            logger.info("导购不存在：clerkId:{}", clerkId);
             return Collections.emptyList();
         }
-        List<String> enterpriseIdStoreIds = storeRangeService.listStoreIdByWxEnterpriseId(clerkDTO.getEnterpriseId(), wxEnterpriseId);
+        List<String> enterpriseIdStoreIds = storeRangeService.listStoreIdByWxEnterpriseId(wxEnterpriseId, clerkDTO.getEnterpriseId());
         logger.info("好办门店id:{}", JSON.toJSONString(enterpriseIdStoreIds));
         List<String> gicStoreIds = getStoreIdList(clerkId);
         if (CollectionUtils.isEmpty(gicStoreIds)) {
+            logger.info("gic门店为空");
             return Collections.emptyList();
         }
         if (gicStoreIds.contains("-1")) {
@@ -1329,7 +1330,7 @@ public class StaffApiServiceImpl implements StaffApiService {
             //商户未关联好办
             return Collections.emptyList();
         }
-        List<String> enterpriseIdStoreIds = storeRangeService.listStoreIdByWxEnterpriseId(enterpriseId, enterpriseRelated.getWxEnterpriseId());
+        List<String> enterpriseIdStoreIds = storeRangeService.listStoreIdByWxEnterpriseId(enterpriseRelated.getWxEnterpriseId(), enterpriseId);
         List<String> storeWidgetIdStoreIds = getStoreWidgetIdStoreIds(storeWidgetId, enterpriseId);
         //取交集
         Sets.SetView<String> intersection = Sets.intersection(Sets.newHashSet(enterpriseIdStoreIds), Sets.newHashSet(storeWidgetIdStoreIds));