Merge remote-tracking branch 'origin/developer' into developer

gic-data-cloud-service/src/main/java/com/gic/cloud/service/UpdateTipService.java

@@ -22,7 +22,7 @@ public interface UpdateTipService {
     void publish(Integer businessId, Integer type);
 
 
-    void erase(Integer userId, Integer businessId, Integer type);
+    void erase(Integer userId, Integer updateTipsId, Integer type);
 
     Map<Integer, TabUpdateTips> mapByIndexIdAndUser(List<Integer> indexIdList, int type, Integer userId);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/UpdateTipServiceImpl.java

@@ -80,8 +80,11 @@ public class UpdateTipServiceImpl implements UpdateTipService {
     }
 
     @Override
-    public void erase(Integer userId, Integer businessId, Integer type) {
-        tabUpdateTipsMapper.updateStatus(businessId, type, userId, 0);
+    public void erase(Integer userId, Integer updateTipsId, Integer type) {
+        TabUpdateTips tabUpdateTips = new TabUpdateTips();
+        tabUpdateTips.setUpdateTipsId(updateTipsId);
+        tabUpdateTips.setShowStatus(0);
+        tabUpdateTipsMapper.updateByPrimaryKeySelective(tabUpdateTips);
     }
 
     @Override

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java

@@ -72,8 +72,10 @@ public class StoreSearchUtils {
     }
 
     public List<Integer> storeSearch(Integer userId, Integer enterpriseId, String searchJson){
+        log.info("storeSearchParams:{},{},{}", userId, enterpriseId, searchJson);
         String key = "1:" + enterpriseId + ":" + userId +":" + (StringUtils.isNotBlank(searchJson) ? searchJson.hashCode() : "searchJSON".hashCode());
         StoreAuth storeAuth = this.dataAuthUtils.getStoreAuth(userId, enterpriseId);
+        log.info("storeAuth:{}", JSON.toJSONString(storeAuth));
         if(!storeAuth.isHasAuth()){
             ArrayList<Integer> list = new ArrayList<>();
             list.add(0);
@@ -110,6 +112,7 @@ public class StoreSearchUtils {
                     }
                 }
                 ServiceResponse<Page<StoreDTO>> pageServiceResponse = this.storeApiService.listStore(storeSearchDTO, 1, 20000);
+                log.info("storeResule:{}", JSON.toJSONString(pageServiceResponse));
                 if(pageServiceResponse.isSuccess() && pageServiceResponse.getResult() != null && CollectionUtils.isNotEmpty(pageServiceResponse.getResult().getResult())){
                     List<StoreDTO> storeDTOList = pageServiceResponse.getResult().getResult();
                     List<Integer> storeInfoIdList = storeDTOList.stream().map(storeDTO -> storeDTO.getStoreInfoId()).collect(Collectors.toList());
@@ -138,6 +141,7 @@ public class StoreSearchUtils {
 
     public List<String> onLineStoreSearch(Integer userId, Integer enterpriseId, String searchJson){
         OnLineAuth onlineStoreAuth = this.dataAuthUtils.getOnlineStore(userId, enterpriseId);
+        log.info("onlineStoreAuth:{}", JSON.toJSONString(onlineStoreAuth));
         List<String> list = new ArrayList<>();
         if(onlineStoreAuth.isHasAuth()){
             this.getOnlineStoreIds(searchJson, onlineStoreAuth, list, StoreChannelEnum.GICMALL.getChannel(), userId, enterpriseId);