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
5d2fe622
Commit
5d2fe622
authored
Dec 13, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-户配置调整
parent
8c0f5027
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
197 additions
and
50 deletions
+197
-50
IcbcTransactionFlowQueryController.java
...v1/ekp/controller/IcbcTransactionFlowQueryController.java
+26
-1
IcbcTransactionFlowQueryService.java
.../plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
+16
-1
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+83
-9
TSocialHouseholdInsertVo.java
...loud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
+0
-8
HouseConfigConstants.java
...d/plus/v1/yifu/social/constants/HouseConfigConstants.java
+2
-0
SysHouseHoldInfoServiceImpl.java
...yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
+70
-31
No files found.
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/controller/IcbcTransactionFlowQueryController.java
View file @
5d2fe622
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
controller
;
package
com
.
yifu
.
cloud
.
plus
.
v1
.
ekp
.
controller
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
...
@@ -109,4 +108,30 @@ public class IcbcTransactionFlowQueryController {
...
@@ -109,4 +108,30 @@ public class IcbcTransactionFlowQueryController {
}
}
return
icbcTransactionFlowQueryService
.
querybankinfo
(
cardNo
);
return
icbcTransactionFlowQueryService
.
querybankinfo
(
cardNo
);
}
}
/**
* 指令对账单明细下载
*
* @param
* @param
* @return
*/
@Operation
(
summary
=
"指令对账单明细下载"
,
description
=
"指令对账单明细下载"
)
@PostMapping
(
"/enterprisePayDowninstr"
)
public
R
getEnterprisePayDowninstr
()
{
return
icbcTransactionFlowQueryService
.
getEnterprisePayDowninstr
();
}
/**
* 电子回单下载功能
*
* @param
* @param
* @return
*/
@Operation
(
summary
=
"电子回单下载功能"
,
description
=
"电子回单下载功能"
)
@PostMapping
(
"/entermeatebillreceive"
)
public
R
getMeatebillreceive
()
{
return
icbcTransactionFlowQueryService
.
getMeatebillreceive
();
}
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/IcbcTransactionFlowQueryService.java
View file @
5d2fe622
...
@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.ekp.service;
...
@@ -2,7 +2,6 @@ package com.yifu.cloud.plus.v1.ekp.service;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
...
@@ -31,4 +30,20 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
...
@@ -31,4 +30,20 @@ public interface IcbcTransactionFlowQueryService extends IService<EkpSocialInfo>
**/
**/
R
<
EkpBankCodeSet
>
querybankinfo
(
String
cardNo
);
R
<
EkpBankCodeSet
>
querybankinfo
(
String
cardNo
);
/**
* @Description: 查询账单明细文件名
* @Author: huyc
* @Date: 2024-12-12
* @return: R
**/
R
getEnterprisePayDowninstr
();
/**
* @Description: 电子回单下载功能
* @Author: huyc
* @Date: 2024-12-13
* @return: R
**/
R
getMeatebillreceive
();
}
}
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
5d2fe622
...
@@ -6,14 +6,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
...
@@ -6,14 +6,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import
com.icbc.api.DefaultIcbcClient
;
import
com.icbc.api.DefaultIcbcClient
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcApiException
;
import
com.icbc.api.IcbcConstants
;
import
com.icbc.api.IcbcConstants
;
import
com.icbc.api.request.JftApiB2bpayTransqueryRequestV1
;
import
com.icbc.api.request.*
;
import
com.icbc.api.request.JftApiPayB2bpayGenpreorderRequestV1
;
import
com.icbc.api.response.*
;
import
com.icbc.api.request.MybankEnterpriseAccountQuerybankinfoRequestV1
;
import
com.icbc.api.request.MybankEnterpriseTradeQhisdRequestV1
;
import
com.icbc.api.response.JftApiB2bpayTransqueryResponseV1
;
import
com.icbc.api.response.JftApiPayB2bpayGenpreorderResponseV1
;
import
com.icbc.api.response.MybankEnterpriseAccountQuerybankinfoResponseV1
;
import
com.icbc.api.response.MybankEnterpriseTradeQhisdResponseV1
;
import
com.yifu.cloud.plus.v1.ekp.config.EkpEntryProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.EkpEntryProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.IcbcConfigProperties
;
import
com.yifu.cloud.plus.v1.ekp.config.IcbcConfigProperties
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
import
com.yifu.cloud.plus.v1.ekp.entity.EkpBankCodeSet
;
...
@@ -22,7 +16,6 @@ import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper;
...
@@ -22,7 +16,6 @@ import com.yifu.cloud.plus.v1.ekp.mapper.EkpSocialInfoMapper;
import
com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService
;
import
com.yifu.cloud.plus.v1.ekp.service.EkpBankCodeSetService
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.ekp.service.IcbcTransactionFlowQueryService
;
import
com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam
;
import
com.yifu.cloud.plus.v1.ekp.vo.EKPEntryPushParam
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
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
io.micrometer.core.instrument.util.StringUtils
;
import
io.micrometer.core.instrument.util.StringUtils
;
...
@@ -498,6 +491,87 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -498,6 +491,87 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
}
}
}
}
@Override
public
R
getEnterprisePayDowninstr
()
{
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
icbcConfigProperties
.
getAppId
(),
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
icbcConfigProperties
.
getAppPrivateKey
(),
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
null
,
null
,
icbcConfigProperties
.
getCaSm
(),
null
);
client
.
setIcbc_ca
(
icbcConfigProperties
.
getCaSmIcbc
());
try
{
MybankEnterprisePayDowninstrRequestV1
.
MybankEnterprisePayDowninstrRequestBizV1
bizContent
=
new
MybankEnterprisePayDowninstrRequestV1
.
MybankEnterprisePayDowninstrRequestBizV1
();
MybankEnterprisePayDowninstrRequestV1
request
=
new
MybankEnterprisePayDowninstrRequestV1
();
// 请对照接口文档用bizContent.setxxx()方法对业务上送数据进行赋值
bizContent
.
setTransCode
(
"DOWNINSTR"
);
bizContent
.
setTranDate
(
"20241204"
);
bizContent
.
setTranTime
(
"103231001"
);
bizContent
.
setBeginDate
(
"20241204"
);
bizContent
.
setEndDate
(
"20241204"
);
bizContent
.
setPayeeAccNo
(
"6222623470001851928"
);
bizContent
.
setLanguage
(
"zh_CN"
);
bizContent
.
setfSeqNo
(
"WX1733276761404"
);
bizContent
.
setServiceCode
(
"PAYENT"
);
// bizContent.setQryfSeqno("PAYENT411erji17023");
request
.
setServiceUrl
(
"https://gw.open.icbc.com.cn/api/mybank/enterprise/pay/downinstr/V1"
);
request
.
setBizContent
(
bizContent
);
MybankEnterprisePayDowninstrResponseV1
response
=
client
.
execute
(
request
);
if
(
response
.
isSuccess
())
{
// 业务成功处理
return
R
.
ok
();
}
else
{
return
R
.
failed
();
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
return
R
.
ok
();
}
@Override
public
R
getMeatebillreceive
()
{
DefaultIcbcClient
client
=
new
DefaultIcbcClient
(
icbcConfigProperties
.
getAppId
(),
IcbcConstants
.
SIGN_TYPE_CA_SM_ICBC
,
icbcConfigProperties
.
getAppPrivateKey
(),
IcbcConstants
.
CHARSET_UTF8
,
IcbcConstants
.
FORMAT_JSON
,
null
,
null
,
null
,
icbcConfigProperties
.
getCaSm
(),
null
);
client
.
setIcbc_ca
(
icbcConfigProperties
.
getCaSmIcbc
());
try
{
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1
.
MybankEnterpriseAccountDownebillRequesBizV1
bizContent
=
new
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1
.
MybankEnterpriseAccountDownebillRequesBizV1
();
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1
request
=
new
MybankEnterpriseAccountTradeinfoMeatebillreceiveRequestV1
();
bizContent
.
setTransCode
(
"DownEBill "
);
bizContent
.
setBankCode
(
"102"
);
bizContent
.
setCis
(
""
);
bizContent
.
setLoginId
(
""
);
bizContent
.
setTranDate
(
""
);
bizContent
.
setTranTime
(
""
);
bizContent
.
setfSeqno
(
""
);
bizContent
.
setAreaCode
(
""
);
bizContent
.
setNetCode
(
""
);
bizContent
.
setTellerNo
(
""
);
bizContent
.
setWorkDate
(
""
);
bizContent
.
setTranSerialNo
(
""
);
bizContent
.
setAcctNo
(
""
);
bizContent
.
setCurrencyType
(
""
);
bizContent
.
setReqReserved1
(
""
);
bizContent
.
setReqReserved2
(
""
);
bizContent
.
setReqReserved3
(
""
);
bizContent
.
setReqReserved4
(
""
);
bizContent
.
setfSeqno
(
""
);
request
.
setServiceUrl
(
"https://gw.open.icbc.com.cn/api/mybank/enterprise/account/tradeinfo/meatebillreceive/V1"
);
request
.
setBizContent
(
bizContent
);
MybankEnterpriseAccountTradeinfoMeatebillreceiveResponseV1
response
=
client
.
execute
(
request
);
if
(
response
.
isSuccess
())
{
return
R
.
ok
();
}
else
{
return
R
.
failed
();
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
return
R
.
ok
();
}
private
void
initValue
(
MybankEnterpriseTradeQhisdResponseV1
.
MybankEnterpriseTradeQhisdResponseRdV1
entry
,
private
void
initValue
(
MybankEnterpriseTradeQhisdResponseV1
.
MybankEnterpriseTradeQhisdResponseRdV1
entry
,
EKPEntryPushParam
pushParam
,
String
bankName
,
String
bankNo
)
throws
ParseException
{
EKPEntryPushParam
pushParam
,
String
bankName
,
String
bankNo
)
throws
ParseException
{
pushParam
.
setFd_recipName
(
entry
.
getRecipName
());
pushParam
.
setFd_recipName
(
entry
.
getRecipName
());
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TSocialHouseholdInsertVo.java
View file @
5d2fe622
...
@@ -35,10 +35,6 @@ import java.io.Serializable;
...
@@ -35,10 +35,6 @@ import java.io.Serializable;
@Data
@Data
public
class
TSocialHouseholdInsertVo
extends
RowIndex
implements
Serializable
{
public
class
TSocialHouseholdInsertVo
extends
RowIndex
implements
Serializable
{
@Schema
(
description
=
"账户性质"
)
@ExcelAttribute
(
name
=
"账户性质"
,
isExport
=
false
)
private
String
type
;
/**
/**
* 员工姓名
* 员工姓名
*/
*/
...
@@ -187,8 +183,4 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
...
@@ -187,8 +183,4 @@ public class TSocialHouseholdInsertVo extends RowIndex implements Serializable {
@ExcelProperty
(
"是否自动办理"
)
@ExcelProperty
(
"是否自动办理"
)
private
String
autoStatus
;
private
String
autoStatus
;
@Schema
(
description
=
"是否配置公章"
)
@ExcelAttribute
(
name
=
"是否配置公章"
,
isExport
=
false
)
private
String
isSign
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/HouseConfigConstants.java
View file @
5d2fe622
...
@@ -31,5 +31,7 @@ public class HouseConfigConstants {
...
@@ -31,5 +31,7 @@ public class HouseConfigConstants {
public
static
final
String
SUCESS
=
"成功"
;
public
static
final
String
SUCESS
=
"成功"
;
public
static
final
String
ERROR_TEMPLATE_SEVEN
=
"未找到模板中填写的所属机构"
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/SysHouseHoldInfoServiceImpl.java
View file @
5d2fe622
This diff is collapsed.
Click to expand it.
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