Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
browser-backend
Project
Project
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
Administrator
browser-backend
Commits
358f20cb
Commit
358f20cb
authored
Jul 16, 2020
by
xuxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加用户充值的日志输出信息
parent
0cbfbe94
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
pom.xml
pom.xml
+2
-2
PaymentServiceImpl.java
...owserbackend/account/service/impl/PaymentServiceImpl.java
+6
-0
PaymentTask.java
...va/com/edgec/browserbackend/browser/task/PaymentTask.java
+1
-0
No files found.
pom.xml
View file @
358f20cb
...
@@ -103,12 +103,12 @@
...
@@ -103,12 +103,12 @@
<artifactId>
alipay-sdk-java
</artifactId>
<artifactId>
alipay-sdk-java
</artifactId>
<version>
3.7.110.ALL
</version>
<version>
3.7.110.ALL
</version>
</dependency>
</dependency>
<dependency>
<
!--<
dependency>
<groupId>de.flapdoodle.embed</groupId>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
<version>1.50.3</version>
<version>1.50.3</version>
<scope>test</scope>
<scope>test</scope>
</dependency>
</dependency>
-->
<dependency>
<dependency>
<groupId>
com.jayway.jsonpath
</groupId>
<groupId>
com.jayway.jsonpath
</groupId>
<artifactId>
json-path
</artifactId>
<artifactId>
json-path
</artifactId>
...
...
src/main/java/com/edgec/browserbackend/account/service/impl/PaymentServiceImpl.java
View file @
358f20cb
...
@@ -70,6 +70,7 @@ public class PaymentServiceImpl implements PaymentService {
...
@@ -70,6 +70,7 @@ public class PaymentServiceImpl implements PaymentService {
// 当微信回调该接口时,说明微信那边已经充值成功,这个时候需要更新系统中 userpayment 充值状态
// 当微信回调该接口时,说明微信那边已经充值成功,这个时候需要更新系统中 userpayment 充值状态
UserPayment
byTradeNo
=
userPaymentRepository
.
findByTradeNo
(
tradno
);
UserPayment
byTradeNo
=
userPaymentRepository
.
findByTradeNo
(
tradno
);
if
(
byTradeNo
!=
null
&&
!
byTradeNo
.
isSucceed
())
{
if
(
byTradeNo
!=
null
&&
!
byTradeNo
.
isSucceed
())
{
log
.
info
(
"微信支付回调确认订单"
+
byTradeNo
.
getTradeNo
()
+
"支付状态,此时chargeType为 0"
);
wxCheckOrderStatus
(
byTradeNo
.
getTradeNo
(),
0
);
wxCheckOrderStatus
(
byTradeNo
.
getTradeNo
(),
0
);
}
}
return
"<xml>\n"
+
return
"<xml>\n"
+
...
@@ -83,6 +84,7 @@ public class PaymentServiceImpl implements PaymentService {
...
@@ -83,6 +84,7 @@ public class PaymentServiceImpl implements PaymentService {
public
void
alipaCallback
(
String
tradno
)
{
public
void
alipaCallback
(
String
tradno
)
{
UserPayment
byTradeNo
=
userPaymentRepository
.
findByTradeNo
(
tradno
);
UserPayment
byTradeNo
=
userPaymentRepository
.
findByTradeNo
(
tradno
);
if
(
byTradeNo
!=
null
&&
!
byTradeNo
.
isSucceed
())
{
if
(
byTradeNo
!=
null
&&
!
byTradeNo
.
isSucceed
())
{
log
.
info
(
"支付宝支付回调确认订单"
+
byTradeNo
.
getTradeNo
()
+
"支付状态,此时chargeType为 0"
);
aliCheckOrderStatus
(
byTradeNo
.
getTradeNo
(),
0
);
aliCheckOrderStatus
(
byTradeNo
.
getTradeNo
(),
0
);
}
}
}
}
...
@@ -791,6 +793,7 @@ public class PaymentServiceImpl implements PaymentService {
...
@@ -791,6 +793,7 @@ public class PaymentServiceImpl implements PaymentService {
// 2.1 更新 userPayment 的支付状态为成功
// 2.1 更新 userPayment 的支付状态为成功
boolean
b
=
userPaymentRepository
.
updatePaymentResult
(
byTradeNo
,
true
);
boolean
b
=
userPaymentRepository
.
updatePaymentResult
(
byTradeNo
,
true
);
if
(
b
)
{
if
(
b
)
{
log
.
info
(
"订单 "
+
byTradeNo
.
getTradeNo
()
+
" 的支付状态更新为成功"
);
// 2.2 获取充值优惠赠送
// 2.2 获取充值优惠赠送
PayBack
payBack
=
payBackRepository
.
findByPay
(
byTradeNo
.
getAmount
());
PayBack
payBack
=
payBackRepository
.
findByPay
(
byTradeNo
.
getAmount
());
if
(
payBack
==
null
)
{
if
(
payBack
==
null
)
{
...
@@ -802,11 +805,13 @@ public class PaymentServiceImpl implements PaymentService {
...
@@ -802,11 +805,13 @@ public class PaymentServiceImpl implements PaymentService {
// 2.3 构建用户充值信息并保存
// 2.3 构建用户充值信息并保存
UserPrePaidBilling
bill
=
getUserPrePaidBilling
(
byTradeNo
,
byName
,
balance
,
payBack
);
UserPrePaidBilling
bill
=
getUserPrePaidBilling
(
byTradeNo
,
byName
,
balance
,
payBack
);
userPrePaidBillingRepository
.
save
(
bill
);
userPrePaidBillingRepository
.
save
(
bill
);
log
.
info
(
"构建订单 "
+
byTradeNo
.
getTradeNo
()
+
" 的充值信息成功"
);
}
}
// 2.4 更新账户余额 userBalance
// 2.4 更新账户余额 userBalance
balance
.
setBalanced
(
balance
.
getBalanced
()
+
byTradeNo
.
getAmount
()
+
payBack
.
getBack
());
balance
.
setBalanced
(
balance
.
getBalanced
()
+
byTradeNo
.
getAmount
()
+
payBack
.
getBack
());
userBalanceRepository
.
save
(
balance
);
userBalanceRepository
.
save
(
balance
);
log
.
info
(
"更新充值订单 "
+
byTradeNo
.
getTradeNo
()
+
" 所对应的账户 "
+
balance
.
getUsername
()
+
" 的余额成功"
);
// 2.5 如果当前用户通过邀请码注册的,则更新邀请人的佣金
// 2.5 如果当前用户通过邀请码注册的,则更新邀请人的佣金
if
(
byName
.
getPromotionCode
()
!=
null
)
{
if
(
byName
.
getPromotionCode
()
!=
null
)
{
...
@@ -814,6 +819,7 @@ public class PaymentServiceImpl implements PaymentService {
...
@@ -814,6 +819,7 @@ public class PaymentServiceImpl implements PaymentService {
if
(
account
!=
null
)
{
if
(
account
!=
null
)
{
account
.
getPromotion
().
setCommission
(
account
.
getPromotion
().
getCommission
()
+
byTradeNo
.
getAmount
());
account
.
getPromotion
().
setCommission
(
account
.
getPromotion
().
getCommission
()
+
byTradeNo
.
getAmount
());
accountRepository
.
save
(
account
);
accountRepository
.
save
(
account
);
log
.
info
(
"更新邀请人的佣金成功"
);
}
}
}
}
}
}
...
...
src/main/java/com/edgec/browserbackend/browser/task/PaymentTask.java
View file @
358f20cb
...
@@ -48,6 +48,7 @@ public class PaymentTask {
...
@@ -48,6 +48,7 @@ public class PaymentTask {
* chargeType 取值范围为 0-4
* chargeType 取值范围为 0-4
* 此处设置为 100 仅仅只是为了避免 wxCheckOrderStatus() 方法中 chargeType == 0 相关代码块
* 此处设置为 100 仅仅只是为了避免 wxCheckOrderStatus() 方法中 chargeType == 0 相关代码块
*/
*/
log
.
info
(
"主动确认订单"
+
payment
.
getTradeNo
()
+
"支付状态,此时chargeType为 100"
);
if
(
PaymentMethod
.
WECHAT
.
equals
(
paymentMethod
))
{
if
(
PaymentMethod
.
WECHAT
.
equals
(
paymentMethod
))
{
paymentService
.
wxCheckOrderStatus
(
payment
.
getTradeNo
(),
100
);
paymentService
.
wxCheckOrderStatus
(
payment
.
getTradeNo
(),
100
);
}
}
...
...
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