|
|
@@ -29,10 +29,7 @@ import com.cyksj.mapper.vip.VipUserMapper;
|
|
|
import com.cyksj.model.dto.*;
|
|
|
import com.cyksj.model.entity.*;
|
|
|
import com.cyksj.model.request.LoginReq;
|
|
|
-import com.cyksj.model.views.CorpUserFollowView;
|
|
|
-import com.cyksj.model.views.RenewalView;
|
|
|
-import com.cyksj.model.views.UserCertInfoView;
|
|
|
-import com.cyksj.model.views.UserTicketView;
|
|
|
+import com.cyksj.model.views.*;
|
|
|
import com.cyksj.redis.RedisService;
|
|
|
import com.cyksj.service.distribute.DistributeService;
|
|
|
import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
|
|
|
@@ -298,17 +295,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
.in(OrderDon::getUserId, userIdList)
|
|
|
.notIn(OrderDon::getStatus, Constant.noOrderStatus));
|
|
|
userWhoami.setIsPay(selectCount > 0);
|
|
|
-
|
|
|
- //是否是会员
|
|
|
- VipUser vipUser = vipUserMapper.selectOne(Wrappers.lambdaQuery(VipUser.class)
|
|
|
- .in(VipUser::getUserId, userIdList)
|
|
|
- .gt(VipUser::getExpiryTime, DateTime.now())
|
|
|
- .last("limit 1"));
|
|
|
- if (vipUser != null) {
|
|
|
- userWhoami.setIsVip(Boolean.TRUE);
|
|
|
- userWhoami.setVipStartTime(vipUser.getStartTime());
|
|
|
- userWhoami.setVipExpiryTime(vipUser.getExpiryTime());
|
|
|
- }
|
|
|
return userWhoami;
|
|
|
}
|
|
|
|
|
|
@@ -888,6 +874,23 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
return userCertInfoView;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public UserSyncInfoView getUserSyncInfo(long userId) {
|
|
|
+ UserSyncInfoView syncInfoView = new UserSyncInfoView();
|
|
|
+ List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
|
|
|
+ //是否是会员
|
|
|
+ VipUser vipUser = vipUserMapper.selectOne(Wrappers.lambdaQuery(VipUser.class)
|
|
|
+ .in(VipUser::getUserId, userIdList)
|
|
|
+ .gt(VipUser::getExpiryTime, DateTime.now())
|
|
|
+ .last("limit 1"));
|
|
|
+ if (vipUser != null) {
|
|
|
+ syncInfoView.setIsVip(Boolean.TRUE);
|
|
|
+ syncInfoView.setVipStartTime(vipUser.getStartTime());
|
|
|
+ syncInfoView.setVipExpiryTime(vipUser.getExpiryTime());
|
|
|
+ }
|
|
|
+ return syncInfoView;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 处理大学生快递站用户
|
|
|
*/
|