Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
huluobin
gogirl-miniapp-backend
Commits
4e21af2f
Commit
4e21af2f
authored
Apr 24, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
异常
parent
e0db95f7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
ChargeOrderServiceImpl.java
...application/order/member/impl/ChargeOrderServiceImpl.java
+4
-0
OrderIncomeFlow.java
...ain/java/com/gogirl/domain/order/pay/OrderIncomeFlow.java
+1
-1
No files found.
src/main/java/com/gogirl/application/order/member/impl/ChargeOrderServiceImpl.java
View file @
4e21af2f
...
@@ -77,7 +77,11 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
...
@@ -77,7 +77,11 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
.
stream
().
filter
(
config
->
config
.
getChargeAmount
()
<=
result
.
getTotalFee
())
.
stream
().
filter
(
config
->
config
.
getChargeAmount
()
<=
result
.
getTotalFee
())
.
max
(
Comparator
.
comparing
(
DiscountConfig:
:
getChargeAmount
)).
orElseThrow
(
NullPointerException:
:
new
);
.
max
(
Comparator
.
comparing
(
DiscountConfig:
:
getChargeAmount
)).
orElseThrow
(
NullPointerException:
:
new
);
try
{
couponService
.
sendCoupon
(
discountConfig
.
getCouponId
(),
customer
.
getId
());
couponService
.
sendCoupon
(
discountConfig
.
getCouponId
(),
customer
.
getId
());
}
catch
(
RRException
e
)
{
log
.
error
(
e
.
getMessage
());
}
//首次充值
//首次充值
...
...
src/main/java/com/gogirl/domain/order/pay/OrderIncomeFlow.java
View file @
4e21af2f
...
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
...
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
@Data
@Data
@EqualsAndHashCode
(
callSuper
=
false
)
@EqualsAndHashCode
(
callSuper
=
false
)
@Accessors
(
chain
=
true
)
@Accessors
(
chain
=
true
)
@ApiModel
(
value
=
"OrderIncomeFlow对象"
,
description
=
""
)
@ApiModel
(
value
=
"OrderIncomeFlow对象"
,
description
=
""
)
public
class
OrderIncomeFlow
implements
Serializable
{
public
class
OrderIncomeFlow
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
...
...
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