Merge branch 'master_xgh_会员待开发+商户停用' into 'developer'

会员小程序过滤不是当前企业的门店

See merge request !212

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -95,7 +95,7 @@ public class StoreController extends WebBaseController {
      */
     @IgnoreLogin
     @RequestMapping("/store-list")
-    public HaobanResponse storeList(String staffId, String wxEnterpriseId, String version) {
+    public HaobanResponse storeList(String staffId, String wxEnterpriseId, String hbversion , String gicEnterpriseId) {
         if (StringUtils.isAnyBlank(staffId, wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
@@ -121,6 +121,10 @@ public class StoreController extends WebBaseController {
                 continue;
             }
             String enterprsieId = store.getEnterpriseId() ;
+            if(StringUtils.isNotBlank(gicEnterpriseId) && gicEnterpriseId.equals(enterprsieId)) {
+                logger.info("非当前商户,跳过={},{}",gicEnterpriseId,enterprsieId);
+                continue ;
+            }
             if(null != map.get(enterprsieId)) {
                 if(Boolean.FALSE.equals(map.get(enterprsieId))) {
                     logger.info("该企业过期,{}", enterprsieId);