|
|
@@ -10,12 +10,8 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
import shop.alien.entity.result.R;
|
|
|
import shop.alien.entity.store.LifeUser;
|
|
|
import shop.alien.entity.store.StoreAliPayLog;
|
|
|
-import shop.alien.entity.store.StoreInfo;
|
|
|
-import shop.alien.entity.store.StoreUser;
|
|
|
import shop.alien.store.service.AliService;
|
|
|
import shop.alien.store.service.LifeUserService;
|
|
|
-import shop.alien.store.service.StoreInfoService;
|
|
|
-import shop.alien.store.service.StoreUserService;
|
|
|
import shop.alien.store.util.ali.AliApi;
|
|
|
import shop.alien.store.util.ali.AliSms;
|
|
|
import shop.alien.util.ali.AliOSSUtil;
|
|
|
@@ -26,10 +22,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
-import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author ssk
|
|
|
@@ -57,12 +50,8 @@ public class AliController {
|
|
|
|
|
|
private final AliApi aliApi;
|
|
|
|
|
|
- private final StoreUserService storeUserService;
|
|
|
-
|
|
|
private final LifeUserService lifeUserService;
|
|
|
|
|
|
- private final StoreInfoService storeInfoService;
|
|
|
-
|
|
|
@ApiOperation("阿里回调")
|
|
|
@ApiOperationSupport(order = 1)
|
|
|
@GetMapping("/notify")
|
|
|
@@ -83,32 +72,15 @@ public class AliController {
|
|
|
String normalizedName = name == null ? null : name.trim();
|
|
|
String normalizedIdCard = idCard == null ? null : idCard.trim().toUpperCase();
|
|
|
log.info("AliController.getIdInfo?name={}&idCard={}", normalizedName, normalizedIdCard);
|
|
|
- int size = 0;
|
|
|
if (appType == 0) {
|
|
|
// 根据身份证查询未注销用户:同一身份证只能实名一个账号
|
|
|
- size = lifeUserService.count(new LambdaQueryWrapper<LifeUser>()
|
|
|
+ int size = lifeUserService.count(new LambdaQueryWrapper<LifeUser>()
|
|
|
.eq(LifeUser::getIdCard, normalizedIdCard)
|
|
|
.eq(LifeUser::getLogoutFlag, 0));
|
|
|
- } else {
|
|
|
- // 根据身份证查询已入驻或审核中的商家:同一身份证只能实名一个账号
|
|
|
- List<StoreUser> storeUserList = storeUserService
|
|
|
- .list(new LambdaQueryWrapper<StoreUser>()
|
|
|
- .eq(StoreUser::getIdCard, normalizedIdCard));
|
|
|
- List<Integer> storeIds = storeUserList.stream()
|
|
|
- .map(StoreUser::getStoreId)
|
|
|
- .filter(Objects::nonNull)
|
|
|
- .collect(Collectors.toList());
|
|
|
- if (!storeIds.isEmpty()) {
|
|
|
- size = storeInfoService
|
|
|
- .list(new LambdaQueryWrapper<StoreInfo>()
|
|
|
- .in(StoreInfo::getId, storeIds)
|
|
|
- .notIn(StoreInfo::getStoreApplicationStatus, 2))
|
|
|
- .size();
|
|
|
+ if (size > 0) {
|
|
|
+ return R.fail("该身份证已实名认证过");
|
|
|
}
|
|
|
}
|
|
|
- if (size > 0) {
|
|
|
- return R.fail("该身份证已实名认证过");
|
|
|
- }
|
|
|
if (aliPayConfig.getIdInfo(normalizedName, normalizedIdCard)) {
|
|
|
return R.success("身份验证成功");
|
|
|
}
|