Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
93755531
Commit
93755531
authored
Mar 26, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
明细接口改造
parent
a951fb43
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
99 additions
and
49 deletions
+99
-49
EkpDaprUtils.java
...ifu/cloud/plus/v1/yifu/common/dapr/util/EkpDaprUtils.java
+5
-4
EkpIncomePushInfoVo.java
...va/com/yifu/cloud/plus/v1/ekp/vo/EkpIncomePushInfoVo.java
+23
-0
TEkpManagerInfoController.java
...oud/plus/v1/ekp/controller/TEkpManagerInfoController.java
+2
-1
TEkpRiskInfoController.java
.../cloud/plus/v1/ekp/controller/TEkpRiskInfoController.java
+2
-1
EkpManagerInfoService.java
...yifu/cloud/plus/v1/ekp/service/EkpManagerInfoService.java
+2
-1
EkpRiskInfoService.java
...om/yifu/cloud/plus/v1/ekp/service/EkpRiskInfoService.java
+2
-1
EkpManagerInfoServiceImpl.java
...d/plus/v1/ekp/service/impl/EkpManagerInfoServiceImpl.java
+9
-2
EkpRiskInfoServiceImpl.java
...loud/plus/v1/ekp/service/impl/EkpRiskInfoServiceImpl.java
+9
-2
TIncomeService.java
...ifu/cloud/plus/v1/yifu/social/service/TIncomeService.java
+5
-0
TIncomeServiceImpl.java
.../plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
+21
-19
DoJointSocialTask.java
...ifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
+19
-18
No files found.
yifu-common/yifu-common-dapr/src/main/java/com/yifu/cloud/plus/v1/yifu/common/dapr/util/EkpDaprUtils.java
View file @
93755531
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
common
.
dapr
.
util
;
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.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
...
@@ -65,8 +66,8 @@ public class EkpDaprUtils {
* @Param
* @return
**/
public
R
<
String
>
pushManagerInfoToEkp
(
EkpIncomeParamManage
incomeParam
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/ekpmanagerinfo/inner/pushManangerInfoToEkp"
,
JSON
.
toJSONString
(
incomeParam
),
String
.
class
,
SecurityConstants
.
FROM_IN
);
public
R
<
EkpIncomePushInfoVo
>
pushManagerInfoToEkp
(
EkpIncomeParamManage
incomeParam
)
{
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 {
* @Param
* @return
**/
public
R
<
String
>
pushRiskInfoToEkp
(
EkpIncomeParamRisk
incomeParam
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/ekpriskinfo/inner/pushRiskInfoToEkp"
,
JSON
.
toJSONString
(
incomeParam
),
String
.
class
,
SecurityConstants
.
FROM_IN
);
public
R
<
EkpIncomePushInfoVo
>
pushRiskInfoToEkp
(
EkpIncomeParamRisk
incomeParam
)
{
return
HttpDaprUtil
.
invokeMethodPost
(
daprProperties
.
getAppUrl
(),
daprProperties
.
getAppId
(),
"/ekpriskinfo/inner/pushRiskInfoToEkp"
,
JSON
.
toJSONString
(
incomeParam
),
EkpIncomePushInfoVo
.
class
,
SecurityConstants
.
FROM_IN
);
}
...
...
yifu-ekp/yifu-ekp-api/src/main/java/com/yifu/cloud/plus/v1/ekp/vo/EkpIncomePushInfoVo.java
0 → 100644
View file @
93755531
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
;
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/TEkpManagerInfoController.java
View file @
93755531
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
controller
;
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.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamManage
;
...
...
@@ -36,7 +37,7 @@ public class TEkpManagerInfoController {
**/
@Inner
@PostMapping
(
"/inner/pushManangerInfoToEkp"
)
public
String
pushManangerInfoToEkp
(
@RequestBody
EkpIncomeParamManage
incomeParam
)
{
public
EkpIncomePushInfoVo
pushManangerInfoToEkp
(
@RequestBody
EkpIncomeParamManage
incomeParam
)
{
return
ekpManagerInfoService
.
pushManangerInfoToEkp
(
incomeParam
);
}
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/TEkpRiskInfoController.java
View file @
93755531
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
controller
;
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.yifu.common.security.annotation.Inner
;
import
com.yifu.cloud.plus.v1.yifu.ekp.vo.EkpIncomeParamRisk
;
...
...
@@ -37,7 +38,7 @@ public class TEkpRiskInfoController {
**/
@Inner
@PostMapping
(
"/inner/pushRiskInfoToEkp"
)
public
String
pushRiskInfoToEkp
(
@RequestBody
EkpIncomeParamRisk
incomeParam
)
{
public
EkpIncomePushInfoVo
pushRiskInfoToEkp
(
@RequestBody
EkpIncomeParamRisk
incomeParam
)
{
return
ekpRiskInfoService
.
pushRiskInfoToEkp
(
incomeParam
);
}
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpManagerInfoService.java
View file @
93755531
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
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.yifu.ekp.vo.EkpIncomeParamManage
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -17,7 +18,7 @@ import java.util.List;
public
interface
EkpManagerInfoService
extends
IService
<
EkpManagerInfo
>
{
@Transactional
String
pushManangerInfoToEkp
(
EkpIncomeParamManage
incomeParam
);
EkpIncomePushInfoVo
pushManangerInfoToEkp
(
EkpIncomeParamManage
incomeParam
);
@Transactional
EkpSocialPushInfoVo
jobPushManagerInfoToEkp
(
List
<
EkpIncomeParamManage
>
incomeParam
);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/EkpRiskInfoService.java
View file @
93755531
...
...
@@ -2,6 +2,7 @@ package com.yifu.cloud.plus.v1.ekp.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
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.yifu.ekp.vo.EkpIncomeParamRisk
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -17,7 +18,7 @@ import java.util.List;
public
interface
EkpRiskInfoService
extends
IService
<
EkpRiskInfo
>
{
@Transactional
String
pushRiskInfoToEkp
(
EkpIncomeParamRisk
incomeParam
);
EkpIncomePushInfoVo
pushRiskInfoToEkp
(
EkpIncomeParamRisk
incomeParam
);
@Transactional
EkpSocialPushInfoVo
jobPushRiskInfoToEkp
(
List
<
EkpIncomeParamRisk
>
incomeParam
);
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpManagerInfoServiceImpl.java
View file @
93755531
...
...
@@ -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.service.EkpManagerInfoService
;
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.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
...
...
@@ -33,7 +34,7 @@ public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper,
* //@Date: 2024-3-14
* //@return: void
**/
public
String
pushManangerInfoToEkp
(
EkpIncomeParamManage
incomeParam
)
{
public
EkpIncomePushInfoVo
pushManangerInfoToEkp
(
EkpIncomeParamManage
incomeParam
)
{
//根据项目编码获取ekp所有项目信息
EkpDeptInfoVo
deptInfo
=
baseMapper
.
getEkpDeptInfoByNo
(
incomeParam
.
getFd_3adfef5e5b9d34
());
...
...
@@ -67,7 +68,13 @@ public class EkpManagerInfoServiceImpl extends ServiceImpl<EkpManagerInfoMapper,
//创建时间
managerInfo
.
setCreateTime
(
DateUtil
.
getCurrentDateTime
());
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
)
{
log
.
error
(
"管理费明细推送失败:"
,
e
);
return
null
;
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/EkpRiskInfoServiceImpl.java
View file @
93755531
...
...
@@ -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.service.EkpRiskInfoService
;
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.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
...
...
@@ -33,7 +34,7 @@ public class EkpRiskInfoServiceImpl extends ServiceImpl<EkpRiskInfoMapper, EkpRi
* //@Date: 2024-3-14
* //@return: void
**/
public
String
pushRiskInfoToEkp
(
EkpIncomeParamRisk
incomeParam
)
{
public
EkpIncomePushInfoVo
pushRiskInfoToEkp
(
EkpIncomeParamRisk
incomeParam
)
{
//根据项目编码获取ekp所有项目信息
EkpDeptInfoVo
deptInfo
=
baseMapper
.
getEkpDeptInfoByNo
(
incomeParam
.
getFd_3adfef5e5b9d34
());
...
...
@@ -66,7 +67,13 @@ public class EkpRiskInfoServiceImpl extends ServiceImpl<EkpRiskInfoMapper, EkpRi
//创建时间
riskInfoInfo
.
setCreateTime
(
DateUtil
.
getCurrentDateTime
());
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
)
{
log
.
error
(
"管理费明细推送失败:"
,
e
);
return
null
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TIncomeService.java
View file @
93755531
...
...
@@ -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.TIncomeDetail
;
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
java.io.InputStream
;
...
...
@@ -68,6 +71,8 @@ public interface TIncomeService extends IService<TIncome> {
* @Date: 2022/9/9 11:42
* @return:
**/
@Transactional
@ShardingTransactionType
(
TransactionType
.
BASE
)
boolean
saveBathDetail
(
TIncomeDetail
tIncomeDetail
,
String
paymentId
);
void
pushDetail
();
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java
View file @
93755531
...
...
@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
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.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
...
...
@@ -299,6 +300,7 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
TIncome
income
=
new
TIncome
();
income
.
setEmpIdcard
(
tIncomeDetail
.
getEmpIdcard
());
income
.
setDeptId
(
tIncomeDetail
.
getDeptId
());
synchronized
(
this
)
{
List
<
TIncome
>
incomeList
=
baseMapper
.
getTIncomeList
(
income
);
TIncomeDetail
detail
=
new
TIncomeDetail
();
detail
.
setEmpIdcard
(
tIncomeDetail
.
getEmpIdcard
());
...
...
@@ -309,10 +311,11 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
tIncomeDetailService
.
save
(
tIncomeDetail
);
// 不存在,直接新增
if
(
incomeList
==
null
||
incomeList
.
isEmpty
())
{
return
this
.
savePaymentIncomeNew
(
tIncomeDetail
,
paymentId
);
return
this
.
savePaymentIncome
(
tIncomeDetail
,
paymentId
);
}
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
if
(
CommonConstants
.
ONE_STRING
.
equals
(
income
.
getFeeType
()))
{
EkpIncomeParamManage
sendParam
=
new
EkpIncomeParamManage
();
this
.
copyToEkpManage
(
income
,
sendParam
);
R
<
String
>
info
=
ekpDaprUtil
.
pushManagerInfoToEkp
(
sendParam
);
R
<
EkpIncomePushInfoVo
>
info
=
ekpDaprUtil
.
pushManagerInfoToEkp
(
sendParam
);
if
(!
Common
.
isEmpty
(
info
)
&&
Common
.
isNotNull
(
info
.
getData
()))
{
sendBack
=
info
.
getData
();
sendBack
=
info
.
getData
()
.
getId
()
;
}
}
else
{
EkpIncomeParamRisk
sendParam
=
new
EkpIncomeParamRisk
();
this
.
copyToEkpRisk
(
income
,
sendParam
);
R
<
String
>
info
=
ekpDaprUtil
.
pushRiskInfoToEkp
(
sendParam
);
R
<
EkpIncomePushInfoVo
>
info
=
ekpDaprUtil
.
pushRiskInfoToEkp
(
sendParam
);
if
(!
Common
.
isEmpty
(
info
)
&&
Common
.
isNotNull
(
info
.
getData
()))
{
sendBack
=
info
.
getData
();
sendBack
=
info
.
getData
()
.
getId
()
;
}
}
return
sendBack
;
...
...
@@ -444,7 +447,6 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
income
.
setSendStatus
(
CommonConstants
.
ZERO_STRING
);
income
.
setApplyNo
(
tIncomeDetail
.
getApplyNo
());
this
.
save
(
income
);
long
start
=
System
.
currentTimeMillis
();
income
.
setSourceId
(
paymentId
);
doJointSocialTask
.
asynchronousEkpIncomePaymentNew
(
income
,
paymentId
);
return
true
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/util/DoJointSocialTask.java
View file @
93755531
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.yifu.archives.entity.TSettleDomain
;
import
com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainSelectVo
;
...
...
@@ -108,7 +109,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
}
}
catch
(
Exception
e
)
{
TSendEkpError
error
=
new
TSendEkpError
();
...
...
@@ -119,7 +120,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
e
.
getMessage
());
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
log
.
error
(
"推送收入到EKP错误"
,
e
);
}
log
.
info
(
"推送收入到EKP结束"
);
...
...
@@ -153,7 +154,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
}
}
catch
(
Exception
e
)
{
TSendEkpError
error
=
new
TSendEkpError
();
...
...
@@ -164,7 +165,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
e
.
getMessage
());
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
log
.
error
(
"推送收入到EKP错误"
,
e
);
}
log
.
info
(
"推送收入到EKP结束"
);
...
...
@@ -207,7 +208,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
}
}
catch
(
Exception
e
)
{
TSendEkpError
error
=
new
TSendEkpError
();
...
...
@@ -218,7 +219,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
e
.
getMessage
());
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
log
.
error
(
"推送收入到EKP错误"
,
e
);
}
log
.
info
(
"推送收入到EKP结束"
);
...
...
@@ -254,7 +255,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
}
}
catch
(
Exception
e
)
{
TSendEkpError
error
=
new
TSendEkpError
();
...
...
@@ -265,7 +266,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
e
.
getMessage
());
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
log
.
error
(
"推送收入到EKP错误"
,
e
);
}
log
.
info
(
"推送收入到EKP结束"
);
...
...
@@ -298,7 +299,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
}
}
catch
(
Exception
e
)
{
TSendEkpError
error
=
new
TSendEkpError
();
...
...
@@ -309,7 +310,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
e
.
getMessage
());
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
log
.
error
(
"推送收入到EKP错误"
,
e
);
}
log
.
info
(
"推送收入到EKP结束"
);
...
...
@@ -326,18 +327,18 @@ public class DoJointSocialTask {
if
(
CommonConstants
.
ONE_STRING
.
equals
(
income
.
getFeeType
()))
{
EkpIncomeParamManage
sendParam
=
new
EkpIncomeParamManage
();
this
.
copyToEkpManage
(
income
,
sendParam
);
R
<
String
>
info
=
ekpDaprUtil
.
pushManagerInfoToEkp
(
sendParam
);
R
<
EkpIncomePushInfoVo
>
info
=
ekpDaprUtil
.
pushManagerInfoToEkp
(
sendParam
);
if
(!
Common
.
isEmpty
(
info
)
&&
Common
.
isNotNull
(
info
.
getData
()))
{
return
info
.
getData
();
return
info
.
getData
()
.
getId
()
;
}
else
{
return
"管理费推送失败"
;
}
}
else
{
EkpIncomeParamRisk
sendParam
=
new
EkpIncomeParamRisk
();
this
.
copyToEkpRisk
(
income
,
sendParam
);
R
<
String
>
info
=
ekpDaprUtil
.
pushRiskInfoToEkp
(
sendParam
);
R
<
EkpIncomePushInfoVo
>
info
=
ekpDaprUtil
.
pushRiskInfoToEkp
(
sendParam
);
if
(!
Common
.
isEmpty
(
info
)
&&
Common
.
isNotNull
(
info
.
getData
()))
{
return
info
.
getData
();
return
info
.
getData
()
.
getId
()
;
}
else
{
return
"风险金推送失败"
;
}
...
...
@@ -1444,7 +1445,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
}
}
catch
(
Exception
e
)
{
TSendEkpError
error
=
new
TSendEkpError
();
...
...
@@ -1455,7 +1456,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
e
.
getMessage
());
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
log
.
error
(
"推送收入到EKP错误"
,
e
);
}
log
.
info
(
"推送收入到EKP结束"
);
...
...
@@ -1480,7 +1481,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
sendBack
);
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
}
}
catch
(
Exception
e
)
{
TSendEkpError
error
=
new
TSendEkpError
();
...
...
@@ -1491,7 +1492,7 @@ public class DoJointSocialTask {
error
.
setLinkId
(
income
.
getId
());
error
.
setTitle
(
e
.
getMessage
());
error
.
setNums
(
CommonConstants
.
ONE_INT
);
tSendEkpErrorService
.
save
Error
(
error
);
tSendEkpErrorService
.
save
(
error
);
log
.
error
(
"推送收入到EKP错误"
,
e
);
}
log
.
info
(
"推送收入到EKP结束"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment