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
c3dfeb84
Commit
c3dfeb84
authored
Sep 24, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.15' into MVP1.7.15
parents
0d226ea4
3dbeb7e7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
10 deletions
+27
-10
TSocialFriendBackLog.java
...loud/plus/v1/yifu/social/entity/TSocialFriendBackLog.java
+1
-1
SocialFriendConfig.java
.../cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
+13
-3
TSocialFriendPushServiceImpl.java
...ifu/social/service/impl/TSocialFriendPushServiceImpl.java
+13
-6
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TSocialFriendBackLog.java
View file @
c3dfeb84
...
@@ -66,7 +66,7 @@ public class TSocialFriendBackLog {
...
@@ -66,7 +66,7 @@ public class TSocialFriendBackLog {
/**
/**
* @Description: 类型1社保增 2社保减 3医保增 4医保减 5推送的日志 6社保图片路径7医保图片路径
* @Description: 类型1社保增 2社保减 3医保增 4医保减 5推送的日志 6社保图片路径7医保图片路径
* 8社保解除劳动合同9医保解除劳动合同11社保增拉取 12社保减拉取 13医保增拉取 14医保减拉取16社保单个图片17医保单个图片 18 反馈附件下载
* 8社保解除劳动合同9医保解除劳动合同11社保增拉取 12社保减拉取 13医保增拉取 14医保减拉取16社保单个图片17医保单个图片 18 反馈附件下载
* 19:花名册附件src
* 19:花名册附件src
20:税友异常情况记录
* @Author: hgw
* @Author: hgw
* @Date: 2025/5/27 10:15
* @Date: 2025/5/27 10:15
**/
**/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/SocialFriendConfig.java
View file @
c3dfeb84
...
@@ -11,6 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
...
@@ -11,6 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.SysHouseHoldInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendBackLog
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialFriendBackLog
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialFriendBackLogService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -90,8 +91,8 @@ public class SocialFriendConfig {
...
@@ -90,8 +91,8 @@ public class SocialFriendConfig {
* @Date: 2024-12-9 16:54:31
* @Date: 2024-12-9 16:54:31
* @return: java.lang.String
* @return: java.lang.String
**/
**/
public
String
pushFriendByInfo
(
RestTemplate
restTemplate
,
SociaFriendYgsAddVo
vo
,
List
<
SociaFriendYgsAddVo
>
listVo
,
int
type
,
String
thisTime
public
String
pushFriendByInfo
(
RestTemplate
restTemplate
,
SociaFriendYgsAddVo
vo
,
List
<
SociaFriendYgsAddVo
>
listVo
,
List
<
TSocialFriendBackLog
>
backLogList
)
{
,
int
type
,
String
bizNo
,
List
<
TSocialFriendBackLog
>
backLogList
,
TSocialFriendBackLogService
tSocialFriendBackLogService
)
{
String
addId
=
""
;
String
addId
=
""
;
String
appAddUrl
=
urlPre
;
String
appAddUrl
=
urlPre
;
if
(
type
==
1
||
type
==
3
)
{
if
(
type
==
1
||
type
==
3
)
{
...
@@ -121,7 +122,7 @@ public class SocialFriendConfig {
...
@@ -121,7 +122,7 @@ public class SocialFriendConfig {
JSONObject
json
=
new
JSONObject
();
JSONObject
json
=
new
JSONObject
();
// 外部业务订单号
// 外部业务订单号
json
.
put
(
"bizNo"
,
vo
.
getSocialId
()
+
type
+
thisTime
);
json
.
put
(
"bizNo"
,
bizNo
);
// 企业名称——户名
// 企业名称——户名
json
.
put
(
"qymc"
,
vo
.
getSocialHouseholdName
());
json
.
put
(
"qymc"
,
vo
.
getSocialHouseholdName
());
// 税号——户配置的“单位统一信用代码”
// 税号——户配置的“单位统一信用代码”
...
@@ -193,10 +194,19 @@ public class SocialFriendConfig {
...
@@ -193,10 +194,19 @@ public class SocialFriendConfig {
backLogPush
.
setLogInfo
(
JSON
.
toJSONString
(
json
,
features
));
backLogPush
.
setLogInfo
(
JSON
.
toJSONString
(
json
,
features
));
backLogPush
.
setCreateTime
(
LocalDateTime
.
now
());
backLogPush
.
setCreateTime
(
LocalDateTime
.
now
());
backLogList
.
add
(
backLogPush
);
backLogList
.
add
(
backLogPush
);
TSocialFriendBackLog
errorSave
=
new
TSocialFriendBackLog
();
errorSave
.
setSocialId
(
bizNo
);
errorSave
.
setType
(
20
);
errorSave
.
setLogInfo
(
JSON
.
toJSONString
(
json
,
features
));
errorSave
.
setCreateTime
(
LocalDateTime
.
now
());
tSocialFriendBackLogService
.
save
(
errorSave
);
String
dataResultList
=
restTemplate
.
postForObject
(
appAddUrl
,
formEntity
,
String
.
class
);
String
dataResultList
=
restTemplate
.
postForObject
(
appAddUrl
,
formEntity
,
String
.
class
);
// {"head":{"code":"00000000","description":"成功","msg":"成功","time":"2024-12-06 17:10:26","status":"Y"
// {"head":{"code":"00000000","description":"成功","msg":"成功","time":"2024-12-06 17:10:26","status":"Y"
// ,"body":{"requestId":"85440b327d71466abcd9c5c81d5bb172"
// ,"body":{"requestId":"85440b327d71466abcd9c5c81d5bb172"
if
(
Common
.
isNotNull
(
dataResultList
))
{
if
(
Common
.
isNotNull
(
dataResultList
))
{
errorSave
.
setType
(
21
);
tSocialFriendBackLogService
.
updateById
(
errorSave
);
// 拉取的数据日志
// 拉取的数据日志
TSocialFriendBackLog
backLog
=
new
TSocialFriendBackLog
();
TSocialFriendBackLog
backLog
=
new
TSocialFriendBackLog
();
StringBuilder
ids
=
new
StringBuilder
();
StringBuilder
ids
=
new
StringBuilder
();
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFriendPushServiceImpl.java
View file @
c3dfeb84
...
@@ -218,6 +218,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -218,6 +218,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
// 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批
// 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批
boolean
nextFlag
=
false
;
boolean
nextFlag
=
false
;
SociaFriendYgsAddVo
vo
;
SociaFriendYgsAddVo
vo
;
String
bizNo
;
int
i
=
1
;
int
i
=
1
;
TSocialFriendReduceSet
reduceSet
;
TSocialFriendReduceSet
reduceSet
;
// 是否为单个推送(派单审核时定性的)
// 是否为单个推送(派单审核时定性的)
...
@@ -315,13 +316,16 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -315,13 +316,16 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
i
=
0
;
i
=
0
;
nextFlag
=
false
;
nextFlag
=
false
;
requestId
=
socialFriendConfig
.
pushFriendByInfo
(
restTemplate
,
vo
,
listVo
,
type
,
thisTime
,
backLogList
);
// 针对部分传参bizNo却无requestId返回的情况,需要改进代码:
bizNo
=
vo
.
getSocialId
()
+
type
+
thisTime
;
requestId
=
socialFriendConfig
.
pushFriendByInfo
(
restTemplate
,
vo
,
listVo
,
type
,
bizNo
,
backLogList
,
tSocialFriendBackLogService
);
ygsHandleStatus
=
CommonConstants
.
TWO_STRING
;
ygsHandleStatus
=
CommonConstants
.
TWO_STRING
;
remark
=
"已推送提交任务!"
;
remark
=
"已推送提交任务!"
;
if
(
Common
.
isEmpty
(
requestId
))
{
if
(
Common
.
isEmpty
(
requestId
))
{
requestId
=
"推送税友
失败"
;
requestId
=
"推送税友
未返回,请联系管理员bizNo="
+
bizNo
;
ygsHandleStatus
=
CommonConstants
.
FIVE_STRING
;
ygsHandleStatus
=
CommonConstants
.
FIVE_STRING
;
remark
=
"推送税友
失败,转人工处理!"
;
remark
=
"推送税友
未返回,转人工处理!请联系管理员bizNo="
+
bizNo
;
}
}
for
(
TSocialInfo
s
:
socialInfoTemp
)
{
for
(
TSocialInfo
s
:
socialInfoTemp
)
{
s
.
setYgsRequestId
(
requestId
);
s
.
setYgsRequestId
(
requestId
);
...
@@ -506,6 +510,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -506,6 +510,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
// 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批
// 同一个户才一批次推送,因为账号密码不一样 ,不同户,则先推送一批
boolean
nextFlag
=
false
;
boolean
nextFlag
=
false
;
SociaFriendYgsAddVo
vo
;
SociaFriendYgsAddVo
vo
;
String
bizNo
;
int
i
=
1
;
int
i
=
1
;
TSocialFriendReduceSet
reduceSet
;
TSocialFriendReduceSet
reduceSet
;
// 是否为生成解除劳动合同书 且是 派减
// 是否为生成解除劳动合同书 且是 派减
...
@@ -614,13 +619,15 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
...
@@ -614,13 +619,15 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
}
}
i
=
0
;
i
=
0
;
nextFlag
=
false
;
nextFlag
=
false
;
requestId
=
socialFriendConfig
.
pushFriendByInfo
(
restTemplate
,
vo
,
listVo
,
type
,
thisTime
,
backLogList
);
// 针对部分无requestId返回的情况,优化代码
bizNo
=
vo
.
getSocialId
()
+
type
+
thisTime
;
requestId
=
socialFriendConfig
.
pushFriendByInfo
(
restTemplate
,
vo
,
listVo
,
type
,
bizNo
,
backLogList
,
tSocialFriendBackLogService
);
ysdHandleStatus
=
CommonConstants
.
TWO_STRING
;
ysdHandleStatus
=
CommonConstants
.
TWO_STRING
;
remark
=
"已推送提交任务!"
;
remark
=
"已推送提交任务!"
;
if
(
Common
.
isEmpty
(
requestId
))
{
if
(
Common
.
isEmpty
(
requestId
))
{
requestId
=
"推送税友
失败"
;
requestId
=
"推送税友
未返回,请联系管理员bizNo="
+
bizNo
;
ysdHandleStatus
=
CommonConstants
.
FIVE_STRING
;
ysdHandleStatus
=
CommonConstants
.
FIVE_STRING
;
remark
=
"推送税友
失败,转人工处理!"
;
remark
=
"推送税友
未返回,转人工处理!请联系管理员bizNo="
+
bizNo
;
}
}
for
(
TSocialInfo
s
:
socialInfoTemp
)
{
for
(
TSocialInfo
s
:
socialInfoTemp
)
{
s
.
setYsdRequestId
(
requestId
);
s
.
setYsdRequestId
(
requestId
);
...
...
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