From 7b7658bab1cbf0db2e9523c47970cf3a6fff2d99 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Wed, 22 Oct 2025 11:39:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=B7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=8A=E9=99=90=E3=80=81=E4=B8=8B=E7=BA=BF=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9BigDecimal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/contractorder/api/dto/contract/DeductRespDTO.java | 4 ++-- .../controller/admin/contract/vo/contract/DeductRespVO.java | 4 ++-- .../admin/contract/vo/contract/DeductSaveReqVO.java | 4 ++-- .../dal/dataobject/contract/ContractDeductDO.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DeductRespDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DeductRespDTO.java index 6184e423..ae49cc42 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DeductRespDTO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DeductRespDTO.java @@ -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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java index c37f0249..e544e2bc 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductRespVO.java @@ -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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java index 8246ab79..fa796e34 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/DeductSaveReqVO.java @@ -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; diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java index f89b3d07..1c9c94c2 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDeductDO.java @@ -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) */ From 3d396dbb5292fa1f47c458f92680544d29cbda59 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Wed, 22 Oct 2025 16:02:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=8E=9F=E5=B8=81?= =?UTF-8?q?=E9=87=91=E9=A2=9D-=E5=8F=98=E6=9B=B4=E5=90=8E=E3=80=81?= =?UTF-8?q?=E6=9C=AC=E5=B8=81=E9=87=91=E9=A2=9D-=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E5=90=8E=E9=BB=98=E8=AE=A40=20=E6=8F=90=E4=BA=A4erp=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF=E8=BF=94=E5=9B=9E=E5=80=BC=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/contract/ContractServiceImpl.java | 19 +++++++++++++++---- .../erp/service/erp/ErpContractService.java | 3 ++- .../service/erp/ErpContractServiceImpl.java | 5 ++--- .../zt/plat/module/erp/utils/ErpConfig.java | 2 ++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java index 765a864a..b6a5b21b 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java @@ -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 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()); diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java index ca681b4b..dfd863ad 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractService.java @@ -7,6 +7,7 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpContractSaveReqVO; import com.zt.plat.module.erp.dal.dataobject.erp.ErpContractDO; import jakarta.validation.Valid; +import java.util.HashMap; import java.util.List; /** @@ -77,5 +78,5 @@ public interface ErpContractService { * @param erpContractVO ERP合同映射数据 * @return ERP合同映射 */ - String submitErp(ErpContractSaveReqVO erpContractVO); + HashMap submitErp(ErpContractSaveReqVO erpContractVO); } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java index 6583933b..21f750c8 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpContractServiceImpl.java @@ -30,7 +30,6 @@ import java.util.Map; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.erp.enums.ErrorCodeConstants.ERP_CONTRACT_NOT_EXISTS; -import static dm.jdbc.util.DriverUtil.log; /** * ERP合同映射 Service 实现类 @@ -227,7 +226,7 @@ public class ErpContractServiceImpl implements ErpContractService { } @Override - public String submitErp(ErpContractSaveReqVO erpContractVO) { + public HashMap submitErp(ErpContractSaveReqVO erpContractVO) { // 转换为DO ErpContractDO erpContract = BeanUtils.toBean(erpContractVO, ErpContractDO.class); @@ -337,7 +336,7 @@ public class ErpContractServiceImpl implements ErpContractService { HashMap response = erpExternalApi.submitDataToErp(erpSubmitReqDTO); - return response.get("resStr"); + return response; } /** diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java index cdcf8790..82d5b653 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/utils/ErpConfig.java @@ -151,6 +151,8 @@ public class ErpConfig { if (StrUtil.isBlank(E_MSG)) { E_MSG = jsonResponse.getString("msg"); } + String E_RESP = data.getString("E_RESP"); + resMap.put("E_RESP", E_RESP); resMap.put("resStr", E_MSG); resMap.put("flag", flag); } From a2794fecfb2c3ae5b9116ee635444b26a4ef299a Mon Sep 17 00:00:00 2001 From: chenbowen Date: Wed, 22 Oct 2025 16:06:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-server/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base-server/src/main/resources/application.yml b/base-server/src/main/resources/application.yml index adccaac5..7eb362ae 100644 --- a/base-server/src/main/resources/application.yml +++ b/base-server/src/main/resources/application.yml @@ -114,8 +114,8 @@ zt: - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求 - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 swagger: - title: 管理后台 - description: 提供管理员管理的所有功能 + title: Base 模块 + description: 提供基础管理模块的所有功能 version: ${zt.info.version} tenant: # 多租户相关配置项 enable: true