浏览代码

fix 认证记录发送用户

zoujiajian 2 年之前
父节点
当前提交
d97450499f

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/user/UserActivityService.java

@@ -11,7 +11,7 @@ import com.cyksj.model.entity.UserActivity;
  * 创建时间:2024/4/16 12:16
  */
 public interface UserActivityService extends IService<UserActivity> {
-	void sendStudentCertActivity(User user, String dsCode) throws Exception;
+	void sendStudentCertActivity(User user, String dsCode, String school) throws Exception;
 
 	void saveOrUpdateActivity(UserActivity userActivity) throws Exception;
 }

+ 13 - 1
netflix-service/src/main/java/com/cyksj/service/user/impl/UserActivityServiceImpl.java

@@ -6,13 +6,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cyksj.common.util.Jsons;
 import com.cyksj.mapper.UserActivityMapper;
 import com.cyksj.mapper.UserMapper;
+import com.cyksj.mapper.UserStudentCertRecordMapper;
 import com.cyksj.model.entity.CouponUser;
 import com.cyksj.model.entity.User;
 import com.cyksj.model.entity.UserActivity;
+import com.cyksj.model.entity.UserStudentCertRecord;
 import com.cyksj.service.mange.coupon.CouponCommonService;
 import com.cyksj.service.user.UserActivityService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -31,8 +34,9 @@ public class UserActivityServiceImpl extends ServiceImpl<UserActivityMapper, Use
 
 	private final UserMapper userMapper;
 
+	private final UserStudentCertRecordMapper userStudentCertRecordMapper;
 	@Override
-	public void sendStudentCertActivity(User user, String dsCode) throws Exception {
+	public void sendStudentCertActivity(User user, String dsCode, String school) throws Exception {
 		UserActivity activity = getById(1);
 		Long sendUserId = user.getId();
 		if (StrUtil.isNotBlank(dsCode)) {
@@ -50,6 +54,14 @@ public class UserActivityServiceImpl extends ServiceImpl<UserActivityMapper, Use
 				couponCommonService.sendCouponToUser(sendUserId, couponId, 0l, 0l, 0l, CouponUser.Channel.student_cert);
 			}
 		}
+		try {
+			UserStudentCertRecord record = new UserStudentCertRecord();
+			//记录发送用户
+			record.setUserId(sendUserId);
+			record.setSchool(school);
+			userStudentCertRecordMapper.insert(record);
+		} catch (DuplicateKeyException e) {
+		}
 	}
 
 	@Override

+ 1 - 9
netflix-web/src/main/java/com/cyksj/web/controller/mini/UserStudentCertController.java

@@ -21,7 +21,6 @@ import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.dao.DuplicateKeyException;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -70,14 +69,7 @@ public class UserStudentCertController {
 		}
 		miniService.getStudentIdentity(user, code);
 		//大学生认证活动 若有sid则发送对应用户
-		try {
-			UserStudentCertRecord record = new UserStudentCertRecord();
-			record.setUserId(userId);
-			record.setSchool(school);
-			userStudentCertRecordMapper.insert(record);
-			userActivityService.sendStudentCertActivity(user, dsCode);
-		} catch (DuplicateKeyException e) {
-		}
+		userActivityService.sendStudentCertActivity(user, dsCode, school);
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 	}