Commit 93755531 authored by huyuchen's avatar huyuchen

明细接口改造

parent a951fb43
package com.yifu.cloud.plus.v1.yifu.common.dapr.util; package com.yifu.cloud.plus.v1.yifu.common.dapr.util;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...@@ -65,8 +66,8 @@ public class EkpDaprUtils { ...@@ -65,8 +66,8 @@ public class EkpDaprUtils {
* @Param * @Param
* @return * @return
**/ **/
public R<String> pushManagerInfoToEkp(EkpIncomeParamManage incomeParam) { public R<EkpIncomePushInfoVo> pushManagerInfoToEkp(EkpIncomeParamManage incomeParam) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpmanagerinfo/inner/pushManangerInfoToEkp", JSON.toJSONString(incomeParam), String.class, SecurityConstants.FROM_IN); return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpmanagerinfo/inner/pushManangerInfoToEkp", JSON.toJSONString(incomeParam), EkpIncomePushInfoVo.class, SecurityConstants.FROM_IN);
} }
/** /**
...@@ -87,8 +88,8 @@ public class EkpDaprUtils { ...@@ -87,8 +88,8 @@ public class EkpDaprUtils {
* @Param * @Param
* @return * @return
**/ **/
public R<String> pushRiskInfoToEkp(EkpIncomeParamRisk incomeParam) { public R<EkpIncomePushInfoVo> pushRiskInfoToEkp(EkpIncomeParamRisk incomeParam) {
return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpriskinfo/inner/pushRiskInfoToEkp", JSON.toJSONString(incomeParam), String.class, SecurityConstants.FROM_IN); return HttpDaprUtil.invokeMethodPost(daprProperties.getAppUrl(),daprProperties.getAppId(),"/ekpriskinfo/inner/pushRiskInfoToEkp", JSON.toJSONString(incomeParam), EkpIncomePushInfoVo.class, SecurityConstants.FROM_IN);
} }
......
package com.yifu.cloud.plus.v1.ekp.vo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TPaymentSocialPush;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Author huyc
* @Date 2024/2/29
* @Description 社保明细推送相关参数
* @Version 1.0
*/
@Data
public class EkpIncomePushInfoVo implements Serializable {
/**
* 社保id合并
**/
private String id;
}
package com.yifu.cloud.plus.v1.ekp.controller; package com.yifu.cloud.plus.v1.ekp.controller;
import com.yifu.cloud.plus.v1.ekp.service.EkpManagerInfoService; import com.yifu.cloud.plus.v1.ekp.service.EkpManagerInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner; import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage;
...@@ -36,7 +37,7 @@ public class TEkpManagerInfoController { ...@@ -36,7 +37,7 @@ public class TEkpManagerInfoController {
**/ **/
@Inner @Inner
@PostMapping("/inner/pushManangerInfoToEkp") @PostMapping("/inner/pushManangerInfoToEkp")
public String pushManangerInfoToEkp(@RequestBody EkpIncomeParamManage incomeParam) { public EkpIncomePushInfoVo pushManangerInfoToEkp(@RequestBody EkpIncomeParamManage incomeParam) {
return ekpManagerInfoService.pushManangerInfoToEkp(incomeParam); return ekpManagerInfoService.pushManangerInfoToEkp(incomeParam);
} }
......
package com.yifu.cloud.plus.v1.ekp.controller; package com.yifu.cloud.plus.v1.ekp.controller;
import com.yifu.cloud.plus.v1.ekp.service.EkpRiskInfoService; import com.yifu.cloud.plus.v1.ekp.service.EkpRiskInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner; import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk;
...@@ -37,7 +38,7 @@ public class TEkpRiskInfoController { ...@@ -37,7 +38,7 @@ public class TEkpRiskInfoController {
**/ **/
@Inner @Inner
@PostMapping("/inner/pushRiskInfoToEkp") @PostMapping("/inner/pushRiskInfoToEkp")
public String pushRiskInfoToEkp(@RequestBody EkpIncomeParamRisk incomeParam) { public EkpIncomePushInfoVo pushRiskInfoToEkp(@RequestBody EkpIncomeParamRisk incomeParam) {
return ekpRiskInfoService.pushRiskInfoToEkp(incomeParam); return ekpRiskInfoService.pushRiskInfoToEkp(incomeParam);
} }
......
...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.service; ...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.ekp.entity.EkpManagerInfo; import com.yifu.cloud.plus.v1.ekp.entity.EkpManagerInfo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -17,7 +18,7 @@ import java.util.List; ...@@ -17,7 +18,7 @@ import java.util.List;
public interface EkpManagerInfoService extends IService<EkpManagerInfo> { public interface EkpManagerInfoService extends IService<EkpManagerInfo> {
@Transactional @Transactional
String pushManangerInfoToEkp(EkpIncomeParamManage incomeParam); EkpIncomePushInfoVo pushManangerInfoToEkp(EkpIncomeParamManage incomeParam);
@Transactional @Transactional
EkpSocialPushInfoVo jobPushManagerInfoToEkp(List<EkpIncomeParamManage> incomeParam); EkpSocialPushInfoVo jobPushManagerInfoToEkp(List<EkpIncomeParamManage> incomeParam);
} }
...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.service; ...@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.ekp.entity.EkpRiskInfo; import com.yifu.cloud.plus.v1.ekp.entity.EkpRiskInfo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -17,7 +18,7 @@ import java.util.List; ...@@ -17,7 +18,7 @@ import java.util.List;
public interface EkpRiskInfoService extends IService<EkpRiskInfo> { public interface EkpRiskInfoService extends IService<EkpRiskInfo> {
@Transactional @Transactional
String pushRiskInfoToEkp(EkpIncomeParamRisk incomeParam); EkpIncomePushInfoVo pushRiskInfoToEkp(EkpIncomeParamRisk incomeParam);
@Transactional @Transactional
EkpSocialPushInfoVo jobPushRiskInfoToEkp(List<EkpIncomeParamRisk> incomeParam); EkpSocialPushInfoVo jobPushRiskInfoToEkp(List<EkpIncomeParamRisk> incomeParam);
} }
...@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.ekp.entity.EkpManagerInfo; ...@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.ekp.entity.EkpManagerInfo;
import com.yifu.cloud.plus.v1.ekp.mapper.EkpManagerInfoMapper; import com.yifu.cloud.plus.v1.ekp.mapper.EkpManagerInfoMapper;
import com.yifu.cloud.plus.v1.ekp.service.EkpManagerInfoService; import com.yifu.cloud.plus.v1.ekp.service.EkpManagerInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
...@@ -33,7 +34,7 @@ public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper, ...@@ -33,7 +34,7 @@ public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper,
* //@Date: 2024-3-14 * //@Date: 2024-3-14
* //@return: void * //@return: void
**/ **/
public String pushManangerInfoToEkp(EkpIncomeParamManage incomeParam) { public EkpIncomePushInfoVo pushManangerInfoToEkp(EkpIncomeParamManage incomeParam) {
//根据项目编码获取ekp所有项目信息 //根据项目编码获取ekp所有项目信息
EkpDeptInfoVo deptInfo = baseMapper.getEkpDeptInfoByNo(incomeParam.getFd_3adfef5e5b9d34()); EkpDeptInfoVo deptInfo = baseMapper.getEkpDeptInfoByNo(incomeParam.getFd_3adfef5e5b9d34());
...@@ -67,7 +68,13 @@ public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper, ...@@ -67,7 +68,13 @@ public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper,
//创建时间 //创建时间
managerInfo.setCreateTime(DateUtil.getCurrentDateTime()); managerInfo.setCreateTime(DateUtil.getCurrentDateTime());
int i = baseMapper.insert(managerInfo); int i = baseMapper.insert(managerInfo);
return i <= 0 ? null : managerInfo.getFdId(); if (i>0) {
EkpIncomePushInfoVo infoVo = new EkpIncomePushInfoVo();
infoVo.setId(managerInfo.getFdId());
return infoVo;
}else {
return null;
}
} catch (Exception e) { } catch (Exception e) {
log.error("管理费明细推送失败:", e); log.error("管理费明细推送失败:", e);
return null; return null;
......
...@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.ekp.entity.EkpRiskInfo; ...@@ -6,6 +6,7 @@ import com.yifu.cloud.plus.v1.ekp.entity.EkpRiskInfo;
import com.yifu.cloud.plus.v1.ekp.mapper.EkpRiskInfoMapper; import com.yifu.cloud.plus.v1.ekp.mapper.EkpRiskInfoMapper;
import com.yifu.cloud.plus.v1.ekp.service.EkpRiskInfoService; import com.yifu.cloud.plus.v1.ekp.service.EkpRiskInfoService;
import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpDeptInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil; import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
...@@ -33,7 +34,7 @@ public class EkpRiskInfoServiceImpl extends ServiceImpl<EkpRiskInfoMapper, EkpRi ...@@ -33,7 +34,7 @@ public class EkpRiskInfoServiceImpl extends ServiceImpl<EkpRiskInfoMapper, EkpRi
* //@Date: 2024-3-14 * //@Date: 2024-3-14
* //@return: void * //@return: void
**/ **/
public String pushRiskInfoToEkp(EkpIncomeParamRisk incomeParam) { public EkpIncomePushInfoVo pushRiskInfoToEkp(EkpIncomeParamRisk incomeParam) {
//根据项目编码获取ekp所有项目信息 //根据项目编码获取ekp所有项目信息
EkpDeptInfoVo deptInfo = baseMapper.getEkpDeptInfoByNo(incomeParam.getFd_3adfef5e5b9d34()); EkpDeptInfoVo deptInfo = baseMapper.getEkpDeptInfoByNo(incomeParam.getFd_3adfef5e5b9d34());
...@@ -66,7 +67,13 @@ public class EkpRiskInfoServiceImpl extends ServiceImpl<EkpRiskInfoMapper, EkpRi ...@@ -66,7 +67,13 @@ public class EkpRiskInfoServiceImpl extends ServiceImpl<EkpRiskInfoMapper, EkpRi
//创建时间 //创建时间
riskInfoInfo.setCreateTime(DateUtil.getCurrentDateTime()); riskInfoInfo.setCreateTime(DateUtil.getCurrentDateTime());
int i = baseMapper.insert(riskInfoInfo); int i = baseMapper.insert(riskInfoInfo);
return i <= 0 ? null : riskInfoInfo.getFdId(); if (i>0) {
EkpIncomePushInfoVo infoVo = new EkpIncomePushInfoVo();
infoVo.setId(riskInfoInfo.getFdId());
return infoVo;
} else {
return null;
}
} catch (Exception e) { } catch (Exception e) {
log.error("管理费明细推送失败:", e); log.error("管理费明细推送失败:", e);
return null; return null;
......
...@@ -27,6 +27,9 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo; ...@@ -27,6 +27,9 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome; import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail; import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo; import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
import org.apache.shardingsphere.transaction.core.TransactionType;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.InputStream; import java.io.InputStream;
...@@ -68,6 +71,8 @@ public interface TIncomeService extends IService<TIncome> { ...@@ -68,6 +71,8 @@ public interface TIncomeService extends IService<TIncome> {
* @Date: 2022/9/9 11:42 * @Date: 2022/9/9 11:42
* @return: * @return:
**/ **/
@Transactional
@ShardingTransactionType(TransactionType.BASE)
boolean saveBathDetail(TIncomeDetail tIncomeDetail, String paymentId); boolean saveBathDetail(TIncomeDetail tIncomeDetail, String paymentId);
void pushDetail(); void pushDetail();
......
...@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.*; import com.yifu.cloud.plus.v1.yifu.common.core.util.*;
...@@ -299,6 +300,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl ...@@ -299,6 +300,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
TIncome income = new TIncome(); TIncome income = new TIncome();
income.setEmpIdcard(tIncomeDetail.getEmpIdcard()); income.setEmpIdcard(tIncomeDetail.getEmpIdcard());
income.setDeptId(tIncomeDetail.getDeptId()); income.setDeptId(tIncomeDetail.getDeptId());
synchronized (this) {
List<TIncome> incomeList = baseMapper.getTIncomeList(income); List<TIncome> incomeList = baseMapper.getTIncomeList(income);
TIncomeDetail detail = new TIncomeDetail(); TIncomeDetail detail = new TIncomeDetail();
detail.setEmpIdcard(tIncomeDetail.getEmpIdcard()); detail.setEmpIdcard(tIncomeDetail.getEmpIdcard());
...@@ -309,10 +311,11 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl ...@@ -309,10 +311,11 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
tIncomeDetailService.save(tIncomeDetail); tIncomeDetailService.save(tIncomeDetail);
// 不存在,直接新增 // 不存在,直接新增
if (incomeList == null || incomeList.isEmpty()) { if (incomeList == null || incomeList.isEmpty()) {
return this.savePaymentIncomeNew(tIncomeDetail, paymentId); return this.savePaymentIncome(tIncomeDetail, paymentId);
} else { } else {
// 核心判断 // 核心判断
return this.copyCoreNew(tIncomeDetail, incomeList, detailList, paymentId, false); return this.copyCore(tIncomeDetail, incomeList, detailList, paymentId, true);
}
} }
} }
...@@ -388,16 +391,16 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl ...@@ -388,16 +391,16 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
if (CommonConstants.ONE_STRING.equals(income.getFeeType())) { if (CommonConstants.ONE_STRING.equals(income.getFeeType())) {
EkpIncomeParamManage sendParam = new EkpIncomeParamManage(); EkpIncomeParamManage sendParam = new EkpIncomeParamManage();
this.copyToEkpManage(income, sendParam); this.copyToEkpManage(income, sendParam);
R<String> info = ekpDaprUtil.pushManagerInfoToEkp(sendParam); R<EkpIncomePushInfoVo> info = ekpDaprUtil.pushManagerInfoToEkp(sendParam);
if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) { if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) {
sendBack = info.getData(); sendBack = info.getData().getId();
} }
} else { } else {
EkpIncomeParamRisk sendParam = new EkpIncomeParamRisk(); EkpIncomeParamRisk sendParam = new EkpIncomeParamRisk();
this.copyToEkpRisk(income, sendParam); this.copyToEkpRisk(income, sendParam);
R<String> info = ekpDaprUtil.pushRiskInfoToEkp(sendParam); R<EkpIncomePushInfoVo> info = ekpDaprUtil.pushRiskInfoToEkp(sendParam);
if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) { if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) {
sendBack = info.getData(); sendBack = info.getData().getId();
} }
} }
return sendBack; return sendBack;
...@@ -444,7 +447,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl ...@@ -444,7 +447,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
income.setSendStatus(CommonConstants.ZERO_STRING); income.setSendStatus(CommonConstants.ZERO_STRING);
income.setApplyNo(tIncomeDetail.getApplyNo()); income.setApplyNo(tIncomeDetail.getApplyNo());
this.save(income); this.save(income);
long start = System.currentTimeMillis();
income.setSourceId(paymentId); income.setSourceId(paymentId);
doJointSocialTask.asynchronousEkpIncomePaymentNew(income,paymentId); doJointSocialTask.asynchronousEkpIncomePaymentNew(income,paymentId);
return true; return true;
......
package com.yifu.cloud.plus.v1.yifu.social.util; package com.yifu.cloud.plus.v1.yifu.social.util;
import com.yifu.cloud.plus.v1.ekp.vo.EkpIncomePushInfoVo;
import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo; import com.yifu.cloud.plus.v1.ekp.vo.EkpSocialPushInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo;
...@@ -108,7 +109,7 @@ public class DoJointSocialTask { ...@@ -108,7 +109,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(sendBack); error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -119,7 +120,7 @@ public class DoJointSocialTask { ...@@ -119,7 +120,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送收入到EKP错误", e); log.error("推送收入到EKP错误", e);
} }
log.info("推送收入到EKP结束"); log.info("推送收入到EKP结束");
...@@ -153,7 +154,7 @@ public class DoJointSocialTask { ...@@ -153,7 +154,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(sendBack); error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -164,7 +165,7 @@ public class DoJointSocialTask { ...@@ -164,7 +165,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送收入到EKP错误", e); log.error("推送收入到EKP错误", e);
} }
log.info("推送收入到EKP结束"); log.info("推送收入到EKP结束");
...@@ -207,7 +208,7 @@ public class DoJointSocialTask { ...@@ -207,7 +208,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(sendBack); error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -218,7 +219,7 @@ public class DoJointSocialTask { ...@@ -218,7 +219,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送收入到EKP错误", e); log.error("推送收入到EKP错误", e);
} }
log.info("推送收入到EKP结束"); log.info("推送收入到EKP结束");
...@@ -254,7 +255,7 @@ public class DoJointSocialTask { ...@@ -254,7 +255,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(sendBack); error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -265,7 +266,7 @@ public class DoJointSocialTask { ...@@ -265,7 +266,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送收入到EKP错误", e); log.error("推送收入到EKP错误", e);
} }
log.info("推送收入到EKP结束"); log.info("推送收入到EKP结束");
...@@ -298,7 +299,7 @@ public class DoJointSocialTask { ...@@ -298,7 +299,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(sendBack); error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -309,7 +310,7 @@ public class DoJointSocialTask { ...@@ -309,7 +310,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送收入到EKP错误", e); log.error("推送收入到EKP错误", e);
} }
log.info("推送收入到EKP结束"); log.info("推送收入到EKP结束");
...@@ -326,18 +327,18 @@ public class DoJointSocialTask { ...@@ -326,18 +327,18 @@ public class DoJointSocialTask {
if (CommonConstants.ONE_STRING.equals(income.getFeeType())) { if (CommonConstants.ONE_STRING.equals(income.getFeeType())) {
EkpIncomeParamManage sendParam = new EkpIncomeParamManage(); EkpIncomeParamManage sendParam = new EkpIncomeParamManage();
this.copyToEkpManage(income, sendParam); this.copyToEkpManage(income, sendParam);
R<String> info = ekpDaprUtil.pushManagerInfoToEkp(sendParam); R<EkpIncomePushInfoVo> info = ekpDaprUtil.pushManagerInfoToEkp(sendParam);
if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) { if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) {
return info.getData(); return info.getData().getId();
} else { } else {
return "管理费推送失败"; return "管理费推送失败";
} }
} else { } else {
EkpIncomeParamRisk sendParam = new EkpIncomeParamRisk(); EkpIncomeParamRisk sendParam = new EkpIncomeParamRisk();
this.copyToEkpRisk(income, sendParam); this.copyToEkpRisk(income, sendParam);
R<String> info = ekpDaprUtil.pushRiskInfoToEkp(sendParam); R<EkpIncomePushInfoVo> info = ekpDaprUtil.pushRiskInfoToEkp(sendParam);
if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) { if (!Common.isEmpty(info) && Common.isNotNull(info.getData())) {
return info.getData(); return info.getData().getId();
} else { } else {
return "风险金推送失败"; return "风险金推送失败";
} }
...@@ -1444,7 +1445,7 @@ public class DoJointSocialTask { ...@@ -1444,7 +1445,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(sendBack); error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -1455,7 +1456,7 @@ public class DoJointSocialTask { ...@@ -1455,7 +1456,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送收入到EKP错误", e); log.error("推送收入到EKP错误", e);
} }
log.info("推送收入到EKP结束"); log.info("推送收入到EKP结束");
...@@ -1480,7 +1481,7 @@ public class DoJointSocialTask { ...@@ -1480,7 +1481,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(sendBack); error.setTitle(sendBack);
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
} }
} catch (Exception e) { } catch (Exception e) {
TSendEkpError error = new TSendEkpError(); TSendEkpError error = new TSendEkpError();
...@@ -1491,7 +1492,7 @@ public class DoJointSocialTask { ...@@ -1491,7 +1492,7 @@ public class DoJointSocialTask {
error.setLinkId(income.getId()); error.setLinkId(income.getId());
error.setTitle(e.getMessage()); error.setTitle(e.getMessage());
error.setNums(CommonConstants.ONE_INT); error.setNums(CommonConstants.ONE_INT);
tSendEkpErrorService.saveError(error); tSendEkpErrorService.save(error);
log.error("推送收入到EKP错误", e); log.error("推送收入到EKP错误", e);
} }
log.info("推送收入到EKP结束"); log.info("推送收入到EKP结束");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment