Merge pull request 'yuqh' (#28) from yuqh into dev
Reviewed-on: http://192.168.2.237:3000/root/kangarooDataCenterV3/pulls/28
This commit is contained in:
commit
aad900a250
|
@ -32,7 +32,7 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
|
|||
}
|
||||
/**
|
||||
*
|
||||
* @content 完全用于测试,此接口不使用
|
||||
* @content 完全用于测试,此接口不使用1
|
||||
* @author laborer
|
||||
* @date 2024/5/15 0015 16:00
|
||||
*
|
||||
|
@ -67,6 +67,8 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
|
|||
@Override
|
||||
public JsonResultEntity saveLogToSuccess(IntegrationTaskLivingDetailsEntity entity)throws Exception {
|
||||
checkDate(entity);
|
||||
entity.setNewState("Y");
|
||||
entity.setRepairPust("N");
|
||||
try {
|
||||
entity = integrationTaskLivingDetailsDao.saveSuccessLog(entity);
|
||||
return BaseResult.getSuccessMessageEntity(entity);
|
||||
|
@ -89,6 +91,8 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
|
|||
public JsonResultEntity saveLogToFail(IntegrationTaskLivingDetailsEntity entity)throws Exception {
|
||||
//验证必填字段如果不满足返回数据
|
||||
checkDate(entity);
|
||||
entity.setNewState("N");
|
||||
entity.setRepairPust("Y");
|
||||
try {
|
||||
entity = integrationTaskLivingDetailsDao.save(entity);
|
||||
return BaseResult.getSuccessMessageEntity(entity);
|
||||
|
@ -108,6 +112,8 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
|
|||
public JsonResultEntity saveLogFailToSuccess(IntegrationTaskLivingDetailsEntity entity)throws Exception {
|
||||
//验证必填字段如果不满足返回数据
|
||||
checkDate(entity);
|
||||
entity.setNewState("Y");
|
||||
entity.setRepairPust("N");
|
||||
try {
|
||||
//先根据主键删除错误日志表数据,在进行成功表写入
|
||||
integrationTaskLivingDetailsDao.delete(entity.getId());
|
||||
|
@ -130,6 +136,8 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
|
|||
public JsonResultEntity updateLogFailToSuccess(IntegrationTaskLivingDetailsEntity entity)throws Exception {
|
||||
//验证必填字段如果不满足返回数据
|
||||
checkDate(entity);
|
||||
entity.setNewState("N");
|
||||
entity.setRepairPust("Y");
|
||||
try {
|
||||
//将数据写入成功日志表
|
||||
entity = integrationTaskLivingDetailsDao.update(entity);
|
||||
|
@ -174,14 +182,14 @@ public class IntegrationTaskLivingDetailsServiceImpl extends BaseService<Integra
|
|||
if (StrUtil.isEmpty(newTransmitInfo)) {
|
||||
throw new BaseSystemException("三方系统返回数据不可为空,请传入");
|
||||
}
|
||||
String repairPust = entity.getRepairPust();//是否补推(Y是N不是) 成功情况下默认N不需要补退
|
||||
if (StrUtil.isEmpty(repairPust)) {
|
||||
throw new BaseSystemException("是否补推不可为空,请传入");
|
||||
}
|
||||
String newState = entity.getNewState();//推送状态 成功情况下默认Y
|
||||
if (StrUtil.isEmpty(newState)) {
|
||||
throw new BaseSystemException("推送状态不可为空,请传入");
|
||||
}
|
||||
// String repairPust = entity.getRepairPust();//是否补推(Y是N不是) 成功情况下默认N不需要补退
|
||||
// if (StrUtil.isEmpty(repairPust)) {
|
||||
// throw new BaseSystemException("是否补推不可为空,请传入");
|
||||
// }
|
||||
// String newState = entity.getNewState();//推送状态 成功情况下默认Y
|
||||
// if (StrUtil.isEmpty(newState)) {
|
||||
// throw new BaseSystemException("推送状态不可为空,请传入");
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue