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

mall-server-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -339,7 +339,8 @@ public class SyncOrderInfoLogic {
                 List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
 
                 itfGreeSynDownloadRecService.lambdaUpdate()
-                        .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
+                        .in(ItfGreeSynDownloadRec::getWorkOrderId, collect)
+                        .le(ItfGreeSynDownloadRec::getUpdatedTimestamp, new Date())
                         .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 1)
                         .set(ItfGreeSynDownloadRec::getDownloadBatchNo, batch)
                         .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())

mall-server-sync-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -337,7 +337,8 @@ public class SyncOrderInfoLogic {
                 List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
 
                 itfGreeSynDownloadRecService.lambdaUpdate()
-                        .in(ItfGreeSynDownloadRec::getSynReqId, syncIds)
+                        .in(ItfGreeSynDownloadRec::getWorkOrderId, collect)
+                        .le(ItfGreeSynDownloadRec::getUpdatedTimestamp, new Date())
                         .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 1)
                         .set(ItfGreeSynDownloadRec::getDownloadBatchNo, batch)
                         .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())