Commit 5f7c8284 5f7c828489791941e7d6c7814539bc7e57a81778 by xianghan

1.优化

1 parent 3fa952f0
...@@ -20,7 +20,6 @@ import io.swagger.annotations.*; ...@@ -20,7 +20,6 @@ import io.swagger.annotations.*;
20 */ 20 */
21 @Api(tags = "会员属性管理") 21 @Api(tags = "会员属性管理")
22 @RestController 22 @RestController
23 //@RequestMapping("/ucEngine/api/memberProfile")
24 @RequestMapping("/ucEngine/memberProfile") 23 @RequestMapping("/ucEngine/memberProfile")
25 @CrossOrigin 24 @CrossOrigin
26 @Slf4j 25 @Slf4j
......
...@@ -4,35 +4,27 @@ import com.topdraw.annotation.AnonymousAccess; ...@@ -4,35 +4,27 @@ import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.aop.log.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.module.common.validated.CreateGroup; 5 import com.topdraw.business.module.common.validated.CreateGroup;
6 import com.topdraw.business.module.common.validated.UpdateGroup; 6 import com.topdraw.business.module.common.validated.UpdateGroup;
7 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
8 import com.topdraw.business.module.member.service.MemberService;
9 import com.topdraw.business.module.member.service.dto.MemberDTO;
10 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService; 7 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService;
11 import com.topdraw.common.ResultInfo; 8 import com.topdraw.common.ResultInfo;
12 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 9 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
13 import lombok.extern.slf4j.Slf4j; 10 import lombok.extern.slf4j.Slf4j;
14 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
15 import org.springframework.util.Assert;
16 import org.springframework.validation.annotation.Validated; 12 import org.springframework.validation.annotation.Validated;
17 import org.springframework.web.bind.annotation.*; 13 import org.springframework.web.bind.annotation.*;
18 import io.swagger.annotations.*; 14 import io.swagger.annotations.*;
19 15
20 import java.util.Objects;
21
22 /** 16 /**
23 * @author XiangHan 17 * @author XiangHan
24 * @date 2021-10-22 18 * @date 2021-10-22
25 */ 19 */
26 @Api(tags = "相关人员管理") 20 @Api(tags = "相关人员管理")
27 @RestController 21 @RestController
28 @RequestMapping("/ucEngine/api/memberRelatedInfo") 22 @RequestMapping("/ucEngine/memberRelatedInfo")
29 @CrossOrigin 23 @CrossOrigin
30 @Slf4j 24 @Slf4j
31 public class MemberRelatedInfoController { 25 public class MemberRelatedInfoController {
32 26
33 @Autowired 27 @Autowired
34 private MemberService memberService;
35 @Autowired
36 private MemberRelatedInfoOperationService memberRelatedInfoOperationService; 28 private MemberRelatedInfoOperationService memberRelatedInfoOperationService;
37 29
38 @Log("新增相关人员") 30 @Log("新增相关人员")
......
...@@ -35,7 +35,7 @@ public class MemberController { ...@@ -35,7 +35,7 @@ public class MemberController {
35 @Autowired 35 @Autowired
36 private MemberOperationService memberOperationService; 36 private MemberOperationService memberOperationService;
37 @Autowired 37 @Autowired
38 private UserOperationService userTvOperationService; 38 private UserOperationService userOperationService;
39 39
40 40
41 @Log("为大屏账户创建会员") 41 @Log("为大屏账户创建会员")
...@@ -46,7 +46,7 @@ public class MemberController { ...@@ -46,7 +46,7 @@ public class MemberController {
46 public ResultInfo createMemberByUserTv(@Validated(value = {CreateGroup.class}) @RequestBody UserTv resources) { 46 public ResultInfo createMemberByUserTv(@Validated(value = {CreateGroup.class}) @RequestBody UserTv resources) {
47 // todo 此接口废弃,将移动至UserTvController中,AppEngine也要同步修改 47 // todo 此接口废弃,将移动至UserTvController中,AppEngine也要同步修改
48 log.info("member ==>> createMemberByUserTv ==>> param ==>> [{}]",resources); 48 log.info("member ==>> createMemberByUserTv ==>> param ==>> [{}]",resources);
49 this.userTvOperationService.createTvUserAndMember(resources); 49 this.userOperationService.createTvUserAndMember(resources);
50 return ResultInfo.success(); 50 return ResultInfo.success();
51 } 51 }
52 52
......
...@@ -2,6 +2,7 @@ package com.topdraw.business.module.member.viphistory.rest; ...@@ -2,6 +2,7 @@ package com.topdraw.business.module.member.viphistory.rest;
2 2
3 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory; 3 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
4 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService; 4 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
5 import com.topdraw.business.process.service.member.MemberOperationService;
5 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
6 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
7 import io.swagger.annotations.ApiOperation; 8 import io.swagger.annotations.ApiOperation;
...@@ -15,16 +16,16 @@ import org.springframework.web.bind.annotation.*; ...@@ -15,16 +16,16 @@ import org.springframework.web.bind.annotation.*;
15 */ 16 */
16 @Api(tags = "会员vip历史管理") 17 @Api(tags = "会员vip历史管理")
17 @RestController 18 @RestController
18 @RequestMapping("/ucEngine/api/memberVipHistory") 19 @RequestMapping("/ucEngine/memberVipHistory")
19 public class MemberVipHistoryController { 20 public class MemberVipHistoryController {
20 21
21 @Autowired 22 @Autowired
22 private MemberVipHistoryService memberVipHistoryService; 23 private MemberOperationService memberOperationService;
23 24
24 @PostMapping 25 @PostMapping
25 @ApiOperation("新增MemberVipHistory") 26 @ApiOperation("新增MemberVipHistory")
26 public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) { 27 public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) {
27 memberVipHistoryService.create(resources); 28 this.memberOperationService.createVipHistory(resources);
28 return ResultInfo.success(); 29 return ResultInfo.success();
29 } 30 }
30 31
......