Merge branch 'feature/订单储值' into 'master'

刷新好友-代码回退

See merge request !1389

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

@@ -94,7 +94,7 @@ public class PreDealServiceImpl implements PreDealService {
     @Override
     public boolean checkTask(String taskId, int dataType) {
         String key = taskId+"_checkTask"+dataType ;
-        Object o = RedisUtil.getCache(key) ;
+        Object o = null ; //RedisUtil.getCache(key) ;
         if(null == o) {
             int i = preDealLogMapper.checkTask(taskId, dataType, PreDealStatusEnum.pre.getVal());
             boolean flag = (i==0) ;
@@ -118,7 +118,7 @@ public class PreDealServiceImpl implements PreDealService {
     @Override
     public int countByTaskId(String taskId) {
         String key = taskId+"countByTaskId" ;
-        Object o = RedisUtil.getCache(key) ;
+        Object o =  null ; //RedisUtil.getCache(key) ;
         if(null == o) {
             int count = this.preDealLogMapper.countByTaskId(taskId,-1,0) ;
             RedisUtil.setCache(key,count,60*3l);
@@ -193,7 +193,7 @@ public class PreDealServiceImpl implements PreDealService {
     @Override
     public boolean checkFriendTask(String taskId, int dataType) {
         String key = taskId+"_checkFriendTask"+dataType ;
-        Object o = RedisUtil.getCache(key) ;
+        Object o =  null ; //RedisUtil.getCache(key) ;
         if(null == o) {
             int i = preDealLogMapper.checkTaskFriend(taskId, null, dataType);
             boolean flag = (i==0) ;
@@ -207,7 +207,7 @@ public class PreDealServiceImpl implements PreDealService {
     @Override
     public boolean checkFriendTaskByPDataId(String taskId, String pDataId, int dataType) {
         String key = taskId+"_checkFriendTaskByPDataId"+dataType ;
-        Object o = RedisUtil.getCache(key) ;
+        Object o =  null ; //RedisUtil.getCache(key) ;
         if(null == o) {
             int i = preDealLogMapper.checkTaskFriend(taskId, pDataId, dataType);
             boolean flag = (i==0) ;

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

@@ -460,13 +460,13 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         }
         TabHaobanSyncTask syncTask = syncTaskService.getSyncTask(taskId);
 
-        int status = syncTask.getStatusFlag() ;
+        /*int status = syncTask.getStatusFlag() ;
         if(status != 4) {
            int count = this.preDealService.countByTaskId(taskId) ;
            if(count <= 0) {
                this.syncTaskService.updateTaskStatus(taskId,4) ;
            }
-        }
+        }*/
         syncCheckDTO.setSyncStatus(syncTask.getStatusFlag());
 
         PreDealLogInfoDTO dealLogInfoDTO = preDealService.getLastPreDataByTaskId(taskId);