1.优化日志信息
2.清理无用的文件
Showing
32 changed files
with
132 additions
and
1080 deletions
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 java.sql.Timestamp; | ||
9 | |||
10 | /** | ||
11 | * 权益-非持久化数据 | ||
12 | */ | ||
13 | @Data | ||
14 | @AllArgsConstructor | ||
15 | @NoArgsConstructor | ||
16 | public class TempCoupon extends TempRights { | ||
17 | |||
18 | @Transient | ||
19 | protected String code; | ||
20 | |||
21 | @Transient | ||
22 | protected Integer useStatus; | ||
23 | |||
24 | @Transient | ||
25 | protected Timestamp useTime; | ||
26 | |||
27 | /**领取时间*/ | ||
28 | @Transient | ||
29 | protected Timestamp receiveTime; | ||
30 | |||
31 | @Transient | ||
32 | protected String userNickname; | ||
33 | |||
34 | } |
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 | |||
9 | /** | ||
10 | * 权益-非持久化数据 | ||
11 | */ | ||
12 | @Data | ||
13 | @AllArgsConstructor | ||
14 | @NoArgsConstructor | ||
15 | public class TempExp extends TempRights { | ||
16 | |||
17 | // 获得成长值 | ||
18 | @Transient | ||
19 | protected Long rewardExp; | ||
20 | |||
21 | |||
22 | } |
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 | |||
9 | @Data | ||
10 | @AllArgsConstructor | ||
11 | @NoArgsConstructor | ||
12 | public class TempIptvUser { | ||
13 | |||
14 | // 账户 | ||
15 | @Transient | ||
16 | private String platformAccount; | ||
17 | |||
18 | // 分数 | ||
19 | @Transient | ||
20 | private Long points; | ||
21 | |||
22 | |||
23 | |||
24 | } |
1 | package com.topdraw.business.process.domian; | ||
2 | |||
3 | import lombok.AllArgsConstructor; | ||
4 | import lombok.Data; | ||
5 | import lombok.NoArgsConstructor; | ||
6 | import lombok.ToString; | ||
7 | |||
8 | import javax.persistence.Transient; | ||
9 | import javax.validation.constraints.NotNull; | ||
10 | |||
11 | /** | ||
12 | * 权益-非持久化数据 | ||
13 | */ | ||
14 | @Data | ||
15 | @AllArgsConstructor | ||
16 | @NoArgsConstructor | ||
17 | @ToString | ||
18 | public class TempPoints extends TempRights { | ||
19 | |||
20 | // 获得积分 | ||
21 | @Transient | ||
22 | @NotNull(message = "【points】积分数值不得为空!!") | ||
23 | protected Long points; | ||
24 | |||
25 | // 积分类型 0:通用 | ||
26 | @Transient | ||
27 | protected Integer pointsType; | ||
28 | |||
29 | @Transient | ||
30 | protected Long rewardPointsExpireTime; | ||
31 | |||
32 | } |
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 | import java.time.LocalDateTime; | ||
10 | |||
11 | /** | ||
12 | * 权益-非持久化数据 | ||
13 | */ | ||
14 | @Data | ||
15 | @AllArgsConstructor | ||
16 | @NoArgsConstructor | ||
17 | public class TempRights { | ||
18 | |||
19 | /** 主键 */ | ||
20 | @Transient | ||
21 | protected Long id; | ||
22 | |||
23 | /** 编号 */ | ||
24 | @Transient | ||
25 | protected String code; | ||
26 | |||
27 | /** 权益名称 */ | ||
28 | @Transient | ||
29 | protected String name; | ||
30 | |||
31 | /** 会员ID */ | ||
32 | @Transient | ||
33 | protected Long memberId; | ||
34 | |||
35 | /** 会员编号 */ | ||
36 | @Transient | ||
37 | protected String memberCode; | ||
38 | |||
39 | /** 账号id */ | ||
40 | @Transient | ||
41 | protected Long userId; | ||
42 | |||
43 | /** 发放策略 */ | ||
44 | @Transient | ||
45 | protected Integer rightsSendStrategy; | ||
46 | |||
47 | /** 账号id */ | ||
48 | @Transient | ||
49 | private Long accountId; | ||
50 | |||
51 | /** 过期时间 */ | ||
52 | @Transient | ||
53 | protected LocalDateTime expireTime; | ||
54 | |||
55 | |||
56 | /** 设备类型 1:大屏;2:小屏(微信)3.小屏(xx) */ | ||
57 | @Transient | ||
58 | @NotNull(message = "设备类型不得为空") | ||
59 | protected Integer deviceType; | ||
60 | |||
61 | /** 应用code(表示当前用户对应应用的标识) */ | ||
62 | @Transient | ||
63 | protected String appCode; | ||
64 | |||
65 | /** 订单id */ | ||
66 | @Transient | ||
67 | protected Long orderId; | ||
68 | |||
69 | /** 节目id(针对观影操作) */ | ||
70 | @Transient | ||
71 | protected Long mediaId; | ||
72 | |||
73 | /** 活动id(针对参与活动) */ | ||
74 | @Transient | ||
75 | protected Long activityId; | ||
76 | |||
77 | /** 商品id */ | ||
78 | @Transient | ||
79 | protected Long itemId; | ||
80 | |||
81 | /** 积分变化描述,用于管理侧显示 */ | ||
82 | @Transient | ||
83 | protected String description; | ||
84 | |||
85 | /** 行为事件类型 1:登录;2:观影;3:参与活动;4:订购;10:跨屏绑定;11:积分转移;98:系统操作;99:其他 */ | ||
86 | @Transient | ||
87 | protected Integer evtType; | ||
88 | |||
89 | /** 数量 */ | ||
90 | @Transient | ||
91 | protected Integer rightsAmount; | ||
92 | |||
93 | } |
1 | package com.topdraw.business.process.domian.weixin; | ||
2 | |||
3 | |||
4 | import com.alibaba.fastjson.annotation.JSONField; | ||
5 | import com.topdraw.annotation.Query; | ||
6 | import lombok.Data; | ||
7 | |||
8 | import java.sql.Timestamp; | ||
9 | |||
10 | @Data | ||
11 | public class UserCollectionMq { | ||
12 | |||
13 | // 应用ID | ||
14 | @JSONField(name = "app_id") | ||
15 | private Long appId; | ||
16 | |||
17 | @JSONField(name = "userId") | ||
18 | private Long userId; | ||
19 | |||
20 | // 收藏夹类型:1-收藏 2-播放记录 3-播放列表 4-评分 5-点赞/关注/订阅 | ||
21 | private Integer type; | ||
22 | |||
23 | // 收藏夹名称 | ||
24 | private String name; | ||
25 | |||
26 | // 数量 | ||
27 | private Integer count; | ||
28 | |||
29 | private String images; | ||
30 | |||
31 | // 收藏夹ID | ||
32 | @JSONField(name = "user_collection_id") | ||
33 | @Query | ||
34 | private Long userCollectionId; | ||
35 | |||
36 | // 自定义收藏内容的类型CODE,默认:DEFAULT | ||
37 | @JSONField(name = "detail_folder_code") | ||
38 | @Query | ||
39 | private String detailFolderCode; | ||
40 | |||
41 | // 收藏内容的类型:MEDIA|EPISODE|CATEGORY|SUBJECT|ARTICLE|ARTIST|SCHOOL | ||
42 | @JSONField(name = "detail_type") | ||
43 | @Query | ||
44 | private String detailType; | ||
45 | |||
46 | // 收藏内容的ID | ||
47 | @JSONField(name = "detail_id") | ||
48 | @Query | ||
49 | private Long detailId; | ||
50 | |||
51 | // 收藏内容的CODE | ||
52 | @JSONField(name = "detail_code") | ||
53 | @Query | ||
54 | private String detailCode; | ||
55 | |||
56 | // 收藏内容的剧集ID | ||
57 | @JSONField(name = "detail_episode_id") | ||
58 | @Query | ||
59 | private Long detailEpisodeId; | ||
60 | |||
61 | // 收藏内容的剧集CODE | ||
62 | @JSONField(name = "detail_episode_code") | ||
63 | @Query | ||
64 | private String detailEpisodeCode; | ||
65 | |||
66 | // 收藏内容的名称 | ||
67 | @JSONField(name = "detail_name") | ||
68 | @Query | ||
69 | private String detailName; | ||
70 | |||
71 | // 收藏内容的标记 | ||
72 | @JSONField(name = "detail_mark") | ||
73 | @Query | ||
74 | private Integer detailMark; | ||
75 | |||
76 | // 收藏内容的图片 | ||
77 | @JSONField(name = "detail_img") | ||
78 | private String detailImg; | ||
79 | |||
80 | // 收藏内容的剧集序号 | ||
81 | @JSONField(name = "detail_index") | ||
82 | @Query | ||
83 | private Integer detailIndex; | ||
84 | |||
85 | // 收藏内容的剧集总数 | ||
86 | @JSONField(name = "detail_total_index") | ||
87 | @Query | ||
88 | private Integer detailTotalIndex; | ||
89 | |||
90 | // 收藏内容的播放时间 | ||
91 | @JSONField(name = "detail_play_time") | ||
92 | @Query | ||
93 | private Integer detailPlayTime; | ||
94 | |||
95 | // 收藏内容的总时间 | ||
96 | @JSONField(name = "detail_total_time") | ||
97 | @Query | ||
98 | private Integer detailTotalTime; | ||
99 | |||
100 | // 收藏内容在同一folder中的顺序 | ||
101 | @JSONField(name = "detail_sequence") | ||
102 | @Query | ||
103 | private Integer detailSequence; | ||
104 | |||
105 | // 收藏内容的评分 | ||
106 | @JSONField(name = "detail_score") | ||
107 | @Query | ||
108 | private Float detailScore; | ||
109 | |||
110 | // 收藏内容(根据文件夹和类型的不同)的点赞/关注/订阅 | ||
111 | @JSONField(name = "detail_like") | ||
112 | @Query | ||
113 | private Integer detailLike; | ||
114 | |||
115 | // 收藏内容的扩展数据 | ||
116 | @JSONField(name = "detail_ext_data") | ||
117 | @Query | ||
118 | private String detailExtData; | ||
119 | |||
120 | // 创建时间 | ||
121 | @JSONField(name = "create_time") | ||
122 | @Query | ||
123 | private Timestamp createTime; | ||
124 | |||
125 | // 更新时间 | ||
126 | @JSONField(name = "update_time") | ||
127 | private Timestamp updateTime; | ||
128 | } |
1 | package com.topdraw.business.process.service.domian; | ||
2 | |||
3 | import com.topdraw.business.process.domian.TempRights; | ||
4 | import lombok.AllArgsConstructor; | ||
5 | import lombok.Data; | ||
6 | import lombok.NoArgsConstructor; | ||
7 | |||
8 | import javax.persistence.Transient; | ||
9 | import java.sql.Timestamp; | ||
10 | |||
11 | /** | ||
12 | * 权益-非持久化数据 | ||
13 | */ | ||
14 | @Data | ||
15 | @AllArgsConstructor | ||
16 | @NoArgsConstructor | ||
17 | public class TempCoupon extends TempRights { | ||
18 | |||
19 | @Transient | ||
20 | protected String code; | ||
21 | |||
22 | @Transient | ||
23 | protected Integer useStatus; | ||
24 | |||
25 | @Transient | ||
26 | protected Timestamp useTime; | ||
27 | |||
28 | /**领取时间*/ | ||
29 | @Transient | ||
30 | protected Timestamp receiveTime; | ||
31 | |||
32 | @Transient | ||
33 | protected String userNickname; | ||
34 | |||
35 | } |
src/main/java/com/topdraw/business/process/service/domian/TempCustomPointBean.java
deleted
100644 → 0
1 | package com.topdraw.business.process.service.domian; | ||
2 | |||
3 | import com.topdraw.business.process.domian.TempIptvUser; | ||
4 | import lombok.AllArgsConstructor; | ||
5 | import lombok.Data; | ||
6 | import lombok.NoArgsConstructor; | ||
7 | |||
8 | import javax.persistence.Transient; | ||
9 | import javax.validation.constraints.NotNull; | ||
10 | |||
11 | @Data | ||
12 | @AllArgsConstructor | ||
13 | @NoArgsConstructor | ||
14 | public class TempCustomPointBean extends TempIptvUser { | ||
15 | |||
16 | /** 设备类型 1:大屏;2:小屏(微信)3.小屏(xx) */ | ||
17 | @Transient | ||
18 | @NotNull(message = "设备类型不得为空") | ||
19 | protected Integer deviceType; | ||
20 | |||
21 | /** 订单id */ | ||
22 | @Transient | ||
23 | protected Long orderId; | ||
24 | |||
25 | /** 节目id(针对观影操作) */ | ||
26 | @Transient | ||
27 | protected Long mediaId; | ||
28 | |||
29 | /** 活动id(针对参与活动) */ | ||
30 | @Transient | ||
31 | protected Long activityId; | ||
32 | |||
33 | /** 商品id */ | ||
34 | @Transient | ||
35 | protected Long itemId; | ||
36 | |||
37 | /** 行为事件类型 1:登录;2:观影;3:参与活动;4:订购;10:跨屏绑定;11:积分转移;98:系统操作;99:其他 */ | ||
38 | @Transient | ||
39 | protected Integer evtType; | ||
40 | |||
41 | } |
1 | package com.topdraw.business.process.service.domian; | ||
2 | |||
3 | import com.topdraw.business.process.domian.TempRights; | ||
4 | import lombok.AllArgsConstructor; | ||
5 | import lombok.Data; | ||
6 | import lombok.NoArgsConstructor; | ||
7 | |||
8 | import javax.persistence.Transient; | ||
9 | |||
10 | /** | ||
11 | * 权益-非持久化数据 | ||
12 | */ | ||
13 | @Data | ||
14 | @AllArgsConstructor | ||
15 | @NoArgsConstructor | ||
16 | public class TempExp extends TempRights { | ||
17 | |||
18 | // 获得成长值 | ||
19 | @Transient | ||
20 | protected Long rewardExp; | ||
21 | |||
22 | |||
23 | } |
1 | package com.topdraw.business.process.service.domian; | ||
2 | |||
3 | import lombok.AllArgsConstructor; | ||
4 | import lombok.Data; | ||
5 | import lombok.NoArgsConstructor; | ||
6 | |||
7 | import javax.persistence.Transient; | ||
8 | import java.sql.Timestamp; | ||
9 | |||
10 | @Data | ||
11 | @AllArgsConstructor | ||
12 | @NoArgsConstructor | ||
13 | public class TempIptvUser { | ||
14 | |||
15 | private String unionid; | ||
16 | |||
17 | // 账户 | ||
18 | @Transient | ||
19 | private String platformAccount; | ||
20 | |||
21 | // 分数 | ||
22 | @Transient | ||
23 | private Long points; | ||
24 | |||
25 | |||
26 | // ID | ||
27 | private Long id; | ||
28 | |||
29 | // 人ID | ||
30 | private Long personId; | ||
31 | |||
32 | // 运营商平台 | ||
33 | private String platform; | ||
34 | |||
35 | // 手机号 | ||
36 | private String cellphone; | ||
37 | |||
38 | // 用户名 | ||
39 | private String username; | ||
40 | |||
41 | // 密码 MD5 | ||
42 | private String password; | ||
43 | |||
44 | // 昵称 Base64 | ||
45 | private String nickname; | ||
46 | |||
47 | // 头像 | ||
48 | private String image; | ||
49 | |||
50 | // 登录天数(总天数) | ||
51 | private Integer loginDays; | ||
52 | |||
53 | // 连续登录天数 | ||
54 | private Integer continueDays; | ||
55 | |||
56 | // 活跃时间 | ||
57 | private Timestamp activeTime; | ||
58 | |||
59 | // 分组 分组ID用逗号分隔 | ||
60 | private String groups; | ||
61 | |||
62 | // 标签 标签用逗号分隔 | ||
63 | private String tags; | ||
64 | |||
65 | // 登录类型 1-运营商隐式登录 2-手机验证登录 3-微信登录 4-QQ登录 5-微博登录 6-苹果登录 | ||
66 | private Integer loginType; | ||
67 | |||
68 | // 状态 0-下线 1-上线 | ||
69 | private Integer status; | ||
70 | |||
71 | // 描述 | ||
72 | private String description; | ||
73 | |||
74 | // 创建者 | ||
75 | private String createBy; | ||
76 | |||
77 | // 创建时间 | ||
78 | private Timestamp createTime; | ||
79 | |||
80 | // 更新者 | ||
81 | private String updateBy; | ||
82 | |||
83 | // 更新时间 | ||
84 | private Timestamp updateTime; | ||
85 | |||
86 | // 会员id | ||
87 | private Long memberId; | ||
88 | |||
89 | private String memberCode; | ||
90 | |||
91 | |||
92 | } |
1 | package com.topdraw.business.process.service.domian; | ||
2 | |||
3 | import com.topdraw.business.process.domian.TempRights; | ||
4 | import lombok.AllArgsConstructor; | ||
5 | import lombok.Data; | ||
6 | import lombok.NoArgsConstructor; | ||
7 | import lombok.ToString; | ||
8 | |||
9 | import javax.persistence.Transient; | ||
10 | import javax.validation.constraints.NotNull; | ||
11 | |||
12 | /** | ||
13 | * 权益-非持久化数据 | ||
14 | */ | ||
15 | @Data | ||
16 | @AllArgsConstructor | ||
17 | @NoArgsConstructor | ||
18 | @ToString | ||
19 | public class TempPoints extends TempRights { | ||
20 | |||
21 | // 获得积分 | ||
22 | @Transient | ||
23 | @NotNull(message = "【points】积分数值不得为空!!") | ||
24 | protected Long points; | ||
25 | |||
26 | // 积分类型 0:通用 | ||
27 | @Transient | ||
28 | protected Integer pointsType; | ||
29 | |||
30 | @Transient | ||
31 | protected Long rewardPointsExpireTime; | ||
32 | |||
33 | } |
1 | package com.topdraw.business.process.service.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 | import java.time.LocalDateTime; | ||
10 | |||
11 | /** | ||
12 | * 权益-非持久化数据 | ||
13 | */ | ||
14 | @Data | ||
15 | @AllArgsConstructor | ||
16 | @NoArgsConstructor | ||
17 | public class TempRights { | ||
18 | |||
19 | /** 主键 */ | ||
20 | @Transient | ||
21 | protected Long id; | ||
22 | |||
23 | /** 编号 */ | ||
24 | @Transient | ||
25 | protected String code; | ||
26 | |||
27 | /** 权益名称 */ | ||
28 | @Transient | ||
29 | protected String name; | ||
30 | |||
31 | /** 会员ID */ | ||
32 | @Transient | ||
33 | protected Long memberId; | ||
34 | |||
35 | /** 会员编号 */ | ||
36 | @Transient | ||
37 | protected String memberCode; | ||
38 | |||
39 | /** 账号id */ | ||
40 | @Transient | ||
41 | protected Long userId; | ||
42 | |||
43 | /** 发放策略 */ | ||
44 | @Transient | ||
45 | protected Integer rightsSendStrategy; | ||
46 | |||
47 | /** 账号id */ | ||
48 | @Transient | ||
49 | protected Long accountId; | ||
50 | |||
51 | /** 过期时间 */ | ||
52 | @Transient | ||
53 | protected LocalDateTime expireTime; | ||
54 | |||
55 | |||
56 | /** 设备类型 1:大屏;2:小屏(微信)3.小屏(xx) */ | ||
57 | @Transient | ||
58 | @NotNull(message = "设备类型不得为空") | ||
59 | protected Integer deviceType; | ||
60 | |||
61 | /** 应用code(表示当前用户对应应用的标识) */ | ||
62 | @Transient | ||
63 | protected String appCode; | ||
64 | |||
65 | /** 订单id */ | ||
66 | @Transient | ||
67 | protected Long orderId; | ||
68 | |||
69 | /** 节目id(针对观影操作) */ | ||
70 | @Transient | ||
71 | protected Long mediaId; | ||
72 | |||
73 | /** 活动id(针对参与活动) */ | ||
74 | @Transient | ||
75 | protected Long activityId; | ||
76 | |||
77 | /** 商品id */ | ||
78 | @Transient | ||
79 | protected Long itemId; | ||
80 | |||
81 | /** 积分变化描述,用于管理侧显示 */ | ||
82 | @Transient | ||
83 | protected String description; | ||
84 | |||
85 | /** 行为事件类型 1:登录;2:观影;3:参与活动;4:订购;10:跨屏绑定;11:积分转移;98:系统操作;99:其他 */ | ||
86 | @Transient | ||
87 | protected Integer evtType; | ||
88 | |||
89 | /** 数量 */ | ||
90 | @Transient | ||
91 | protected Integer rightsAmount; | ||
92 | |||
93 | } |
src/main/java/com/topdraw/business/process/service/domian/result/CustomPointsResult.java
deleted
100644 → 0
1 | package com.topdraw.business.process.service.domian.result; | ||
2 | |||
3 | |||
4 | import lombok.AllArgsConstructor; | ||
5 | import lombok.Data; | ||
6 | import lombok.NoArgsConstructor; | ||
7 | |||
8 | @Data | ||
9 | @AllArgsConstructor | ||
10 | @NoArgsConstructor | ||
11 | public class CustomPointsResult { | ||
12 | private boolean result; | ||
13 | private Long point; | ||
14 | } |
1 | package com.topdraw.business.process.service.domian.weixin; | ||
2 | |||
3 | import com.fasterxml.jackson.annotation.JsonFormat; | ||
4 | import lombok.Data; | ||
5 | |||
6 | import java.time.LocalDateTime; | ||
7 | |||
8 | /** | ||
9 | * 微信账户信息 | ||
10 | * @author XiangHan | ||
11 | * @date 2021-01-18 | ||
12 | */ | ||
13 | @Data | ||
14 | public class BuyVipBean extends WeiXinUserBean { | ||
15 | |||
16 | private Integer vip; | ||
17 | |||
18 | @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss") | ||
19 | private LocalDateTime vipExpireTime; | ||
20 | |||
21 | |||
22 | } |
src/main/java/com/topdraw/business/process/service/domian/weixin/SubscribeBean.java
deleted
100644 → 0
1 | package com.topdraw.business.process.service.domian.weixin; | ||
2 | |||
3 | |||
4 | import com.alibaba.fastjson.JSONObject; | ||
5 | import lombok.Data; | ||
6 | |||
7 | @Data | ||
8 | public class SubscribeBean extends WeiXinUserBean { | ||
9 | |||
10 | private JSONObject userInfoJson; | ||
11 | |||
12 | private JSONObject iptvUserInfo; | ||
13 | |||
14 | private String msgType; | ||
15 | |||
16 | private String event; | ||
17 | |||
18 | |||
19 | /** */ | ||
20 | private String openId; | ||
21 | |||
22 | /** */ | ||
23 | private String appId; | ||
24 | |||
25 | /** */ | ||
26 | private String eventKey; | ||
27 | |||
28 | private String unionid; | ||
29 | private String nickname; | ||
30 | private String headimgurl; | ||
31 | |||
32 | } |
src/main/java/com/topdraw/business/process/service/domian/weixin/SubscribeBeanEvent.java
deleted
100644 → 0
1 | package com.topdraw.business.process.service.domian.weixin; | ||
2 | |||
3 | import lombok.AllArgsConstructor; | ||
4 | import lombok.Data; | ||
5 | import lombok.NoArgsConstructor; | ||
6 | |||
7 | import javax.validation.constraints.NotNull; | ||
8 | |||
9 | @Data | ||
10 | @AllArgsConstructor | ||
11 | @NoArgsConstructor | ||
12 | public class SubscribeBeanEvent { | ||
13 | |||
14 | @NotNull(message = "【content】 not be null !!!") | ||
15 | private String content; | ||
16 | |||
17 | } |
src/main/java/com/topdraw/business/process/service/domian/weixin/UserCollectionMq.java
deleted
100644 → 0
1 | package com.topdraw.business.process.service.domian.weixin; | ||
2 | |||
3 | |||
4 | import com.alibaba.fastjson.annotation.JSONField; | ||
5 | import com.topdraw.annotation.Query; | ||
6 | import lombok.Data; | ||
7 | |||
8 | import java.sql.Timestamp; | ||
9 | |||
10 | @Data | ||
11 | public class UserCollectionMq { | ||
12 | |||
13 | // 应用ID | ||
14 | @JSONField(name = "app_id") | ||
15 | private Long appId; | ||
16 | |||
17 | @JSONField(name = "userId") | ||
18 | private Long userId; | ||
19 | |||
20 | // 收藏夹类型:1-收藏 2-播放记录 3-播放列表 4-评分 5-点赞/关注/订阅 | ||
21 | private Integer type; | ||
22 | |||
23 | // 收藏夹名称 | ||
24 | private String name; | ||
25 | |||
26 | // 数量 | ||
27 | private Integer count; | ||
28 | |||
29 | private String images; | ||
30 | |||
31 | // 收藏夹ID | ||
32 | @JSONField(name = "user_collection_id") | ||
33 | @Query | ||
34 | private Long userCollectionId; | ||
35 | |||
36 | // 自定义收藏内容的类型CODE,默认:DEFAULT | ||
37 | @JSONField(name = "detail_folder_code") | ||
38 | @Query | ||
39 | private String detailFolderCode; | ||
40 | |||
41 | // 收藏内容的类型:MEDIA|EPISODE|CATEGORY|SUBJECT|ARTICLE|ARTIST|SCHOOL | ||
42 | @JSONField(name = "detail_type") | ||
43 | @Query | ||
44 | private String detailType; | ||
45 | |||
46 | // 收藏内容的ID | ||
47 | @JSONField(name = "detail_id") | ||
48 | @Query | ||
49 | private Long detailId; | ||
50 | |||
51 | // 收藏内容的CODE | ||
52 | @JSONField(name = "detail_code") | ||
53 | @Query | ||
54 | private String detailCode; | ||
55 | |||
56 | // 收藏内容的剧集ID | ||
57 | @JSONField(name = "detail_episode_id") | ||
58 | @Query | ||
59 | private Long detailEpisodeId; | ||
60 | |||
61 | // 收藏内容的剧集CODE | ||
62 | @JSONField(name = "detail_episode_code") | ||
63 | @Query | ||
64 | private String detailEpisodeCode; | ||
65 | |||
66 | // 收藏内容的名称 | ||
67 | @JSONField(name = "detail_name") | ||
68 | @Query | ||
69 | private String detailName; | ||
70 | |||
71 | // 收藏内容的标记 | ||
72 | @JSONField(name = "detail_mark") | ||
73 | @Query | ||
74 | private Integer detailMark; | ||
75 | |||
76 | // 收藏内容的图片 | ||
77 | @JSONField(name = "detail_img") | ||
78 | private String detailImg; | ||
79 | |||
80 | // 收藏内容的剧集序号 | ||
81 | @JSONField(name = "detail_index") | ||
82 | @Query | ||
83 | private Integer detailIndex; | ||
84 | |||
85 | // 收藏内容的剧集总数 | ||
86 | @JSONField(name = "detail_total_index") | ||
87 | @Query | ||
88 | private Integer detailTotalIndex; | ||
89 | |||
90 | // 收藏内容的播放时间 | ||
91 | @JSONField(name = "detail_play_time") | ||
92 | @Query | ||
93 | private Integer detailPlayTime; | ||
94 | |||
95 | // 收藏内容的总时间 | ||
96 | @JSONField(name = "detail_total_time") | ||
97 | @Query | ||
98 | private Integer detailTotalTime; | ||
99 | |||
100 | // 收藏内容在同一folder中的顺序 | ||
101 | @JSONField(name = "detail_sequence") | ||
102 | @Query | ||
103 | private Integer detailSequence; | ||
104 | |||
105 | // 收藏内容的评分 | ||
106 | @JSONField(name = "detail_score") | ||
107 | @Query | ||
108 | private Float detailScore; | ||
109 | |||
110 | // 收藏内容(根据文件夹和类型的不同)的点赞/关注/订阅 | ||
111 | @JSONField(name = "detail_like") | ||
112 | @Query | ||
113 | private Integer detailLike; | ||
114 | |||
115 | // 收藏内容的扩展数据 | ||
116 | @JSONField(name = "detail_ext_data") | ||
117 | @Query | ||
118 | private String detailExtData; | ||
119 | |||
120 | // 创建时间 | ||
121 | @JSONField(name = "create_time") | ||
122 | @Query | ||
123 | private Timestamp createTime; | ||
124 | |||
125 | // 更新时间 | ||
126 | @JSONField(name = "update_time") | ||
127 | private Timestamp updateTime; | ||
128 | } |
src/main/java/com/topdraw/business/process/service/domian/weixin/WeiXinUserBean.java
deleted
100644 → 0
1 | package com.topdraw.business.process.service.domian.weixin; | ||
2 | |||
3 | |||
4 | import lombok.Data; | ||
5 | |||
6 | /** | ||
7 | * 微信账户信息 | ||
8 | * @author XiangHan | ||
9 | * @date 2021-01-18 | ||
10 | */ | ||
11 | @Data | ||
12 | public class WeiXinUserBean { | ||
13 | |||
14 | private Long id; | ||
15 | |||
16 | private String unionid; | ||
17 | |||
18 | /** */ | ||
19 | private String openid; | ||
20 | |||
21 | /** */ | ||
22 | private String appid; | ||
23 | |||
24 | /** 加密后的appId,参数 */ | ||
25 | private String wxAppid; | ||
26 | |||
27 | /** 加密后的code,参数 */ | ||
28 | private String wxCode; | ||
29 | |||
30 | /** */ | ||
31 | private String userInfo; | ||
32 | |||
33 | /** 会员id */ | ||
34 | private Long memberId; | ||
35 | |||
36 | /** 加密信息 */ | ||
37 | private String encryptedData; | ||
38 | |||
39 | /** 解析用户电话号码时使用,参数 */ | ||
40 | private String iv; | ||
41 | |||
42 | /** 资源id */ | ||
43 | private String sourceId; | ||
44 | |||
45 | /** 资源类型 */ | ||
46 | private String sourceType; | ||
47 | |||
48 | /** 资源描述,用来表示从哪个地方链接进来的 */ | ||
49 | private String sourceDesc; | ||
50 | |||
51 | /** 资源实例 */ | ||
52 | private String sourceEntity; | ||
53 | |||
54 | /** 推荐者id */ | ||
55 | private Long sourceUser; | ||
56 | |||
57 | private String nikename; | ||
58 | |||
59 | private String headimgurl; | ||
60 | } |
src/main/java/com/topdraw/business/process/service/impl/CompareTaskCondition.java
deleted
100644 → 0
1 | package com.topdraw.business.process.service.impl; | ||
2 | |||
3 | import com.topdraw.business.module.member.service.dto.MemberDTO; | ||
4 | import com.topdraw.business.module.task.domain.Task; | ||
5 | |||
6 | import java.util.List; | ||
7 | |||
8 | @FunctionalInterface | ||
9 | public interface CompareTaskCondition { | ||
10 | |||
11 | boolean compareCondition(MemberDTO memberDTO, List<Task> taskList); | ||
12 | |||
13 | } |
... | @@ -17,8 +17,6 @@ public class CouponOperationServiceImpl implements CouponOperationService { | ... | @@ -17,8 +17,6 @@ public class CouponOperationServiceImpl implements CouponOperationService { |
17 | @Autowired | 17 | @Autowired |
18 | private CouponHistoryService couponHistoryService; | 18 | private CouponHistoryService couponHistoryService; |
19 | @Autowired | 19 | @Autowired |
20 | private MemberOperationService memberOperationService; | ||
21 | @Autowired | ||
22 | private MemberService memberService; | 20 | private MemberService memberService; |
23 | 21 | ||
24 | public void asyncMemberCoupon(Member member) { | 22 | public void asyncMemberCoupon(Member member) { | ... | ... |
... | @@ -3,43 +3,66 @@ package com.topdraw.business.process.service.impl; | ... | @@ -3,43 +3,66 @@ package com.topdraw.business.process.service.impl; |
3 | import com.topdraw.business.module.exp.detail.domain.ExpDetail; | 3 | import com.topdraw.business.module.exp.detail.domain.ExpDetail; |
4 | import com.topdraw.business.module.exp.detail.service.ExpDetailService; | 4 | 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; | ||
7 | import com.topdraw.business.module.member.service.MemberService; | 6 | import com.topdraw.business.module.member.service.MemberService; |
8 | import com.topdraw.business.module.member.service.dto.MemberDTO; | 7 | import com.topdraw.business.module.member.service.dto.MemberDTO; |
9 | import com.topdraw.business.process.service.ExpOperationService; | 8 | import com.topdraw.business.process.service.ExpOperationService; |
10 | import com.topdraw.business.process.service.member.MemberOperationService; | 9 | import com.topdraw.utils.StringUtils; |
10 | import lombok.extern.slf4j.Slf4j; | ||
11 | import org.springframework.beans.factory.annotation.Autowired; | 11 | import org.springframework.beans.factory.annotation.Autowired; |
12 | import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | ||
13 | import org.springframework.stereotype.Service; | 12 | import org.springframework.stereotype.Service; |
14 | 13 | ||
15 | import java.util.Objects; | 14 | import java.util.Objects; |
16 | 15 | ||
17 | /** | 16 | |
18 | * | ||
19 | */ | ||
20 | @Service | 17 | @Service |
18 | @Slf4j | ||
21 | public class ExpOperationServiceImpl implements ExpOperationService { | 19 | public class ExpOperationServiceImpl implements ExpOperationService { |
22 | 20 | ||
23 | @Autowired | 21 | @Autowired |
24 | private ExpDetailService expDetailService; | ||
25 | @Autowired | ||
26 | private MemberService memberService; | 22 | private MemberService memberService; |
23 | @Autowired | ||
24 | private ExpDetailService expDetailService; | ||
25 | |||
26 | |||
27 | public void asyncMemberExpAndLevel(Member resource) { | ||
28 | log.info("同步会员成长值和等级,参数 asyncMemberExpAndLevel# resource ==>> {}", resource); | ||
29 | |||
30 | String code = resource.getCode(); | ||
31 | if (StringUtils.isBlank(code)) { | ||
32 | log.error("同步会员成长值和等级异常,asyncMemberExpAndLevel# message ==>> 会员code不得为空"); | ||
33 | return; | ||
34 | } | ||
27 | 35 | ||
28 | public void asyncMemberExpAndLevel(Member member) { | ||
29 | String code = member.getCode(); | ||
30 | MemberDTO memberDTO = this.memberService.findByCode(code); | 36 | MemberDTO memberDTO = this.memberService.findByCode(code); |
31 | member.setId(memberDTO.getId()); | 37 | log.info("同步会员成长值和等级,asyncMemberExpAndLevel# 通过code ==>> {},查询会员信息,结果集,memberDTO ==>> {}", code, memberDTO); |
38 | |||
39 | resource.setId(memberDTO.getId()); | ||
32 | 40 | ||
33 | this.memberService.doUpdateMemberExpAndLevel(member); | 41 | log.info("同步会员成长值和等级,asyncMemberExpAndLevel# 入库参数,resource ==>> {}", resource); |
42 | this.memberService.doUpdateMemberExpAndLevel(resource); | ||
34 | } | 43 | } |
35 | 44 | ||
36 | public void asyncExpDetail(ExpDetail expDetail) { | 45 | public void asyncExpDetail(ExpDetail resource) { |
37 | String code = expDetail.getMemberCode(); | 46 | log.info("同步会员成长值详情,参数 asyncExpDetail# resource ==>> {}", resource); |
47 | |||
48 | String code = resource.getMemberCode(); | ||
49 | if (StringUtils.isBlank(code)) { | ||
50 | log.error("同步会员成长值和等级异常,asyncExpDetail# message ==>> 会员code不得为空"); | ||
51 | return; | ||
52 | } | ||
53 | |||
38 | MemberDTO memberDTO = this.memberService.findByCode(code); | 54 | MemberDTO memberDTO = this.memberService.findByCode(code); |
39 | if (Objects.nonNull(memberDTO.getId())) { | 55 | log.info("同步会员成长值详情,asyncExpDetail# 通过code ==>> {},查询会员信息,结果集,memberDTO ==>> {}", code, memberDTO); |
40 | expDetail.setMemberId(memberDTO.getId()); | 56 | |
41 | this.expDetailService.create(expDetail); | 57 | if (Objects.isNull(memberDTO.getId())) { |
58 | log.error("同步会员成长值详情,asyncExpDetail# message ==>> 会员"); | ||
59 | return; | ||
42 | } | 60 | } |
43 | 61 | ||
62 | resource.setMemberId(memberDTO.getId()); | ||
63 | |||
64 | log.info("同步会员成长值详情,asyncExpDetail# 入库参数,resource ==>> {}", resource); | ||
65 | this.expDetailService.create(resource); | ||
66 | |||
44 | } | 67 | } |
45 | } | 68 | } | ... | ... |
... | @@ -13,7 +13,6 @@ import com.topdraw.business.process.service.PointsOperationService; | ... | @@ -13,7 +13,6 @@ import com.topdraw.business.process.service.PointsOperationService; |
13 | import com.topdraw.utils.StringUtils; | 13 | import com.topdraw.utils.StringUtils; |
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.scheduling.concurrent.ThreadPoolTaskExecutor; | ||
17 | import org.springframework.stereotype.Service; | 16 | import org.springframework.stereotype.Service; |
18 | import org.springframework.transaction.annotation.Propagation; | 17 | import org.springframework.transaction.annotation.Propagation; |
19 | import org.springframework.transaction.annotation.Transactional; | 18 | import org.springframework.transaction.annotation.Transactional; |
... | @@ -29,49 +28,92 @@ import java.util.*; | ... | @@ -29,49 +28,92 @@ import java.util.*; |
29 | public class PointsOperationServiceImpl implements PointsOperationService { | 28 | public class PointsOperationServiceImpl implements PointsOperationService { |
30 | 29 | ||
31 | @Autowired | 30 | @Autowired |
31 | private MemberService memberService; | ||
32 | @Autowired | ||
32 | private PointsDetailService pointsDetailService; | 33 | private PointsDetailService pointsDetailService; |
33 | @Autowired | 34 | @Autowired |
34 | private PointsAvailableService pointsAvailableService; | 35 | private PointsAvailableService pointsAvailableService; |
35 | @Autowired | ||
36 | private MemberService memberService; | ||
37 | @Autowired | ||
38 | ThreadPoolTaskExecutor threadPoolTaskExecutor; | ||
39 | 36 | ||
40 | public void asyncMemberPoint(Member member) { | 37 | |
41 | log.info("修改会员积分,参数 =>> {}", member); | 38 | public void asyncMemberPoint(Member resource) { |
42 | String code = member.getCode(); | 39 | log.info("同步会员积分,参数 asyncMemberPoint# resource ==>> {}", resource); |
40 | |||
41 | String code = resource.getCode(); | ||
43 | if (StringUtils.isBlank(code)) { | 42 | if (StringUtils.isBlank(code)) { |
44 | log.error("修改会员积分失败,参数错误,会员code为空"); | 43 | log.error("同步会员积分异常,asyncMemberPoint# message ==>> 会员code不得为空"); |
45 | return; | 44 | return; |
46 | } | 45 | } |
46 | |||
47 | MemberDTO memberDTO = this.memberService.findByCode(code); | 47 | MemberDTO memberDTO = this.memberService.findByCode(code); |
48 | if (Objects.nonNull(memberDTO.getId())) { | 48 | log.info("同步会员积分,asyncMemberPoint# 通过code ==>> {},查询会员信息,结果集,memberDTO ==>> {}", code, memberDTO); |
49 | member.setId(memberDTO.getId()); | 49 | if (Objects.isNull(memberDTO.getId())) { |
50 | this.memberService.doUpdateMemberPoints(member); | 50 | log.error("同步会员积分异常,asyncMemberPoint# message ==>> 会员信息不存在"); |
51 | return; | ||
51 | } | 52 | } |
53 | |||
54 | resource.setId(memberDTO.getId()); | ||
55 | |||
56 | log.info("同步会员积分,asyncMemberPoint# 入库参数, resource ==>> {}", resource); | ||
57 | this.memberService.doUpdateMemberPoints(resource); | ||
52 | } | 58 | } |
53 | 59 | ||
54 | public void asyncPointsAvailable(PointsAvailable pointsAvailable) { | 60 | public void asyncPointsAvailable(PointsAvailable resource) { |
55 | String memberCode = pointsAvailable.getMemberCode(); | 61 | log.info("同步会员可用积分,参数 asyncPointsAvailable# resource ==>> {}", resource); |
62 | |||
63 | String memberCode = resource.getMemberCode(); | ||
64 | if (StringUtils.isBlank(memberCode)) { | ||
65 | log.error("同步会员可用积分异常,asyncPointsAvailable# message ==>> 会员code不得为空"); | ||
66 | return; | ||
67 | } | ||
68 | |||
56 | MemberDTO memberDTO = this.memberService.findByCode(memberCode); | 69 | MemberDTO memberDTO = this.memberService.findByCode(memberCode); |
57 | if (Objects.nonNull(memberDTO.getId())) { | 70 | log.info("同步会员可用积分,asyncPointsAvailable# 通过code ==>> {},查询会员信息,结果集,memberDTO ==>> {}", memberCode, memberDTO); |
58 | pointsAvailable.setMemberId(memberDTO.getId()); | 71 | if (Objects.isNull(memberDTO.getId())) { |
59 | this.pointsAvailableService.create4Custom(pointsAvailable); | 72 | log.error("同步会员可用积分异常,asyncPointsAvailable# message ==>> 会员信息不存在 || code ==>> {}", memberCode); |
73 | return; | ||
60 | } | 74 | } |
75 | |||
76 | resource.setMemberId(memberDTO.getId()); | ||
77 | |||
78 | log.info("同步会员可用积分,asyncPointsAvailable# 入库参数, resource ==>> {}", resource); | ||
79 | this.pointsAvailableService.create4Custom(resource); | ||
61 | } | 80 | } |
62 | 81 | ||
63 | public void asyncPointsDetail(PointsDetail pointsDetail) { | 82 | public void asyncPointsDetail(PointsDetail resource) { |
64 | String memberCode = pointsDetail.getMemberCode(); | 83 | log.info("同步会员积分流水,参数 asyncPointsDetail# resource ==>> {}", resource); |
84 | |||
85 | String memberCode = resource.getMemberCode(); | ||
86 | if (StringUtils.isBlank(memberCode)) { | ||
87 | log.error("同步会员积分流水异常,asyncPointsDetail# message ==>> 会员code不得为空"); | ||
88 | return; | ||
89 | } | ||
90 | |||
65 | MemberDTO memberDTO = this.memberService.findByCode(memberCode); | 91 | MemberDTO memberDTO = this.memberService.findByCode(memberCode); |
92 | log.info("同步会员积分流水,asyncPointsDetail# 通过code ==>> {},查询会员信息,结果集,memberDTO ==>> {}", memberCode, memberDTO); | ||
66 | if (Objects.nonNull(memberDTO.getId())) { | 93 | if (Objects.nonNull(memberDTO.getId())) { |
67 | pointsDetail.setMemberId(memberDTO.getId()); | 94 | log.error("同步会员积分流水异常,asyncPointsDetail# message ==>> 会员信息不存在 || code ==>> {}", memberCode); |
68 | this.pointsDetailService.create4Custom(pointsDetail); | 95 | return; |
69 | } | 96 | } |
97 | |||
98 | resource.setMemberId(memberDTO.getId()); | ||
99 | |||
100 | log.info("同步会员积分流水,asyncPointsDetail# 入库参数, resource ==>> {}", resource); | ||
101 | this.pointsDetailService.create4Custom(resource); | ||
70 | } | 102 | } |
71 | 103 | ||
72 | public void asyncDeletePointsAvailable(PointsAvailable pointsAvailable) { | 104 | public void asyncDeletePointsAvailable(PointsAvailable resource) { |
73 | String code = pointsAvailable.getCode(); | 105 | log.info("同步删除会员可用积分,参数 asyncDeletePointsAvailable# resource ==>> {}", resource); |
106 | |||
107 | String code = resource.getCode(); | ||
108 | if (StringUtils.isBlank(code)) { | ||
109 | log.error("同步删除会员可用积分异常,asyncDeletePointsAvailable# message ==>> 可用积分code不得为空"); | ||
110 | return; | ||
111 | } | ||
112 | |||
74 | PointsAvailableDTO pointsAvailableDTO = this.pointsAvailableService.getByCode(code); | 113 | PointsAvailableDTO pointsAvailableDTO = this.pointsAvailableService.getByCode(code); |
114 | log.info("同步会员积分流水,asyncPointsDetail# 通过code ==>> {},查询会员可用积分,结果集,pointsAvailableDTO ==>> {}", code, pointsAvailableDTO); | ||
115 | |||
116 | log.info("同步会员积分流水,asyncPointsDetail# 删除可用积分,入库参数,pointsAvailableDTO ==>> {}", pointsAvailableDTO); | ||
75 | this.pointsAvailableService.delete(pointsAvailableDTO.getId()); | 117 | this.pointsAvailableService.delete(pointsAvailableDTO.getId()); |
76 | } | 118 | } |
77 | } | 119 | } | ... | ... |
1 | package com.topdraw.business.process.service.impl; | 1 | package com.topdraw.business.process.service.impl; |
2 | 2 | ||
3 | import com.alibaba.fastjson.JSONObject; | ||
4 | import com.topdraw.business.module.task.attribute.domain.TaskAttr; | 3 | import com.topdraw.business.module.task.attribute.domain.TaskAttr; |
5 | import com.topdraw.business.module.task.attribute.service.TaskAttrService; | 4 | import com.topdraw.business.module.task.attribute.service.TaskAttrService; |
6 | import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO; | 5 | import com.topdraw.business.module.task.attribute.service.dto.TaskAttrDTO; | ... | ... |
... | @@ -5,7 +5,6 @@ import com.topdraw.business.module.task.template.service.TaskTemplateService; | ... | @@ -5,7 +5,6 @@ import com.topdraw.business.module.task.template.service.TaskTemplateService; |
5 | import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO; | 5 | import com.topdraw.business.module.task.template.service.dto.TaskTemplateDTO; |
6 | import com.topdraw.business.process.service.TaskTemplateOperationService; | 6 | import com.topdraw.business.process.service.TaskTemplateOperationService; |
7 | import lombok.extern.slf4j.Slf4j; | 7 | import lombok.extern.slf4j.Slf4j; |
8 | import org.springframework.beans.BeanUtils; | ||
9 | import org.springframework.beans.factory.annotation.Autowired; | 8 | import org.springframework.beans.factory.annotation.Autowired; |
10 | import org.springframework.stereotype.Service; | 9 | import org.springframework.stereotype.Service; |
11 | 10 | ||
... | @@ -29,27 +28,14 @@ public class TaskTemplateOperationServiceImpl implements TaskTemplateOperationSe | ... | @@ -29,27 +28,14 @@ public class TaskTemplateOperationServiceImpl implements TaskTemplateOperationSe |
29 | private TaskTemplateService taskTemplateService; | 28 | private TaskTemplateService taskTemplateService; |
30 | 29 | ||
31 | public void asyncCreate(TaskTemplate resources) { | 30 | public void asyncCreate(TaskTemplate resources) { |
32 | this.create(resources); | ||
33 | } | ||
34 | |||
35 | public void asyncUpdate(TaskTemplate resources) { | ||
36 | this.update(resources); | ||
37 | } | ||
38 | |||
39 | public void asyncDelete(TaskTemplate resources) { | ||
40 | this.delete(resources); | ||
41 | } | ||
42 | |||
43 | private void create(TaskTemplate resources) { | ||
44 | String code = resources.getCode(); | 31 | String code = resources.getCode(); |
45 | TaskTemplateDTO taskTemplateDTO = this.findByCode(code); | 32 | TaskTemplateDTO taskTemplateDTO = this.findByCode(code); |
46 | if (Objects.isNull(taskTemplateDTO.getId())) { | 33 | if (Objects.isNull(taskTemplateDTO.getId())) { |
47 | this.taskTemplateService.create(resources); | 34 | this.taskTemplateService.create(resources); |
48 | } | 35 | } |
49 | |||
50 | } | 36 | } |
51 | 37 | ||
52 | private void update(TaskTemplate resources) { | 38 | public void asyncUpdate(TaskTemplate resources) { |
53 | String code = resources.getCode(); | 39 | String code = resources.getCode(); |
54 | TaskTemplateDTO taskTemplateDTO = this.findByCode(code); | 40 | TaskTemplateDTO taskTemplateDTO = this.findByCode(code); |
55 | if (Objects.nonNull(taskTemplateDTO.getId())) { | 41 | if (Objects.nonNull(taskTemplateDTO.getId())) { |
... | @@ -59,7 +45,7 @@ public class TaskTemplateOperationServiceImpl implements TaskTemplateOperationSe | ... | @@ -59,7 +45,7 @@ public class TaskTemplateOperationServiceImpl implements TaskTemplateOperationSe |
59 | } | 45 | } |
60 | } | 46 | } |
61 | 47 | ||
62 | private void delete(TaskTemplate resources) { | 48 | public void asyncDelete(TaskTemplate resources) { |
63 | String code = resources.getCode(); | 49 | String code = resources.getCode(); |
64 | TaskTemplateDTO taskTemplateDTO = this.findByCode(code); | 50 | TaskTemplateDTO taskTemplateDTO = this.findByCode(code); |
65 | if (Objects.nonNull(taskTemplateDTO.getId())) { | 51 | if (Objects.nonNull(taskTemplateDTO.getId())) { |
... | @@ -68,21 +54,11 @@ public class TaskTemplateOperationServiceImpl implements TaskTemplateOperationSe | ... | @@ -68,21 +54,11 @@ public class TaskTemplateOperationServiceImpl implements TaskTemplateOperationSe |
68 | } | 54 | } |
69 | } | 55 | } |
70 | 56 | ||
71 | private void delete(Long id) { | ||
72 | TaskTemplateDTO taskTemplateDTO = this.findById(id); | ||
73 | this.taskTemplateService.delete(id); | ||
74 | |||
75 | TaskTemplate taskTemplate = new TaskTemplate(); | ||
76 | BeanUtils.copyProperties(taskTemplateDTO, taskTemplate); | ||
77 | taskTemplate.setDeleteMark(1); | ||
78 | } | ||
79 | |||
80 | @Override | 57 | @Override |
81 | public TaskTemplateDTO findByCode(String code) { | 58 | public TaskTemplateDTO findByCode(String code) { |
82 | return this.taskTemplateService.findByCode(code); | 59 | return this.taskTemplateService.findByCode(code); |
83 | } | 60 | } |
84 | 61 | ||
85 | |||
86 | private TaskTemplateDTO findById(Long id) { | 62 | private TaskTemplateDTO findById(Long id) { |
87 | return this.taskTemplateService.findById(id); | 63 | return this.taskTemplateService.findById(id); |
88 | } | 64 | } | ... | ... |
This diff is collapsed.
Click to expand it.
... | @@ -39,21 +39,25 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation | ... | @@ -39,21 +39,25 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation |
39 | * @param resource | 39 | * @param resource |
40 | */ | 40 | */ |
41 | public void asyncCreateMemberProfileAndSyncMember(MemberProfileDTO resource) { | 41 | public void asyncCreateMemberProfileAndSyncMember(MemberProfileDTO resource) { |
42 | log.info("创建会员属性,参数 ==>> {}", resource); | 42 | log.info("保存会员以及会员属性,参数 asyncCreateMemberProfileAndSyncMember# resource ==>> {}", resource); |
43 | |||
43 | String memberCode = resource.getMemberCode(); | 44 | String memberCode = resource.getMemberCode(); |
44 | if (StringUtils.isBlank(memberCode)) { | 45 | if (StringUtils.isBlank(memberCode)) { |
45 | log.error("创建会员属性失败,会员code不存在"); | 46 | log.error("保存会员以及会员属性异常,asyncCreateMemberProfileAndSyncMember# message ==>> 会员code不存在"); |
46 | return; | 47 | return; |
47 | } | 48 | } |
48 | 49 | ||
49 | MemberDTO memberDTO = this.memberService.findByCode(memberCode); | 50 | MemberDTO memberDTO = this.memberService.findByCode(memberCode); |
51 | log.info("保存会员以及会员属性,asyncCreateMemberProfileAndSyncMember# 通过code ==>> {},查询会员信息,结果集,memberDTO ==>> {}", memberCode, memberDTO); | ||
52 | |||
50 | if (Objects.isNull(memberDTO.getId())) { | 53 | if (Objects.isNull(memberDTO.getId())) { |
51 | log.error("创建会员属性失败,会员信息不存在 ==>> memberCode ==>> {}", memberCode); | 54 | log.error("保存会员以及会员属性失败,asyncCreateMemberProfileAndSyncMember# message ==>> 会员信息不存在 || memberCode ==>> {}", memberCode); |
52 | return; | 55 | return; |
53 | } | 56 | } |
54 | 57 | ||
55 | Long memberId = memberDTO.getId(); | 58 | Long memberId = memberDTO.getId(); |
56 | MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId); | 59 | MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId); |
60 | log.info("保存会员以及会员属性,asyncCreateMemberProfileAndSyncMember# 通过会员id ==>> {},查询会员属性信息,结果集,_memberProfileDTO ==>> {}", memberId, _memberProfileDTO); | ||
57 | 61 | ||
58 | if (Objects.isNull(_memberProfileDTO.getId())) { | 62 | if (Objects.isNull(_memberProfileDTO.getId())) { |
59 | 63 | ||
... | @@ -61,6 +65,8 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation | ... | @@ -61,6 +65,8 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation |
61 | BeanUtils.copyProperties(resource, memberProfile); | 65 | BeanUtils.copyProperties(resource, memberProfile); |
62 | memberProfile.setId(null); | 66 | memberProfile.setId(null); |
63 | memberProfile.setMemberId(memberId); | 67 | memberProfile.setMemberId(memberId); |
68 | |||
69 | log.info("保存会员以及会员属性,asyncCreateMemberProfileAndSyncMember# 保存会员属性,入库参数,memberProfile ==>> {}", memberProfile); | ||
64 | this.memberProfileService.createDefault(memberProfile); | 70 | this.memberProfileService.createDefault(memberProfile); |
65 | 71 | ||
66 | Member member = new Member(); | 72 | Member member = new Member(); |
... | @@ -69,56 +75,60 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation | ... | @@ -69,56 +75,60 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation |
69 | member.setAvatarUrl(memberProfile.getAvatarUrl()); | 75 | member.setAvatarUrl(memberProfile.getAvatarUrl()); |
70 | member.setNickname(memberProfile.getRealname()); | 76 | member.setNickname(memberProfile.getRealname()); |
71 | member.setGender(memberProfile.getGender()); | 77 | member.setGender(memberProfile.getGender()); |
78 | |||
79 | log.info("保存会员以及会员属性,asyncCreateMemberProfileAndSyncMember# 更新会员头像、昵称、性别,入库参数,member ==>> {}", member); | ||
72 | this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member); | 80 | this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member); |
73 | } | 81 | } |
74 | 82 | ||
75 | } | 83 | } |
76 | 84 | ||
77 | 85 | ||
78 | /** | ||
79 | * | ||
80 | * @param resources | ||
81 | */ | ||
82 | public void asyncUpdateMemberProfileAndSyncMember(MemberProfileAndMemberDTO resources) { | 86 | public void asyncUpdateMemberProfileAndSyncMember(MemberProfileAndMemberDTO resources) { |
83 | log.info("修改会员属性,参数 ==>> {}", resources); | 87 | log.info("修改会员属性,参数 asyncUpdateMemberProfileAndSyncMember# resource ==>> {}", resources); |
84 | 88 | ||
85 | MemberProfileDTO memberProfileDTO = resources.getMemberProfileDTO(); | 89 | MemberProfileDTO memberProfileDTO = resources.getMemberProfileDTO(); |
86 | if (Objects.isNull(memberProfileDTO)) { | 90 | if (Objects.isNull(memberProfileDTO)) { |
87 | log.error("修改会员属性异常, 会员属性参数为空"); | 91 | log.error("修改会员属性异常,asyncUpdateMemberProfileAndSyncMember# message ==>> 会员属性不得为空"); |
88 | return; | 92 | return; |
89 | } | 93 | } |
90 | 94 | ||
91 | MemberDTO memberDTO = resources.getMemberDTO(); | 95 | MemberDTO memberDTO = resources.getMemberDTO(); |
92 | if (Objects.isNull(memberDTO)) { | 96 | if (Objects.isNull(memberDTO)) { |
93 | log.error("修改会员属性异常, 会员信息为空"); | 97 | log.error("修改会员属性异常,asyncUpdateMemberProfileAndSyncMember# message ==>> 会员信息不得为空"); |
94 | return; | 98 | return; |
95 | } | 99 | } |
96 | 100 | ||
97 | MemberProfileDTO _memberProfileDTO = this.asyncMemberProfile(memberProfileDTO); | 101 | MemberProfileDTO _memberProfileDTO = this.asyncMemberProfile(memberProfileDTO); |
102 | log.info("修改会员属性,asyncUpdateMemberProfileAndSyncMember# 结果集,_memberProfileDTO ==>> {}", _memberProfileDTO); | ||
103 | |||
98 | String code = memberDTO.getCode(); | 104 | String code = memberDTO.getCode(); |
99 | if (!StringUtils.isEmpty(code)) { | 105 | if (!StringUtils.isEmpty(code)) { |
100 | MemberDTO memberDTO1 = this.memberService.findByCode(code); | 106 | MemberDTO memberDTO1 = this.memberService.findByCode(code); |
107 | log.info("修改会员属性,asyncUpdateMemberProfileAndSyncMember# 通过code ==>> {},查询会员信息,结果集,memberDTO1 ==>> {}", code, memberDTO); | ||
101 | 108 | ||
102 | Member member = new Member(); | 109 | Member member = new Member(); |
103 | member.setId(memberDTO1.getId()); | 110 | member.setId(memberDTO1.getId()); |
104 | member.setNickname(_memberProfileDTO.getRealname()); | 111 | member.setNickname(_memberProfileDTO.getRealname()); |
105 | member.setBirthday(_memberProfileDTO.getBirthday()); | 112 | member.setBirthday(_memberProfileDTO.getBirthday()); |
106 | member.setGender(_memberProfileDTO.getGender()); | 113 | member.setGender(_memberProfileDTO.getGender()); |
114 | |||
115 | log.info("修改会员属性,asyncUpdateMemberProfileAndSyncMember# 入库参数,member ==>> {}", member); | ||
107 | this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member); | 116 | this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member); |
108 | } | 117 | } |
109 | } | 118 | } |
110 | 119 | ||
111 | public MemberProfileDTO asyncMemberProfile(MemberProfileDTO memberProfileDTO){ | 120 | public MemberProfileDTO asyncMemberProfile(MemberProfileDTO resource){ |
112 | String memberCode = memberProfileDTO.getMemberCode(); | 121 | log.info("修改会员属性,参数 asyncMemberProfile# resource ==>> {}", resource); |
122 | String memberCode = resource.getMemberCode(); | ||
113 | MemberDTO memberDTO = this.memberService.findByCode(memberCode); | 123 | MemberDTO memberDTO = this.memberService.findByCode(memberCode); |
114 | Long memberId = memberDTO.getId(); | 124 | Long memberId = memberDTO.getId(); |
115 | 125 | ||
116 | MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId); | 126 | MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId); |
117 | memberProfileDTO.setId(_memberProfileDTO.getId()); | 127 | resource.setId(_memberProfileDTO.getId()); |
118 | memberProfileDTO.setMemberId(memberId); | 128 | resource.setMemberId(memberId); |
119 | 129 | ||
120 | MemberProfile memberProfile = new MemberProfile(); | 130 | MemberProfile memberProfile = new MemberProfile(); |
121 | BeanUtils.copyProperties(memberProfileDTO, memberProfile); | 131 | BeanUtils.copyProperties(resource, memberProfile); |
122 | return this.memberProfileService.update(memberProfile); | 132 | return this.memberProfileService.update(memberProfile); |
123 | } | 133 | } |
124 | 134 | ... | ... |
src/main/java/com/topdraw/business/process/service/mapper/CollectionMq2DetailMapper.java
deleted
100644 → 0
1 | package com.topdraw.business.process.service.mapper; | ||
2 | |||
3 | import com.topdraw.base.BaseMapper; | ||
4 | import com.topdraw.business.module.user.weixin.collection.domain.UserCollectionDetail; | ||
5 | import com.topdraw.business.process.domian.weixin.UserCollectionMq; | ||
6 | import org.mapstruct.Mapper; | ||
7 | import org.mapstruct.Mapping; | ||
8 | import org.mapstruct.Mappings; | ||
9 | import org.mapstruct.ReportingPolicy; | ||
10 | |||
11 | @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) | ||
12 | public interface CollectionMq2DetailMapper extends BaseMapper<UserCollectionMq, UserCollectionDetail> { | ||
13 | @Override | ||
14 | @Mappings({ | ||
15 | @Mapping(target = "detailImg", source = "images") | ||
16 | }) | ||
17 | UserCollectionDetail toEntity(UserCollectionMq dto); | ||
18 | } |
-
Please register or sign in to post a comment