zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
chenbowen
2025-10-22 16:07:47 +08:00
parent a63d90faf2 a2794fecfb
commit 0a5f8c67f9
9 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DeductRespDTO.java
View File

@@ -32,10 +32,10 @@ public class DeductRespDTO {
private String rangeWay;
@Schema(description = "上限")
private String up;
private BigDecimal up;
@Schema(description = "下限")
private String down;
private BigDecimal down;
@Schema(description = "类型(字典：STLM_COEF)")
private String type;

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java
View File

@@ -31,10 +31,10 @@ public class DeductRespVO {
private String rangeWay;
@Schema(description = "上限")
private String up;
private BigDecimal up;
@Schema(description = "下限")
private String down;
private BigDecimal down;
@Schema(description = "类型(字典：STLM_COEF)")
private String type;

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java
View File

@@ -31,10 +31,10 @@ public class DeductSaveReqVO {
private String rangeWay;
@Schema(description = "上限")
private String up;
private BigDecimal up;
@Schema(description = "下限")
private String down;
private BigDecimal down;
@Schema(description = "类型(字典：STLM_COEF)")
private String type;

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java
View File

@@ -63,12 +63,12 @@ public class ContractDeductDO extends BusinessBaseDO {
* 上限
*/
@TableField("UP")
private String up;
private BigDecimal up;
/**
* 下限
*/
@TableField("DOWN")
private String down;
private BigDecimal down;
/**
* 类型(字典：STLM_COEF)
*/

19
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
View File

@@ -54,6 +54,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.ByteArrayOutputStream;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -171,7 +172,11 @@ public class ContractServiceImpl implements ContractService {
// 合同状态保存为草稿
contractMainDO.setStatus(DictEnum.BSE_CTRT_STS_DRAFT.getCode());
// 生成系统合同编号
contractMainDO.setSystemContractNumber(generateSystemContractNumber(reqVO.getCategory()));
contractMainDO.setSystemContractNumber(generateSystemContractNumber(reqVO.getBusinessType()));
// 原币金额-变更后
if (contractMainDO.getChangeCooAmount() == null) contractMainDO.setChangeCooAmount(new BigDecimal(0));
// 本币金额-变更后
if (contractMainDO.getChangeBasicAmount() == null) contractMainDO.setChangeBasicAmount(new BigDecimal(0));
// 保存合同主信息
contractMainMapper.insert(contractMainDO);
@@ -1352,7 +1357,7 @@ public class ContractServiceImpl implements ContractService {
} else {
contractMainDO.setStatus(DictEnum.BSE_CTRT_STS_PUSH_ERROR.getCode());
contractMainDO.setErpStatus(DictEnum.ERP_REQ_STS_RLBK.getCode());
// contractMainDO.setCause(erpResult.getStr("errMsg"));
contractMainDO.setCause(erpResult.getStr("errMsg"));
contractMainMapper.updateById(contractMainDO);
}
} else {
@@ -1366,8 +1371,14 @@ public class ContractServiceImpl implements ContractService {
private JSONObject sendToErp(ErpContractSaveReqVO erpContractVO) {
JSONObject erpResult = new JSONObject();
try {
String result = erpContractService.submitErp(erpContractVO);
erpResult.putOnce("success", true);
HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
if ("E".equals(result.get("flag"))) {
erpResult.putOnce("success", false);
erpResult.putOnce("errMsg", result.get("resStr")+":"+result.get("E_RESP"));
} else {
erpResult.putOnce("success", true);
erpResult.putOnce("data", result);
}
} catch (Exception e) {
erpResult.putOnce("success", false);
erpResult.putOnce("errMsg", e.getMessage());