fix 已登录用户分销;是否是新用户

netflix-web/src/main/java/com/cyksj/web/controller/distribute/EquipmentDistributeController.java

@@ -1,5 +1,7 @@
 package com.cyksj.web.controller.distribute;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -15,11 +17,13 @@ import com.cyksj.mapper.manage.distribute.equipment.EquipmentUserChanceMapper;
 import com.cyksj.model.dto.EquipmentConfigDto;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.manage.views.GroupsRelationView;
+import com.cyksj.model.request.LoginPhoneReq;
 import com.cyksj.model.request.ReceiveBenefitsReq;
 import com.cyksj.model.views.CouponUserView;
 import com.cyksj.model.views.EquipmentDistributeView;
 import com.cyksj.redis.RedisService;
 import com.cyksj.service.distribute.equipment.EquipmentDistributeFrontService;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
 import com.cyksj.service.sys.SysConfigService;
 import com.cyksj.web.util.StpUserUtil;
 import com.ejlchina.searcher.BeanSearcher;
@@ -64,6 +68,8 @@ public class EquipmentDistributeController {
 
 	private final OrderDonMapper orderDonMapper;
 
+	private final EquipmentDistributeService equipDistributeService;
+
 	/**
 	 * 个人实物分销详情
 	 */
@@ -93,7 +99,7 @@ public class EquipmentDistributeController {
 		SearchResult<EquipmentUserChanceRecord> search = beanSearcher.search(EquipmentUserChanceRecord.class, MapUtils.flatBuilder(request.getParameterMap())
 				.field(EquipmentUserChanceRecord::getShareId, userId)
 				.build());
-		search.getDataList().forEach(data->{
+		search.getDataList().forEach(data -> {
 			Optional.ofNullable(userMapper.selectById(data.getUserId())).ifPresent(user -> data.setNickname(user.getNickname()));
 			Optional.ofNullable(orderDonMapper.selectById(data.getOrderId())).ifPresent(oder -> data.setPayTime(oder.getPayTime()));
 		});
@@ -172,4 +178,36 @@ public class EquipmentDistributeController {
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}
+
+	/**
+	 * 已登录的用户 实物分销
+	 */
+	@PostMapping("/hasLogged")
+	public Result<String> hasLogged(@RequestBody LoginPhoneReq req) {
+		Long userId = StpUserUtil.getLoginIdAsLong();
+		User user = userMapper.selectById(userId);
+		Boolean isNewUser = user != null ? false : true;
+		Long sharedId = req.getSharedId();
+		Integer dsType = req.getDsType();
+		//新旧用户都可实物分销
+		if (sharedId != null && dsType != null && dsType == 2) {
+			equipDistributeService.saveDistributionInvitation(sharedId, isNewUser, user.getId());
+		}
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
+
+	/**
+	 * 是否是新用户
+	 */
+	@GetMapping("/get/isNewUser")
+	public Result<Boolean> isNewUser() {
+		Long userId = StpUserUtil.getLoginIdAsLong();
+		DateTime now = DateTime.now();
+		User user = userMapper.selectOne(Wrappers.lambdaQuery(User.class).eq(User::getId, userId)
+				.between(User::getCreatedTime, DateUtil.beginOfDay(now), DateUtil.endOfDay(now)).last("limit 1"));
+		if (user == null) {
+			return GatewayResponse.SUCCESS.newBuilder().toResult(false);
+		}
+		return GatewayResponse.SUCCESS.newBuilder().toResult(true);
+	}
 }