Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
55d807ce
提交
55d807ce
authored
2月 04, 2024
作者:
liuhaiquan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改json 类型转换
上级
2482a001
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
6 行增加
和
3 行删除
+6
-3
OwnerLoanRecordVO.java
...clx/performance/vo/pc/loan/carrier/OwnerLoanRecordVO.java
+1
-1
OwnerLoanRecordServiceImpl.java
...ormance/service/impl/loan/OwnerLoanRecordServiceImpl.java
+3
-1
OwnerRepaymentServiceImpl.java
...formance/service/impl/loan/OwnerRepaymentServiceImpl.java
+2
-1
没有找到文件。
performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanRecordVO.java
浏览文件 @
55d807ce
...
@@ -45,7 +45,7 @@ public class OwnerLoanRecordVO {
...
@@ -45,7 +45,7 @@ public class OwnerLoanRecordVO {
@ApiModelProperty
(
"借款单号"
)
@ApiModelProperty
(
"借款单号"
)
private
Lo
ng
loanNo
;
private
Stri
ng
loanNo
;
@ApiModelProperty
(
"借款类型 1:虚拟货币 2:资金"
)
@ApiModelProperty
(
"借款类型 1:虚拟货币 2:资金"
)
...
...
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanRecordServiceImpl.java
浏览文件 @
55d807ce
...
@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.loan;
...
@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.loan;
import
cn.hutool.json.JSONUtil
;
import
cn.hutool.json.JSONUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.TypeReference
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.clx.performance.component.IdGenerateSnowFlake
;
import
com.clx.performance.component.IdGenerateSnowFlake
;
...
@@ -49,6 +50,7 @@ import com.msl.user.data.UserSessionData;
...
@@ -49,6 +50,7 @@ import com.msl.user.data.UserSessionData;
import
com.msl.user.utils.TokenUtil
;
import
com.msl.user.utils.TokenUtil
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.poi.ss.formula.functions.T
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
...
@@ -307,7 +309,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
...
@@ -307,7 +309,7 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
PerformanceResultEnum
.
DATA_NOT_FIND
);
PerformanceResultEnum
.
DATA_NOT_FIND
);
OwnerLoanRecordVO
ownerLoanRecordVO
=
ownerLoanRecordStruct
.
convert
(
ownerLoanRecord
);
OwnerLoanRecordVO
ownerLoanRecordVO
=
ownerLoanRecordStruct
.
convert
(
ownerLoanRecord
);
//货主借款: 收款方鑫祥和 付款方为诚联信 借款方为货主
//货主借款: 收款方鑫祥和 付款方为诚联信 借款方为货主
Map
<
String
,
String
>
map
=
JSON
.
parseObject
(
JSON
Util
.
parse
(
ownerLoanRecordVO
).
toString
(),
Map
.
class
);
Map
<
String
,
String
>
map
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
ownerLoanRecordVO
),
new
TypeReference
<
Map
<
String
,
String
>>(){}
);
// 创建合同
// 创建合同
GenerateContractParam
feignParam
=
new
GenerateContractParam
();
GenerateContractParam
feignParam
=
new
GenerateContractParam
();
if
(
Objects
.
equals
(
OwnerRePaymentEnum
.
Channel
.
ORDER
.
getCode
(),
param
.
getPayWay
())){
if
(
Objects
.
equals
(
OwnerRePaymentEnum
.
Channel
.
ORDER
.
getCode
(),
param
.
getPayWay
())){
...
...
performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerRepaymentServiceImpl.java
浏览文件 @
55d807ce
...
@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.loan;
...
@@ -2,6 +2,7 @@ package com.clx.performance.service.impl.loan;
import
cn.hutool.json.JSONUtil
;
import
cn.hutool.json.JSONUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.TypeReference
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.clx.performance.config.loan.ClxPayeeConfig
;
import
com.clx.performance.config.loan.ClxPayeeConfig
;
...
@@ -102,7 +103,7 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
...
@@ -102,7 +103,7 @@ public class OwnerRepaymentServiceImpl implements OwnerRepaymentService {
OwnerRepayment
ownerRepayment
=
ownerRepaymentDao
.
getEntityByKey
(
param
.
getId
()).
orElseThrow
(
OwnerRepayment
ownerRepayment
=
ownerRepaymentDao
.
getEntityByKey
(
param
.
getId
()).
orElseThrow
(
PerformanceResultEnum
.
DATA_NOT_FIND
);
PerformanceResultEnum
.
DATA_NOT_FIND
);
OwnerRepaymentVO
ownerRepaymentVO
=
ownerRepaymentStruct
.
convert
(
ownerRepayment
);
OwnerRepaymentVO
ownerRepaymentVO
=
ownerRepaymentStruct
.
convert
(
ownerRepayment
);
Map
<
String
,
String
>
map
=
JSON
.
parseObject
(
JSON
Util
.
parse
(
ownerRepaymentVO
).
toString
(),
Map
.
class
);
Map
<
String
,
String
>
map
=
JSON
.
parseObject
(
JSON
.
toJSONString
(
ownerRepaymentVO
),
new
TypeReference
<
Map
<
String
,
String
>>(){}
);
// 创建合同
// 创建合同
GenerateContractParam
feignParam
=
new
GenerateContractParam
();
GenerateContractParam
feignParam
=
new
GenerateContractParam
();
if
(
Objects
.
equals
(
OwnerRePaymentEnum
.
Channel
.
ORDER
.
getCode
(),
param
.
getPayWay
())){
if
(
Objects
.
equals
(
OwnerRePaymentEnum
.
Channel
.
ORDER
.
getCode
(),
param
.
getPayWay
())){
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论