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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java
This commit is contained in:
1745237360-cloud
2026-01-12 14:32:37 +08:00
parent c8493dd658 d2e8d6ab30
commit 935c154136
12 changed files with 158 additions and 58 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
+16 -21
View File
@@ -1,12 +1,10 @@
package com.linke.finance.application.server.reconciliation;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.aliyun.dingtalkworkflow_1_0.models.StartProcessInstanceResponse;
import com.linke.finance.domain.businessDocument.entity.BusinessDocument;
import com.linke.finance.domain.businessDocument.service.BusinessDocumentDomainService;
import com.linke.finance.domain.reconciliation.entity.Reconciliation;
import com.linke.finance.domain.reconciliation.entity.ReconciliationBusinessDocument;
import com.linke.finance.domain.reconciliation.entity.ReconciliationOrderDetail;
import com.linke.finance.domain.reconciliation.repository.po.FinacialReconciliationListVO;
import com.linke.finance.domain.reconciliation.repository.po.ReconciliationOrderDetailPO;
@@ -15,7 +13,6 @@ import com.linke.finance.domain.reconciliation.repository.todo.ReconciliationDO;
import com.linke.finance.domain.reconciliation.service.ReconciliationDomainService;
import com.linke.finance.domain.revenueExpensesRecord.entity.RevenueExpensesRecord;
import com.linke.finance.domain.revenueExpensesRecord.service.RevenueExpensesRecordDomainService;
import com.linke.finance.domain.tmsReceipt.entity.TmsReceipt;
import com.linke.finance.domain.tmsReceipt.repository.mapper.TmsReceiptMapper;
import com.linke.finance.domain.tmsReceipt.repository.po.TmsReceiptPO;
import com.linke.finance.domain.tmsReceipt.service.TmsReceiptDomainService;
@@ -39,7 +36,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -47,7 +43,6 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -146,21 +141,21 @@ public class ReconciliationApplicationService {
}
}
}
// List<ReconciliationPO> reconciliationPOS = reconciliationDomainService.queryList(reconciliationDO);
// for (ReconciliationPO reconciliationPO : reconciliationPOS) {
// Long reconciliationId = reconciliationPO.getReconciliationId();
// AjaxResult tmsOrderSettlementDetails = wlhyServiceFeign.getById(reconciliationId);
// Map<String,Object> result = (Map<String,Object>)tmsOrderSettlementDetails.get("result");
// if (ObjectUtil.isNotEmpty( result)){
// Integer receiptIdstr = (Integer)result.get("receiptId");
// Long receiptId = receiptIdstr.longValue();
// TmsReceipt tmsReceipt = tmsReceiptMapper.selectById(receiptId);
// if (tmsReceipt != null) {
// reconciliationPO.setSettlementCurrency(tmsReceipt.getSettlementCurrency());
// }
// }
// }
// return reconciliationPOS;
/* List<ReconciliationPO> reconciliationPOS = reconciliationDomainService.queryList(reconciliationDO);
for (ReconciliationPO reconciliationPO : reconciliationPOS) {
Long reconciliationId = reconciliationPO.getReconciliationId();
AjaxResult tmsOrderSettlementDetails = wlhyServiceFeign.getById(reconciliationId);
Map<String,Object> result = (Map<String,Object>)tmsOrderSettlementDetails.get("result");
if (ObjectUtil.isNotEmpty( result)){
Integer receiptIdstr = (Integer)result.get("receiptId");
Long receiptId = receiptIdstr.longValue();
TmsReceipt tmsReceipt = tmsReceiptMapper.selectById(receiptId);
if (tmsReceipt != null) {
reconciliationPO.setSettlementCurrency(tmsReceipt.getSettlementCurrency());
}
}
}
return reconciliationPOS;*/
return reconciliationDomainService.queryList(reconciliationDO);
}
@@ -699,4 +694,4 @@ public class ReconciliationApplicationService {
{
return reconciliationDomainService.editIsInvoice(innerNumber,isInvoice,invoiceId,invoiceMakeTime,applyNumber);
}
}
}
mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/entity/TmsReceipt.java
+11 -10
View File
@@ -2,15 +2,16 @@ package com.linke.finance.domain.tmsReceipt.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.mhd.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import com.mhd.common.core.web.domain.BaseVOEntity;
import java.math.BigDecimal;
import lombok.Data;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mhd.common.core.annotation.Excel;
import com.mhd.common.core.web.domain.BaseVOEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
/**
* 收款单对象 tms_receipt
@@ -43,9 +44,9 @@ public class TmsReceipt extends BaseVOEntity{
@Excel(name = "收款单号")
private String receivePaymentNumber;
// @ApiModelProperty("结算方id")
// @Excel(name = "结算方id")
// private String settlementPartyId;
@ApiModelProperty("结算方id")
@Excel(name = "结算方id")
private String settlementPartyId;
@ApiModelProperty("结算方名称")
@Excel(name = "结算方名称")
private String settlementPartyName;
@@ -118,4 +119,4 @@ public class TmsReceipt extends BaseVOEntity{
@ApiModelProperty("结算币种")
private String settlementCurrency;
}
}