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
ba666a93
Commit
ba666a93
authored
Sep 25, 2020
by
xuxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改用户使用赠送的16元的支付方式
parent
b9eb3cb1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
+10
-10
AdministratorController.java
...erbackend/account/controller/AdministratorController.java
+1
-1
UserPrePaidBilling.java
...gec/browserbackend/account/domain/UserPrePaidBilling.java
+1
-1
PaymentService.java
.../edgec/browserbackend/account/service/PaymentService.java
+5
-5
AccountServiceImpl.java
...owserbackend/account/service/impl/AccountServiceImpl.java
+1
-1
PaymentServiceImpl.java
...owserbackend/account/service/impl/PaymentServiceImpl.java
+2
-2
No files found.
src/main/java/com/edgec/browserbackend/account/controller/AdministratorController.java
View file @
ba666a93
...
...
@@ -101,7 +101,7 @@ public class AdministratorController {
public
HashMap
bankTransferInsert
(
@RequestBody
UserBalance
userBalance
)
{
HashMap
<
String
,
Object
>
map
=
new
HashMap
<>();
try
{
map
.
put
(
"userbalance"
,
paymentService
.
bankTransferInsertion
(
userBalance
.
getUsername
(),
(
int
)
userBalance
.
getBalanced
()));
map
.
put
(
"userbalance"
,
paymentService
.
bankTransferInsertion
(
userBalance
.
getUsername
(),
(
int
)
userBalance
.
getBalanced
()
,
3
));
map
.
put
(
"status"
,
"success"
);
}
catch
(
Exception
e
)
{
map
.
put
(
"status"
,
"failed"
);
...
...
src/main/java/com/edgec/browserbackend/account/domain/UserPrePaidBilling.java
View file @
ba666a93
...
...
@@ -41,7 +41,7 @@ public class UserPrePaidBilling {
private
BillStatus
status
;
/**
* 0 -- 余额, 1 -- 支付宝, 2 -- 微信, 3 -- 银行转账
* 0 -- 余额, 1 -- 支付宝, 2 -- 微信, 3 -- 银行转账
, 4--注册时赠送
*/
private
int
payMethod
;
...
...
src/main/java/com/edgec/browserbackend/account/service/PaymentService.java
View file @
ba666a93
...
...
@@ -6,19 +6,19 @@ import com.edgec.browserbackend.account.domain.UserPaymentDto;
public
interface
PaymentService
{
UserPaymentDto
wxPutPayOrder
(
String
username
,
int
amount
);
UserPaymentDto
wxPutPayOrder
(
String
username
,
int
amount
);
String
alipayPutPayOrder
(
String
username
,
int
amount
,
String
by
);
String
alipayPutPayOrder
(
String
username
,
int
amount
,
String
by
);
String
wechatPayCallback
(
String
tradno
);
String
wechatPayCallback
(
String
tradno
);
UserPaymentDto
wxCheckOrderStatus
(
String
tradno
,
int
chargeType
);
UserPaymentDto
wxCheckOrderStatus
(
String
tradno
,
int
chargeType
);
UserPaymentDto
aliCheckOrderStatus
(
String
tradno
,
int
chargeType
);
void
alipaCallback
(
String
tradno
);
UserBalance
bankTransferInsertion
(
String
username
,
int
amount
);
UserBalance
bankTransferInsertion
(
String
username
,
int
amount
,
int
payMethod
);
UserPaymentDto
h5wxPayOrder
(
String
ip
,
String
username
,
int
amount
);
...
...
src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java
View file @
ba666a93
...
...
@@ -477,7 +477,7 @@ public class AccountServiceImpl implements AccountService {
list
.
add
(
"184"
);
list
.
add
(
"170"
);
if
(!
StringUtils
.
isEmpty
(
account
.
getPhoneNumber
())
&&
!
list
.
contains
(
account
.
getPhoneNumber
().
substring
(
0
,
3
))
&&
inviter
!=
null
)
{
paymentService
.
bankTransferInsertion
(
account
.
getName
(),
globalFieldRepository
.
findAll
().
get
(
0
).
getRegisterGift
());
paymentService
.
bankTransferInsertion
(
account
.
getName
(),
globalFieldRepository
.
findAll
().
get
(
0
).
getRegisterGift
()
,
4
);
}
log
.
info
(
"new account has been created: "
+
account
.
getName
());
...
...
src/main/java/com/edgec/browserbackend/account/service/impl/PaymentServiceImpl.java
View file @
ba666a93
...
...
@@ -310,7 +310,7 @@ public class PaymentServiceImpl implements PaymentService {
}
@Override
public
UserBalance
bankTransferInsertion
(
String
username
,
int
amount
)
{
public
UserBalance
bankTransferInsertion
(
String
username
,
int
amount
,
int
payMethod
)
{
UserPayment
bankOrder
=
new
UserPayment
();
bankOrder
.
setUsername
(
username
);
...
...
@@ -332,7 +332,7 @@ public class PaymentServiceImpl implements PaymentService {
bill
.
setAmount
(
0
);
bill
.
setUnit
(
null
);
bill
.
setPeriod
(
0
);
bill
.
setPayMethod
(
3
);
bill
.
setPayMethod
(
payMethod
);
bill
.
setUsername
(
username
);
bill
.
setTotal
((
float
)
amount
);
bill
.
setStatus
(
BillStatus
.
PAID
);
...
...
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