推送修改,修复推送返回值不为code不为200时 会显示推送成功的问题

mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java

@@ -251,11 +251,27 @@ public class BusinessDocumentOrderApplicationService {
                 gwLog.setResponseBody(responseString);
 
                 if (response.getStatusLine().getStatusCode() == 200) {
+//                    gwLog.setStatus(2);
+//                    if (pushData.getId() != null) {
+//                        updatePushStatus(pushData.getId(), 3, new Date(), String.valueOf(pushBy), pushByName);
+//                    }
+//                    successCount++;
+
+                    JSONObject responseJson = JSONObject.parseObject(responseString);
+
+                    Integer dataCode = responseJson.getInteger("code");
+
+                    if (dataCode != null && dataCode == 200) {
                         gwLog.setStatus(2);
-                    if (pushData.getId() != null) {
                         updatePushStatus(pushData.getId(), 3, new Date(), String.valueOf(pushBy), pushByName);
-                    }
                         successCount++;
+                    } else {
+                        gwLog.setStatus(3);
+                        gwLog.setErrorMsg(responseString);
+                        updatePushStatus(pushData.getId(), 4, new Date(), String.valueOf(pushBy), pushByName);
+                        failCount++;
+                        failMsg.append("物料编码:").append(pushData.getMaterialCode()).append("失败;");
+                    }
                 } else {
                     gwLog.setStatus(3);
                     gwLog.setErrorMsg(responseString);

mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java

@@ -153,6 +153,11 @@ public class ErpCountryApplicationService{
                 gwLog.setResponseBody(responseString);
 
                 if (response.getStatusLine().getStatusCode() == 200) {
+                    JSONObject responseJson = JSONObject.parseObject(responseString);
+
+                    Integer dataCode = responseJson.getInteger("code");
+
+                    if (dataCode != null && dataCode == 200) {
                         gwLog.setStatus(2);
                         updatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName);
                         successCount++;
@@ -163,6 +168,13 @@ public class ErpCountryApplicationService{
                         failCount++;
                         failMsg.append("erpCountryCode:").append(dto.getErpCountryCode()).append("失败;");
                     }
+                } else {
+                    gwLog.setStatus(3);
+                    gwLog.setErrorMsg(responseString);
+                    updatePushStatus(dto.getId(), 4, new Date(), pushBy,pushByName);
+                    failCount++;
+                    failMsg.append("erpCountryCode:").append(dto.getErpCountryCode()).append("失败;");
+                }
                 gwLogMapper.updateById(gwLog);
                 response.close();
             } catch (IOException e) {

mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java

@@ -159,6 +159,11 @@ public class ErpEnterpriseUnitApplicationService {
                 gwLog.setResponseBody(responseString);
 
                 if (response.getStatusLine().getStatusCode() == 200) {
+                    JSONObject responseJson = JSONObject.parseObject(responseString);
+
+                    Integer dataCode = responseJson.getInteger("code");
+
+                    if (dataCode != null && dataCode == 200) {
                         gwLog.setStatus(2);
                         updatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName);
                         successCount++;
@@ -169,6 +174,13 @@ public class ErpEnterpriseUnitApplicationService {
                         failCount++;
                         failMsg.append("erpUnitCode:").append(dto.getErpCode()).append("失败;");
                     }
+                } else {
+                    gwLog.setStatus(3);
+                    gwLog.setErrorMsg(responseString);
+                    updatePushStatus(dto.getId(), 4, new Date(), pushBy,pushByName);
+                    failCount++;
+                    failMsg.append("erpUnitCode:").append(dto.getErpCode()).append("失败;");
+                }
                 gwLogMapper.updateById(gwLog);
                 response.close();
             } catch (IOException e) {

mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java

@@ -136,6 +136,12 @@ public class ExchangeRateApplicationService {
                 gwLog.setResponseBody(responseString);
 
                 if (response.getStatusLine().getStatusCode() == 200) {
+                    JSONObject responseJson = JSONObject.parseObject(responseString);
+
+                    // 判断业务状态：data.code = 200 成功，data.code = 500 或其他 失败
+                    Integer dataCode = responseJson.getInteger("code");
+
+                    if (dataCode != null && dataCode == 200) {  // 业务也成功
                         gwLog.setStatus(2);
                         updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName);
                         successCount++;
@@ -146,6 +152,13 @@ public class ExchangeRateApplicationService {
                         failCount++;
                         failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
                     }
+                } else {
+                    gwLog.setStatus(3);
+                    gwLog.setErrorMsg(responseString);
+                    updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
+                    failCount++;
+                    failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
+                }
                 gwLogMapper.updateById(gwLog);
                 response.close();
             } catch (IOException e) {

mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java

@@ -126,6 +126,11 @@ public class MaterialInfoApplicationService {
                 gwLog.setResponseBody(responseString);
 
                 if (response.getStatusLine().getStatusCode() == 200) {
+                    JSONObject responseJson = JSONObject.parseObject(responseString);
+
+                    Integer dataCode = responseJson.getInteger("code");
+
+                    if (dataCode != null && dataCode == 200) {
                         gwLog.setStatus(2);
                         updatePushStatus(dto.getMaterialBaseInfoId(), 3, new Date(), pushBy, pushByName);
                         successCount++;
@@ -136,6 +141,13 @@ public class MaterialInfoApplicationService {
                         failCount++;
                         failMsg.append("materialCode:").append(dto.getMaterialCode()).append("失败;");
                     }
+                } else {
+                    gwLog.setStatus(3);
+                    gwLog.setErrorMsg(responseString);
+                    updatePushStatus(dto.getMaterialBaseInfoId(), 4, new Date(), pushBy, pushByName);
+                    failCount++;
+                    failMsg.append("materialCode:").append(dto.getMaterialCode()).append("失败;");
+                }
                 gwLogMapper.updateById(gwLog);
                 response.close();
             } catch (IOException e) {