Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
6fd99b79
Commit
6fd99b79
authored
May 27, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改文案提示
parent
17d89f6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
21 deletions
+17
-21
order-application-service/src/main/java/cn/freemud/handler/MemberBlacklistHandler.java
+14
-6
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-15
No files found.
order-application-service/src/main/java/cn/freemud/handler/MemberBlacklistHandler.java
View file @
6fd99b79
...
@@ -26,7 +26,7 @@ public class MemberBlacklistHandler {
...
@@ -26,7 +26,7 @@ public class MemberBlacklistHandler {
*
*
* @param blacklistDto
* @param blacklistDto
*/
*/
public
OrderBlacklistResp
checkisTrueBlacklist
(
BlacklistDto
blacklistDto
)
{
public
String
checkisTrueBlacklist
(
BlacklistDto
blacklistDto
)
{
//step1 查询是否存在
//step1 查询是否存在
BlackListQueryByClient
req
=
new
BlackListQueryByClient
();
BlackListQueryByClient
req
=
new
BlackListQueryByClient
();
req
.
setPartnerId
(
blacklistDto
.
getPartnerId
());
req
.
setPartnerId
(
blacklistDto
.
getPartnerId
());
...
@@ -49,12 +49,20 @@ public class MemberBlacklistHandler {
...
@@ -49,12 +49,20 @@ public class MemberBlacklistHandler {
return
null
;
return
null
;
}
}
// step3 余额不足组装前端参数 考虑负数默认0
// step3 余额不足组装前端参数 考虑负数默认0
long
surplusAmount
=
limitAmount
-
shoppingTotalAmount
-
blacklistDto
.
getAmount
()
;
long
surplusAmount
=
limitAmount
-
shoppingTotalAmount
;
OrderBlacklistResp
orderBlacklistResp
=
new
OrderBlacklistResp
();
// OrderBlacklistResp orderBlacklistResp = new OrderBlacklistResp();
orderBlacklistResp
.
setMoblie
(
result
.
getMoblie
());
// orderBlacklistResp.setMoblie(result.getMoblie());
orderBlacklistResp
.
setSurplusAmount
(
surplusAmount
<
0
?
0L
:
surplusAmount
);
// orderBlacklistResp.setSurplusAmount(surplusAmount < 0 ? 0L : surplusAmount);
return
orderBlacklistResp
;
// return orderBlacklistResp;
// 您的消费额度还有3元,暂无法支付,如有疑问,详询客服热线4008899096
StringBuilder
sb
=
new
StringBuilder
();
long
amount
=
surplusAmount
<
0L
?
0L
:
surplusAmount
*
100
;
sb
.
append
(
"您的消费额度还有"
)
.
append
(
amount
)
.
append
(
"元,暂无法支付,如有疑问,详询客服热线"
)
.
append
(
result
.
getMoblie
());
return
sb
.
toString
();
}
}
}
}
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
6fd99b79
...
@@ -2463,18 +2463,6 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2463,18 +2463,6 @@ public class OrderServiceImpl implements Orderservice {
* @return
* @return
*/
*/
public
BaseResponse
sdkCreateOrder
(
CreateOrderBONew
createOrderBO
)
{
public
BaseResponse
sdkCreateOrder
(
CreateOrderBONew
createOrderBO
)
{
BaseResponse
baseResponse
=
new
BaseResponse
();
baseResponse
.
setCode
();
baseResponse
.
setMessage
();
baseResponse
.
setVer
();
baseResponse
.
setResult
();
return
baseResponse
;
BaseResponse
baseResponse
=
new
BaseResponse
();
baseResponse
.
setCode
();
baseResponse
.
setMessage
();
baseResponse
.
setVer
();
baseResponse
.
setResult
();
return
baseResponse
;
CreateOrderVo
createOrderVo
=
createOrderBO
.
getCreateOrderVo
();
CreateOrderVo
createOrderVo
=
createOrderBO
.
getCreateOrderVo
();
StoreMixResponseDto
storeMixResponseDto
=
createOrderBO
.
getStoreMixResponseDto
();
StoreMixResponseDto
storeMixResponseDto
=
createOrderBO
.
getStoreMixResponseDto
();
StoreResponseDto
storeResponseDto
=
storeMixResponseDto
.
getStoreInfo
();
StoreResponseDto
storeResponseDto
=
storeMixResponseDto
.
getStoreInfo
();
...
@@ -2514,9 +2502,9 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2514,9 +2502,9 @@ public class OrderServiceImpl implements Orderservice {
blacklistDto
.
setAmount
(
amount
);
blacklistDto
.
setAmount
(
amount
);
blacklistDto
.
setPartnerId
(
createOrderVo
.
getPartnerId
());
blacklistDto
.
setPartnerId
(
createOrderVo
.
getPartnerId
());
blacklistDto
.
setMemberId
(
createOrderVo
.
getUserId
());
blacklistDto
.
setMemberId
(
createOrderVo
.
getUserId
());
OrderBlacklistResp
orderBlacklistResp
=
memberBlacklistHandler
.
checkisTrueBlacklist
(
blacklistDto
);
String
touchStr
=
memberBlacklistHandler
.
checkisTrueBlacklist
(
blacklistDto
);
if
(
Objects
.
nonNull
(
orderBlacklistResp
))
{
if
(
StringUtils
.
isNotEmpty
(
touchStr
))
{
return
ResponseUtil
.
error
(
ResponseResult
.
TOUCH_SHOPPING_BLACK_LIST
,
orderBlacklistResp
);
return
ResponseUtil
.
error
(
ResponseResult
.
TOUCH_SHOPPING_BLACK_LIST
.
getCode
(),
touchStr
);
}
}
// 预先前置 设置 支付方式
// 预先前置 设置 支付方式
...
...
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