Commit c8ae983f c8ae983f79c605d4716f339cb5a38dc783c87ab4 by xianghan

1.优化部分会员信息与会员属性逻辑

1 parent ccf3dc70
......@@ -38,7 +38,7 @@ public class MemberController {
public ResultInfo createMemberByUserTv(@Validated(value = {CreateGroup.class}) @RequestBody UserTv resources) {
// todo 此接口废弃,将移动至UserTvController中,AppEngine也要同步修改
log.info("member ==>> createMemberByUserTv ==>> param ==>> [{}]",resources);
boolean result = this.userTvOperationService.createTvUserAndCreateMember(resources);
boolean result = this.userTvOperationService.createTvUserAndMember(resources);
log.info("member ==>> createMemberByUserTv ==>> result ==>> [{}]",result);
return ResultInfo.success(result);
}
......
......@@ -63,13 +63,13 @@ public class UserOperationController {
private static final Integer SUBSCRIBE_STATUS = 1;
@Log("保存大屏账户同时创建会员")
@PostMapping(value = "/createUserAndCreateMember")
@PostMapping(value = "/createTvUserAndMember")
@ApiOperation("保存大屏账户同时创建会员信息")
@AnonymousAccess
public ResultInfo createTvUserAndCreateMember(@Validated(value = {CreateGroup.class}) @RequestBody UserTv resources) {
public ResultInfo createTvUserAndMember(@Validated(value = {CreateGroup.class}) @RequestBody UserTv resources) {
log.info("UserOperationController ==> createUserAndCreateMember ==>> param ==> [{}]",resources);
boolean result = this.userTvOperationService.createTvUserAndCreateMember(resources);
boolean result = this.userTvOperationService.createTvUserAndMember(resources);
return ResultInfo.success(result);
}
......
......@@ -17,7 +17,7 @@ public interface UserOperationService {
* @param resources
* @return
*/
boolean createTvUserAndCreateMember(UserTv resources);
boolean createTvUserAndMember(UserTv resources);
/**
* 保存小屏账户并创建会员
......
......@@ -981,7 +981,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
long l = System.currentTimeMillis();
this.userTvOperationService.createTvUserAndCreateMember(this.checkUserTv(platformAccount));
this.userTvOperationService.createTvUserAndMember(this.checkUserTv(platformAccount));
UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
if (Objects.nonNull(userTvDTO)) {
......
......@@ -99,7 +99,7 @@ public class UserOperationServiceImpl implements UserOperationService {
@Override
@Transactional
@AsyncMqSend
public boolean createTvUserAndCreateMember(UserTv resources) {
public boolean createTvUserAndMember(UserTv resources) {
// 大屏账户
String platformAccount = resources.getPlatformAccount();
......
package com.topdraw.test.business.process.rest;
import com.alibaba.fastjson.JSON;
import com.topdraw.BaseTest;
import com.topdraw.business.process.rest.TaskOperationController;
import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria;
import com.topdraw.module.mq.DataSyncMsg;
import com.topdraw.module.mq.EventType;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.FutureTask;
public class UserOperationControllerTest extends BaseTest {
@Autowired
TaskOperationController taskOperationController;
@Test
public void dealTask() {
try {
DataSyncMsg dataSyncMsg = new DataSyncMsg();
dataSyncMsg.setEventType(EventType.VIEWING.name());
DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData();
msgData.setEvent(6); // 类型 1-登录 2-观影 3-参加活动 4-订购 5-优享会员 6-签到
msgData.setRemarks("remark");
msgData.setMemberId(2261L);
msgData.setDeviceType(2);
msgData.setAppCode("WEI_XIN_GOLD_PANDA");
dataSyncMsg.setMsg(msgData);
String s = JSON.toJSONString(dataSyncMsg);
TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria();
pointsQueryCriteria.setContent(s);
String s1 = JSON.toJSONString(pointsQueryCriteria);
System.out.println(s1);
this.taskOperationController.dealTask(pointsQueryCriteria);
} catch (Exception e) {
e.printStackTrace();
}
}
}