Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
5991eb7b
提交
5991eb7b
authored
10月 17, 2023
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
对公转账信息接口
上级
17fe9a83
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
84 行增加
和
15 行删除
+84
-15
OwnerAccountController.java
...rformance/controller/pc/owner/OwnerAccountController.java
+26
-3
OwnerAccountService.java
...java/com/clx/performance/service/OwnerAccountService.java
+11
-0
OwnerAccountServiceImpl.java
...clx/performance/service/impl/OwnerAccountServiceImpl.java
+47
-12
没有找到文件。
performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerAccountController.java
浏览文件 @
5991eb7b
package
com
.
clx
.
performance
.
controller
.
pc
.
owner
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.clx.performance.dao.OwnerTransferInfoDao
;
import
com.clx.performance.model.OwnerTransferInfo
;
import
com.clx.performance.param.pc.*
;
import
com.clx.performance.service.OwnerAccountService
;
...
...
@@ -12,6 +11,9 @@ import com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO;
import
com.clx.performance.vo.pc.OwnerAccountVO
;
import
com.clx.performance.vo.pc.OwnerCaseOutVO
;
import
com.clx.performance.vo.pc.OwnerTopUpVO
;
import
com.clx.user.feign.OwnerInfoFeign
;
import
com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam
;
import
com.clx.user.vo.pc.owner.OwnerBindCardVO
;
import
com.msl.common.base.PageData
;
import
com.msl.common.convertor.aspect.UnitCovert
;
import
com.msl.common.result.Result
;
...
...
@@ -19,6 +21,7 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiOperation
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.poi.xssf.streaming.SXSSFWorkbook
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.MediaType
;
...
...
@@ -45,7 +48,7 @@ public class OwnerAccountController {
private
final
OwnerRunningWaterRecordService
ownerRunningWaterRecordService
;
private
final
Owner
TransferInfoDao
ownerTransferInfoDao
;
private
final
Owner
InfoFeign
ownerInfoFeign
;
@ApiOperation
(
value
=
"账户信息"
,
notes
=
"<br>By:胡宇帆"
)
@GetMapping
(
"/accountInfo"
)
...
...
@@ -115,6 +118,26 @@ public class OwnerAccountController {
@ApiOperation
(
value
=
"对公转账信息"
,
notes
=
"<br>By:胡宇帆"
)
@GetMapping
(
"/transferPublic"
)
public
Result
<
OwnerTransferInfo
>
transferPublic
()
{
return
Result
.
ok
(
ownerTransferInfoDao
.
getEntityByKey
(
1
).
orElse
(
null
));
return
Result
.
ok
(
ownerAccountService
.
transferPublic
());
}
@ApiOperation
(
value
=
"获取货主信息绑卡信息"
,
notes
=
"<br>By:胡宇帆"
)
@GetMapping
(
"/getOwnerBindCard"
)
public
Result
<
OwnerBindCardVO
>
getOwnerBindCard
(
@RequestParam
(
"userNo"
)
@NotNull
(
message
=
"userNo不能为空"
)
Long
userNo
)
{
return
Result
.
ok
(
ownerAccountService
.
getOwnerBindCard
(
userNo
));
}
@ApiOperation
(
value
=
"绑定货主银行卡"
)
@PostMapping
({
"/bindOwnerBindCard"
})
Result
<
Object
>
bindOwnerBindCard
(
@RequestBody
UpdateOwnerBindCardFeignParam
param
)
{
ownerAccountService
.
bindOwnerBindCard
(
param
);
return
Result
.
ok
();
}
@ApiOperation
(
value
=
"解绑货主银行卡"
)
@PostMapping
({
"/unBindOwnerBindCard"
})
Result
<
Object
>
unBindOwnerBindCard
(
@RequestBody
UpdateOwnerBindCardFeignParam
param
)
{
ownerAccountService
.
unBindOwnerBindCard
(
param
);
return
Result
.
ok
();
}
}
performance-web/src/main/java/com/clx/performance/service/OwnerAccountService.java
浏览文件 @
5991eb7b
package
com
.
clx
.
performance
.
service
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.clx.performance.model.OwnerTransferInfo
;
import
com.clx.performance.param.pc.*
;
import
com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO
;
import
com.clx.performance.vo.pc.OwnerAccountVO
;
import
com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam
;
import
com.clx.user.vo.pc.owner.OwnerBindCardVO
;
import
org.apache.poi.xssf.streaming.SXSSFWorkbook
;
import
java.util.List
;
...
...
@@ -51,4 +54,12 @@ public interface OwnerAccountService {
* @return
*/
SXSSFWorkbook
exportPrepaidFreightAccountPageList
(
PagePlatformPrepaidFreightAccountParam
param
);
OwnerTransferInfo
transferPublic
();
OwnerBindCardVO
getOwnerBindCard
(
Long
userNo
);
void
bindOwnerBindCard
(
UpdateOwnerBindCardFeignParam
param
);
void
unBindOwnerBindCard
(
UpdateOwnerBindCardFeignParam
param
);
}
performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java
浏览文件 @
5991eb7b
...
...
@@ -2,17 +2,11 @@ package com.clx.performance.service.impl;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.clx.performance.component.IdGenerateSnowFlake
;
import
com.clx.performance.dao.OwnerAccountDao
;
import
com.clx.performance.dao.OwnerCaseOutDao
;
import
com.clx.performance.dao.OwnerRunningWaterRecordDao
;
import
com.clx.performance.dao.OwnerTopUpDao
;
import
com.clx.performance.dao.*
;
import
com.clx.performance.enums.IdTypeEnum
;
import
com.clx.performance.enums.OwnerAccountEnum
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.model.OwnerAccount
;
import
com.clx.performance.model.OwnerCaseOut
;
import
com.clx.performance.model.OwnerRunningWaterRecord
;
import
com.clx.performance.model.OwnerTopUp
;
import
com.clx.performance.model.*
;
import
com.clx.performance.param.pc.*
;
import
com.clx.performance.service.OwnerAccountService
;
import
com.clx.performance.utils.excel.ExcelData
;
...
...
@@ -22,9 +16,13 @@ import com.clx.performance.utils.excel.ExcelUtil;
import
com.clx.performance.vo.pc.OwnerAccountRunningWaterRecordVO
;
import
com.clx.performance.vo.pc.OwnerAccountVO
;
import
com.clx.user.enums.driver.DriverTruckEnum
;
import
com.clx.user.feign.OwnerInfoFeign
;
import
com.clx.user.param.pc.owner.UpdateOwnerBindCardFeignParam
;
import
com.clx.user.vo.pc.driver.truck.DriverTruckVo
;
import
com.clx.user.vo.pc.owner.OwnerBindCardVO
;
import
com.msl.common.base.Optional
;
import
com.msl.common.exception.ServiceSystemException
;
import
com.msl.common.result.Result
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -51,6 +49,10 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
private
final
OwnerCaseOutDao
ownerCaseOutDao
;
private
final
OwnerTransferInfoDao
ownerTransferInfoDao
;
private
final
OwnerInfoFeign
ownerInfoFeign
;
@Override
public
IPage
<
OwnerAccountVO
>
pageList
(
PageOwnerAccountListParam
param
)
{
return
ownerAccountDao
.
pageList
(
param
);
...
...
@@ -175,6 +177,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
/**
* 提现审批
*
* @param param
*/
@Override
...
...
@@ -251,12 +254,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
// 组装数据
List
<
List
<
ExcelData
>>
dataList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
OwnerAccountRunningWaterRecordVO
dto
=
list
.
get
(
i
);
List
<
ExcelData
>
rowData
=
new
ArrayList
<>();
rowData
.
add
(
new
ExcelData
(
i
+
1
));
rowData
.
add
(
new
ExcelData
(
i
+
1
));
rowData
.
add
(
new
ExcelData
(
dto
.
getOwnerUserNo
().
toString
()));
rowData
.
add
(
new
ExcelData
(
dto
.
getOwnerName
()));
rowData
.
add
(
new
ExcelData
(
dto
.
getMobile
()));
...
...
@@ -308,12 +311,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
// 组装数据
List
<
List
<
ExcelData
>>
dataList
=
new
ArrayList
<>();
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
list
.
size
();
i
++)
{
OwnerAccountRunningWaterRecordVO
dto
=
list
.
get
(
i
);
List
<
ExcelData
>
rowData
=
new
ArrayList
<>();
rowData
.
add
(
new
ExcelData
(
i
+
1
));
rowData
.
add
(
new
ExcelData
(
i
+
1
));
rowData
.
add
(
new
ExcelData
(
dto
.
getOwnerUserNo
().
toString
()));
rowData
.
add
(
new
ExcelData
(
dto
.
getOwnerName
()));
rowData
.
add
(
new
ExcelData
(
dto
.
getMobile
()));
...
...
@@ -338,4 +341,36 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
//创建excel
return
ExcelUtil
.
create
(
excelSheet
);
}
@Override
public
OwnerTransferInfo
transferPublic
()
{
return
ownerTransferInfoDao
.
getEntityByKey
(
1
).
orElse
(
null
);
}
@Override
public
OwnerBindCardVO
getOwnerBindCard
(
Long
userNo
)
{
Result
<
OwnerBindCardVO
>
result
=
ownerInfoFeign
.
getOwnerInfoVO
(
userNo
);
if
(
result
.
succeed
())
{
return
result
.
getData
();
}
else
{
return
null
;
}
}
@Override
public
void
bindOwnerBindCard
(
UpdateOwnerBindCardFeignParam
param
)
{
Result
<
OwnerBindCardVO
>
result
=
ownerInfoFeign
.
getOwnerInfoVO
(
param
.
getUserNo
());
if
(!
result
.
succeed
())
{
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
HTTP_ERROR
,
"当前参数未查询到有效数据"
);
}
if
(
result
.
succeed
()
&&
StringUtils
.
isNotBlank
(
result
.
getData
().
getOwnerAccountBank
()))
{
throw
new
ServiceSystemException
(
PerformanceResultEnum
.
HTTP_ERROR
,
"当前货主存在绑定银行卡,请先解绑银行卡后再进行绑定操作"
);
}
ownerInfoFeign
.
bindOwnerBindCard
(
param
);
}
@Override
public
void
unBindOwnerBindCard
(
UpdateOwnerBindCardFeignParam
param
)
{
ownerInfoFeign
.
unBindOwnerBindCard
(
param
);
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论