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

Merge branch 'dev_wkx_yutong_20260106' into dev

Browse Source
This commit is contained in:
王奎兴
2026-01-13 18:54:45 +08:00
parent 931d63a5da 8f0d4ed687
commit 89b5d544c6
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
+22 -1
View File
@@ -2,6 +2,8 @@ package com.linke.finance.application.server.reconciliation;
import com.alibaba.fastjson.JSONObject;
import com.aliyun.dingtalkworkflow_1_0.models.StartProcessInstanceResponse;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.linke.finance.domain.businessDocument.entity.BusinessDocument;
import com.linke.finance.domain.businessDocument.service.BusinessDocumentDomainService;
import com.linke.finance.domain.reconciliation.entity.Reconciliation;
@@ -21,6 +23,7 @@ import com.linke.finance.infrastructure.feign.ProductServiceFeign;
import com.linke.finance.infrastructure.feign.WlhyServiceFeign;
import com.mhd.common.core.constant.SubjectConstants;
import com.mhd.common.core.domain.dto.ReconciliationDTO;
import com.mhd.common.core.domain.entity.TmsOrder;
import com.mhd.common.core.domain.entity.Verification;
import com.mhd.common.core.domain.po.OrganizationPo;
import com.mhd.common.core.domain.po.UserPo;
@@ -29,6 +32,7 @@ import com.mhd.common.core.exception.ServiceException;
import com.mhd.common.core.utils.OrderSequence;
import com.mhd.common.core.utils.StringUtils;
import com.mhd.common.core.utils.bean.BeanUtils;
import com.mhd.common.core.utils.sms.Result;
import com.mhd.common.core.web.domain.AjaxResult;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.model.LoginUser;
@@ -156,8 +160,25 @@ public class ReconciliationApplicationService {
}
}
return reconciliationPOS;*/
List<ReconciliationPO> reconciliationPOS = reconciliationDomainService.queryList(reconciliationDO);
for (ReconciliationPO reconciliationPO : reconciliationPOS) {
String innerNumber = reconciliationPO.getInnerNumber();
if (innerNumber != null && !innerNumber.trim().isEmpty()) {
ReconciliationDTO reconciliationDTO = new ReconciliationDTO();
reconciliationDTO.setInnerNumber(innerNumber);
Result<Page<TmsOrder>> orderListByReconciliation = wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO, 1, 10);
if (orderListByReconciliation != null && orderListByReconciliation.getResult() != null) {
Page<TmsOrder> result = orderListByReconciliation.getResult();
List<TmsOrder> records = result.getRecords();
if (records != null && !records.isEmpty()) {
TmsOrder tmsOrder = records.get(0);
reconciliationPO.setSettlementCurrency(tmsOrder.getSettlementCurrency());
}
}
}
}
return reconciliationDomainService.queryList(reconciliationDO);
return reconciliationPOS;
}
/**
mhd_finance/src/main/java/com/linke/finance/infrastructure/feign/WlhyServiceFeign.java
+11 -1
View File
@@ -1,6 +1,11 @@
package com.linke.finance.infrastructure.feign;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mhd.common.core.domain.dto.ReconciliationDTO;
import com.mhd.common.core.domain.dto.UserDriverDTO;
import com.mhd.common.core.domain.entity.TmsOrder;
import com.mhd.common.core.utils.sms.Result;
import com.mhd.common.core.web.domain.AjaxResult;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
@@ -16,4 +21,9 @@ public interface WlhyServiceFeign {
*/
@GetMapping("/ntocc/tmsOrder/getById")
public AjaxResult getById(@RequestParam(name="id",required=true) Long id);
}
@GetMapping(value = "/ntocc/outBoundSummary/getOrderListByReconciliation")
public Result<Page<TmsOrder>> getOrderListByReconciliation(ReconciliationDTO reconciliationDTO,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize);
}