需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/outside/OutsideBaseApi.java

@@ -21,12 +21,8 @@ public class OutsideBaseApi {
 
     public <T> T checkData(ResponseHelper<T> result){
         if(result.getCode() != ResponseHelper.ResponseCode_Success ){
-            if ( result.getCode() != 415) {
-                String errMsg = result.getMessage().replace("温馨提示：", "");
-                throw new RemoteServiceException(result.getCode(), errMsg);
-            }else {
-                throw new RemoteServiceException(result.getCode(), result.getMessage());
-            }
+            String errMsg = result.getMessage().replace("温馨提示：", "");
+            throw new RemoteServiceException(result.getCode(), errMsg);
         }
         return result.getData();
     }

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

@@ -338,13 +338,7 @@ public class SyncOrderInfoLogic {
                 List<String> collect = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId).distinct().collect(Collectors.toList());
                 List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
 
-                itfGreeSynDownloadRecService.lambdaUpdate()
-                        .in(ItfGreeSynDownloadRec::getWorkOrderId, collect)
-                        .notIn(ItfGreeSynDownloadRec::getGreeStatSynStatus,1,9)
-                        .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 1)
-                        .set(ItfGreeSynDownloadRec::getDownloadBatchNo, batch)
-                        .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
-                        .update();
+
 
                 workOrderSearchReq.setWorkOrderIds(collect);
 
@@ -361,6 +355,14 @@ public class SyncOrderInfoLogic {
                 Map<String, Object> bodyMap = JSON.parseObject(body);
                 String s = bodyMap.get("data").toString();
 
+                itfGreeSynDownloadRecService.lambdaUpdate()
+                        .in(ItfGreeSynDownloadRec::getWorkOrderId, collect)
+                        .notIn(ItfGreeSynDownloadRec::getGreeStatSynStatus,1,9)
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynStatus, 1)
+                        .set(ItfGreeSynDownloadRec::getDownloadBatchNo, batch)
+                        .set(ItfGreeSynDownloadRec::getGreeStatSynTime, new Date())
+                        .update();
+
 
 
                 if (StringUtil.isEmpty(s))
@@ -691,13 +693,7 @@ public class SyncOrderInfoLogic {
 
                 String json = JSONUtil.toJsonStr(workOrderSearchReq);
 
-                ItfGreeSynDownloadRec itfGreeSynDownloadRec = itfGreeSynDownloadRecs.get(0);
-
-                itfGreeSynDownloadRec.setGreeStatSynTime(new Date());
-                itfGreeSynDownloadRec.setGreeStatSynStatus(1);
-
 
-                itfGreeSynDownloadRec.updateById();
 
 
                 String body = HttpRequest.post(greeUrl + Constant.gree.POST_WORKER_ORDER_DETAIL)
@@ -709,6 +705,14 @@ public class SyncOrderInfoLogic {
                 Map<String, Object> bodyMap = JSON.parseObject(body);
                 String s = bodyMap.get("data").toString();
 
+                ItfGreeSynDownloadRec itfGreeSynDownloadRec = itfGreeSynDownloadRecs.get(0);
+
+                itfGreeSynDownloadRec.setGreeStatSynTime(new Date());
+                itfGreeSynDownloadRec.setGreeStatSynStatus(1);
+
+
+                itfGreeSynDownloadRec.updateById();
+
 
                 if (StringUtil.isEmpty(s))
                     continue;