Merge branch 'invtie_ep' into pre

netflix-service/src/main/java/com/cyksj/service/distribute/equipment/impl/EquipmentDistributeServiceImpl.java

@@ -92,10 +92,10 @@ public class EquipmentDistributeServiceImpl implements EquipmentDistributeServic
 			record.setUserId(userId);
 			try {
 				//发放新用户福利优惠券
-				if (isNewUser) {
-					sendInvitedUserEquipmentCoupon(userId);
-					record.setIsNewUser(true);
-				}
+//				if (isNewUser) {
+//				sendInvitedUserEquipmentCoupon(userId);
+//				}
+				record.setIsNewUser(isNewUser);
 				inviteRecordMapper.insert(record);
 
 			} catch (DuplicateKeyException e) {

netflix-service/src/main/java/com/cyksj/service/user/UserService.java

@@ -59,4 +59,9 @@ public interface UserService extends IService<User> {
 	Long getSharedIdByUserId(Long userId);
 
 	void bindUserDistributeShared(Long userId, String dsCode);
+
+	/**
+	 * 实物好友邀请分销
+	 */
+	void saveEpDistributeShared(Long userId, String dsCode);
 }

netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -765,4 +765,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 		log.info("建立用户userId:{}与sharedId:{}绑定关系", userId, sharedId);
 		distributeService.saveDistributionInvitation(sharedId, user.getId(), dsPopularizeId);
 	}
+
+	@Override
+	public void saveEpDistributeShared(Long userId, String dsCode) {
+		if (StrUtil.isEmpty(dsCode)) {
+			log.info("设备好友邀请userId：{}，code为空", userId);
+			return;
+		}
+		User user = getById(userId);
+		Date createdTime = user.getCreatedTime();
+		String createDate = new DateTime(createdTime).toDateStr();
+		Boolean isNewUser = false;
+		if (StrUtil.equals(createDate, DateTime.now().toDateStr())) {
+			isNewUser = true;
+		}
+		UserSharedDto userSharedDto = getUserShredDtoByDsCode(dsCode);
+		if (userSharedDto != null) {
+			log.info("实物好友分销邀请sharedId:{},被邀请用户id:{}", userSharedDto.getSharedId(), userId);
+			equipDistributeService.saveDistributionInvitation(userSharedDto.getSharedId(), isNewUser, user.getId());
+		}
+	}
 }

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

@@ -77,7 +77,6 @@ public class EquipmentDistributeController {
 	private final EquipmentDistributeService equipDistributeService;
 
 	private final EquipmentUserDistributeInviteRecordMapper inviteRecordMapper;
-
 	/**
 	 * 个人实物分销详情
 	 */
@@ -249,4 +248,14 @@ public class EquipmentDistributeController {
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult(true);
 	}
+
+	/**
+	 * 实物分销绑定
+	 */
+	@GetMapping("/equipment/invite/bind")
+	public Result<String> equipmentInviteBind(String dsCode) {
+		long userId = StpUserUtil.getLoginIdAsLong();
+		userService.saveEpDistributeShared(userId, dsCode);
+		return GatewayResponse.SUCCESS.newBuilder().toResult();
+	}
 }

netflix-web/src/main/java/com/cyksj/web/controller/landing/CorpFollowActiveCodeController.java

@@ -4,13 +4,11 @@ import cn.hutool.core.util.StrUtil;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.cyksj.service.corp.CorpFollowActiveCodeFrontService;
+import com.cyksj.service.distribute.equipment.EquipmentDistributeService;
 import com.cyksj.service.user.UserService;
 import com.cyksj.web.util.StpUserUtil;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 项目名: yhlxj
@@ -26,6 +24,8 @@ public class CorpFollowActiveCodeController {
 
 	private final UserService userService;
 
+	private final EquipmentDistributeService equipDistributeService;
+
 	/**
 	 * 活动活码落地页 获取对应客服二维码
 	 */