Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 2bfdb4f9 2bfdb4f9a2003aa75225054955f1444d224929e1 by 鲁二龙
Options

Merge remote-tracking branch 'origin/1.1.0-future-UserCenter接口转移' into 1.1.0-future-UserCenter接口转移

2 parents 77f8eaa1 546d2831
Inline Side-by-side
Showing 47 changed files with 354 additions and 232 deletions
...@@ -40,6 +40,7 @@ public class DataSyncMsg implements Serializable { ...@@ -40,6 +40,7 @@ public class DataSyncMsg implements Serializable {
40 private Integer event; // 具体事件 行为事件类型 1：登录；2：观影；3：参与活动；4：订购；10：跨屏绑定；11：积分转移；30：积分兑换商品；98：系统操作；99：其他 40 private Integer event; // 具体事件 行为事件类型 1：登录；2：观影；3：参与活动；4：订购；10：跨屏绑定；11：积分转移；30：积分兑换商品；98：系统操作；99：其他
41 @NotNull 41 @NotNull
42 private Long memberId; // 会员id 42 private Long memberId; // 会员id
43 private Long userId; // 账户id
43 @NotNull 44 @NotNull
44 private Integer deviceType; //设备类型 1：大屏；2：小屏（微信）3.小屏（xx） 45 private Integer deviceType; //设备类型 1：大屏；2：小屏（微信）3.小屏（xx）
45 @NotNull 46 @NotNull
...@@ -49,7 +50,7 @@ public class DataSyncMsg implements Serializable { ...@@ -49,7 +50,7 @@ public class DataSyncMsg implements Serializable {
49 private Long activityId; 50 private Long activityId;
50 private Long mediaId; 51 private Long mediaId;
51 private Long itemId; 52 private Long itemId;
52 53 private String param;
53 54
54 } 55 }
55 56
......
1 package com.topdraw.module.mq;
2
3 /**
4 * @author ：
5 * @description：
6 * @function :
7 * @date ：Created in 2022/2/3 22:46
8 * @version: ：
9 * @modified By：
10 * @since : modified in 2022/2/3 22:46
11 */
12 public enum DeviceType {
13
14 IPTV(),
15 weixin();
16
17 }
...@@ -34,13 +34,6 @@ ...@@ -34,13 +34,6 @@
34 <version>${parent.version}</version> 34 <version>${parent.version}</version>
35 </dependency> 35 </dependency>
36 36
37 <!--代码生成器-->
38 <dependency>
39 <groupId>com.topdraw</groupId>
40 <artifactId>code-generator</artifactId>
41 <version>3.1.0</version>
42 </dependency>
43
44 <!-- Spring boot 热部署 : 此热部署会遇到 java.lang.ClassCastException 异常 --> 37 <!-- Spring boot 热部署 : 此热部署会遇到 java.lang.ClassCastException 异常 -->
45 <dependency> 38 <dependency>
46 <groupId>org.springframework.boot</groupId> 39 <groupId>org.springframework.boot</groupId>
......
...@@ -48,7 +48,7 @@ public class CouponHistory implements Serializable { ...@@ -48,7 +48,7 @@ public class CouponHistory implements Serializable {
48 48
49 // 领取时间 49 // 领取时间
50 @Column(name = "receive_time") 50 @Column(name = "receive_time")
51 private Timestamp receiveTime; 51 private LocalDateTime receiveTime;
52 52
53 // 失效时间 53 // 失效时间
54 @Column(name = "expire_time") 54 @Column(name = "expire_time")
...@@ -60,7 +60,7 @@ public class CouponHistory implements Serializable { ...@@ -60,7 +60,7 @@ public class CouponHistory implements Serializable {
60 60
61 // 使用时间 61 // 使用时间
62 @Column(name = "use_time") 62 @Column(name = "use_time")
63 private Timestamp useTime; 63 private LocalDateTime useTime;
64 64
65 // 订单详情id 65 // 订单详情id
66 @Column(name = "order_detail_id") 66 @Column(name = "order_detail_id")
...@@ -69,12 +69,12 @@ public class CouponHistory implements Serializable { ...@@ -69,12 +69,12 @@ public class CouponHistory implements Serializable {
69 // 创建时间 69 // 创建时间
70 @CreatedDate 70 @CreatedDate
71 @Column(name = "create_time") 71 @Column(name = "create_time")
72 private Timestamp createTime; 72 private LocalDateTime createTime;
73 73
74 // 更新时间 74 // 更新时间
75 @LastModifiedDate 75 @LastModifiedDate
76 @Column(name = "update_time") 76 @Column(name = "update_time")
77 private Timestamp updateTime; 77 private LocalDateTime updateTime;
78 78
79 public void copy(CouponHistory source){ 79 public void copy(CouponHistory source){
80 BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); 80 BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
......
...@@ -5,6 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository; ...@@ -5,6 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor; 5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6 6
7 import java.sql.Timestamp; 7 import java.sql.Timestamp;
8 import java.time.LocalDateTime;
8 9
9 /** 10 /**
10 * @author XiangHan 11 * @author XiangHan
...@@ -14,7 +15,7 @@ public interface CouponHistoryRepository extends JpaRepository<CouponHistory, Lo ...@@ -14,7 +15,7 @@ public interface CouponHistoryRepository extends JpaRepository<CouponHistory, Lo
14 15
15 Long countByUserId(Long userId); 16 Long countByUserId(Long userId);
16 17
17 Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now); 18 Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now);
18 19
19 Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime); 20 Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime);
20 } 21 }
......
1 package com.topdraw.business.module.coupon.history.rest; 1 package com.topdraw.business.module.coupon.history.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.coupon.history.domain.CouponHistory; 4 import com.topdraw.business.module.coupon.history.domain.CouponHistory;
6 import com.topdraw.business.module.coupon.history.service.CouponHistoryService; 5 import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
7 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQueryCriteria; 6 import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQueryCriteria;
...@@ -35,7 +34,6 @@ public class CouponHistoryController { ...@@ -35,7 +34,6 @@ public class CouponHistoryController {
35 return ResultInfo.success(CouponHistoryService.queryAll(criteria)); 34 return ResultInfo.success(CouponHistoryService.queryAll(criteria));
36 } 35 }
37 36
38 @Log
39 @PostMapping(value = "/create") 37 @PostMapping(value = "/create")
40 @ApiOperation("新增CouponHistory") 38 @ApiOperation("新增CouponHistory")
41 public ResultInfo create(@Validated @RequestBody CouponHistory resources) { 39 public ResultInfo create(@Validated @RequestBody CouponHistory resources) {
...@@ -43,7 +41,6 @@ public class CouponHistoryController { ...@@ -43,7 +41,6 @@ public class CouponHistoryController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping(value = "/update") 44 @PutMapping(value = "/update")
48 @ApiOperation("修改CouponHistory") 45 @ApiOperation("修改CouponHistory")
49 public ResultInfo update(@Validated @RequestBody CouponHistory resources) { 46 public ResultInfo update(@Validated @RequestBody CouponHistory resources) {
...@@ -52,7 +49,6 @@ public class CouponHistoryController { ...@@ -52,7 +49,6 @@ public class CouponHistoryController {
52 } 49 }
53 50
54 51
55 @Log
56 @DeleteMapping(value = "/delete/{id}") 52 @DeleteMapping(value = "/delete/{id}")
57 @ApiOperation("删除CouponHistory") 53 @ApiOperation("删除CouponHistory")
58 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
...@@ -6,6 +6,7 @@ import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQuery ...@@ -6,6 +6,7 @@ import com.topdraw.business.module.coupon.history.service.dto.CouponHistoryQuery
6 import org.springframework.data.domain.Pageable; 6 import org.springframework.data.domain.Pageable;
7 7
8 import java.sql.Timestamp; 8 import java.sql.Timestamp;
9 import java.time.LocalDateTime;
9 import java.util.Map; 10 import java.util.Map;
10 import java.util.List; 11 import java.util.List;
11 12
...@@ -45,7 +46,7 @@ public interface CouponHistoryService { ...@@ -45,7 +46,7 @@ public interface CouponHistoryService {
45 46
46 Long countByUserId(Long userId); 47 Long countByUserId(Long userId);
47 48
48 Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now); 49 Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now);
49 50
50 Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime); 51 Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime);
51 } 52 }
......
1 package com.topdraw.business.module.coupon.history.service.dto; 1 package com.topdraw.business.module.coupon.history.service.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 import java.sql.Timestamp;
5 import java.io.Serializable; 4 import java.io.Serializable;
6 import java.time.LocalDateTime; 5 import java.time.LocalDateTime;
7 6
...@@ -29,7 +28,7 @@ public class CouponHistoryDTO implements Serializable { ...@@ -29,7 +28,7 @@ public class CouponHistoryDTO implements Serializable {
29 private String userNickname; 28 private String userNickname;
30 29
31 // 领取时间 30 // 领取时间
32 private Timestamp receiveTime; 31 private LocalDateTime receiveTime;
33 32
34 // 失效时间 33 // 失效时间
35 private LocalDateTime expireTime; 34 private LocalDateTime expireTime;
...@@ -38,14 +37,14 @@ public class CouponHistoryDTO implements Serializable { ...@@ -38,14 +37,14 @@ public class CouponHistoryDTO implements Serializable {
38 private Integer useStatus; 37 private Integer useStatus;
39 38
40 // 使用时间 39 // 使用时间
41 private Timestamp useTime; 40 private LocalDateTime useTime;
42 41
43 // 订单详情id 42 // 订单详情id
44 private Long orderDetailId; 43 private Long orderDetailId;
45 44
46 // 创建时间 45 // 创建时间
47 private Timestamp createTime; 46 private LocalDateTime createTime;
48 47
49 // 更新时间 48 // 更新时间
50 private Timestamp updateTime; 49 private LocalDateTime updateTime;
51 } 50 }
......
...@@ -20,6 +20,7 @@ import com.topdraw.utils.PageUtil; ...@@ -20,6 +20,7 @@ import com.topdraw.utils.PageUtil;
20 import com.topdraw.utils.QueryHelp; 20 import com.topdraw.utils.QueryHelp;
21 21
22 import java.sql.Timestamp; 22 import java.sql.Timestamp;
23 import java.time.LocalDateTime;
23 import java.util.List; 24 import java.util.List;
24 import java.util.Map; 25 import java.util.Map;
25 26
...@@ -87,12 +88,12 @@ public class CouponHistoryServiceImpl implements CouponHistoryService { ...@@ -87,12 +88,12 @@ public class CouponHistoryServiceImpl implements CouponHistoryService {
87 } 88 }
88 89
89 @Override 90 @Override
90 public Long countByUserIdAndExpireTimeBefore(Long userId, Timestamp now) { 91 public Long countByUserIdAndExpireTimeBefore(Long userId, LocalDateTime now) {
91 return this.CouponHistoryRepository.countByUserIdAndExpireTimeBefore(userId,now); 92 return this.CouponHistoryRepository.countByUserIdAndExpireTimeBefore(userId,now);
92 } 93 }
93 94
94 @Override 95 @Override
95 public Long countByUserIdAndExpireTimeBetween(Long userId, Timestamp now, Timestamp expireTime) { 96 public Long countByUserIdAndExpireTimeBetween(Long userId, LocalDateTime now, LocalDateTime expireTime) {
96 return this.CouponHistoryRepository.countByUserIdAndExpireTimeBetween(userId,now,expireTime); 97 return this.CouponHistoryRepository.countByUserIdAndExpireTimeBetween(userId,now,expireTime);
97 } 98 }
98 99
......
1 package com.topdraw.business.module.coupon.rest; 1 package com.topdraw.business.module.coupon.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.coupon.domain.Coupon; 4 import com.topdraw.business.module.coupon.domain.Coupon;
6 import com.topdraw.business.module.coupon.service.CouponService; 5 import com.topdraw.business.module.coupon.service.CouponService;
7 import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria; 6 import com.topdraw.business.module.coupon.service.dto.CouponQueryCriteria;
...@@ -35,7 +34,6 @@ public class CouponController { ...@@ -35,7 +34,6 @@ public class CouponController {
35 return ResultInfo.success(CouponService.queryAll(criteria)); 34 return ResultInfo.success(CouponService.queryAll(criteria));
36 } 35 }
37 36
38 @Log
39 @PostMapping(value = "/create") 37 @PostMapping(value = "/create")
40 @ApiOperation("新增Coupon") 38 @ApiOperation("新增Coupon")
41 public ResultInfo create(@Validated @RequestBody Coupon resources) { 39 public ResultInfo create(@Validated @RequestBody Coupon resources) {
...@@ -43,7 +41,6 @@ public class CouponController { ...@@ -43,7 +41,6 @@ public class CouponController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping(value = "/update") 44 @PutMapping(value = "/update")
48 @ApiOperation("修改Coupon") 45 @ApiOperation("修改Coupon")
49 public ResultInfo update(@Validated @RequestBody Coupon resources) { 46 public ResultInfo update(@Validated @RequestBody Coupon resources) {
...@@ -51,8 +48,6 @@ public class CouponController { ...@@ -51,8 +48,6 @@ public class CouponController {
51 return ResultInfo.success(); 48 return ResultInfo.success();
52 } 49 }
53 50
54
55 @Log
56 @DeleteMapping(value = "/delete/{id}") 51 @DeleteMapping(value = "/delete/{id}")
57 @ApiOperation("删除Coupon") 52 @ApiOperation("删除Coupon")
58 public ResultInfo delete(@PathVariable Long id) { 53 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.exp.detail.rest; 1 package com.topdraw.business.module.exp.detail.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.exp.detail.domain.ExpDetail; 4 import com.topdraw.business.module.exp.detail.domain.ExpDetail;
6 import com.topdraw.business.module.exp.detail.service.ExpDetailService; 5 import com.topdraw.business.module.exp.detail.service.ExpDetailService;
7 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria; 6 import com.topdraw.business.module.exp.detail.service.dto.ExpDetailQueryCriteria;
...@@ -35,7 +34,6 @@ public class ExpDetailController { ...@@ -35,7 +34,6 @@ public class ExpDetailController {
35 return ResultInfo.success(ExpDetailService.queryAll(criteria)); 34 return ResultInfo.success(ExpDetailService.queryAll(criteria));
36 } 35 }
37 36
38 @Log
39 @PostMapping(value = "/create") 37 @PostMapping(value = "/create")
40 @ApiOperation("新增ExpDetail") 38 @ApiOperation("新增ExpDetail")
41 public ResultInfo create(@Validated @RequestBody ExpDetail resources) { 39 public ResultInfo create(@Validated @RequestBody ExpDetail resources) {
...@@ -43,7 +41,6 @@ public class ExpDetailController { ...@@ -43,7 +41,6 @@ public class ExpDetailController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping(value = "/update") 44 @PutMapping(value = "/update")
48 @ApiOperation("修改ExpDetail") 45 @ApiOperation("修改ExpDetail")
49 public ResultInfo update(@Validated @RequestBody ExpDetail resources) { 46 public ResultInfo update(@Validated @RequestBody ExpDetail resources) {
...@@ -51,8 +48,6 @@ public class ExpDetailController { ...@@ -51,8 +48,6 @@ public class ExpDetailController {
51 return ResultInfo.success(); 48 return ResultInfo.success();
52 } 49 }
53 50
54
55 @Log
56 @DeleteMapping(value = "/delete/{id}") 51 @DeleteMapping(value = "/delete/{id}")
57 @ApiOperation("删除ExpDetail") 52 @ApiOperation("删除ExpDetail")
58 public ResultInfo delete(@PathVariable Long id) { 53 public ResultInfo delete(@PathVariable Long id) {
......
...@@ -3,7 +3,6 @@ package com.topdraw.business.module.member.address.rest; ...@@ -3,7 +3,6 @@ package com.topdraw.business.module.member.address.rest;
3 import com.topdraw.business.module.member.service.MemberService; 3 import com.topdraw.business.module.member.service.MemberService;
4 import com.topdraw.business.module.member.service.dto.MemberDTO; 4 import com.topdraw.business.module.member.service.dto.MemberDTO;
5 import com.topdraw.common.ResultInfo; 5 import com.topdraw.common.ResultInfo;
6 import com.topdraw.annotation.Log;
7 import com.topdraw.business.module.member.address.domain.MemberAddress; 6 import com.topdraw.business.module.member.address.domain.MemberAddress;
8 import com.topdraw.business.module.member.address.service.MemberAddressService; 7 import com.topdraw.business.module.member.address.service.MemberAddressService;
9 import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria; 8 import com.topdraw.business.module.member.address.service.dto.MemberAddressQueryCriteria;
...@@ -43,7 +42,6 @@ public class MemberAddressController { ...@@ -43,7 +42,6 @@ public class MemberAddressController {
43 return ResultInfo.success(MemberAddressService.findById(id)); 42 return ResultInfo.success(MemberAddressService.findById(id));
44 } 43 }
45 44
46 @Log
47 @PostMapping(value = "/create") 45 @PostMapping(value = "/create")
48 @ApiOperation("新增MemberAddress") 46 @ApiOperation("新增MemberAddress")
49 public ResultInfo create(@Validated @RequestBody MemberAddress resources) { 47 public ResultInfo create(@Validated @RequestBody MemberAddress resources) {
...@@ -51,7 +49,6 @@ public class MemberAddressController { ...@@ -51,7 +49,6 @@ public class MemberAddressController {
51 return ResultInfo.success(); 49 return ResultInfo.success();
52 } 50 }
53 51
54 @Log
55 @PutMapping(value = "/update") 52 @PutMapping(value = "/update")
56 @ApiOperation("修改MemberAddress") 53 @ApiOperation("修改MemberAddress")
57 public ResultInfo update(@Validated @RequestBody MemberAddress resources) { 54 public ResultInfo update(@Validated @RequestBody MemberAddress resources) {
...@@ -69,7 +66,6 @@ public class MemberAddressController { ...@@ -69,7 +66,6 @@ public class MemberAddressController {
69 return ResultInfo.success(); 66 return ResultInfo.success();
70 } 67 }
71 68
72 @Log
73 @DeleteMapping(value = "/delete/{id}") 69 @DeleteMapping(value = "/delete/{id}")
74 @ApiOperation("删除MemberAddress") 70 @ApiOperation("删除MemberAddress")
75 public ResultInfo delete(@PathVariable Long id) { 71 public ResultInfo delete(@PathVariable Long id) {
......
...@@ -116,17 +116,17 @@ public class Member implements Serializable { ...@@ -116,17 +116,17 @@ public class Member implements Serializable {
116 116
117 /** iptv账号绑定时间 */ 117 /** iptv账号绑定时间 */
118 @Column(name = "bind_iptv_time") 118 @Column(name = "bind_iptv_time")
119 private Timestamp bindIptvTime; 119 private LocalDateTime bindIptvTime;
120 120
121 /** 创建时间 */ 121 /** 创建时间 */
122 @CreatedDate 122 @CreatedDate
123 @Column(name = "create_time") 123 @Column(name = "create_time")
124 private Timestamp createTime; 124 private LocalDateTime createTime;
125 125
126 /** 更新时间 */ 126 /** 更新时间 */
127 @LastModifiedDate 127 @LastModifiedDate
128 @Column(name = "update_time") 128 @Column(name = "update_time")
129 private Timestamp updateTime; 129 private LocalDateTime updateTime;
130 130
131 /** 是否在黑名单 1：是；0否 */ 131 /** 是否在黑名单 1：是；0否 */
132 @Column(name = "black_status") 132 @Column(name = "black_status")
......
1 package com.topdraw.business.module.member.group.rest; 1 package com.topdraw.business.module.member.group.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.member.group.domain.MemberGroup; 4 import com.topdraw.business.module.member.group.domain.MemberGroup;
6 import com.topdraw.business.module.member.group.service.MemberGroupService; 5 import com.topdraw.business.module.member.group.service.MemberGroupService;
7 import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria; 6 import com.topdraw.business.module.member.group.service.dto.MemberGroupQueryCriteria;
...@@ -35,7 +34,6 @@ public class MemberGroupController { ...@@ -35,7 +34,6 @@ public class MemberGroupController {
35 return ResultInfo.success(MemberGroupService.queryAll(criteria)); 34 return ResultInfo.success(MemberGroupService.queryAll(criteria));
36 } 35 }
37 36
38 @Log
39 @PostMapping 37 @PostMapping
40 @ApiOperation("新增MemberGroup") 38 @ApiOperation("新增MemberGroup")
41 public ResultInfo create(@Validated @RequestBody MemberGroup resources) { 39 public ResultInfo create(@Validated @RequestBody MemberGroup resources) {
...@@ -43,7 +41,6 @@ public class MemberGroupController { ...@@ -43,7 +41,6 @@ public class MemberGroupController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping 44 @PutMapping
48 @ApiOperation("修改MemberGroup") 45 @ApiOperation("修改MemberGroup")
49 public ResultInfo update(@Validated @RequestBody MemberGroup resources) { 46 public ResultInfo update(@Validated @RequestBody MemberGroup resources) {
...@@ -51,8 +48,6 @@ public class MemberGroupController { ...@@ -51,8 +48,6 @@ public class MemberGroupController {
51 return ResultInfo.success(); 48 return ResultInfo.success();
52 } 49 }
53 50
54
55 @Log
56 @DeleteMapping(value = "/{id}") 51 @DeleteMapping(value = "/{id}")
57 @ApiOperation("删除MemberGroup") 52 @ApiOperation("删除MemberGroup")
58 public ResultInfo delete(@PathVariable Long id) { 53 public ResultInfo delete(@PathVariable Long id) {
......
...@@ -5,7 +5,6 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; ...@@ -5,7 +5,6 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
5 import com.topdraw.business.module.member.service.MemberService; 5 import com.topdraw.business.module.member.service.MemberService;
6 import com.topdraw.business.module.member.service.dto.MemberDTO; 6 import com.topdraw.business.module.member.service.dto.MemberDTO;
7 import com.topdraw.common.ResultInfo; 7 import com.topdraw.common.ResultInfo;
8 import com.topdraw.annotation.Log;
9 import com.topdraw.business.module.member.profile.domain.MemberProfile; 8 import com.topdraw.business.module.member.profile.domain.MemberProfile;
10 import com.topdraw.business.module.member.profile.service.MemberProfileService; 9 import com.topdraw.business.module.member.profile.service.MemberProfileService;
11 import com.topdraw.utils.StringUtils; 10 import com.topdraw.utils.StringUtils;
...@@ -44,7 +43,6 @@ public class MemberProfileController { ...@@ -44,7 +43,6 @@ public class MemberProfileController {
44 return ResultInfo.success(MemberProfileService.queryAll(criteria)); 43 return ResultInfo.success(MemberProfileService.queryAll(criteria));
45 }*/ 44 }*/
46 45
47 @Log
48 @PostMapping(value = "/create") 46 @PostMapping(value = "/create")
49 @ApiOperation("新增MemberProfile") 47 @ApiOperation("新增MemberProfile")
50 @AnonymousAccess 48 @AnonymousAccess
...@@ -53,7 +51,6 @@ public class MemberProfileController { ...@@ -53,7 +51,6 @@ public class MemberProfileController {
53 return ResultInfo.success(); 51 return ResultInfo.success();
54 } 52 }
55 53
56 @Log
57 @PutMapping(value = "/update") 54 @PutMapping(value = "/update")
58 @ApiOperation("修改MemberProfile") 55 @ApiOperation("修改MemberProfile")
59 @AnonymousAccess 56 @AnonymousAccess
...@@ -78,7 +75,6 @@ public class MemberProfileController { ...@@ -78,7 +75,6 @@ public class MemberProfileController {
78 return ResultInfo.success(); 75 return ResultInfo.success();
79 } 76 }
80 77
81 @Log
82 @PutMapping 78 @PutMapping
83 @ApiOperation("修改MemberProfile") 79 @ApiOperation("修改MemberProfile")
84 @AnonymousAccess 80 @AnonymousAccess
...@@ -87,8 +83,6 @@ public class MemberProfileController { ...@@ -87,8 +83,6 @@ public class MemberProfileController {
87 return ResultInfo.success(); 83 return ResultInfo.success();
88 } 84 }
89 85
90
91 @Log
92 @DeleteMapping(value = "/delete/{id}") 86 @DeleteMapping(value = "/delete/{id}")
93 @ApiOperation("删除MemberProfile") 87 @ApiOperation("删除MemberProfile")
94 public ResultInfo delete(@PathVariable Long id) { 88 public ResultInfo delete(@PathVariable Long id) {
......
...@@ -6,19 +6,21 @@ import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedI ...@@ -6,19 +6,21 @@ import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedI
6 import com.topdraw.business.module.member.service.MemberService; 6 import com.topdraw.business.module.member.service.MemberService;
7 import com.topdraw.business.module.member.service.dto.MemberDTO; 7 import com.topdraw.business.module.member.service.dto.MemberDTO;
8 import com.topdraw.common.ResultInfo; 8 import com.topdraw.common.ResultInfo;
9 import com.topdraw.annotation.Log;
10 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 9 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
11 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService; 10 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
12 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria; 11 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoQueryCriteria;
13 import com.topdraw.exception.BadRequestException; 12 import com.topdraw.exception.BadRequestException;
13 import com.topdraw.util.Base64Util;
14 import lombok.extern.slf4j.Slf4j; 14 import lombok.extern.slf4j.Slf4j;
15 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.data.domain.Pageable; 16 import org.springframework.data.domain.Pageable;
17 import org.springframework.util.Assert; 17 import org.springframework.util.Assert;
18 import org.springframework.util.StringUtils;
18 import org.springframework.validation.annotation.Validated; 19 import org.springframework.validation.annotation.Validated;
19 import org.springframework.web.bind.annotation.*; 20 import org.springframework.web.bind.annotation.*;
20 import io.swagger.annotations.*; 21 import io.swagger.annotations.*;
21 22
23 import java.util.Base64;
22 import java.util.Objects; 24 import java.util.Objects;
23 25
24 /** 26 /**
...@@ -43,7 +45,6 @@ public class MemberRelatedInfoController { ...@@ -43,7 +45,6 @@ public class MemberRelatedInfoController {
43 return ResultInfo.successPage(MemberRelatedInfoService.queryAll(criteria,pageable)); 45 return ResultInfo.successPage(MemberRelatedInfoService.queryAll(criteria,pageable));
44 } 46 }
45 47
46 @Log
47 @PostMapping(value = "/create") 48 @PostMapping(value = "/create")
48 @ApiOperation("新增MemberRelatedInfo") 49 @ApiOperation("新增MemberRelatedInfo")
49 @AnonymousAccess 50 @AnonymousAccess
...@@ -52,11 +53,19 @@ public class MemberRelatedInfoController { ...@@ -52,11 +53,19 @@ public class MemberRelatedInfoController {
52 return ResultInfo.success(); 53 return ResultInfo.success();
53 } 54 }
54 55
55 @Log("修改MemberRelatedInfo")
56 @PutMapping(value = "/update") 56 @PutMapping(value = "/update")
57 @ApiOperation("修改MemberRelatedInfo") 57 @ApiOperation("修改MemberRelatedInfo")
58 @AnonymousAccess 58 @AnonymousAccess
59 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberRelatedInfo resources) { 59 public ResultInfo update(@Validated(value = {UpdateGroup.class}) @RequestBody MemberRelatedInfo resources) {
60
61 log.info("Param ===> resources ===> [{}]",resources);
62
63 String name = resources.getName();
64 if (StringUtils.hasText(name)) {
65 String nickNameEncode = Base64Util.encode(name);
66 resources.setName(nickNameEncode);
67 }
68
60 Long id = resources.getId(); 69 Long id = resources.getId();
61 MemberRelatedInfoDTO memberRelatedInfoDTO = this.MemberRelatedInfoService.findById(id); 70 MemberRelatedInfoDTO memberRelatedInfoDTO = this.MemberRelatedInfoService.findById(id);
62 if (memberRelatedInfoDTO.getId() != null) { 71 if (memberRelatedInfoDTO.getId() != null) {
...@@ -84,7 +93,6 @@ public class MemberRelatedInfoController { ...@@ -84,7 +93,6 @@ public class MemberRelatedInfoController {
84 return ResultInfo.success(MemberRelatedInfoService.findById(id)); 93 return ResultInfo.success(MemberRelatedInfoService.findById(id));
85 } 94 }
86 95
87 @Log
88 @DeleteMapping(value = "/delete/{id}") 96 @DeleteMapping(value = "/delete/{id}")
89 @ApiOperation("删除MemberRelatedInfo") 97 @ApiOperation("删除MemberRelatedInfo")
90 @AnonymousAccess 98 @AnonymousAccess
......
1 package com.topdraw.business.module.member.rest; 1 package com.topdraw.business.module.member.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.member.domain.Member; 4 import com.topdraw.business.module.member.domain.Member;
6 import com.topdraw.business.module.member.service.MemberService; 5 import com.topdraw.business.module.member.service.MemberService;
7 import com.topdraw.business.module.member.service.dto.MemberDTO; 6 import com.topdraw.business.module.member.service.dto.MemberDTO;
...@@ -36,7 +35,6 @@ public class MemberController { ...@@ -36,7 +35,6 @@ public class MemberController {
36 @Autowired 35 @Autowired
37 private UserOperationService userTvOperationService; 36 private UserOperationService userTvOperationService;
38 37
39 @Log
40 @GetMapping(value = "/findById/{id}") 38 @GetMapping(value = "/findById/{id}")
41 @ApiOperation("新增UserTv会员") 39 @ApiOperation("新增UserTv会员")
42 public ResultInfo findById(@PathVariable Long id) { 40 public ResultInfo findById(@PathVariable Long id) {
...@@ -44,7 +42,6 @@ public class MemberController { ...@@ -44,7 +42,6 @@ public class MemberController {
44 return ResultInfo.success(memberDTO); 42 return ResultInfo.success(memberDTO);
45 } 43 }
46 44
47 @Log
48 @PostMapping(value = "/createMemberByUserTv") 45 @PostMapping(value = "/createMemberByUserTv")
49 @ApiOperation("新增UserTv会员") 46 @ApiOperation("新增UserTv会员")
50 public ResultInfo createMemberByUserTv(@Validated @RequestBody UserTv resources) { 47 public ResultInfo createMemberByUserTv(@Validated @RequestBody UserTv resources) {
...@@ -54,7 +51,6 @@ public class MemberController { ...@@ -54,7 +51,6 @@ public class MemberController {
54 return ResultInfo.success(result); 51 return ResultInfo.success(result);
55 } 52 }
56 53
57 @Log
58 @PostMapping(value = "/create") 54 @PostMapping(value = "/create")
59 @ApiOperation("新增Member") 55 @ApiOperation("新增Member")
60 public ResultInfo create(@Validated @RequestBody Member resources) { 56 public ResultInfo create(@Validated @RequestBody Member resources) {
...@@ -62,7 +58,6 @@ public class MemberController { ...@@ -62,7 +58,6 @@ public class MemberController {
62 return ResultInfo.success(id); 58 return ResultInfo.success(id);
63 } 59 }
64 60
65 @Log
66 @PostMapping(value = "/doUpdateVip") 61 @PostMapping(value = "/doUpdateVip")
67 @ApiOperation("修改Member等级") 62 @ApiOperation("修改Member等级")
68 public ResultInfo doUpdateVip(@RequestBody Member member) { 63 public ResultInfo doUpdateVip(@RequestBody Member member) {
...@@ -70,7 +65,6 @@ public class MemberController { ...@@ -70,7 +65,6 @@ public class MemberController {
70 return ResultInfo.success(); 65 return ResultInfo.success();
71 } 66 }
72 67
73 @Log
74 @PutMapping(value = "/update") 68 @PutMapping(value = "/update")
75 @ApiOperation("修改Member") 69 @ApiOperation("修改Member")
76 @AnonymousAccess 70 @AnonymousAccess
......
...@@ -81,13 +81,13 @@ public class MemberDTO implements Serializable { ...@@ -81,13 +81,13 @@ public class MemberDTO implements Serializable {
81 private Integer bindIptvPlatformType; 81 private Integer bindIptvPlatformType;
82 82
83 // iptv账号绑定时间 83 // iptv账号绑定时间
84 private Timestamp bindIptvTime; 84 private LocalDateTime bindIptvTime;
85 85
86 // 创建时间 86 // 创建时间
87 private Timestamp createTime; 87 private LocalDateTime createTime;
88 88
89 // 更新时间 89 // 更新时间
90 private Timestamp updateTime; 90 private LocalDateTime updateTime;
91 91
92 // 是否在黑名单 1：是；0否 92 // 是否在黑名单 1：是；0否
93 private Long blackStatus; 93 private Long blackStatus;
......
1 package com.topdraw.business.module.member.viphistory.rest; 1 package com.topdraw.business.module.member.viphistory.rest;
2 2
3 import com.topdraw.annotation.Log;
4 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory; 3 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
5 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService; 4 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
6 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria; 5 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryQueryCriteria;
...@@ -36,7 +35,6 @@ public class MemberVipHistoryController { ...@@ -36,7 +35,6 @@ public class MemberVipHistoryController {
36 return ResultInfo.success(memberVipHistoryService.queryAll(criteria)); 35 return ResultInfo.success(memberVipHistoryService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping 38 @PostMapping
41 @ApiOperation("新增MemberVipHistory") 39 @ApiOperation("新增MemberVipHistory")
42 public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) { 40 public ResultInfo create(@Validated @RequestBody MemberVipHistory resources) {
...@@ -44,7 +42,6 @@ public class MemberVipHistoryController { ...@@ -44,7 +42,6 @@ public class MemberVipHistoryController {
44 return ResultInfo.success(); 42 return ResultInfo.success();
45 } 43 }
46 44
47 @Log
48 @PutMapping 45 @PutMapping
49 @ApiOperation("修改MemberVipHistory") 46 @ApiOperation("修改MemberVipHistory")
50 public ResultInfo update(@Validated @RequestBody MemberVipHistory resources) { 47 public ResultInfo update(@Validated @RequestBody MemberVipHistory resources) {
...@@ -52,8 +49,6 @@ public class MemberVipHistoryController { ...@@ -52,8 +49,6 @@ public class MemberVipHistoryController {
52 return ResultInfo.success(); 49 return ResultInfo.success();
53 } 50 }
54 51
55
56 @Log
57 @DeleteMapping(value = "/{id}") 52 @DeleteMapping(value = "/{id}")
58 @ApiOperation("删除MemberVipHistory") 53 @ApiOperation("删除MemberVipHistory")
59 public ResultInfo delete(@PathVariable Long id) { 54 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.points.standingbook.rest; 1 package com.topdraw.business.module.points.standingbook.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.points.standingbook.domain.PointsStandingBook; 4 import com.topdraw.business.module.points.standingbook.domain.PointsStandingBook;
6 import com.topdraw.business.module.points.standingbook.service.PointsStandingBookService; 5 import com.topdraw.business.module.points.standingbook.service.PointsStandingBookService;
7 import com.topdraw.business.module.points.standingbook.service.dto.PointsStandingBookQueryCriteria; 6 import com.topdraw.business.module.points.standingbook.service.dto.PointsStandingBookQueryCriteria;
...@@ -35,7 +34,6 @@ public class PointsStandingBookController { ...@@ -35,7 +34,6 @@ public class PointsStandingBookController {
35 return ResultInfo.success(PointsStandingBookService.queryAll(criteria)); 34 return ResultInfo.success(PointsStandingBookService.queryAll(criteria));
36 } 35 }
37 36
38 @Log
39 @PostMapping 37 @PostMapping
40 @ApiOperation("新增PointsStandingBook") 38 @ApiOperation("新增PointsStandingBook")
41 public ResultInfo create(@Validated @RequestBody PointsStandingBook resources) { 39 public ResultInfo create(@Validated @RequestBody PointsStandingBook resources) {
...@@ -43,7 +41,6 @@ public class PointsStandingBookController { ...@@ -43,7 +41,6 @@ public class PointsStandingBookController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping 44 @PutMapping
48 @ApiOperation("修改PointsStandingBook") 45 @ApiOperation("修改PointsStandingBook")
49 public ResultInfo update(@Validated @RequestBody PointsStandingBook resources) { 46 public ResultInfo update(@Validated @RequestBody PointsStandingBook resources) {
...@@ -51,8 +48,6 @@ public class PointsStandingBookController { ...@@ -51,8 +48,6 @@ public class PointsStandingBookController {
51 return ResultInfo.success(); 48 return ResultInfo.success();
52 } 49 }
53 50
54
55 @Log
56 @DeleteMapping(value = "/{id}") 51 @DeleteMapping(value = "/{id}")
57 @ApiOperation("删除PointsStandingBook") 52 @ApiOperation("删除PointsStandingBook")
58 public ResultInfo delete(@PathVariable Long id) { 53 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.rights.permanentrights.rest; 1 package com.topdraw.business.module.rights.permanentrights.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.rights.permanentrights.domain.PermanentRights; 4 import com.topdraw.business.module.rights.permanentrights.domain.PermanentRights;
6 import com.topdraw.business.module.rights.permanentrights.service.PermanentRightsService; 5 import com.topdraw.business.module.rights.permanentrights.service.PermanentRightsService;
7 import com.topdraw.business.module.rights.permanentrights.service.dto.PermanentRightsQueryCriteria; 6 import com.topdraw.business.module.rights.permanentrights.service.dto.PermanentRightsQueryCriteria;
...@@ -35,7 +34,6 @@ public class PermanentRightsController { ...@@ -35,7 +34,6 @@ public class PermanentRightsController {
35 return ResultInfo.success(PermanentRightsService.findById(id)); 34 return ResultInfo.success(PermanentRightsService.findById(id));
36 } 35 }
37 36
38 @Log
39 @PostMapping(value = "/create") 37 @PostMapping(value = "/create")
40 @ApiOperation("新增PermanentRights") 38 @ApiOperation("新增PermanentRights")
41 public ResultInfo create(@Validated @RequestBody PermanentRights resources) { 39 public ResultInfo create(@Validated @RequestBody PermanentRights resources) {
...@@ -43,7 +41,6 @@ public class PermanentRightsController { ...@@ -43,7 +41,6 @@ public class PermanentRightsController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping(value = "/update") 44 @PutMapping(value = "/update")
48 @ApiOperation("修改PermanentRights") 45 @ApiOperation("修改PermanentRights")
49 public ResultInfo update(@Validated @RequestBody PermanentRights resources) { 46 public ResultInfo update(@Validated @RequestBody PermanentRights resources) {
...@@ -51,7 +48,6 @@ public class PermanentRightsController { ...@@ -51,7 +48,6 @@ public class PermanentRightsController {
51 return ResultInfo.success(); 48 return ResultInfo.success();
52 } 49 }
53 50
54 @Log
55 @DeleteMapping(value = "/delete/{id}") 51 @DeleteMapping(value = "/delete/{id}")
56 @ApiOperation("删除PermanentRights") 52 @ApiOperation("删除PermanentRights")
57 public ResultInfo delete(@PathVariable Long id) { 53 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.task.attribute.rest; 1 package com.topdraw.business.module.task.attribute.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.task.attribute.domain.TaskAttr; 4 import com.topdraw.business.module.task.attribute.domain.TaskAttr;
6 import com.topdraw.business.module.task.attribute.service.TaskAttrService; 5 import com.topdraw.business.module.task.attribute.service.TaskAttrService;
7 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrQueryCriteria; 6 import com.topdraw.business.module.task.attribute.service.dto.TaskAttrQueryCriteria;
...@@ -39,7 +38,6 @@ public class TaskAttrController { ...@@ -39,7 +38,6 @@ public class TaskAttrController {
39 return ResultInfo.success(TaskAttrService.queryAll(criteria)); 38 return ResultInfo.success(TaskAttrService.queryAll(criteria));
40 } 39 }
41 40
42 @Log
43 @PostMapping 41 @PostMapping
44 @ApiOperation("新增TaskAttr") 42 @ApiOperation("新增TaskAttr")
45 public ResultInfo create(@Validated @RequestBody TaskAttr resources) { 43 public ResultInfo create(@Validated @RequestBody TaskAttr resources) {
...@@ -47,7 +45,6 @@ public class TaskAttrController { ...@@ -47,7 +45,6 @@ public class TaskAttrController {
47 return ResultInfo.success(); 45 return ResultInfo.success();
48 } 46 }
49 47
50 @Log
51 @PutMapping 48 @PutMapping
52 @ApiOperation("修改TaskAttr") 49 @ApiOperation("修改TaskAttr")
53 public ResultInfo update(@Validated @RequestBody TaskAttr resources) { 50 public ResultInfo update(@Validated @RequestBody TaskAttr resources) {
...@@ -55,8 +52,6 @@ public class TaskAttrController { ...@@ -55,8 +52,6 @@ public class TaskAttrController {
55 return ResultInfo.success(); 52 return ResultInfo.success();
56 } 53 }
57 54
58
59 @Log
60 @DeleteMapping(value = "/{id}") 55 @DeleteMapping(value = "/{id}")
61 @ApiOperation("删除TaskAttr") 56 @ApiOperation("删除TaskAttr")
62 public ResultInfo delete(@PathVariable Long id) { 57 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.task.progress.rest; 1 package com.topdraw.business.module.task.progress.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.task.progress.domain.TrTaskProgress; 4 import com.topdraw.business.module.task.progress.domain.TrTaskProgress;
6 import com.topdraw.business.module.task.progress.service.TrTaskProgressService; 5 import com.topdraw.business.module.task.progress.service.TrTaskProgressService;
7 import com.topdraw.business.module.task.progress.service.dto.TrTaskProgressQueryCriteria; 6 import com.topdraw.business.module.task.progress.service.dto.TrTaskProgressQueryCriteria;
...@@ -35,7 +34,6 @@ public class TrTaskProgressController { ...@@ -35,7 +34,6 @@ public class TrTaskProgressController {
35 return ResultInfo.success(TrTaskProgressService.queryAll(criteria)); 34 return ResultInfo.success(TrTaskProgressService.queryAll(criteria));
36 } 35 }
37 36
38 @Log
39 @PostMapping 37 @PostMapping
40 @ApiOperation("新增TrTaskProgress") 38 @ApiOperation("新增TrTaskProgress")
41 public ResultInfo create(@Validated @RequestBody TrTaskProgress resources) { 39 public ResultInfo create(@Validated @RequestBody TrTaskProgress resources) {
...@@ -43,7 +41,6 @@ public class TrTaskProgressController { ...@@ -43,7 +41,6 @@ public class TrTaskProgressController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping 44 @PutMapping
48 @ApiOperation("修改TrTaskProgress") 45 @ApiOperation("修改TrTaskProgress")
49 public ResultInfo update(@Validated @RequestBody TrTaskProgress resources) { 46 public ResultInfo update(@Validated @RequestBody TrTaskProgress resources) {
...@@ -51,8 +48,6 @@ public class TrTaskProgressController { ...@@ -51,8 +48,6 @@ public class TrTaskProgressController {
51 return ResultInfo.success(); 48 return ResultInfo.success();
52 } 49 }
53 50
54
55 @Log
56 @DeleteMapping(value = "/{id}") 51 @DeleteMapping(value = "/{id}")
57 @ApiOperation("删除TrTaskProgress") 52 @ApiOperation("删除TrTaskProgress")
58 public ResultInfo delete(@PathVariable Long id) { 53 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.task.rest; 1 package com.topdraw.business.module.task.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.task.domain.Task; 4 import com.topdraw.business.module.task.domain.Task;
6 import com.topdraw.business.module.task.service.TaskService; 5 import com.topdraw.business.module.task.service.TaskService;
7 import com.topdraw.business.module.task.service.dto.TaskQueryCriteria; 6 import com.topdraw.business.module.task.service.dto.TaskQueryCriteria;
...@@ -35,7 +34,6 @@ public class TaskController { ...@@ -35,7 +34,6 @@ public class TaskController {
35 return ResultInfo.success(TaskService.queryAll(criteria)); 34 return ResultInfo.success(TaskService.queryAll(criteria));
36 } 35 }
37 36
38 @Log
39 @PostMapping 37 @PostMapping
40 @ApiOperation("新增Task") 38 @ApiOperation("新增Task")
41 public ResultInfo create(@Validated @RequestBody Task resources) { 39 public ResultInfo create(@Validated @RequestBody Task resources) {
...@@ -43,7 +41,6 @@ public class TaskController { ...@@ -43,7 +41,6 @@ public class TaskController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping 44 @PutMapping
48 @ApiOperation("修改Task") 45 @ApiOperation("修改Task")
49 public ResultInfo update(@Validated @RequestBody Task resources) { 46 public ResultInfo update(@Validated @RequestBody Task resources) {
...@@ -51,8 +48,6 @@ public class TaskController { ...@@ -51,8 +48,6 @@ public class TaskController {
51 return ResultInfo.success(); 48 return ResultInfo.success();
52 } 49 }
53 50
54
55 @Log
56 @DeleteMapping(value = "/{id}") 51 @DeleteMapping(value = "/{id}")
57 @ApiOperation("删除Task") 52 @ApiOperation("删除Task")
58 public ResultInfo delete(@PathVariable Long id) { 53 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.task.template.rest; 1 package com.topdraw.business.module.task.template.rest;
2 2
3 import com.topdraw.common.ResultInfo; 3 import com.topdraw.common.ResultInfo;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.task.template.domain.TaskTemplate; 4 import com.topdraw.business.module.task.template.domain.TaskTemplate;
6 import com.topdraw.business.module.task.template.service.TaskTemplateService; 5 import com.topdraw.business.module.task.template.service.TaskTemplateService;
7 import com.topdraw.business.module.task.template.service.dto.TaskTemplateQueryCriteria; 6 import com.topdraw.business.module.task.template.service.dto.TaskTemplateQueryCriteria;
...@@ -35,7 +34,6 @@ public class TaskTemplateController { ...@@ -35,7 +34,6 @@ public class TaskTemplateController {
35 return ResultInfo.success(TaskTemplateService.queryAll(criteria)); 34 return ResultInfo.success(TaskTemplateService.queryAll(criteria));
36 } 35 }
37 36
38 @Log
39 @PostMapping 37 @PostMapping
40 @ApiOperation("新增TaskTemplate") 38 @ApiOperation("新增TaskTemplate")
41 public ResultInfo create(@Validated @RequestBody TaskTemplate resources) { 39 public ResultInfo create(@Validated @RequestBody TaskTemplate resources) {
...@@ -43,7 +41,6 @@ public class TaskTemplateController { ...@@ -43,7 +41,6 @@ public class TaskTemplateController {
43 return ResultInfo.success(); 41 return ResultInfo.success();
44 } 42 }
45 43
46 @Log
47 @PutMapping 44 @PutMapping
48 @ApiOperation("修改TaskTemplate") 45 @ApiOperation("修改TaskTemplate")
49 public ResultInfo update(@Validated @RequestBody TaskTemplate resources) { 46 public ResultInfo update(@Validated @RequestBody TaskTemplate resources) {
...@@ -51,8 +48,6 @@ public class TaskTemplateController { ...@@ -51,8 +48,6 @@ public class TaskTemplateController {
51 return ResultInfo.success(); 48 return ResultInfo.success();
52 } 49 }
53 50
54
55 @Log
56 @DeleteMapping(value = "/{id}") 51 @DeleteMapping(value = "/{id}")
57 @ApiOperation("删除TaskTemplate") 52 @ApiOperation("删除TaskTemplate")
58 public ResultInfo delete(@PathVariable Long id) { 53 public ResultInfo delete(@PathVariable Long id) {
......
...@@ -15,4 +15,6 @@ public interface UserTvRepository extends JpaRepository<UserTv, Long>, JpaSpecif ...@@ -15,4 +15,6 @@ public interface UserTvRepository extends JpaRepository<UserTv, Long>, JpaSpecif
15 Optional<UserTv> findByPlatformAccount(String platformAccount); 15 Optional<UserTv> findByPlatformAccount(String platformAccount);
16 16
17 Optional<UserTv> findByPriorityMemberCode(String memberCode); 17 Optional<UserTv> findByPriorityMemberCode(String memberCode);
18
19 Optional<UserTv> findByMemberId(Long memberId);
18 } 20 }
......
...@@ -2,7 +2,6 @@ package com.topdraw.business.module.user.iptv.rest; ...@@ -2,7 +2,6 @@ package com.topdraw.business.module.user.iptv.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.common.ResultInfo; 4 import com.topdraw.common.ResultInfo;
5 import com.topdraw.annotation.Log;
6 import com.topdraw.business.module.user.iptv.domain.UserTv; 5 import com.topdraw.business.module.user.iptv.domain.UserTv;
7 import com.topdraw.business.module.user.iptv.service.UserTvService; 6 import com.topdraw.business.module.user.iptv.service.UserTvService;
8 import com.topdraw.business.module.user.iptv.service.dto.UserTvQueryCriteria; 7 import com.topdraw.business.module.user.iptv.service.dto.UserTvQueryCriteria;
...@@ -36,7 +35,6 @@ public class UserTvController { ...@@ -36,7 +35,6 @@ public class UserTvController {
36 return ResultInfo.success(UserTvService.queryAll(criteria)); 35 return ResultInfo.success(UserTvService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping(value = "/create") 38 @PostMapping(value = "/create")
41 @ApiOperation("新增UserTv") 39 @ApiOperation("新增UserTv")
42 @AnonymousAccess 40 @AnonymousAccess
...@@ -45,7 +43,6 @@ public class UserTvController { ...@@ -45,7 +43,6 @@ public class UserTvController {
45 return ResultInfo.success(); 43 return ResultInfo.success();
46 } 44 }
47 45
48 @Log
49 @PutMapping 46 @PutMapping
50 @ApiOperation("修改UserTv") 47 @ApiOperation("修改UserTv")
51 @AnonymousAccess 48 @AnonymousAccess
...@@ -54,7 +51,6 @@ public class UserTvController { ...@@ -54,7 +51,6 @@ public class UserTvController {
54 return ResultInfo.success(); 51 return ResultInfo.success();
55 } 52 }
56 53
57 @Log
58 @DeleteMapping(value = "/{id}") 54 @DeleteMapping(value = "/{id}")
59 @ApiOperation("删除UserTv") 55 @ApiOperation("删除UserTv")
60 public ResultInfo delete(@PathVariable Long id) { 56 public ResultInfo delete(@PathVariable Long id) {
......
...@@ -44,4 +44,6 @@ public interface UserTvService { ...@@ -44,4 +44,6 @@ public interface UserTvService {
44 UserTvDTO findByPlatformAccount(String platformAccount); 44 UserTvDTO findByPlatformAccount(String platformAccount);
45 45
46 UserTvDTO findByPriorityMemberCode(String memberCode); 46 UserTvDTO findByPriorityMemberCode(String memberCode);
47
48 UserTvDTO findByMemberId(Long memberId);
47 } 49 }
......
...@@ -115,5 +115,15 @@ public class UserTvServiceImpl implements UserTvService { ...@@ -115,5 +115,15 @@ public class UserTvServiceImpl implements UserTvService {
115 return null; 115 return null;
116 } 116 }
117 117
118 @Override
119 public UserTvDTO findByMemberId(Long memberId) {
120 Optional<UserTv> userTv = UserTvRepository.findByMemberId(memberId);
121 if (userTv.isPresent()) {
122 ValidationUtil.isNull( userTv.get().getId(),"UserTv","id",userTv.get().getId());
123 return UserTvMapper.toDto(userTv.get());
124 }
125 return null;
126 }
127
118 128
119 } 129 }
......
...@@ -2,7 +2,6 @@ package com.topdraw.business.module.user.weixin.rest; ...@@ -2,7 +2,6 @@ package com.topdraw.business.module.user.weixin.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.common.ResultInfo; 4 import com.topdraw.common.ResultInfo;
5 import com.topdraw.annotation.Log;
6 import com.topdraw.business.module.user.weixin.domain.UserWeixin; 5 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
7 import com.topdraw.business.module.user.weixin.service.UserWeixinService; 6 import com.topdraw.business.module.user.weixin.service.UserWeixinService;
8 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinQueryCriteria; 7 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinQueryCriteria;
...@@ -36,7 +35,6 @@ public class UserWeixinController { ...@@ -36,7 +35,6 @@ public class UserWeixinController {
36 return ResultInfo.success(UserWeixinService.queryAll(criteria)); 35 return ResultInfo.success(UserWeixinService.queryAll(criteria));
37 } 36 }
38 37
39 @Log
40 @PostMapping(value = "/create") 38 @PostMapping(value = "/create")
41 @ApiOperation("新增UserWeixin") 39 @ApiOperation("新增UserWeixin")
42 @AnonymousAccess 40 @AnonymousAccess
...@@ -45,7 +43,6 @@ public class UserWeixinController { ...@@ -45,7 +43,6 @@ public class UserWeixinController {
45 return ResultInfo.success(); 43 return ResultInfo.success();
46 } 44 }
47 45
48 @Log
49 @PutMapping(value = "/update") 46 @PutMapping(value = "/update")
50 @ApiOperation("修改UserWeixin") 47 @ApiOperation("修改UserWeixin")
51 @AnonymousAccess 48 @AnonymousAccess
...@@ -54,8 +51,6 @@ public class UserWeixinController { ...@@ -54,8 +51,6 @@ public class UserWeixinController {
54 return ResultInfo.success(); 51 return ResultInfo.success();
55 } 52 }
56 53
57
58 @Log
59 @PutMapping(value = "/updateWeixinMemberProfile") 54 @PutMapping(value = "/updateWeixinMemberProfile")
60 @ApiOperation("修改UserWeixin") 55 @ApiOperation("修改UserWeixin")
61 @AnonymousAccess 56 @AnonymousAccess
...@@ -64,8 +59,6 @@ public class UserWeixinController { ...@@ -64,8 +59,6 @@ public class UserWeixinController {
64 return ResultInfo.success(); 59 return ResultInfo.success();
65 } 60 }
66 61
67
68 @Log
69 @DeleteMapping(value = "/{id}") 62 @DeleteMapping(value = "/{id}")
70 @ApiOperation("删除UserWeixin") 63 @ApiOperation("删除UserWeixin")
71 public ResultInfo delete(@PathVariable Long id) { 64 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.process.domian;
2
3 import lombok.AllArgsConstructor;
4 import lombok.Data;
5 import lombok.NoArgsConstructor;
6
7 import javax.persistence.Transient;
8 import javax.validation.constraints.NotNull;
9
10 @Data
11 @AllArgsConstructor
12 @NoArgsConstructor
13 public class TempCustomPointBean extends TempIptvUser {
14
15 /** 设备类型 1：大屏；2：小屏（微信）3.小屏（xx） */
16 @Transient
17 @NotNull(message = "设备类型不得为空")
18 protected Integer deviceType;
19
20 /** 订单id */
21 @Transient
22 protected Long orderId;
23
24 /** 节目id（针对观影操作） */
25 @Transient
26 protected Long mediaId;
27
28 /** 活动id（针对参与活动） */
29 @Transient
30 protected Long activityId;
31
32 /** 商品id */
33 @Transient
34 protected Long itemId;
35
36 /** 行为事件类型 1：登录；2：观影；3：参与活动；4：订购；10：跨屏绑定；11：积分转移；98：系统操作；99：其他 */
37 @Transient
38 protected Integer evtType;
39
40 }
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.Log;
4 import com.topdraw.business.process.domian.TempCoupon; 3 import com.topdraw.business.process.domian.TempCoupon;
5 import com.topdraw.business.process.service.CouponOperationService; 4 import com.topdraw.business.process.service.CouponOperationService;
6 import com.topdraw.common.ResultInfo; 5 import com.topdraw.common.ResultInfo;
...@@ -23,7 +22,6 @@ public class CouponOperationController { ...@@ -23,7 +22,6 @@ public class CouponOperationController {
23 @Autowired 22 @Autowired
24 private CouponOperationService couponOperationService; 23 private CouponOperationService couponOperationService;
25 24
26 @Log
27 @PostMapping(value = "/grantCouponByManual") 25 @PostMapping(value = "/grantCouponByManual")
28 @ApiOperation("手动发放优惠券") 26 @ApiOperation("手动发放优惠券")
29 public ResultInfo grantCouponByManual(List<TempCoupon> tempCouponList) { 27 public ResultInfo grantCouponByManual(List<TempCoupon> tempCouponList) {
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.Log;
4 import com.topdraw.business.process.domian.TempCoupon; 3 import com.topdraw.business.process.domian.TempCoupon;
5 import com.topdraw.business.process.domian.TempExp; 4 import com.topdraw.business.process.domian.TempExp;
6 import com.topdraw.business.process.service.CouponOperationService; 5 import com.topdraw.business.process.service.CouponOperationService;
...@@ -30,7 +29,6 @@ public class ExpOperationController { ...@@ -30,7 +29,6 @@ public class ExpOperationController {
30 @Autowired 29 @Autowired
31 private ExpOperationService expOperationService; 30 private ExpOperationService expOperationService;
32 31
33 @Log
34 @PostMapping(value = "/grantExpByManual") 32 @PostMapping(value = "/grantExpByManual")
35 @ApiOperation("手动发放成长值") 33 @ApiOperation("手动发放成长值")
36 public ResultInfo grantExpByManual(@Validated @RequestBody TempExp tempExp) { 34 public ResultInfo grantExpByManual(@Validated @RequestBody TempExp tempExp) {
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.annotation.Log;
5 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; 4 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
6 import com.topdraw.business.module.member.service.dto.MemberDTO; 5 import com.topdraw.business.module.member.service.dto.MemberDTO;
7 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinQueryCriteria; 6 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinQueryCriteria;
...@@ -23,7 +22,6 @@ public class MemberOperationController { ...@@ -23,7 +22,6 @@ public class MemberOperationController {
23 @Autowired 22 @Autowired
24 private MemberOperationService memberOperationService; 23 private MemberOperationService memberOperationService;
25 24
26 @Log("获取会员基本信息并且检查vip状态")
27 @GetMapping("/getMemberProfileAndCheckVip/{appId}/{memberId}") 25 @GetMapping("/getMemberProfileAndCheckVip/{appId}/{memberId}")
28 @ApiOperation("获取会员基本信息并且检查vip状态") 26 @ApiOperation("获取会员基本信息并且检查vip状态")
29 @AnonymousAccess 27 @AnonymousAccess
...@@ -32,7 +30,6 @@ public class MemberOperationController { ...@@ -32,7 +30,6 @@ public class MemberOperationController {
32 return ResultInfo.success(memberProfileDTO); 30 return ResultInfo.success(memberProfileDTO);
33 } 31 }
34 32
35 @Log("购买vip")
36 @PutMapping("/buyVip") 33 @PutMapping("/buyVip")
37 @ApiOperation("购买vip") 34 @ApiOperation("购买vip")
38 @AnonymousAccess 35 @AnonymousAccess
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.Log;
4 import com.topdraw.business.module.member.service.MemberService; 3 import com.topdraw.business.module.member.service.MemberService;
5 import com.topdraw.business.module.member.service.dto.MemberDTO; 4 import com.topdraw.business.module.member.service.dto.MemberDTO;
6 import com.topdraw.business.module.points.available.service.PointsAvailableService; 5 import com.topdraw.business.module.points.available.service.PointsAvailableService;
...@@ -12,7 +11,7 @@ import com.topdraw.business.module.user.iptv.service.UserTvService; ...@@ -12,7 +11,7 @@ import com.topdraw.business.module.user.iptv.service.UserTvService;
12 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO; 11 import com.topdraw.business.module.user.iptv.service.dto.UserTvDTO;
13 import com.topdraw.business.module.user.weixin.service.UserWeixinService; 12 import com.topdraw.business.module.user.weixin.service.UserWeixinService;
14 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO; 13 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
15 import com.topdraw.business.process.domian.TempIptvUser; 14 import com.topdraw.business.process.domian.TempCustomPointBean;
16 import com.topdraw.business.process.domian.TempPoints; 15 import com.topdraw.business.process.domian.TempPoints;
17 import com.topdraw.business.process.domian.result.CustomPointsResult; 16 import com.topdraw.business.process.domian.result.CustomPointsResult;
18 import com.topdraw.business.process.service.PointsOperationService; 17 import com.topdraw.business.process.service.PointsOperationService;
...@@ -38,7 +37,7 @@ import java.util.Objects; ...@@ -38,7 +37,7 @@ import java.util.Objects;
38 */ 37 */
39 @Api(tags = "PointsOperation管理") 38 @Api(tags = "PointsOperation管理")
40 @RestController 39 @RestController
41 @RequestMapping("/api/pointsOperation") 40 @RequestMapping("/ucEngine/api/pointsOperation")
42 public class PointsOperationController { 41 public class PointsOperationController {
43 42
44 private static final Logger LOG = LoggerFactory.getLogger(PointsOperationController.class); 43 private static final Logger LOG = LoggerFactory.getLogger(PointsOperationController.class);
...@@ -74,7 +73,6 @@ public class PointsOperationController { ...@@ -74,7 +73,6 @@ public class PointsOperationController {
74 return ResultInfo.successPage(pointsAvailableService.queryAll(criteria,pageable)); 73 return ResultInfo.successPage(pointsAvailableService.queryAll(criteria,pageable));
75 } 74 }
76 75
77 @Log
78 @GetMapping(value = "/cleanInvalidPointsAndCalculateCurrentPoints/{id}") 76 @GetMapping(value = "/cleanInvalidPointsAndCalculateCurrentPoints/{id}")
79 @ApiOperation("清除过期积分并计算总积分，供客户端会员查询积分时调用") 77 @ApiOperation("清除过期积分并计算总积分，供客户端会员查询积分时调用")
80 public ResultInfo cleanInvalidPointsAndCalculateCurrentPoints(@PathVariable("id") Long id) { 78 public ResultInfo cleanInvalidPointsAndCalculateCurrentPoints(@PathVariable("id") Long id) {
...@@ -82,7 +80,6 @@ public class PointsOperationController { ...@@ -82,7 +80,6 @@ public class PointsOperationController {
82 return ResultInfo.success(Objects.isNull(aLong) ? 0L : aLong); 80 return ResultInfo.success(Objects.isNull(aLong) ? 0L : aLong);
83 } 81 }
84 82
85 @Log
86 @PostMapping(value = "/grantPointsByManual") 83 @PostMapping(value = "/grantPointsByManual")
87 @ApiOperation("手动发放积分") 84 @ApiOperation("手动发放积分")
88 public ResultInfo grantPointsByManual(@Validated @RequestBody TempPoints tempPoints) { 85 public ResultInfo grantPointsByManual(@Validated @RequestBody TempPoints tempPoints) {
...@@ -105,12 +102,17 @@ public class PointsOperationController { ...@@ -105,12 +102,17 @@ public class PointsOperationController {
105 * @param tempIptvUser 102 * @param tempIptvUser
106 * @return 103 * @return
107 */ 104 */
108 @Log
109 @PostMapping(value = "/customPointsByUserTvPlatformAccount") 105 @PostMapping(value = "/customPointsByUserTvPlatformAccount")
110 @ApiOperation("通过大屏账户积分消耗") 106 @ApiOperation("通过大屏账户积分消耗")
111 public ResultInfo customPointsByUserTvPlatformAccount(@Validated @RequestBody TempIptvUser tempIptvUser) { 107 public ResultInfo customPointsByUserTvPlatformAccount(@Validated @RequestBody TempCustomPointBean tempIptvUser) {
112 String platformAccount = tempIptvUser.getPlatformAccount(); 108 String platformAccount = tempIptvUser.getPlatformAccount();
113 Long points = tempIptvUser.getPoints(); 109 Long points = tempIptvUser.getPoints();
110 Long activityId = tempIptvUser.getActivityId();
111 Integer evtType = tempIptvUser.getEvtType();
112 Long mediaId = tempIptvUser.getMediaId();
113 Long orderId = tempIptvUser.getOrderId();
114 Integer deviceType = tempIptvUser.getDeviceType();
115
114 116
115 TempPoints tempPoints = new TempPoints(); 117 TempPoints tempPoints = new TempPoints();
116 UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount); 118 UserTvDTO userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
...@@ -124,9 +126,12 @@ public class PointsOperationController { ...@@ -124,9 +126,12 @@ public class PointsOperationController {
124 tempPoints.setMemberId(memberId); 126 tempPoints.setMemberId(memberId);
125 } 127 }
126 tempPoints.setPoints(points); 128 tempPoints.setPoints(points);
127 tempPoints.setDeviceType(LocalConstants.DEVICE_VIS); 129 tempPoints.setDeviceType(deviceType);
128 tempPoints.setAppCode(LocalConstants.APP_CODE_CHONGQING_CHONGSHU_VIS); 130 tempPoints.setAppCode(LocalConstants.APP_CODE_CHONGQING_CHONGSHU_VIS);
129 tempPoints.setEvtType(LocalConstants.EVT_TYPE_ACTIVITY); 131 tempPoints.setEvtType(evtType);
132 tempPoints.setActivityId(activityId);
133 tempPoints.setMediaId(mediaId);
134 tempPoints.setOrderId(orderId);
130 return this.customPoints(tempPoints); 135 return this.customPoints(tempPoints);
131 } 136 }
132 137
...@@ -135,7 +140,6 @@ public class PointsOperationController { ...@@ -135,7 +140,6 @@ public class PointsOperationController {
135 * @param tempPoints 140 * @param tempPoints
136 * @return 141 * @return
137 */ 142 */
138 @Log
139 @PostMapping(value = "/customPointsByUserId") 143 @PostMapping(value = "/customPointsByUserId")
140 @ApiOperation("积分消耗") 144 @ApiOperation("积分消耗")
141 public ResultInfo customPointsByUserId(@Validated @RequestBody TempPoints tempPoints) { 145 public ResultInfo customPointsByUserId(@Validated @RequestBody TempPoints tempPoints) {
...@@ -176,7 +180,6 @@ public class PointsOperationController { ...@@ -176,7 +180,6 @@ public class PointsOperationController {
176 return userWeixinDTO.getMemberId(); 180 return userWeixinDTO.getMemberId();
177 } 181 }
178 182
179 @Log
180 @PostMapping(value = "/consumePoints") 183 @PostMapping(value = "/consumePoints")
181 @ApiOperation("积分消耗") 184 @ApiOperation("积分消耗")
182 public ResultInfo customPoints(@Validated @RequestBody TempPoints tempPoints) { 185 public ResultInfo customPoints(@Validated @RequestBody TempPoints tempPoints) {
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.annotation.Log; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.business.process.domian.TempIptvUser; 4 import com.topdraw.business.process.domian.TempIptvUser;
5 import com.topdraw.business.process.service.TaskOperationService; 5 import com.topdraw.business.process.service.TaskOperationService;
6 import com.topdraw.common.ResultInfo; 6 import com.topdraw.common.ResultInfo;
...@@ -14,7 +14,7 @@ import java.util.Arrays; ...@@ -14,7 +14,7 @@ import java.util.Arrays;
14 14
15 @Api("任务处理") 15 @Api("任务处理")
16 @RestController 16 @RestController
17 @RequestMapping(value = "/api/TaskOperation") 17 @RequestMapping(value = "/ucEngine/api/taskOperation")
18 public class TaskOperationController { 18 public class TaskOperationController {
19 19
20 @Autowired 20 @Autowired
...@@ -25,9 +25,9 @@ public class TaskOperationController { ...@@ -25,9 +25,9 @@ public class TaskOperationController {
25 * 25 *
26 * @param criteria 消息 26 * @param criteria 消息
27 */ 27 */
28 @Log
29 @PostMapping(value = "/dealTask") 28 @PostMapping(value = "/dealTask")
30 @ApiOperation("事件处理") 29 @ApiOperation("事件处理")
30 @AnonymousAccess
31 public void dealTask(@RequestBody @Validated TaskOperationQueryCriteria criteria) { 31 public void dealTask(@RequestBody @Validated TaskOperationQueryCriteria criteria) {
32 // 任务处理 32 // 任务处理
33 this.taskOperationService.dealTask(criteria.getContent()); 33 this.taskOperationService.dealTask(criteria.getContent());
...@@ -40,7 +40,6 @@ public class TaskOperationController { ...@@ -40,7 +40,6 @@ public class TaskOperationController {
40 * 1.用户每天首次进入活动详情页的时候赠送5个积分 40 * 1.用户每天首次进入活动详情页的时候赠送5个积分
41 * 2.判断任务是否已经做过，没有做过的话，保存任务记录，任务记录通过redis保存即可 41 * 2.判断任务是否已经做过，没有做过的话，保存任务记录，任务记录通过redis保存即可
42 */ 42 */
43 @Log
44 @PostMapping(value = "/createPoint4ChongQing") 43 @PostMapping(value = "/createPoint4ChongQing")
45 @ApiOperation("针对重庆大屏20211220号的积分兑换活动专门定制的接口") 44 @ApiOperation("针对重庆大屏20211220号的积分兑换活动专门定制的接口")
46 @Deprecated 45 @Deprecated
......
...@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil; ...@@ -4,7 +4,6 @@ import cn.hutool.core.util.ObjectUtil;
4 import cn.hutool.core.util.StrUtil; 4 import cn.hutool.core.util.StrUtil;
5 import com.alibaba.fastjson.JSONObject; 5 import com.alibaba.fastjson.JSONObject;
6 import com.topdraw.annotation.AnonymousAccess; 6 import com.topdraw.annotation.AnonymousAccess;
7 import com.topdraw.annotation.Log;
8 import com.topdraw.business.module.member.profile.domain.MemberProfile; 7 import com.topdraw.business.module.member.profile.domain.MemberProfile;
9 import com.topdraw.business.module.member.service.dto.MemberDTO; 8 import com.topdraw.business.module.member.service.dto.MemberDTO;
10 import com.topdraw.business.module.user.iptv.domain.UserTv; 9 import com.topdraw.business.module.user.iptv.domain.UserTv;
...@@ -57,7 +56,6 @@ public class UserOperationController { ...@@ -57,7 +56,6 @@ public class UserOperationController {
57 @Autowired 56 @Autowired
58 private RedisUtils redisUtils; 57 private RedisUtils redisUtils;
59 58
60 @Log("新增大屏账户同时创建会员信息")
61 @PostMapping(value = "/createUserAndCreateMember") 59 @PostMapping(value = "/createUserAndCreateMember")
62 @ApiOperation("新增大屏账户同时创建会员信息") 60 @ApiOperation("新增大屏账户同时创建会员信息")
63 @AnonymousAccess 61 @AnonymousAccess
...@@ -68,7 +66,6 @@ public class UserOperationController { ...@@ -68,7 +66,6 @@ public class UserOperationController {
68 return ResultInfo.success(result); 66 return ResultInfo.success(result);
69 } 67 }
70 68
71 @Log("新增小屏账户同时创建会员信息")
72 @PostMapping(value = "/createWeixinUserAndCreateMember") 69 @PostMapping(value = "/createWeixinUserAndCreateMember")
73 @ApiOperation("新增小屏账户同时创建会员信息") 70 @ApiOperation("新增小屏账户同时创建会员信息")
74 @AnonymousAccess 71 @AnonymousAccess
...@@ -93,7 +90,6 @@ public class UserOperationController { ...@@ -93,7 +90,6 @@ public class UserOperationController {
93 return ResultInfo.success(result); 90 return ResultInfo.success(result);
94 } 91 }
95 92
96 @Log("获取大屏绑定的小屏会员列表")
97 @GetMapping(value = "/findBindByPlatformAccount/{platformAccount}") 93 @GetMapping(value = "/findBindByPlatformAccount/{platformAccount}")
98 @AnonymousAccess 94 @AnonymousAccess
99 public ResultInfo findBindByPlatformAccount(@PathVariable("platformAccount") String platformAccount) { 95 public ResultInfo findBindByPlatformAccount(@PathVariable("platformAccount") String platformAccount) {
...@@ -102,7 +98,6 @@ public class UserOperationController { ...@@ -102,7 +98,6 @@ public class UserOperationController {
102 return ResultInfo.success(result); 98 return ResultInfo.success(result);
103 } 99 }
104 100
105 @Log("带参二维码")
106 @PostMapping(value = "/sendQrCodeMessage") 101 @PostMapping(value = "/sendQrCodeMessage")
107 @ApiOperation("带参二维码") 102 @ApiOperation("带参二维码")
108 @AnonymousAccess 103 @AnonymousAccess
...@@ -112,7 +107,6 @@ public class UserOperationController { ...@@ -112,7 +107,6 @@ public class UserOperationController {
112 return ResultInfo.success(result); 107 return ResultInfo.success(result);
113 } 108 }
114 109
115 @Log("删除全部收藏")
116 @PostMapping(value = "/deleteAllCollection") 110 @PostMapping(value = "/deleteAllCollection")
117 @ApiOperation("删除全部收藏") 111 @ApiOperation("删除全部收藏")
118 @AnonymousAccess 112 @AnonymousAccess
...@@ -122,7 +116,6 @@ public class UserOperationController { ...@@ -122,7 +116,6 @@ public class UserOperationController {
122 return ResultInfo.success(result); 116 return ResultInfo.success(result);
123 } 117 }
124 118
125 @Log("删除收藏")
126 @PostMapping(value = "/deleteCollection") 119 @PostMapping(value = "/deleteCollection")
127 @ApiOperation("删除收藏") 120 @ApiOperation("删除收藏")
128 @AnonymousAccess 121 @AnonymousAccess
...@@ -132,7 +125,6 @@ public class UserOperationController { ...@@ -132,7 +125,6 @@ public class UserOperationController {
132 return ResultInfo.success(result); 125 return ResultInfo.success(result);
133 } 126 }
134 127
135 @Log("添加收藏")
136 @PostMapping(value = "/addCollection") 128 @PostMapping(value = "/addCollection")
137 @ApiOperation("添加收藏") 129 @ApiOperation("添加收藏")
138 @AnonymousAccess 130 @AnonymousAccess
...@@ -142,9 +134,6 @@ public class UserOperationController { ...@@ -142,9 +134,6 @@ public class UserOperationController {
142 return ResultInfo.success(result); 134 return ResultInfo.success(result);
143 } 135 }
144 136
145
146
147 @Log("大屏用户解绑")
148 @PutMapping(value = "/unbind") 137 @PutMapping(value = "/unbind")
149 @ApiOperation("大屏用户解绑") 138 @ApiOperation("大屏用户解绑")
150 @AnonymousAccess 139 @AnonymousAccess
...@@ -155,7 +144,6 @@ public class UserOperationController { ...@@ -155,7 +144,6 @@ public class UserOperationController {
155 return ResultInfo.success(); 144 return ResultInfo.success();
156 } 145 }
157 146
158 @Log("大屏更换主账号")
159 @PutMapping(value = "/changeMainAccount") 147 @PutMapping(value = "/changeMainAccount")
160 @ApiOperation("大屏更换主账号") 148 @ApiOperation("大屏更换主账号")
161 @AnonymousAccess 149 @AnonymousAccess
...@@ -166,7 +154,6 @@ public class UserOperationController { ...@@ -166,7 +154,6 @@ public class UserOperationController {
166 return ResultInfo.success("update success"); 154 return ResultInfo.success("update success");
167 } 155 }
168 156
169 @Log("微信服务号(H5)登录")
170 @PostMapping("/serviceLogin") 157 @PostMapping("/serviceLogin")
171 @ApiOperation("微信服务号(H5)登录") 158 @ApiOperation("微信服务号(H5)登录")
172 @AnonymousAccess 159 @AnonymousAccess
...@@ -175,7 +162,6 @@ public class UserOperationController { ...@@ -175,7 +162,6 @@ public class UserOperationController {
175 return ResultInfo.success(o); 162 return ResultInfo.success(o);
176 } 163 }
177 164
178 @Log("微信小程序登录")
179 @PostMapping("/appletLogin") 165 @PostMapping("/appletLogin")
180 @ApiOperation("微信小程序登录") 166 @ApiOperation("微信小程序登录")
181 @AnonymousAccess 167 @AnonymousAccess
...@@ -184,7 +170,6 @@ public class UserOperationController { ...@@ -184,7 +170,6 @@ public class UserOperationController {
184 return ResultInfo.success(result); 170 return ResultInfo.success(result);
185 } 171 }
186 172
187 @Log("微信小程序绑定大屏")
188 @PostMapping("/appletBind") 173 @PostMapping("/appletBind")
189 @ApiOperation("微信小程序绑定大屏") 174 @ApiOperation("微信小程序绑定大屏")
190 @AnonymousAccess 175 @AnonymousAccess
...@@ -201,7 +186,6 @@ public class UserOperationController { ...@@ -201,7 +186,6 @@ public class UserOperationController {
201 return ResultInfo.success(result); 186 return ResultInfo.success(result);
202 } 187 }
203 188
204 @Log("微信公众号关注")
205 @PostMapping("/subscribe") 189 @PostMapping("/subscribe")
206 @ApiOperation("微信公众号关注") 190 @ApiOperation("微信公众号关注")
207 @AnonymousAccess 191 @AnonymousAccess
...@@ -293,7 +277,6 @@ public class UserOperationController { ...@@ -293,7 +277,6 @@ public class UserOperationController {
293 } 277 }
294 } 278 }
295 279
296 @Log("微信公众号取关")
297 @PostMapping("/unsubscribe") 280 @PostMapping("/unsubscribe")
298 @ApiOperation("微信公众号取关") 281 @ApiOperation("微信公众号取关")
299 @AnonymousAccess 282 @AnonymousAccess
...@@ -315,7 +298,6 @@ public class UserOperationController { ...@@ -315,7 +298,6 @@ public class UserOperationController {
315 * @author Hongyan Wang 298 * @author Hongyan Wang
316 * @date 2021/8/24 4:54 下午 299 * @date 2021/8/24 4:54 下午
317 */ 300 */
318 @Log("保存大屏侧信息")
319 @PostMapping(value = "/saveUserInfo") 301 @PostMapping(value = "/saveUserInfo")
320 @ApiOperation("保存大屏侧信息") 302 @ApiOperation("保存大屏侧信息")
321 @AnonymousAccess 303 @AnonymousAccess
...@@ -334,7 +316,6 @@ public class UserOperationController { ...@@ -334,7 +316,6 @@ public class UserOperationController {
334 return ResultInfo.success(s); 316 return ResultInfo.success(s);
335 } 317 }
336 318
337 @Log("保存用户手机号信息")
338 @PostMapping(value = "/saveUserWeixinPhone") 319 @PostMapping(value = "/saveUserWeixinPhone")
339 @ApiOperation("保存用户手机号信息") 320 @ApiOperation("保存用户手机号信息")
340 @AnonymousAccess 321 @AnonymousAccess
......
...@@ -4,6 +4,8 @@ import com.topdraw.business.module.coupon.history.domain.CouponHistory; ...@@ -4,6 +4,8 @@ import com.topdraw.business.module.coupon.history.domain.CouponHistory;
4 import com.topdraw.business.module.coupon.history.service.CouponHistoryService; 4 import com.topdraw.business.module.coupon.history.service.CouponHistoryService;
5 import com.topdraw.business.module.coupon.service.CouponService; 5 import com.topdraw.business.module.coupon.service.CouponService;
6 import com.topdraw.business.module.member.domain.Member; 6 import com.topdraw.business.module.member.domain.Member;
7 import com.topdraw.business.module.member.service.MemberService;
8 import com.topdraw.business.module.member.service.dto.MemberDTO;
7 import com.topdraw.business.process.service.CouponOperationService; 9 import com.topdraw.business.process.service.CouponOperationService;
8 import com.topdraw.business.process.service.MemberOperationService; 10 import com.topdraw.business.process.service.MemberOperationService;
9 import com.topdraw.business.process.domian.TempCoupon; 11 import com.topdraw.business.process.domian.TempCoupon;
...@@ -39,6 +41,8 @@ public class CouponOperationServiceImpl implements CouponOperationService { ...@@ -39,6 +41,8 @@ public class CouponOperationServiceImpl implements CouponOperationService {
39 @Autowired 41 @Autowired
40 RightsOperationService rightsOperationService; 42 RightsOperationService rightsOperationService;
41 @Autowired 43 @Autowired
44 MemberService memberService;
45 @Autowired
42 RedissonClient redissonClient; 46 RedissonClient redissonClient;
43 @Autowired 47 @Autowired
44 ThreadPoolTaskExecutor threadPoolTaskExecutor; 48 ThreadPoolTaskExecutor threadPoolTaskExecutor;
...@@ -123,14 +127,23 @@ public class CouponOperationServiceImpl implements CouponOperationService { ...@@ -123,14 +127,23 @@ public class CouponOperationServiceImpl implements CouponOperationService {
123 * @param expireSoonCouponCount 127 * @param expireSoonCouponCount
124 */ 128 */
125 private void doUpdateMemberInfo(Long memberId, Long currentCoupon, Long expireSoonCouponCount) { 129 private void doUpdateMemberInfo(Long memberId, Long currentCoupon, Long expireSoonCouponCount) {
130 MemberDTO memberDTO = this.findMemberByMemberId(memberId);
131
126 Member member = new Member(); 132 Member member = new Member();
127 member.setId(memberId); 133 BeanUtils.copyProperties(memberDTO,member);
134
128 member.setCouponAmount(currentCoupon); 135 member.setCouponAmount(currentCoupon);
129 member.setDueCouponAmount(expireSoonCouponCount); 136 member.setDueCouponAmount(expireSoonCouponCount);
130 member.setUpdateTime(TimestampUtil.now()); 137 member.setUpdateTime(LocalDateTime.now());
131 this.memberOperationService.doUpdateMemberInfo(member); 138 this.memberOperationService.doUpdateMemberInfo(member);
132 } 139 }
133 140
141 private MemberDTO findMemberByMemberId(Long memberId) {
142 MemberDTO memberDTO = this.memberService.findById(memberId);
143 return memberDTO;
144 }
145
146
134 147
135 /** 148 /**
136 * 当前优惠券数量 = 总优惠券-已过期的优惠券 149 * 当前优惠券数量 = 总优惠券-已过期的优惠券
...@@ -149,8 +162,8 @@ public class CouponOperationServiceImpl implements CouponOperationService { ...@@ -149,8 +162,8 @@ public class CouponOperationServiceImpl implements CouponOperationService {
149 * @return 162 * @return
150 */ 163 */
151 private Long getTotalExpireSoonCoupon(Long userId, Integer expireFactor) { 164 private Long getTotalExpireSoonCoupon(Long userId, Integer expireFactor) {
152 Timestamp expireTime = TimestampUtil.localDateTime2Timestamp(LocalDateTime.now().plusDays(expireFactor)); 165 LocalDateTime expireTime = LocalDateTime.now().plusDays(expireFactor);
153 return this.couponHistoryService.countByUserIdAndExpireTimeBetween(userId,TimestampUtil.now(),expireTime); 166 return this.couponHistoryService.countByUserIdAndExpireTimeBetween(userId,LocalDateTime.now(),expireTime);
154 } 167 }
155 168
156 169
...@@ -160,7 +173,7 @@ public class CouponOperationServiceImpl implements CouponOperationService { ...@@ -160,7 +173,7 @@ public class CouponOperationServiceImpl implements CouponOperationService {
160 * @return 173 * @return
161 */ 174 */
162 private Long getTotalExpireCoupon(Long userId) { 175 private Long getTotalExpireCoupon(Long userId) {
163 return this.couponHistoryService.countByUserIdAndExpireTimeBefore(userId,TimestampUtil.now()); 176 return this.couponHistoryService.countByUserIdAndExpireTimeBefore(userId,LocalDateTime.now());
164 } 177 }
165 178
166 179
...@@ -187,7 +200,7 @@ public class CouponOperationServiceImpl implements CouponOperationService { ...@@ -187,7 +200,7 @@ public class CouponOperationServiceImpl implements CouponOperationService {
187 couponHistory.setCouponCode(tempCoupon.getCode()); 200 couponHistory.setCouponCode(tempCoupon.getCode());
188 couponHistory.setUserNickname(tempCoupon.getUserNickname()); 201 couponHistory.setUserNickname(tempCoupon.getUserNickname());
189 couponHistory.setOrderDetailId(tempCoupon.getOrderId()); 202 couponHistory.setOrderDetailId(tempCoupon.getOrderId());
190 couponHistory.setReceiveTime(TimestampUtil.now()); 203 couponHistory.setReceiveTime(LocalDateTime.now());
191 couponHistory.setUseStatus(Objects.nonNull(couponHistory.getUseStatus()) ? couponHistory.getUseStatus():0); 204 couponHistory.setUseStatus(Objects.nonNull(couponHistory.getUseStatus()) ? couponHistory.getUseStatus():0);
192 this.couponHistoryService.create(couponHistory); 205 this.couponHistoryService.create(couponHistory);
193 } 206 }
......
...@@ -5,6 +5,7 @@ import com.topdraw.business.module.exp.detail.service.ExpDetailService; ...@@ -5,6 +5,7 @@ import com.topdraw.business.module.exp.detail.service.ExpDetailService;
5 import com.topdraw.business.module.member.domain.Member; 5 import com.topdraw.business.module.member.domain.Member;
6 import com.topdraw.business.module.member.level.service.MemberLevelService; 6 import com.topdraw.business.module.member.level.service.MemberLevelService;
7 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO; 7 import com.topdraw.business.module.member.level.service.dto.MemberLevelDTO;
8 import com.topdraw.business.module.member.service.MemberService;
8 import com.topdraw.business.module.member.service.dto.MemberDTO; 9 import com.topdraw.business.module.member.service.dto.MemberDTO;
9 import com.topdraw.business.process.service.ExpOperationService; 10 import com.topdraw.business.process.service.ExpOperationService;
10 import com.topdraw.business.process.service.MemberOperationService; 11 import com.topdraw.business.process.service.MemberOperationService;
...@@ -23,6 +24,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; ...@@ -23,6 +24,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
23 import org.springframework.stereotype.Service; 24 import org.springframework.stereotype.Service;
24 import org.springframework.util.CollectionUtils; 25 import org.springframework.util.CollectionUtils;
25 26
27 import java.time.LocalDateTime;
26 import java.util.List; 28 import java.util.List;
27 import java.util.Objects; 29 import java.util.Objects;
28 30
...@@ -41,6 +43,8 @@ public class ExpOperationServiceImpl implements ExpOperationService { ...@@ -41,6 +43,8 @@ public class ExpOperationServiceImpl implements ExpOperationService {
41 @Autowired 43 @Autowired
42 MemberLevelService memberLevelService; 44 MemberLevelService memberLevelService;
43 @Autowired 45 @Autowired
46 MemberService memberService;
47 @Autowired
44 RedissonClient redissonClient; 48 RedissonClient redissonClient;
45 @Autowired 49 @Autowired
46 ThreadPoolTaskExecutor threadPoolTaskExecutor; 50 ThreadPoolTaskExecutor threadPoolTaskExecutor;
...@@ -137,14 +141,22 @@ public class ExpOperationServiceImpl implements ExpOperationService { ...@@ -137,14 +141,22 @@ public class ExpOperationServiceImpl implements ExpOperationService {
137 * @param memberId 会员id 141 * @param memberId 会员id
138 */ 142 */
139 private void updateMemberInfo(Integer level,Long totalExp,Long memberId) { 143 private void updateMemberInfo(Integer level,Long totalExp,Long memberId) {
144 MemberDTO memberDTO = this.findMemberByMemberId(memberId);
145
140 Member member = new Member(); 146 Member member = new Member();
141 member.setId(memberId); 147 BeanUtils.copyProperties(memberDTO,member);
148
142 member.setExp(totalExp); 149 member.setExp(totalExp);
143 member.setLevel(level); 150 member.setLevel(level);
144 member.setUpdateTime(TimestampUtil.now()); 151 member.setUpdateTime(LocalDateTime.now());
145 this.memberOperationService.doUpdateMemberInfo(member); 152 this.memberOperationService.doUpdateMemberInfo(member);
146 } 153 }
147 154
155 private MemberDTO findMemberByMemberId(Long memberId) {
156 MemberDTO memberDTO = this.memberService.findById(memberId);
157 return memberDTO;
158 }
159
148 private Integer compareExp(long newExp, MemberLevelDTO memberLevelDTO,MemberDTO memberDTO) { 160 private Integer compareExp(long newExp, MemberLevelDTO memberLevelDTO,MemberDTO memberDTO) {
149 if (Objects.nonNull(memberLevelDTO)) { 161 if (Objects.nonNull(memberLevelDTO)) {
150 Long nextLevelExp = memberLevelDTO.getExpValue(); 162 Long nextLevelExp = memberLevelDTO.getExpValue();
......
...@@ -497,12 +497,15 @@ public class PointsOperationServiceImpl implements PointsOperationService { ...@@ -497,12 +497,15 @@ public class PointsOperationServiceImpl implements PointsOperationService {
497 * @param currentPoints 当前总积分 497 * @param currentPoints 当前总积分
498 */ 498 */
499 private void freshMemberCurrentPoints(Long memberId, Long currentPoints,long duePoints,TempPoints tempPoints) { 499 private void freshMemberCurrentPoints(Long memberId, Long currentPoints,long duePoints,TempPoints tempPoints) {
500
501 MemberDTO memberDTO = this.findMemberByMemberId(memberId);
502
500 Member member = new Member(); 503 Member member = new Member();
501 member.setId(memberId); 504 BeanUtils.copyProperties(memberDTO,member);
505
502 member.setPoints(Objects.nonNull(currentPoints)?currentPoints:0); 506 member.setPoints(Objects.nonNull(currentPoints)?currentPoints:0);
503 member.setDuePoints(duePoints); 507 member.setDuePoints(duePoints);
504 member.setUpdateTime(Timestamp.valueOf(LocalDateTime.now())); 508 member.setUpdateTime(LocalDateTime.now());
505 member.setCode(tempPoints.getMemberCode());
506 try { 509 try {
507 this.memberOperationService.doUpdateMemberPoints(member); 510 this.memberOperationService.doUpdateMemberPoints(member);
508 } catch (Exception e){ 511 } catch (Exception e){
...@@ -510,6 +513,11 @@ public class PointsOperationServiceImpl implements PointsOperationService { ...@@ -510,6 +513,11 @@ public class PointsOperationServiceImpl implements PointsOperationService {
510 } 513 }
511 } 514 }
512 515
516 private MemberDTO findMemberByMemberId(Long memberId) {
517 MemberDTO memberDTO = this.memberService.findById(memberId);
518 return memberDTO;
519 }
520
513 /** 521 /**
514 * 计算当前总积分 522 * 计算当前总积分
515 * @param memberId 会员id 523 * @param memberId 会员id
......
1 package com.topdraw.business.process.service.impl; 1 package com.topdraw.business.process.service.impl;
2 2
3 import com.alibaba.fastjson.JSONArray;
3 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
4 import com.topdraw.business.module.coupon.service.CouponService; 5 import com.topdraw.business.module.coupon.service.CouponService;
5 import com.topdraw.business.module.coupon.service.dto.CouponDTO; 6 import com.topdraw.business.module.coupon.service.dto.CouponDTO;
...@@ -32,6 +33,7 @@ import com.topdraw.business.module.task.template.service.TaskTemplateService; ...@@ -32,6 +33,7 @@ import com.topdraw.business.module.task.template.service.TaskTemplateService;
32 import com.topdraw.business.process.domian.*; 33 import com.topdraw.business.process.domian.*;
33 import com.topdraw.business.process.service.UserOperationService; 34 import com.topdraw.business.process.service.UserOperationService;
34 import com.topdraw.common.ResultInfo; 35 import com.topdraw.common.ResultInfo;
36 import com.topdraw.exception.BadRequestException;
35 import com.topdraw.module.mq.DataSyncMsg; 37 import com.topdraw.module.mq.DataSyncMsg;
36 import com.topdraw.util.*; 38 import com.topdraw.util.*;
37 import lombok.extern.slf4j.Slf4j; 39 import lombok.extern.slf4j.Slf4j;
...@@ -43,6 +45,7 @@ import org.springframework.stereotype.Service; ...@@ -43,6 +45,7 @@ import org.springframework.stereotype.Service;
43 import org.springframework.util.CollectionUtils; 45 import org.springframework.util.CollectionUtils;
44 import org.springframework.util.StringUtils; 46 import org.springframework.util.StringUtils;
45 47
48 import javax.validation.constraints.NotNull;
46 import java.sql.Timestamp; 49 import java.sql.Timestamp;
47 import java.time.LocalDate; 50 import java.time.LocalDate;
48 import java.time.LocalDateTime; 51 import java.time.LocalDateTime;
...@@ -81,6 +84,8 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -81,6 +84,8 @@ public class TaskOperationServiceImpl implements TaskOperationService {
81 MemberGroupService memberGroupService; 84 MemberGroupService memberGroupService;
82 @Autowired 85 @Autowired
83 TaskAttrService taskAttrService; 86 TaskAttrService taskAttrService;
87 @Autowired
88 UserTvService userTvService;
84 89
85 90
86 private static final Integer TASK_FINISH_STATUS = 1; 91 private static final Integer TASK_FINISH_STATUS = 1;
...@@ -91,7 +96,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -91,7 +96,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
91 @Override 96 @Override
92 public ResultInfo dealTask(String content) { 97 public ResultInfo dealTask(String content) {
93 98
94 DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(content, DataSyncMsg.class); 99 DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(content, DataSyncMsg.class);
95 DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg(); 100 DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg();
96 Integer event = msgData.getEvent(); 101 Integer event = msgData.getEvent();
97 Long memberId = msgData.getMemberId(); 102 Long memberId = msgData.getMemberId();
...@@ -109,19 +114,35 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -109,19 +114,35 @@ public class TaskOperationServiceImpl implements TaskOperationService {
109 // 4.判断当前用户是否满足任务完成条件 114 // 4.判断当前用户是否满足任务完成条件
110 boolean checkResult = this.checkTaskCompletion(memberId,taskList); 115 boolean checkResult = this.checkTaskCompletion(memberId,taskList);
111 if (checkResult) { 116 if (checkResult) {
112
113 // 5.权益区分(积分、权益、成长值) 117 // 5.权益区分(积分、权益、成长值)
114 Map<RightType,Object> tempRightsMap = this.distinguishRight(memberId,taskList,msgData); 118 Map<RightType,Object> tempRightsMap = this.distinguishRight(memberId,taskList,msgData);
115 // 6.权益发放 119
120 // 6.风控检查
121 boolean result = this.checkRiskManagement(memberId,tempRightsMap);
122
123 if (result) throw new BadRequestException("发放失败，已达风控上限");
124
125 // 7.权益发放
116 this.grantRight(tempRightsMap); 126 this.grantRight(tempRightsMap);
117 127
118 } 128 }
119 129 System.out.println(taskList);
120 return ResultInfo.success(); 130 return ResultInfo.success();
121 131
122 } 132 }
123 133
124 /** 134 /**
135 * 风控检查
136 * @param memberId
137 * @param tempRightsMap
138 * @return
139 */
140 private boolean checkRiskManagement(Long memberId , Map<RightType, Object> tempRightsMap) {
141
142 return false;
143 }
144
145 /**
125 * 验证会员信息 146 * 验证会员信息
126 * @param memberId 147 * @param memberId
127 * @return 148 * @return
...@@ -224,6 +245,34 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -224,6 +245,34 @@ public class TaskOperationServiceImpl implements TaskOperationService {
224 245
225 } 246 }
226 247
248 private Long getIptvPriorityMemberId(Long memberId1,DataSyncMsg.MsgData msgData) {
249
250 //
251 if (Objects.nonNull(memberId1)) {
252 return memberId1;
253 }
254
255
256 @NotNull Integer deviceType = msgData.getDeviceType();
257 Long userId = msgData.getUserId();
258 // 大屏
259 if (Objects.nonNull(userId) || deviceType == 1) {
260
261 }
262
263 MemberDTO memberDTO = this.findMemberById(memberId1);
264 if (Objects.nonNull(memberDTO.getId())) {
265 Long userIptvId = memberDTO.getUserIptvId();
266 // 绑定了大屏，直接返回小屏会员id
267 if (Objects.nonNull(userIptvId)) {
268 return memberDTO.getId();
269 } else {
270 //
271 }
272 }
273 return null;
274 }
275
227 /** 276 /**
228 * 验证是否满足永久权益 277 * 验证是否满足永久权益
229 * @param permanentRights 278 * @param permanentRights
...@@ -772,16 +821,7 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -772,16 +821,7 @@ public class TaskOperationServiceImpl implements TaskOperationService {
772 List<Task> taskList = this.taskService.findByTemplateId(taskTemplateId); 821 List<Task> taskList = this.taskService.findByTemplateId(taskTemplateId);
773 822
774 Integer type = taskTemplate.getType(); 823 Integer type = taskTemplate.getType();
775 switch (type) { 824 taskList = this.pickUpTask(taskList,dataSyncMsg,type);
776 // 订购
777 case TaskTemplateType.TYPE_4:
778 taskList = this.pickUpTask(taskList,dataSyncMsg);
779 break;
780
781 default:
782 break;
783 }
784
785 return taskList; 825 return taskList;
786 826
787 } 827 }
...@@ -795,29 +835,57 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -795,29 +835,57 @@ public class TaskOperationServiceImpl implements TaskOperationService {
795 * @param dataSyncMsg 835 * @param dataSyncMsg
796 * @return 836 * @return
797 */ 837 */
798 private List<Task> pickUpTask(List<Task> taskList,DataSyncMsg dataSyncMsg) { 838 private List<Task> pickUpTask(List<Task> taskList,DataSyncMsg dataSyncMsg,Integer type) {
799 839
800 List<Task> taskList1 = new ArrayList<>(); 840 List<Task> taskList1 = new ArrayList<>();
801 841
802 DataSyncMsg.TaskTemplateParam param = dataSyncMsg.getParam(); 842 DataSyncMsg.MsgData msgData = dataSyncMsg.getMsg();
843
844 if (Objects.nonNull(msgData)) {
803 845
804 if (Objects.nonNull(param)) { 846 String param = msgData.getParam();
847 Map<String,String> jsonObjectMap = JSONObject.parseObject(param,Map.class);
848 Collection<String> values = jsonObjectMap.values();
805 849
806 String code = param.getCode();
807 for (Task task : taskList) { 850 for (Task task : taskList) {
851
808 Long taskId = task.getId(); 852 Long taskId = task.getId();
809 TaskAttrDTO taskAttrDTO = this.findTaskAttrByTaskId(taskId); 853 TaskAttrDTO taskAttrDTO = this.findTaskAttrByTaskId(taskId);
854 if (Objects.isNull(taskAttrDTO.getId()))
855 continue;
856
810 String attrStr = taskAttrDTO.getAttrStr(); 857 String attrStr = taskAttrDTO.getAttrStr();
811 if (StringUtils.hasText(attrStr)) { 858 if (StringUtils.hasText(attrStr)) {
812 DataSyncMsg.TaskTemplateParam taskTemplateParam = JSONObject.parseObject(attrStr, DataSyncMsg.TaskTemplateParam.class); 859 JSONObject jsonObject = JSONObject.parseObject(attrStr);
813 if (Objects.nonNull(taskTemplateParam)) { 860 JSONArray values_0 = jsonObject.getJSONArray("value");
814 String code1 = taskTemplateParam.getCode(); 861
815 if (StringUtils.hasText(code1) && code.equalsIgnoreCase(code1)) { 862 switch (type) {
816 taskList1.add(task); 863 // 登录
817 } 864 case TaskTemplateType.TYPE_1:
865
866 Integer o1 = (Integer)values_0.get(0);
867 Integer o2 = (Integer)values_0.get(1);
868 List<Integer> list = Arrays.asList(o1, o2);
869 String s = values.toArray()[0].toString();
870 Integer i = Integer.valueOf(s);
871 boolean b = UcListUtils.compareIntegerList(i, list);
872 if (b)
873 taskList1.add(task);
874 break;
875
876 // 订购
877 case TaskTemplateType.TYPE_4:
878 if (values_0.containsAll(values))
879 taskList1.add(task);
880 break;
881
882 default:
883 break;
818 } 884 }
819 885
886
820 } 887 }
888
821 } 889 }
822 890
823 } else { 891 } else {
...@@ -855,11 +923,11 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -855,11 +923,11 @@ public class TaskOperationServiceImpl implements TaskOperationService {
855 * @return TaskTemplate 任务模板 923 * @return TaskTemplate 任务模板
856 */ 924 */
857 private TaskTemplate getTaskTemplate(Integer event,DataSyncMsg msgData) { 925 private TaskTemplate getTaskTemplate(Integer event,DataSyncMsg msgData) {
858 DataSyncMsg.TaskTemplateParam taskTemplateParam = msgData.getParam(); 926 DataSyncMsg.MsgData msg = msgData.getMsg();
859 927
860 if (Objects.nonNull(taskTemplateParam)) { 928 if (Objects.nonNull(msg)) {
861 929
862 return this.findByTypeAndParam(event,taskTemplateParam); 930 return this.findByTypeAndParam(event,msg);
863 931
864 } else { 932 } else {
865 933
...@@ -878,28 +946,31 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -878,28 +946,31 @@ public class TaskOperationServiceImpl implements TaskOperationService {
878 } 946 }
879 } 947 }
880 948
881 private TaskTemplate findByTypeAndParam(Integer event, DataSyncMsg.TaskTemplateParam taskTemplateParam) { 949 private TaskTemplate findByTypeAndParam(Integer event, DataSyncMsg.MsgData taskTemplateParam) {
882 String category = taskTemplateParam.getCategory(); 950 String param = taskTemplateParam.getParam();
951 if (StringUtils.hasText(param)) {
883 952
884 List<TaskTemplate> taskTemplateList = this.taskTemplateService.findByType(event); 953 Map<String,String> jsonObject = JSONObject.parseObject(param,Map.class);
885 if (!CollectionUtils.isEmpty(taskTemplateList)) {
886 954
887 for (TaskTemplate taskTemplate : taskTemplateList) { 955 List<TaskTemplate> taskTemplateList = this.taskTemplateService.findByType(event);
888 956 if (!CollectionUtils.isEmpty(taskTemplateList)) {
889 String params = taskTemplate.getParams();
890 if(!StringUtils.isEmpty(params)) {
891 957
892 DataSyncMsg.TaskTemplateParam taskTemplateParam1 = JSONObject.parseObject(params,DataSyncMsg.TaskTemplateParam.class); 958 for (TaskTemplate taskTemplate : taskTemplateList) {
893 String category1 = taskTemplateParam1.getCategory();
894 if (!StringUtils.isEmpty(category1) && category1.equalsIgnoreCase(category))
895 return taskTemplate;
896 959
897 } 960 String templateParams = taskTemplate.getParams();
961 if(StringUtils.hasText(templateParams)) {
962 String templateParamsUpperCase = templateParams.toUpperCase();
963 boolean b = jsonObject.containsKey(templateParamsUpperCase);
964 if (b)
965 return taskTemplate;
966 }
967 }
898 968
899 } 969 }
900 970
901 } 971 }
902 972
973
903 return null; 974 return null;
904 } 975 }
905 976
...@@ -907,8 +978,6 @@ public class TaskOperationServiceImpl implements TaskOperationService { ...@@ -907,8 +978,6 @@ public class TaskOperationServiceImpl implements TaskOperationService {
907 //////////////////////////////////////////////////////////////////////////////////////////////////////////// 978 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
908 979
909 @Autowired 980 @Autowired
910 UserTvService userTvService;
911 @Autowired
912 private StringRedisTemplate stringRedisTemplate; 981 private StringRedisTemplate stringRedisTemplate;
913 @Autowired 982 @Autowired
914 private PointsOperationService pointsOperationService; 983 private PointsOperationService pointsOperationService;
......
...@@ -60,6 +60,7 @@ import org.springframework.transaction.annotation.Propagation; ...@@ -60,6 +60,7 @@ import org.springframework.transaction.annotation.Propagation;
60 import org.springframework.transaction.annotation.Transactional; 60 import org.springframework.transaction.annotation.Transactional;
61 import org.springframework.util.CollectionUtils; 61 import org.springframework.util.CollectionUtils;
62 62
63 import java.time.LocalDateTime;
63 import java.util.*; 64 import java.util.*;
64 import java.util.concurrent.TimeUnit; 65 import java.util.concurrent.TimeUnit;
65 import java.util.stream.Collectors; 66 import java.util.stream.Collectors;
...@@ -958,7 +959,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -958,7 +959,7 @@ public class UserOperationServiceImpl implements UserOperationService {
958 959
959 if (memberDTO != null) { 960 if (memberDTO != null) {
960 memberDTO.setUserIptvId(userIptvId); 961 memberDTO.setUserIptvId(userIptvId);
961 memberDTO.setBindIptvTime(TimestampUtil.now()); 962 memberDTO.setBindIptvTime(LocalDateTime.now());
962 memberDTO.setBindIptvPlatformType(bindIptvPlatformType); 963 memberDTO.setBindIptvPlatformType(bindIptvPlatformType);
963 } 964 }
964 965
......
1 package com.topdraw.util;
2
3 import com.alibaba.fastjson.JSONArray;
4 import com.alibaba.fastjson.JSONObject;
5
6 import java.util.Arrays;
7 import java.util.Collection;
8 import java.util.List;
9 import java.util.Map;
10
11 public class UcListUtils {
12
13 public static boolean compareIntegerList(Integer obj , List<Integer> originList){
14 Integer o = originList.get(0);
15 Integer o1 = originList.get(1);
16
17 if (o >= 0 && o1 > o && obj >= o && obj <= o1)
18 return true;
19
20 if (o > 0 && o1 < 0 && obj >= o)
21 return true;
22
23 return false;
24 }
25
26 public static void main(String[] args) {
27 String param = "{CONTINUE_LOGIN:30}";
28 Map<String,String> jsonObjectMap = JSONObject.parseObject(param,Map.class);
29 Collection<String> values = jsonObjectMap.values();
30 Object o = values.toArray()[0];
31
32 String attrStr = "{\"value\":[31,-99]}";
33 JSONObject jsonObject = JSONObject.parseObject(attrStr);
34 JSONArray values_0 = jsonObject.getJSONArray("value");
35 Integer o1 = (Integer)values_0.get(0);
36 Integer o2 = (Integer)values_0.get(1);
37 List<Integer> list = Arrays.asList(o1, o2);
38 Integer i = (Integer) o;
39 boolean b = compareIntegerList(i, list);
40 System.out.println(b);
41 }
42
43 }
1 <?xml version="1.0" encoding="UTF-8"?>
2
3 <!--
4 This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
5 Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
6 -->
7 <application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
8
9 <id>member-service-impl</id>
10
11 <classpath>
12 <dir name="C:/Users/lenovo/Documents/workspace/member-service/member-service-impl/target/classes">
13 </dir>
14 </classpath>
15
16 </application>
...@@ -10,6 +10,9 @@ import org.springframework.boot.test.context.SpringBootTest; ...@@ -10,6 +10,9 @@ import org.springframework.boot.test.context.SpringBootTest;
10 import org.springframework.test.context.junit4.SpringRunner; 10 import org.springframework.test.context.junit4.SpringRunner;
11 11
12 import java.sql.Timestamp; 12 import java.sql.Timestamp;
13 import java.util.Collection;
14 import java.util.HashMap;
15 import java.util.Map;
13 16
14 @SpringBootTest(classes= MemberServiceApplication.class) 17 @SpringBootTest(classes= MemberServiceApplication.class)
15 @RunWith(SpringRunner.class) 18 @RunWith(SpringRunner.class)
...@@ -26,9 +29,23 @@ public class BaseTest { ...@@ -26,9 +29,23 @@ public class BaseTest {
26 } 29 }
27 30
28 public static void main(String[] args) { 31 public static void main(String[] args) {
29 String param = "{\"category\":\"common_member\"}"; 32 /* Map<String,Integer> map = new HashMap<>();
30 DataSyncMsg.TaskTemplateParam taskTemplateParam = JSONObject.parseObject(param, DataSyncMsg.TaskTemplateParam.class); 33 map.put("1",1);
31 System.out.println(taskTemplateParam); 34 map.put("2",15);
35
36 int i = 5;
37
38 Object[] objects = map.values().toArray();
39 Integer object0 = (Integer) objects[0];
40 Integer object1 = (Integer) objects[1];
41
42 if (i > object0 && i < object1)
43 System.out.println(true);*/
44
45
46 String param = "{\"GOODS\":\"aabbccddeeff\"}";
47 Map<String,String> jsonObject = JSONObject.parseObject(param,Map.class);
48 System.out.println(jsonObject);
32 } 49 }
33 50
34 51
......
...@@ -10,6 +10,8 @@ import com.topdraw.util.TimestampUtil; ...@@ -10,6 +10,8 @@ import com.topdraw.util.TimestampUtil;
10 import org.junit.Test; 10 import org.junit.Test;
11 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
12 12
13 import java.time.LocalDateTime;
14
13 public class MemberControllerTest extends BaseTest { 15 public class MemberControllerTest extends BaseTest {
14 16
15 17
...@@ -75,7 +77,7 @@ public class MemberControllerTest extends BaseTest { ...@@ -75,7 +77,7 @@ public class MemberControllerTest extends BaseTest {
75 member.setDueCouponAmount(0L); 77 member.setDueCouponAmount(0L);
76 member.setUserIptvId(1L); 78 member.setUserIptvId(1L);
77 member.setBindIptvPlatformType(0); 79 member.setBindIptvPlatformType(0);
78 member.setUpdateTime(TimestampUtil.now()); 80 member.setUpdateTime(LocalDateTime.now());
79 String s = JSON.toJSONString(member); 81 String s = JSON.toJSONString(member);
80 ResultInfo byId = this.memberController.create(member); 82 ResultInfo byId = this.memberController.create(member);
81 LOG.info("===>>>"+byId); 83 LOG.info("===>>>"+byId);
......
...@@ -9,6 +9,8 @@ import com.topdraw.util.TimestampUtil; ...@@ -9,6 +9,8 @@ import com.topdraw.util.TimestampUtil;
9 import org.junit.Test; 9 import org.junit.Test;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 11
12 import java.time.LocalDateTime;
13
12 public class MemberOperationServiceTest extends BaseTest { 14 public class MemberOperationServiceTest extends BaseTest {
13 15
14 @Autowired 16 @Autowired
...@@ -43,7 +45,7 @@ public class MemberOperationServiceTest extends BaseTest { ...@@ -43,7 +45,7 @@ public class MemberOperationServiceTest extends BaseTest {
43 member.setDueCouponAmount(0L); 45 member.setDueCouponAmount(0L);
44 member.setUserIptvId(1L); 46 member.setUserIptvId(1L);
45 member.setBindIptvPlatformType(0); 47 member.setBindIptvPlatformType(0);
46 member.setUpdateTime(TimestampUtil.now()); 48 member.setUpdateTime(LocalDateTime.now());
47 String s = JSONObject.toJSONString(member); 49 String s = JSONObject.toJSONString(member);
48 50
49 this.memberOperationService.doUpdateMemberInfo(member); 51 this.memberOperationService.doUpdateMemberInfo(member);
...@@ -71,9 +73,9 @@ public class MemberOperationServiceTest extends BaseTest { ...@@ -71,9 +73,9 @@ public class MemberOperationServiceTest extends BaseTest {
71 member.setDueCouponAmount(0L); 73 member.setDueCouponAmount(0L);
72 member.setUserIptvId(1L); 74 member.setUserIptvId(1L);
73 member.setBindIptvPlatformType(0); 75 member.setBindIptvPlatformType(0);
74 member.setBindIptvTime(TimestampUtil.now()); 76 member.setBindIptvTime(LocalDateTime.now());
75 member.setCreateTime(TimestampUtil.now()); 77 member.setCreateTime(LocalDateTime.now());
76 member.setUpdateTime(TimestampUtil.now()); 78 member.setUpdateTime(LocalDateTime.now());
77 // member.setUpdateTime(Timestamp.valueOf(LocalDateTime.now())); 79 // member.setUpdateTime(Timestamp.valueOf(LocalDateTime.now()));
78 this.memberOperationService.doInsertMember(member); 80 this.memberOperationService.doInsertMember(member);
79 } 81 }
......