aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/dev/dev' into dev/dev_xp

Browse Source
This commit is contained in:
xupei
2024-11-19 17:09:36 +08:00
parent 4d756d5624 74e6d5a1da
commit 2ea19dcf03
18 changed files with 274 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ai/da/service/AccountService.java
View File

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.util.List;
import java.util.Map;
@@ -181,4 +182,8 @@ public interface AccountService extends IService<Account> {
String updateNoLoginRequiredNew(NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request);
void halfPricePromotion();
String googleCallback(String code, HttpSession session);
List<String> getPaidCustomerEmail();
}

4
src/main/java/com/ai/da/service/ConvenientInquiryService.java
View File

@@ -32,9 +32,9 @@ public interface ConvenientInquiryService extends IService<Questionnaire> {
Map<String, List<Object>> getActiveUserFunc(String startTime, String endTime, List<Long> ids);
Map<String, Float> conversionRate();
Map<String, Object> conversionRate(String startTime, String endTime);
Map<String, List<Object>> trialUserCountry();
Map<String, List<Object>> trialUserCountry(String startTime, String endTime);
Boolean addUser(AccountAddDTO accountAddDTO);

110
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -34,10 +34,12 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.sql.DataSource;
import java.math.BigDecimal;
import java.sql.Connection;
@@ -62,6 +64,9 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
@Resource
private AccountMapper accountMapper;
@Resource
private AccountExtendMapper accountExtendMapper;
@Resource
private JWTTokenHelper jwtTokenHelper;
@@ -571,6 +576,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
account.setIsBeginner(1);
account.setSystemUser(3);
account.setValidStartTime(System.currentTimeMillis());
account.setCountry(accountTrialDTO.getCountry());
if (link) {
account.setValidEndTime(toDayEnd(Instant.now().plus(5, ChronoUnit.DAYS).toEpochMilli()));
} else {
@@ -583,6 +589,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
account.setUserPassword("Third-000000");
account.setUserEmail(trialOrder.getEmail());
account.setLanguage(Language.ENGLISH.name());
account.setCountry(accountTrialDTO.getCountry());
account.setValidStartTime(System.currentTimeMillis());
if (link) {
account.setValidEndTime(toDayEnd(Instant.now().plus(5, ChronoUnit.DAYS).toEpochMilli()));
@@ -1464,6 +1471,31 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
}
}
private static final String QUERY_PAID_CUSTOMER_EMAIL = "SELECT distinct c.email " +
"FROM `pmr_wc_order_stats` o " +
"inner join `pmr_wc_customer_lookup` c " +
"on o.customer_id = c.customer_id " +
"and o.net_total in (5000, 500, 250) " +
"and o.`status` != 'wc-failed' " +
"and c.email not in ('1779019091@qq.com', 'xupei3360@163.com', '1627315083@qq.com', 'gigiwu33@hotmail.com')";
public List<String> getPaidCustomerEmail(){
List<String> paidCustomerEmail = new ArrayList<>();
try (Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement = connection.prepareStatement(QUERY_PAID_CUSTOMER_EMAIL)) {
try (ResultSet queryOrderResultSet = preparedStatement.executeQuery()) {
while (queryOrderResultSet.next()) {
paidCustomerEmail.add(queryOrderResultSet.getString("email"));
}
}
} catch (Exception e) {
// 记录异常并处理
e.printStackTrace();
// return null;
}
return paidCustomerEmail;
}
// 收集调查问卷的信息
@Override
@Transactional(rollbackFor = Exception.class)
@@ -1822,4 +1854,82 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
log.info("邮箱绑定更改完成，用户id:{}，新邮箱：{}", accountId, newMailbox);
}
@Override
public String googleCallback(String code, HttpSession session) {
try {
log.info("code:" + code);
// 使用 code 获取 Google 用户信息
GoogleUser googleUser = getGoogleUserFromCode(code);
log.info("googleUser:" + JSON.toJSONString(googleUser));
// 检查数据库中是否已有该用户
// QueryWrapper<AccountExtend> qw = new QueryWrapper<>();
// qw.lambda().eq(AccountExtend::getAuth, googleUser.getId());
// List<AccountExtend> accountExtends = accountExtendMapper.selectList(qw);
// Account existingUser = findUserByGoogleId(googleUser.getId());
return "Login successful";
// if (CollectionUtil.isNotEmpty(accountExtends)) {
// // 用户已存在，直接登录
//// session.setAttribute("user", existingUser);
// return "Login successful";
// } else {
// // 用户不存在，创建新用户（自动注册）
//// User newUser = googleAuthService.registerNewUser(googleUser);
//// session.setAttribute("user", newUser);
// return "Registration and login successful";
// }
} catch (Exception e) {
return "Error processing Google login: " + e.getMessage();
}
}
private static final String TOKEN_URL = "https://oauth2.googleapis.com/token";
private static final String USER_INFO_URL = "https://www.googleapis.com/oauth2/v3/userinfo";
private static final String CLIENT_ID = "194770296147-njd68pm7tnapgonkj2h48mhf63n15n3f.apps.googleusercontent.com";
private static final String CLIENT_SECRET = "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";
private static final String REDIRECT_URI = "https://develop.api.aida.com.hk/api/third/party/auth/google_callback";
public GoogleUser getGoogleUserFromCode(String code) {
// Step 1: Exchange code for access_token
String accessToken = getAccessToken(code);
log.info("accessToken" + accessToken);
// Step 2: Use access_token to get Google User info
return getGoogleUserInfo(accessToken);
}
private String getAccessToken(String code) {
RestTemplate restTemplate = new RestTemplate();
Map<String, String> params = new HashMap<>();
params.put("client_id", CLIENT_ID);
params.put("client_secret", CLIENT_SECRET);
params.put("redirect_uri", REDIRECT_URI);
params.put("grant_type", "authorization_code");
params.put("code", code);
// 使用 RestTemplate 发起请求以获取 access_token
GoogleTokenResponse response = restTemplate.postForObject(TOKEN_URL, params, GoogleTokenResponse.class);
return response.getAccessToken();
}
private GoogleUser getGoogleUserInfo(String accessToken) {
RestTemplate restTemplate = new RestTemplate();
String url = USER_INFO_URL + "?access_token=" + accessToken;
return restTemplate.getForObject(url, GoogleUser.class);
}
// public User findUserByGoogleId(String googleId) {
// // 从数据库中根据 Google ID 查找用户
// return userRepository.findByGoogleId(googleId);
// }
// public User registerNewUser(GoogleUser googleUser) {
// // 创建并保存新用户
// User newUser = new User();
// newUser.setGoogleId(googleUser.getId());
// newUser.setEmail(googleUser.getEmail());
// newUser.setUsername(googleUser.getName());
// return userRepository.save(newUser);
// }
}

40
src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
View File

@@ -392,9 +392,15 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
private TrialOrderMapper trialOrderMapper;
// 试用用户到正式用户的转化率
public Map<String, Float> conversionRate() {
public Map<String, Object> conversionRate(String startTime, String endTime) {
QueryWrapper<TrialOrder> queryWrapper = new QueryWrapper<>();
if (!StringUtils.isNullOrEmpty(startTime)){
queryWrapper.gt("create_time", startTime);
}
if (!StringUtils.isNullOrEmpty(endTime)){
queryWrapper.lt("create_time", endTime);
}
// 获取试用用户总数
queryWrapper.select("count(distinct email) as count");
@@ -402,22 +408,40 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
Long totalTrials = (Long) trialMaps.get(0).get("count");
// 获取从试用用户转为正式用户的用户数量
Map<String, Long> officialMaps = trialOrderMapper.countOfficialUser();
Long trialToOfficial = officialMaps.get("count");
List<String> paidCustomerEmail = accountService.getPaidCustomerEmail();
QueryWrapper<TrialOrder> qw = new QueryWrapper<>();
if (!StringUtils.isNullOrEmpty(startTime)){
qw.gt("create_time", startTime);
}
if (!StringUtils.isNullOrEmpty(endTime)){
qw.lt("create_time", endTime);
}
qw.in("email", paidCustomerEmail);
List<TrialOrder> paidTrialUsers = trialOrderMapper.selectList(qw);
// Map<String, Long> officialMaps = trialOrderMapper.countOfficialUser();
// Long trialToOfficial = officialMaps.get("count");
// 计算转化率
HashMap<String, Float> resp = new HashMap<>();
HashMap<String, Object> resp = new HashMap<>();
resp.put("trialUserCount", totalTrials.floatValue());
resp.put("trialToOfficialCount", trialToOfficial.floatValue());
resp.put("conversionRate", new BigDecimal(trialToOfficial).divide(new BigDecimal(totalTrials), 2, RoundingMode.HALF_UP).floatValue());
resp.put("trialToOfficialCount", (float) paidTrialUsers.size());
resp.put("conversionRate", new BigDecimal(paidTrialUsers.size()).divide(new BigDecimal(totalTrials), 6, RoundingMode.HALF_UP).floatValue());
resp.put("paidTrialUser", paidTrialUsers);
return resp;
}
// 试用用户地区统计
public Map<String, List<Object>> trialUserCountry() {
public Map<String, List<Object>> trialUserCountry(String startTime, String endTime) {
QueryWrapper<TrialOrder> queryWrapper = new QueryWrapper<>();
if (!StringUtils.isNullOrEmpty(startTime)){
queryWrapper.gt("create_time", startTime);
}
if (!StringUtils.isNullOrEmpty(endTime)){
queryWrapper.lt("create_time", endTime);
}
queryWrapper.select("country, count(id) as count")
.groupBy("country");
List<Map<String, Object>> countryCount = trialOrderMapper.selectMaps(queryWrapper);

6
src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java
View File

@@ -204,11 +204,7 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
String jsonString = JSON.toJSONString(resp);
// log.info("消息推送 ： {}", jsonString);
try {
notificationConnection.sendMsg(jsonString, receiverId);
} catch (IOException e) {
throw new RuntimeException(e);
}
notificationConnection.sendMsg(jsonString, receiverId);
}
// 取消点赞、删除评论、取消关注