weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改企业币值-各组织独立问题

Browse Source
This commit is contained in:
zhaoqing
2026-06-18 10:25:53 +08:00
parent dd4fc13adc
commit ece29d5f46
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java
+3 -2
View File
@@ -546,11 +546,12 @@ public interface WlhyServiceFeign {
@RequestParam(name="organizationId", required = false) String organizationId);
@ApiOperation("汇率-更新推送状态")
@ApiOperation("汇率-更新推送状态（按组织独立推送）")
@PostMapping("/ntocc/tmsSettlementExchangeRate/updatePushStatus")
void updateExchangeRatePushStatus(@RequestParam("id") String id,
@RequestParam("pushStatus") Integer pushStatus,
@RequestParam(name="pushTime",required = false) String pushTime,
@RequestParam(name="pushBy",required = false) Long pushBy,
@RequestParam(name="pushByName",required = false) String pushByName);
@RequestParam(name="pushByName",required = false) String pushByName,
@RequestParam("organizationId") Long organizationId);
}
mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWlhyFallbackFactory.java
+1 -1
View File
@@ -557,7 +557,7 @@ public class RemoteWlhyFallbackFactory implements FallbackFactory<WlhyServiceFei
}
@Override
public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName) {
public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName, Long organization) {
}
};
mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java
+7 -7
View File
@@ -133,7 +133,7 @@ public class ExchangeRateApplicationService {
gwLogMapper.insert(gwLog);
// 更新为推送中
updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy, pushByName);
updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy, pushByName, organizationId, organizationName);
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(pushUrl);
@@ -156,19 +156,19 @@ public class ExchangeRateApplicationService {
if (dataCode != null && dataCode == 200) { // 业务也成功
gwLog.setStatus(2);
updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName);
updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName, organizationId, organizationName);
successCount++;
} else {
gwLog.setStatus(3);
gwLog.setErrorMsg(responseString);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
failCount++;
failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
}
} else {
gwLog.setStatus(3);
gwLog.setErrorMsg(responseString);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
failCount++;
failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
}
@@ -179,7 +179,7 @@ public class ExchangeRateApplicationService {
gwLog.setErrorMsg(e.getMessage());
gwLog.setResponseBody("请求异常：" + e.getMessage());
gwLogMapper.updateById(gwLog);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName, organizationId, organizationName);
failCount++;
failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("异常:").append(e.getMessage()).append(";");
log.error("汇率推送异常: id={}, error={}", dto.getId(), e.getMessage());
@@ -199,10 +199,10 @@ public class ExchangeRateApplicationService {
return AjaxResult.success(resultMsg);
}
private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy, String pushByName) {
private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy, String pushByName, Long organizationId, String organizationName) {
try {
String pushTimeStr = pushTime != null ? DateUtil.format(pushTime, "yyyy-MM-dd HH:mm:ss") : null;
wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy, pushByName);
wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy, pushByName, organizationId);
} catch (Exception e) {
log.error("更新汇率推送状态失败: id={}, error={}", id, e.getMessage());
}
mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/exchangeRate/ExchangeRateDTO.java
+6
View File
@@ -16,4 +16,10 @@ public class ExchangeRateDTO {
@ApiModelProperty(value = "币种名称（ERP名称）")
private String erpCurrName;
@ApiModelProperty(value = "组织ID")
private Long organizationId;
@ApiModelProperty(value = "组织名称")
private String organizationName;
}