Commit db9d9dda by kangxiaoshan

校验客户主账号

parent 2d0593b8
...@@ -87,20 +87,20 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -87,20 +87,20 @@ public class TkioAccountServiceImpl implements TkioAccountService {
public Map<String, Object> findSale(User user, Long sale) { public Map<String, Object> findSale(User user, Long sale) {
Map<String, Object> map = new HashMap(); Map<String, Object> map = new HashMap();
String email = null; String email = null;
if(null != sale){ if (null != sale) {
try { try {
SalesManLeader one = salesManLeaderRepository.findOne(Integer.parseInt(sale + "")); SalesManLeader one = salesManLeaderRepository.findOne(Integer.parseInt(sale + ""));
User user1 = userRepository.findByEmail(one.getEmail()); User user1 = userRepository.findByEmail(one.getEmail());
if (null != user1) if (null != user1)
map.put("old", user1.getName()); map.put("old", user1.getName());
}catch (Exception e){ } catch (Exception e) {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
} }
} }
List<User> list = new ArrayList<>(); List<User> list = new ArrayList<>();
if(user.getRole().equals(RoleEnum.NORTH_BUSSINUSS.getKey()) || user.getRole().equals(RoleEnum.SOUTH_BUSSINUSS.getKey())){ if (user.getRole().equals(RoleEnum.NORTH_BUSSINUSS.getKey()) || user.getRole().equals(RoleEnum.SOUTH_BUSSINUSS.getKey())) {
list = userService.findbyRole(user.getRole()); list = userService.findbyRole(user.getRole());
}else { } else {
list = userRepository.findSales(); list = userRepository.findSales();
} }
map.put("new", list); map.put("new", list);
...@@ -114,10 +114,10 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -114,10 +114,10 @@ public class TkioAccountServiceImpl implements TkioAccountService {
SalesManLeader leader = salesManLeaderRepository.findOneByEmail(email); SalesManLeader leader = salesManLeaderRepository.findOneByEmail(email);
User user = userRepository.findByEmail(email); User user = userRepository.findByEmail(email);
accountTkio.setBussinessman(Long.parseLong(leader.getId()+"")); accountTkio.setBussinessman(Long.parseLong(leader.getId() + ""));
accountRepository.save(accountTkio); accountRepository.save(accountTkio);
account4Web.setBussinessMan(Long.parseLong(leader.getId()+"")); account4Web.setBussinessMan(Long.parseLong(leader.getId() + ""));
account4Web.setSaleEamil(user.getEmail()); account4Web.setSaleEamil(user.getEmail());
return account4WebRepository.save(account4Web); return account4WebRepository.save(account4Web);
} }
...@@ -126,44 +126,44 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -126,44 +126,44 @@ public class TkioAccountServiceImpl implements TkioAccountService {
public List<Account4Web> findAll(User user) { public List<Account4Web> findAll(User user) {
List<Account4Web> result = new ArrayList<>(); List<Account4Web> result = new ArrayList<>();
List<Account4Web> account4WebList = null; List<Account4Web> account4WebList = null;
if(user.getRole().equals(RoleEnum.MANAGER.getKey())){ if (user.getRole().equals(RoleEnum.MANAGER.getKey())) {
account4WebList = account4WebRepository.findAll(); account4WebList = account4WebRepository.findAll();
} else{ } else {
List<Integer> idList = new ArrayList<>(); List<Integer> idList = new ArrayList<>();
if(user.getRoleType().equals(RoleTypeEnum.MANAGER.getKey())){ if (user.getRoleType().equals(RoleTypeEnum.MANAGER.getKey())) {
List<User> userList = userRepository.findAllUserByRole(user.getRole()); List<User> userList = userRepository.findAllUserByRole(user.getRole());
List<String> emialList = new ArrayList<>(); List<String> emialList = new ArrayList<>();
for(User u : userList){ for (User u : userList) {
emialList.add(u.getEmail()); emialList.add(u.getEmail());
} }
List<SalesManLeader> salesManLeaderList = salesManLeaderRepository.findAllByEmails(emialList); List<SalesManLeader> salesManLeaderList = salesManLeaderRepository.findAllByEmails(emialList);
if (ValidateUtil.isValid(salesManLeaderList)){ if (ValidateUtil.isValid(salesManLeaderList)) {
for(SalesManLeader sml : salesManLeaderList){ for (SalesManLeader sml : salesManLeaderList) {
idList.add(sml.getId()); idList.add(sml.getId());
} }
} }
}else{ } else {
List<String> emailList = new ArrayList<>(); List<String> emailList = new ArrayList<>();
emailList.add(user.getEmail()); emailList.add(user.getEmail());
List<User> userList = userService.findAllSons(user.getId()); List<User> userList = userService.findAllSons(user.getId());
if(ValidateUtil.isValid(userList)){ if (ValidateUtil.isValid(userList)) {
for(User u : userList){ for (User u : userList) {
emailList.add(u.getEmail()); emailList.add(u.getEmail());
} }
} }
List<SalesManLeader> manLeaderList = salesManLeaderRepository.findAllByEmails(emailList); List<SalesManLeader> manLeaderList = salesManLeaderRepository.findAllByEmails(emailList);
if(ValidateUtil.isValid(manLeaderList)){ if (ValidateUtil.isValid(manLeaderList)) {
for(SalesManLeader a : manLeaderList){ for (SalesManLeader a : manLeaderList) {
idList.add(a.getId()); idList.add(a.getId());
} }
} }
} }
if(ValidateUtil.isValid(idList)){ if (ValidateUtil.isValid(idList)) {
List<Account> accountList = accountRepository.findBussnissMan(idList); List<Account> accountList = accountRepository.findBussnissMan(idList);
List<String> emails = new ArrayList<>(); List<String> emails = new ArrayList<>();
if(ValidateUtil.isValid(accountList)){ if (ValidateUtil.isValid(accountList)) {
for(Account ac : accountList){ for (Account ac : accountList) {
emails.add(ac.getEmail()); emails.add(ac.getEmail());
} }
account4WebList = account4WebRepository.findByEmails(emails); account4WebList = account4WebRepository.findByEmails(emails);
...@@ -173,69 +173,69 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -173,69 +173,69 @@ public class TkioAccountServiceImpl implements TkioAccountService {
List<SalesManLeader> roles = salesManLeaderRepository.findAll(); List<SalesManLeader> roles = salesManLeaderRepository.findAll();
Map<Long, String> busMap = new HashMap<>(); Map<Long, String> busMap = new HashMap<>();
for(SalesManLeader u : roles){ for (SalesManLeader u : roles) {
busMap.put((long)u.getId(),u.getName()); busMap.put((long) u.getId(), u.getName());
} }
List<User> users = userRepository.findAll(); List<User> users = userRepository.findAll();
Map<String, Long> saleMap = new HashMap<>(); Map<String, Long> saleMap = new HashMap<>();
for(User u : users){ for (User u : users) {
saleMap.put(u.getEmail(),u.getId()); saleMap.put(u.getEmail(), u.getId());
} }
List<Reminder> reminderList = reminderRepository.findAllDistinct("tkio"); List<Reminder> reminderList = reminderRepository.findAllDistinct("tkio");
Map<Long, Boolean> reMap = new HashMap<>(); Map<Long, Boolean> reMap = new HashMap<>();
if(ValidateUtil.isValid(reminderList)){ if (ValidateUtil.isValid(reminderList)) {
for(Reminder re : reminderList){ for (Reminder re : reminderList) {
reMap.put(re.getAccountId(), re.getRemindStatus()); reMap.put(re.getAccountId(), re.getRemindStatus());
} }
} }
List<PressMoney> allPress = pressMoneyRepository.findAllPress("tkio"); List<PressMoney> allPress = pressMoneyRepository.findAllPress("tkio");
Map<Long, Boolean> pressMap = new HashMap<>(); Map<Long, Boolean> pressMap = new HashMap<>();
if(ValidateUtil.isValid(allPress)){ if (ValidateUtil.isValid(allPress)) {
for(PressMoney re : allPress){ for (PressMoney re : allPress) {
pressMap.put(re.getAccountId(), re.getPressStatus()); pressMap.put(re.getAccountId(), re.getPressStatus());
} }
} }
if(ValidateUtil.isValid(account4WebList)){ if (ValidateUtil.isValid(account4WebList)) {
Map<String, Integer> backTimeMap = getBackTime(); Map<String, Integer> backTimeMap = getBackTime();
Map<String, List<Contract>> payMap = getPay(); Map<String, List<Contract>> payMap = getPay();
for(Account4Web aw : account4WebList){ for (Account4Web aw : account4WebList) {
if(backTimeMap.containsKey(aw.getEmail())){ if (backTimeMap.containsKey(aw.getEmail())) {
aw.setBackTime(backTimeMap.get(aw.getEmail())); aw.setBackTime(backTimeMap.get(aw.getEmail()));
} else{ } else {
aw.setBackTime(0); aw.setBackTime(0);
} }
if(payMap.containsKey(aw.getEmail())){ if (payMap.containsKey(aw.getEmail())) {
List<Contract> contractList = payMap.get(aw.getEmail()); List<Contract> contractList = payMap.get(aw.getEmail());
//aw.setMoney(contractList.get(contractList.size() - 1 ).getPayMoney()); //aw.setMoney(contractList.get(contractList.size() - 1 ).getPayMoney());
aw.setContractStatus(contractRepository.findByPlatformAndEmailLimit1("tkio", aw.getEmail(), ContractTypeEnum.MAIN.getKey()).getStatus()); aw.setContractStatus(contractRepository.findByPlatformAndEmailLimit1("tkio", aw.getEmail(), ContractTypeEnum.MAIN.getKey()).getStatus());
aw.setContractTime(contractList.size()); aw.setContractTime(contractList.size());
} else{ } else {
aw.setContractTime(0); aw.setContractTime(0);
aw.setContractStatus("empty"); aw.setContractStatus("empty");
aw.setMoney(0L); aw.setMoney(0L);
} }
if(reMap.containsKey(aw.getAccountId())){ if (reMap.containsKey(aw.getAccountId())) {
aw.setRemStatus(reMap.get(aw.getAccountId())); aw.setRemStatus(reMap.get(aw.getAccountId()));
} else{ } else {
aw.setRemStatus(true); aw.setRemStatus(true);
} }
if(pressMap.containsKey(aw.getAccountId())){ if (pressMap.containsKey(aw.getAccountId())) {
aw.setPressStatus(true); aw.setPressStatus(true);
aw.setContractStatus("stop"); aw.setContractStatus("stop");
} else{ } else {
aw.setRemStatus(false); aw.setRemStatus(false);
} }
if(busMap.containsKey(aw.getBussinessMan())){ if (busMap.containsKey(aw.getBussinessMan())) {
aw.setSaleName(busMap.get(aw.getBussinessMan())); aw.setSaleName(busMap.get(aw.getBussinessMan()));
}else{ } else {
aw.setSaleName(""); aw.setSaleName("");
} }
if(saleMap.containsKey(aw.getSaleEamil())){ if (saleMap.containsKey(aw.getSaleEamil())) {
aw.setSale(saleMap.get(aw.getSaleEamil())); aw.setSale(saleMap.get(aw.getSaleEamil()));
} }
result.add(aw); result.add(aw);
...@@ -243,55 +243,64 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -243,55 +243,64 @@ public class TkioAccountServiceImpl implements TkioAccountService {
} }
return result; return result;
} }
@Override @Override
public Account4Web findOne(String email) { public Account4Web findOne(String email) {
List<Reminder> reminderList = reminderRepository.findAllDistinct("tkio"); List<Reminder> reminderList = reminderRepository.findAllDistinct("tkio");
Map<Long, Boolean> reMap = new HashMap<>(); Map<Long, Boolean> reMap = new HashMap<>();
if(ValidateUtil.isValid(reminderList)){ if (ValidateUtil.isValid(reminderList)) {
for(Reminder re : reminderList){ for (Reminder re : reminderList) {
reMap.put(re.getAccountId(), re.getRemindStatus()); reMap.put(re.getAccountId(), re.getRemindStatus());
} }
} }
Account4Web aw = account4WebRepository.findByEmail(email);
if(null == aw){ Account account = accountRepository.findByEmail(email);
//Account4Web aw = account4WebRepository.findByEmail(email);
Account4Web aw = null;
if (null == account) {
return null; return null;
} else {
aw = new Account4Web();
aw.setAccountId(account.getId());
aw.setBussinessMan(account.getBussinessman());
} }
List<SalesManLeader> roles = salesManLeaderRepository.findAll(); List<SalesManLeader> roles = salesManLeaderRepository.findAll();
Map<Long, String> busMap = new HashMap<>(); Map<Long, String> busMap = new HashMap<>();
for(SalesManLeader u : roles){ for (SalesManLeader u : roles) {
busMap.put((long)u.getId(),u.getName()); busMap.put((long) u.getId(), u.getName());
} }
List<User> users = userRepository.findAll(); List<User> users = userRepository.findAll();
Map<String, Long> saleMap = new HashMap<>(); Map<String, Long> saleMap = new HashMap<>();
for(User u : users){ for (User u : users) {
saleMap.put(u.getEmail(),u.getId()); saleMap.put(u.getEmail(), u.getId());
} }
List<BackVisit> backVisitList = backVisitRepository.findAllByPlatformAndEmail("tkio", email); List<BackVisit> backVisitList = backVisitRepository.findAllByPlatformAndEmail("tkio", email);
if(ValidateUtil.isValid(backVisitList)){ if (ValidateUtil.isValid(backVisitList)) {
aw.setBackTime(backVisitList.size()); aw.setBackTime(backVisitList.size());
} else{ } else {
aw.setBackTime(0); aw.setBackTime(0);
} }
List<Contract> contractList = contractRepository.findByPlatformAndEmail("tkio", email,ContractTypeEnum.MAIN.getKey()); List<Contract> contractList = contractRepository.findByPlatformAndEmail("tkio", email, ContractTypeEnum.MAIN.getKey());
if(ValidateUtil.isValid(contractList)){ if (ValidateUtil.isValid(contractList)) {
//aw.setMoney(contractList.get(contractList.size() - 1 ).getPayMoney()); //aw.setMoney(contractList.get(contractList.size() - 1 ).getPayMoney());
aw.setContractStatus(contractList.get(contractList.size() - 1 ).getStatus()); aw.setContractStatus(contractList.get(contractList.size() - 1).getStatus());
aw.setContractTime(contractList.size()); aw.setContractTime(contractList.size());
} else{ } else {
aw.setContractTime(0); aw.setContractTime(0);
aw.setContractStatus("empty"); aw.setContractStatus("empty");
aw.setMoney(0L); aw.setMoney(0L);
} }
if(reMap.containsKey(aw.getAccountId())){ if (reMap.containsKey(aw.getAccountId())) {
aw.setRemStatus(reMap.get(aw.getAccountId())); aw.setRemStatus(reMap.get(aw.getAccountId()));
} else{ } else {
aw.setRemStatus(true); aw.setRemStatus(true);
} }
if(busMap.containsKey(aw.getBussinessMan())){ if (busMap.containsKey(aw.getBussinessMan())) {
aw.setSaleName(busMap.get(aw.getBussinessMan())); aw.setSaleName(busMap.get(aw.getBussinessMan()));
}else{ } else {
aw.setSaleName(""); aw.setSaleName("");
} }
return aw; return aw;
...@@ -331,7 +340,7 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -331,7 +340,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
pressMoney.setDs(DateUtil.getBeforeDays(0)); pressMoney.setDs(DateUtil.getBeforeDays(0));
Contract contract = contractRepository.findByPlatformAndEmailLimit1("tkio", resource.getEmail(), ContractTypeEnum.MAIN.getKey()); Contract contract = contractRepository.findByPlatformAndEmailLimit1("tkio", resource.getEmail(), ContractTypeEnum.MAIN.getKey());
if(null != contract){ if (null != contract) {
contract.setStatus("executing"); contract.setStatus("executing");
contractRepository.save(contract); contractRepository.save(contract);
} }
...@@ -345,20 +354,20 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -345,20 +354,20 @@ public class TkioAccountServiceImpl implements TkioAccountService {
accountRepository.save(account); accountRepository.save(account);
pressMoneyRepository.save(pressMoney); pressMoneyRepository.save(pressMoney);
return ; return;
} }
@Override @Override
public PressMoney enablePress(User user, PressMoney resource) { public PressMoney enablePress(User user, PressMoney resource) {
PressMoney pressMoney = pressMoneyRepository.findOne("tkio", resource.getAccountId()); PressMoney pressMoney = pressMoneyRepository.findOne("tkio", resource.getAccountId());
if(null == pressMoney){ if (null == pressMoney) {
resource.setUser(user.getId()); resource.setUser(user.getId());
resource.setModifyTime(new Date()); resource.setModifyTime(new Date());
resource.setPlatform("tkio"); resource.setPlatform("tkio");
resource.setPressStatus(true); resource.setPressStatus(true);
resource.setDs(DateUtil.getBeforeDays(0)); resource.setDs(DateUtil.getBeforeDays(0));
pressMoneyRepository.save(resource); pressMoneyRepository.save(resource);
}else{ } else {
pressMoney.setUser(user.getId()); pressMoney.setUser(user.getId());
pressMoney.setModifyTime(new Date()); pressMoney.setModifyTime(new Date());
pressMoney.setPressStatus(true); pressMoney.setPressStatus(true);
...@@ -368,7 +377,7 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -368,7 +377,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
Contract contract = contractRepository.findByPlatformAndEmailLimit1("tkio", resource.getEmail(), ContractTypeEnum.MAIN.getKey()); Contract contract = contractRepository.findByPlatformAndEmailLimit1("tkio", resource.getEmail(), ContractTypeEnum.MAIN.getKey());
if(null != contract){ if (null != contract) {
contract.setStatus("stop"); contract.setStatus("stop");
contractRepository.save(contract); contractRepository.save(contract);
} }
...@@ -415,7 +424,7 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -415,7 +424,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
Map<String, Integer> result = new HashMap<>(); Map<String, Integer> result = new HashMap<>();
List<Account> accountList = accountRepository.findByRootParent(account); List<Account> accountList = accountRepository.findByRootParent(account);
List<Long> idList = new ArrayList<>(); List<Long> idList = new ArrayList<>();
for(Account ac : accountList){ for (Account ac : accountList) {
idList.add(ac.getId()); idList.add(ac.getId());
} }
List<String> appkeys = appRepository.findAppkeys(idList); List<String> appkeys = appRepository.findAppkeys(idList);
...@@ -427,7 +436,7 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -427,7 +436,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
BigInteger numChannel = channelRepository.countByAccount(idList, startDate, endDate); BigInteger numChannel = channelRepository.countByAccount(idList, startDate, endDate);
BigInteger event_sum = accountFlowRestrictService.getTotalNum(startDate, endDate, "'" + appkeyStr + "'", "account_io_flow_restrict", "event_sum"); BigInteger event_sum = accountFlowRestrictService.getTotalNum(startDate, endDate, "'" + appkeyStr + "'", "account_io_flow_restrict", "event_sum");
BigInteger click_sum =accountFlowRestrictService.getTotalNum(startDate, endDate, "'" + appkeyStr + "'","account_track_flow_restrict","click_sum"); BigInteger click_sum = accountFlowRestrictService.getTotalNum(startDate, endDate, "'" + appkeyStr + "'", "account_track_flow_restrict", "click_sum");
result.put("numAccount", numAccount.intValue()); result.put("numAccount", numAccount.intValue());
result.put("numApp", numApp.intValue()); result.put("numApp", numApp.intValue());
result.put("numCampaign", numCampaign.intValue()); result.put("numCampaign", numCampaign.intValue());
...@@ -442,7 +451,7 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -442,7 +451,7 @@ public class TkioAccountServiceImpl implements TkioAccountService {
List<Map<String, Object>> result = new ArrayList<>(); List<Map<String, Object>> result = new ArrayList<>();
List<Account> accountList = accountRepository.findByRootParent(account); List<Account> accountList = accountRepository.findByRootParent(account);
List<Long> idList = new ArrayList<>(); List<Long> idList = new ArrayList<>();
for(Account ac : accountList){ for (Account ac : accountList) {
idList.add(ac.getId()); idList.add(ac.getId());
} }
List<String> appkeys = appRepository.findAppkeys(idList); List<String> appkeys = appRepository.findAppkeys(idList);
...@@ -460,12 +469,12 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -460,12 +469,12 @@ public class TkioAccountServiceImpl implements TkioAccountService {
conditions.put("iscache", "0"); conditions.put("iscache", "0");
String responseJson = HttpClientUtil.doHttpPostRequest(url, "trackingio", conditions); String responseJson = HttpClientUtil.doHttpPostRequest(url, "trackingio", conditions);
if(responseJson.contains("val")){ if (responseJson.contains("val")) {
try { try {
JSONObject jsonObject = new JSONObject(responseJson); JSONObject jsonObject = new JSONObject(responseJson);
JSONArray valArr = jsonObject.getJSONArray("val"); JSONArray valArr = jsonObject.getJSONArray("val");
if(null != valArr && valArr.length() > 0){ if (null != valArr && valArr.length() > 0) {
for(int i = 0; i < valArr.length(); i++){ for (int i = 0; i < valArr.length(); i++) {
JSONObject val = valArr.getJSONObject(i); JSONObject val = valArr.getJSONObject(i);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("menu", val.getString("menu")); map.put("menu", val.getString("menu"));
...@@ -488,12 +497,12 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -488,12 +497,12 @@ public class TkioAccountServiceImpl implements TkioAccountService {
List<Reminder> result = new ArrayList<>(); List<Reminder> result = new ArrayList<>();
List<User> userList = userRepository.findAll(); List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>(); Map<Long, String> userMap = new HashMap<>();
for(User u : userList){ for (User u : userList) {
userMap.put(u.getId(), u.getName()); userMap.put(u.getId(), u.getName());
} }
List<Reminder> list = reminderRepository.findAll(account, startDate, endDate, "tkio"); List<Reminder> list = reminderRepository.findAll(account, startDate, endDate, "tkio");
if (ValidateUtil.isValid(list)) { if (ValidateUtil.isValid(list)) {
for(Reminder re : list){ for (Reminder re : list) {
re.setUserName(userMap.get(re.getUser())); re.setUserName(userMap.get(re.getUser()));
result.add(re); result.add(re);
} }
...@@ -506,12 +515,12 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -506,12 +515,12 @@ public class TkioAccountServiceImpl implements TkioAccountService {
List<BackVisit> result = new ArrayList<>(); List<BackVisit> result = new ArrayList<>();
List<User> userList = userRepository.findAll(); List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>(); Map<Long, String> userMap = new HashMap<>();
for(User u : userList){ for (User u : userList) {
userMap.put(u.getId(), u.getName()); userMap.put(u.getId(), u.getName());
} }
List<BackVisit> list = backVisitRepository.findAll(account, startDate, endDate, "tkio"); List<BackVisit> list = backVisitRepository.findAll(account, startDate, endDate, "tkio");
if (ValidateUtil.isValid(list)) { if (ValidateUtil.isValid(list)) {
for(BackVisit re : list){ for (BackVisit re : list) {
re.setUserName(userMap.get(re.getUser())); re.setUserName(userMap.get(re.getUser()));
result.add(re); result.add(re);
} }
...@@ -524,12 +533,12 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -524,12 +533,12 @@ public class TkioAccountServiceImpl implements TkioAccountService {
List<ContractMoney> result = new ArrayList<>(); List<ContractMoney> result = new ArrayList<>();
List<User> userList = userRepository.findAll(); List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>(); Map<Long, String> userMap = new HashMap<>();
for(User u : userList){ for (User u : userList) {
userMap.put(u.getId(), u.getName()); userMap.put(u.getId(), u.getName());
} }
List<ContractMoney> list = contractMoneyRepository.findByDs(startDate, endDate, email,"tkio"); List<ContractMoney> list = contractMoneyRepository.findByDs(startDate, endDate, email, "tkio");
if(ValidateUtil.isValid(list)){ if (ValidateUtil.isValid(list)) {
for(ContractMoney cm : list){ for (ContractMoney cm : list) {
Long user = null == cm.getModifyAccount() ? cm.getUser() : cm.getModifyAccount(); Long user = null == cm.getModifyAccount() ? cm.getUser() : cm.getModifyAccount();
cm.setCreateName(userMap.containsKey(user) ? userMap.get(user) : ""); cm.setCreateName(userMap.containsKey(user) ? userMap.get(user) : "");
result.add(cm); result.add(cm);
...@@ -543,19 +552,19 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -543,19 +552,19 @@ public class TkioAccountServiceImpl implements TkioAccountService {
List<Contract> result = new ArrayList<>(); List<Contract> result = new ArrayList<>();
List<User> userList = userRepository.findAll(); List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>(); Map<Long, String> userMap = new HashMap<>();
for(User u : userList){ for (User u : userList) {
userMap.put(u.getId(), u.getName()); userMap.put(u.getId(), u.getName());
} }
List<PackageType> typeList = packageTypeRepository.findAll(); List<PackageType> typeList = packageTypeRepository.findAll();
Map<Long, String> typeMap = new HashMap<>(); Map<Long, String> typeMap = new HashMap<>();
if(ValidateUtil.isValid(typeList)){ if (ValidateUtil.isValid(typeList)) {
for(PackageType s: typeList){ for (PackageType s : typeList) {
typeMap.put(s.getId(), s.getPackageName()); typeMap.put(s.getId(), s.getPackageName());
} }
} }
List<Contract> contractList = contractRepository.findByPlatformAndEmail("tkio", email,ContractTypeEnum.MAIN.getKey()); List<Contract> contractList = contractRepository.findByPlatformAndEmail("tkio", email, ContractTypeEnum.MAIN.getKey());
if(ValidateUtil.isValid(contractList)){ if (ValidateUtil.isValid(contractList)) {
for(Contract cm : contractList){ for (Contract cm : contractList) {
cm.setSaleName(userMap.containsKey(cm.getSale()) ? userMap.get(cm.getSale()) : ""); cm.setSaleName(userMap.containsKey(cm.getSale()) ? userMap.get(cm.getSale()) : "");
cm.setPriceLevelName(typeMap.containsKey(cm.getPriceLevel()) ? typeMap.get(cm.getPriceLevel()) : ""); cm.setPriceLevelName(typeMap.containsKey(cm.getPriceLevel()) ? typeMap.get(cm.getPriceLevel()) : "");
result.add(cm); result.add(cm);
...@@ -569,20 +578,20 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -569,20 +578,20 @@ public class TkioAccountServiceImpl implements TkioAccountService {
List<ContractChange> result = new ArrayList<>(); List<ContractChange> result = new ArrayList<>();
List<User> userList = userRepository.findAll(); List<User> userList = userRepository.findAll();
Map<Long, String> userMap = new HashMap<>(); Map<Long, String> userMap = new HashMap<>();
for(User u : userList){ for (User u : userList) {
userMap.put(u.getId(), u.getName()); userMap.put(u.getId(), u.getName());
} }
List<PackageType> typeList = packageTypeRepository.findAll(); List<PackageType> typeList = packageTypeRepository.findAll();
Map<Long, String> typeMap = new HashMap<>(); Map<Long, String> typeMap = new HashMap<>();
if(ValidateUtil.isValid(typeList)){ if (ValidateUtil.isValid(typeList)) {
for(PackageType s: typeList){ for (PackageType s : typeList) {
typeMap.put(s.getId(), s.getPackageName()); typeMap.put(s.getId(), s.getPackageName());
} }
} }
List<ContractChange> contractChangeList = contractChangeRepository.findByPlatformAndEmail("tkio", email, startDate, endDate); List<ContractChange> contractChangeList = contractChangeRepository.findByPlatformAndEmail("tkio", email, startDate, endDate);
if(ValidateUtil.isValid(contractChangeList)){ if (ValidateUtil.isValid(contractChangeList)) {
for(ContractChange cm : contractChangeList){ for (ContractChange cm : contractChangeList) {
Long user = null == cm.getModifyAccount() ? cm.getUser() : cm.getModifyAccount(); Long user = null == cm.getModifyAccount() ? cm.getUser() : cm.getModifyAccount();
cm.setCreateName(userMap.containsKey(user) ? userMap.get(user) : ""); cm.setCreateName(userMap.containsKey(user) ? userMap.get(user) : "");
cm.setLevelName(typeMap.containsKey(cm.getLevel()) ? typeMap.get(cm.getLevel()) : ""); cm.setLevelName(typeMap.containsKey(cm.getLevel()) ? typeMap.get(cm.getLevel()) : "");
...@@ -596,28 +605,28 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -596,28 +605,28 @@ public class TkioAccountServiceImpl implements TkioAccountService {
public void contractPay(User loginUser, ContractMoney resource) { public void contractPay(User loginUser, ContractMoney resource) {
Contract contract = contractRepository.findByCode(resource.getContractCode()); Contract contract = contractRepository.findByCode(resource.getContractCode());
//增值服务 //增值服务
if(contract.getType().equals(ContractTypeEnum.INCREMENT.getKey())){ if (contract.getType().equals(ContractTypeEnum.INCREMENT.getKey())) {
//回本分析不作操作 //回本分析不作操作
if(contract.getPriceLevel().longValue() == 3L){ if (contract.getPriceLevel().longValue() == 3L) {
return; return;
} }
Crowd crowd = crowdRepository.findOne(resource.getContractCode()); Crowd crowd = crowdRepository.findOne(resource.getContractCode());
if(null != crowd){ if (null != crowd) {
crowd.setPayment(1); crowd.setPayment(1);
crowdRepository.save(crowd); crowdRepository.save(crowd);
} }
//人群分析 //人群分析
if(null == contract.getEndDate()){ if (null == contract.getEndDate()) {
contract.setStatus("end"); contract.setStatus("end");
contractRepository.save(contract); contractRepository.save(contract);
} }
}else{//基础套餐 } else {//基础套餐
Account account = accountRepository.findByEmail(resource.getEmail()); Account account = accountRepository.findByEmail(resource.getEmail());
PressMoney press = pressMoneyRepository.findOnePress("tkio",account.getId()); PressMoney press = pressMoneyRepository.findOnePress("tkio", account.getId());
//如果被催款了,恢复状态 //如果被催款了,恢复状态
if(press != null){ if (press != null) {
account.setStatus(1); account.setStatus(1);
accountRepository.save(account); accountRepository.save(account);
...@@ -630,14 +639,14 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -630,14 +639,14 @@ public class TkioAccountServiceImpl implements TkioAccountService {
} }
public Map<String, Integer> getBackTime(){ public Map<String, Integer> getBackTime() {
Map<String, Integer> map = new HashMap<>(); Map<String, Integer> map = new HashMap<>();
List<BackVisit> all = backVisitRepository.findAllByPlatform("tkio"); List<BackVisit> all = backVisitRepository.findAllByPlatform("tkio");
if (ValidateUtil.isValid(all)){ if (ValidateUtil.isValid(all)) {
for(BackVisit bv : all){ for (BackVisit bv : all) {
if(map.containsKey(bv.getEmail())){ if (map.containsKey(bv.getEmail())) {
map.put(bv.getEmail(), map.get(bv.getEmail()) + 1); map.put(bv.getEmail(), map.get(bv.getEmail()) + 1);
} else{ } else {
map.put(bv.getEmail(), 1); map.put(bv.getEmail(), 1);
} }
} }
...@@ -646,17 +655,16 @@ public class TkioAccountServiceImpl implements TkioAccountService { ...@@ -646,17 +655,16 @@ public class TkioAccountServiceImpl implements TkioAccountService {
} }
public Map<String, List<Contract>> getPay() {
public Map<String, List<Contract>> getPay(){
Map<String, List<Contract>> map = new HashMap<>(); Map<String, List<Contract>> map = new HashMap<>();
List<Contract> contractList = contractRepository.findByPlatform("tkio"); List<Contract> contractList = contractRepository.findByPlatform("tkio");
if (ValidateUtil.isValid(contractList)){ if (ValidateUtil.isValid(contractList)) {
for(Contract pa : contractList){ for (Contract pa : contractList) {
if(map.containsKey(pa.getEmail())){ if (map.containsKey(pa.getEmail())) {
List<Contract> list = map.get(pa.getEmail()); List<Contract> list = map.get(pa.getEmail());
list.add(pa); list.add(pa);
map.put(pa.getEmail(), list); map.put(pa.getEmail(), list);
} else{ } else {
List<Contract> list = new TreeList<>(); List<Contract> list = new TreeList<>();
list.add(pa); list.add(pa);
map.put(pa.getEmail(), list); map.put(pa.getEmail(), list);
......
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