Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-finance
Overview
Overview
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
base_platform_enterprise
gic-platform-finance
Commits
22e43332
Commit
22e43332
authored
Apr 16, 2020
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提现申请,物流数据调整,提现的时候允许为空,新增接口用于后续更新物流信息
parent
88522f68
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
55 additions
and
2 deletions
+55
-2
CashWithdrawalDTO.java
.../src/main/java/com/gic/finance/dto/CashWithdrawalDTO.java
+0
-2
CashWithdrawalApiService.java
...ava/com/gic/finance/service/CashWithdrawalApiService.java
+12
-0
TabCashWithdrawalMapper.java
...a/com/gic/finance/dao/mapper/TabCashWithdrawalMapper.java
+3
-0
CashWithdrawalService.java
...n/java/com/gic/finance/service/CashWithdrawalService.java
+10
-0
CashWithdrawalServiceImpl.java
...m/gic/finance/service/impl/CashWithdrawalServiceImpl.java
+5
-0
CashWithdrawalApiServiceImpl.java
...ance/service/outer/impl/CashWithdrawalApiServiceImpl.java
+18
-0
TabCashWithdrawalMapper.xml
...ice/src/main/resources/mapper/TabCashWithdrawalMapper.xml
+7
-0
No files found.
gic-platform-finance-api/src/main/java/com/gic/finance/dto/CashWithdrawalDTO.java
View file @
22e43332
...
...
@@ -143,13 +143,11 @@ public class CashWithdrawalDTO implements Serializable{
/**
* 物流公司
*/
@NotBlank
(
message
=
"发票物流公司名称不能为空"
,
groups
=
{
CashWithdrawal
.
class
})
private
String
expressMailName
;
/**
* 发票物流号
*/
@NotBlank
(
message
=
"发票物流单号不能为空"
,
groups
=
{
CashWithdrawal
.
class
})
private
String
expressMailNumber
;
/**
...
...
gic-platform-finance-api/src/main/java/com/gic/finance/service/CashWithdrawalApiService.java
View file @
22e43332
...
...
@@ -35,6 +35,18 @@ public interface CashWithdrawalApiService {
ServiceResponse
<
String
>
cashWithdrawalOfSupplier
(
CashWithdrawalDTO
dto
);
/**
* 填写物流信息
* @Title: expressMail
* @Description:
* @author guojuxing
* @param serialNumber 提现申请流水号
* @param expressMailName 物流公司
* @param expressMailNumber 物流单号
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>
*/
ServiceResponse
<
Void
>
expressMail
(
String
serialNumber
,
String
expressMailName
,
String
expressMailNumber
);
/**
* 审核通过
* @Title: approval
* @Description:
...
...
gic-platform-finance-service/src/main/java/com/gic/finance/dao/mapper/TabCashWithdrawalMapper.java
View file @
22e43332
...
...
@@ -63,4 +63,6 @@ public interface TabCashWithdrawalMapper {
* @return java.util.List<com.gic.finance.entity.TabCashWithdrawal>
*/
List
<
TabCashWithdrawal
>
listCashWithdrawal
(
CashWithdrawalQueryListQO
params
);
TabCashWithdrawal
getBySerialNumber
(
String
serialNumber
);
}
\ No newline at end of file
gic-platform-finance-service/src/main/java/com/gic/finance/service/CashWithdrawalService.java
View file @
22e43332
...
...
@@ -46,4 +46,14 @@ public interface CashWithdrawalService {
TabCashWithdrawal
getById
(
Integer
id
);
/**
* 根据提现流水号获取
* @Title: getBySerialNumber
* @Description:
* @author guojuxing
* @param serialNumber
* @return com.gic.finance.entity.TabCashWithdrawal
*/
TabCashWithdrawal
getBySerialNumber
(
String
serialNumber
);
}
gic-platform-finance-service/src/main/java/com/gic/finance/service/impl/CashWithdrawalServiceImpl.java
View file @
22e43332
...
...
@@ -41,4 +41,9 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService {
public
TabCashWithdrawal
getById
(
Integer
id
)
{
return
tabCashWithdrawalMapper
.
selectByPrimaryKey
(
id
);
}
@Override
public
TabCashWithdrawal
getBySerialNumber
(
String
serialNumber
)
{
return
tabCashWithdrawalMapper
.
getBySerialNumber
(
serialNumber
);
}
}
gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/CashWithdrawalApiServiceImpl.java
View file @
22e43332
...
...
@@ -66,6 +66,24 @@ public class CashWithdrawalApiServiceImpl implements CashWithdrawalApiService{
}
@Override
public
ServiceResponse
<
Void
>
expressMail
(
String
serialNumber
,
String
expressMailName
,
String
expressMailNumber
)
{
TabCashWithdrawal
record
=
cashWithdrawalService
.
getBySerialNumber
(
serialNumber
);
if
(
record
==
null
)
{
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"提现流水号错误,查无数据"
);
}
if
(
StringUtils
.
isBlank
(
expressMailName
))
{
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"物流公司不能为空"
);
}
if
(
StringUtils
.
isBlank
(
expressMailNumber
))
{
return
ServiceResponse
.
failure
(
ErrorCode
.
PARAMETER_ERROR
.
getCode
(),
"物流单号不能为空"
);
}
record
.
setExpressMailName
(
expressMailName
);
record
.
setExpressMailNumber
(
expressMailNumber
);
cashWithdrawalService
.
update
(
record
);
return
ServiceResponse
.
success
();
}
@Override
public
ServiceResponse
<
Void
>
approval
(
Integer
id
,
OperationUserInfoDTO
dto
)
{
TabCashWithdrawal
record
=
cashWithdrawalService
.
getById
(
id
);
if
(
record
==
null
)
{
...
...
gic-platform-finance-service/src/main/resources/mapper/TabCashWithdrawalMapper.xml
View file @
22e43332
...
...
@@ -371,4 +371,10 @@
</if>
order by create_time desc
</select>
<select
id=
"getBySerialNumber"
resultMap=
"BaseResultMap"
>
select
<include
refid=
"Base_Column_List"
></include>
from tab_cash_withdrawal
where cash_withdrawal_serial_number = #{serialNumber}
</select>
</mapper>
\ No newline at end of file
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