Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

 Conflicts:
	gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java

@@ -83,7 +83,7 @@ public class ClerkImportController {
             }
             fo.flush();
         } catch (Exception e) {
-            logger.warn("异常：", e);
+            logger.info("下载错误", e);
         } finally {
             if (fo != null) {
                 fo.close();

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -10,6 +10,7 @@ import com.gic.download.constants.QrcodeTypeEnum;
 import com.gic.download.qo.QrcodeContent;
 import com.gic.download.utils.*;
 import com.gic.download.utils.log.LogUtils;
+import com.gic.enterprise.ano.IgnoreLogin;
 import com.gic.enterprise.context.RequestContext;
 import com.gic.enterprise.dto.EnterpriseLicenseDTO;
 import com.gic.enterprise.error.ErrorCode;
@@ -97,6 +98,7 @@ public class StoreController extends DownloadUtils {
     @Autowired
     private StoreTransferApiService storeTransferApiService;
 
+
     private Map<Integer, SimpleDateFormat> map = new ConcurrentHashMap<>();
     private Map<Integer, SimpleDateFormat> map1 = new ConcurrentHashMap<>();
 
@@ -824,4 +826,15 @@ public class StoreController extends DownloadUtils {
         }
         return simpleDateFormat;
     }
+
+    /**
+     * 小康那边跑非实时的分组 需要这个接口转换数据
+     */
+    @RequestMapping("/list-widget-store-info")
+    @IgnoreLogin
+    public RestResponse listWidgetStoreInfo(Integer enterpriseId, Integer storeWidgetId) {
+        ServiceResponse<List<Integer>> serviceResponse = this.storeWidgetApiService.listStoreInfoIdByStoreWidgetId(enterpriseId, storeWidgetId);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
 }
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/StoreTagController.java

@@ -117,7 +117,7 @@ public class StoreTagController {
             }
             fo.flush();
         } catch (Exception e) {
-            e.printStackTrace();
+            LOGGER.info("下载错误", e);
         } finally {
             if (fo != null) {
                 fo.close();