Skip to content

B
browser-backend
Commit 1169df93 authored by renjie's avatar renjie
Browse files
Options

Merge branch 'dev-zrj' into 'staging' 

1.生成3proxy配置文件

See merge request !50
parents 71f58f31 d2c12f58
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java
View file @ 1169df93
...@@ -368,7 +368,7 @@ public class AccountServiceImpl implements AccountService { ...@@ -368,7 +368,7 @@ public class AccountServiceImpl implements AccountService {
if (account.getPromotion() != null) { if (account.getPromotion() != null) {
int invitedUsers = repository.countByPromotionCodeAndParentIsNull(account.getPromotion().getCode()); int invitedUsers = repository.countByPromotionCodeAndParentIsNull(account.getPromotion().getCode());
String code = account.getPromotion().getCode(); String code = account.getPromotion().getCode();
List<Account> promotes = repository.findByPromotionCode(code); List<Account> promotes = repository.findByPromotionCodeAndParentIsNull(code);
double totalCommission = 0; double totalCommission = 0;
totalCommission = 0; totalCommission = 0;
for (Account promote : promotes) { for (Account promote : promotes) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment