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-05-14 13:55:23 +08:00
parent 94fd0ddbb7
commit c7c536782f
3 changed files with 11 additions and 9 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
@@ -550,6 +550,7 @@ public interface WlhyServiceFeign {
@PostMapping("/ntocc/tmsSettlementExchangeRate/updatePushStatus")
void updateExchangeRatePushStatus(@RequestParam("id") String id,
@RequestParam("pushStatus") Integer pushStatus,
@RequestParam("pushTime") String pushTime,
@RequestParam("pushBy") Long pushBy);
@RequestParam(name="pushTime",required = false) String pushTime,
@RequestParam(name="pushBy",required = false) Long pushBy,
@RequestParam(name="pushByName",required = false) String pushByName);
}
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) {
public void updateExchangeRatePushStatus(String id, Integer pushStatus, String pushTime, Long pushBy, String pushByName) {
}
};
mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java
+7 -6
View File
@@ -85,6 +85,7 @@ public class ExchangeRateApplicationService {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long pushBy = loginUser != null ? loginUser.getUserid() : null;
String pushByName = loginUser != null ? loginUser.getUsername() : null;
Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null;
Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null;
String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null;
@@ -114,7 +115,7 @@ public class ExchangeRateApplicationService {
gwLogMapper.insert(gwLog);
// 更新为推送中
updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy);
updateExchangeRatePushStatus(dto.getId(), 2, new Date(), pushBy, pushByName);
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(PUSH_API_URL);
@@ -130,12 +131,12 @@ public class ExchangeRateApplicationService {
if (response.getStatusLine().getStatusCode() == 200) {
gwLog.setStatus(2);
updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy);
updateExchangeRatePushStatus(dto.getId(), 3, new Date(), pushBy, pushByName);
successCount++;
} else {
gwLog.setStatus(3);
gwLog.setErrorMsg(responseString);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
failCount++;
failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("失败;");
}
@@ -145,7 +146,7 @@ public class ExchangeRateApplicationService {
gwLog.setStatus(3);
gwLog.setErrorMsg(e.getMessage());
gwLogMapper.updateById(gwLog);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy);
updateExchangeRatePushStatus(dto.getId(), 4, new Date(), pushBy, pushByName);
failCount++;
failMsg.append("erpCurrCode:").append(dto.getErpCurrCode()).append("异常:").append(e.getMessage()).append(";");
log.error("汇率推送异常: id={}, error={}", dto.getId(), e.getMessage());
@@ -165,10 +166,10 @@ public class ExchangeRateApplicationService {
return AjaxResult.success(resultMsg);
}
private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy) {
private void updateExchangeRatePushStatus(String id, Integer pushStatus, Date pushTime, Long pushBy, String pushByName) {
try {
String pushTimeStr = pushTime != null ? DateUtil.format(pushTime, "yyyy-MM-dd HH:mm:ss") : null;
wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy);
wlhyServiceFeign.updateExchangeRatePushStatus(id, pushStatus, pushTimeStr, pushBy, pushByName);
} catch (Exception e) {
log.error("更新汇率推送状态失败: id={}, error={}", id, e.getMessage());
}