|
|
@@ -3,23 +3,20 @@ package com.izouma.nineth.service;
|
|
|
import cn.binarywang.wx.miniapp.api.WxMaService;
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
-import cn.hutool.core.collection.CollUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.alipay.api.AlipayApiException;
|
|
|
import com.alipay.api.AlipayClient;
|
|
|
-import com.alipay.api.DefaultAlipayClient;
|
|
|
import com.alipay.api.request.AlipayUserCertifyOpenCertifyRequest;
|
|
|
import com.alipay.api.request.AlipayUserCertifyOpenInitializeRequest;
|
|
|
import com.alipay.api.request.AlipayUserCertifyOpenQueryRequest;
|
|
|
import com.alipay.api.response.AlipayUserCertifyOpenCertifyResponse;
|
|
|
import com.alipay.api.response.AlipayUserCertifyOpenInitializeResponse;
|
|
|
import com.alipay.api.response.AlipayUserCertifyOpenQueryResponse;
|
|
|
-import com.github.kevinsawicki.http.HttpRequest;
|
|
|
import com.huifu.adapay.core.exception.BaseAdaPayException;
|
|
|
import com.izouma.nineth.TokenHistory;
|
|
|
-import com.izouma.nineth.config.AlipayProperties;
|
|
|
import com.izouma.nineth.config.Constants;
|
|
|
import com.izouma.nineth.config.GeneralProperties;
|
|
|
import com.izouma.nineth.config.RedisKeys;
|
|
|
@@ -65,9 +62,6 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
|
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import javax.management.openmbean.OpenMBeanAttributeInfoSupport;
|
|
|
-import javax.persistence.criteria.CriteriaBuilder;
|
|
|
-import javax.persistence.criteria.CriteriaQuery;
|
|
|
import javax.persistence.criteria.Predicate;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.math.BigInteger;
|
|
|
@@ -75,6 +69,7 @@ import java.net.URLEncoder;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.Duration;
|
|
|
+import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.regex.Pattern;
|
|
|
@@ -1175,8 +1170,10 @@ public class UserService {
|
|
|
//给积分
|
|
|
Long invitor = user.getCollectionInvitor();
|
|
|
if (ObjectUtils.isEmpty(user.getCollectionId()) || ObjectUtils.isEmpty(invitor)) {
|
|
|
+ this.noCollectionId(user);
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
Collection collection = collectionRepo.findById(user.getCollectionId()).orElse(null);
|
|
|
if (collection == null) {
|
|
|
return;
|
|
|
@@ -1221,4 +1218,17 @@ public class UserService {
|
|
|
log.info("邀请绑卡限购+1,{}", invitor);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ public void noCollectionId(User user) {
|
|
|
+ if (user.getCreatedAt().isBefore(LocalDateTime.of(2022, 7, 5, 15, 0, 0))) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (user.getVipPoint() < 1) {
|
|
|
+ //有效新用户1个限购
|
|
|
+ user.setVipPoint(100);
|
|
|
+ userRepo.save(user);
|
|
|
+ cacheService.clearUserMy(user.getId());
|
|
|
+ cacheService.clearUser(user.getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
