合同新增逻辑修改:原币金额-变更后、本币金额-变更后默认0
提交erp判断逻辑修改:修改错误返回值解析方式
This commit is contained in:
@@ -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<String, String> submitErp(ErpContractSaveReqVO erpContractVO);
|
||||
}
|
||||
@@ -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<String, String> submitErp(ErpContractSaveReqVO erpContractVO) {
|
||||
|
||||
// 转换为DO
|
||||
ErpContractDO erpContract = BeanUtils.toBean(erpContractVO, ErpContractDO.class);
|
||||
@@ -337,7 +336,7 @@ public class ErpContractServiceImpl implements ErpContractService {
|
||||
|
||||
HashMap<String, String> response = erpExternalApi.submitDataToErp(erpSubmitReqDTO);
|
||||
|
||||
return response.get("resStr");
|
||||
return response;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user