Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
Project
Project
Details
Activity
Releases
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
周健威
rs-cloud-platform
Commits
ab43b9b7
Commit
ab43b9b7
authored
Dec 29, 2020
by
unset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加通知信息
parent
c104908d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
6 deletions
+23
-6
OrderInfo.java
...java/com/upyuns/platform/rs/website/entity/OrderInfo.java
+10
-0
OrderInfoBiz.java
...java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
+13
-6
No files found.
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/OrderInfo.java
View file @
ab43b9b7
...
@@ -232,6 +232,16 @@ public class OrderInfo implements Serializable {
...
@@ -232,6 +232,16 @@ public class OrderInfo implements Serializable {
*/
*/
String
payImg
;
String
payImg
;
/**
* 审核状态: 1、审核通过,2、审核拒绝
*/
Integer
auditStatus
;
/**
* 审核理由
*/
String
auditReason
;
@Transient
@Transient
private
List
<
OrderItem
>
orderItemList
;
private
List
<
OrderItem
>
orderItemList
;
...
...
rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java
View file @
ab43b9b7
...
@@ -1019,18 +1019,25 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
...
@@ -1019,18 +1019,25 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
* @return
* @return
*/
*/
public
ObjectRestResponse
payByCompanyBank
(
OrderInfo
orderInfo
)
{
public
ObjectRestResponse
payByCompanyBank
(
OrderInfo
orderInfo
)
{
if
(
orderInfo
==
null
||
StringUtils
.
isBlank
(
orderInfo
.
getOrderNo
()))
{
if
(
orderInfo
==
null
||
StringUtils
.
isBlank
(
orderInfo
.
getOrderNo
())
||
orderInfo
.
getAuditStatus
()
==
null
)
{
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
PARAM_ILLEGAL_CODE
,
ResultCode
.
getMsg
(
ResultCode
.
PARAM_ILLEGAL_CODE
));
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
PARAM_ILLEGAL_CODE
,
ResultCode
.
getMsg
(
ResultCode
.
PARAM_ILLEGAL_CODE
));
}
}
OrderInfo
old
=
getOneByOrderNo
(
orderInfo
.
getOrderNo
());
OrderInfo
old
=
getOneByOrderNo
(
orderInfo
.
getOrderNo
());
if
(
old
==
null
)
{
if
(
old
==
null
)
{
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
ORDER_NOT_EXIST
,
ResultCode
.
getMsg
(
ResultCode
.
ORDER_NOT_EXIST
));
return
ObjectRestResponse
.
createFailedResult
(
ResultCode
.
ORDER_NOT_EXIST
,
ResultCode
.
getMsg
(
ResultCode
.
ORDER_NOT_EXIST
));
}
}
if
(
orderInfo
.
getAuditStatus
()
==
1
)
{
old
.
setPayImg
(
orderInfo
.
getPayImg
());
old
.
setPayImg
(
orderInfo
.
getPayImg
());
old
.
setPayCode
(
orderInfo
.
getPayCode
());
old
.
setPayCode
(
orderInfo
.
getPayCode
());
old
.
setPayType
(
3
);
old
.
setPayType
(
3
);
old
.
setPayTime
(
new
Date
());
old
.
setPayTime
(
new
Date
());
old
.
setAuditStatus
(
1
);
updateSelectiveByIdRe
(
old
);
}
else
{
old
.
setAuditStatus
(
2
);
old
.
setAuditReason
(
orderInfo
.
getAuditReason
());
updateSelectiveByIdRe
(
old
);
updateSelectiveByIdRe
(
old
);
}
return
ObjectRestResponse
.
succ
();
return
ObjectRestResponse
.
succ
();
}
}
...
...
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