Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit facad29b facad29bd7ec40f5596bdf972895b95d48f9f844 by xianghan
Options

1.优化

1 parent 530a9a13
Inline Side-by-side
Showing 40 changed files with 466 additions and 103 deletions
...@@ -17,17 +17,18 @@ ...@@ -17,17 +17,18 @@
17 17
18 <dependencies> 18 <dependencies>
19 <!--系统--> 19 <!--系统-->
20 <dependency> 20 <!--<dependency>
21 <groupId>com.topdraw</groupId> 21 <groupId>com.topdraw</groupId>
22 <artifactId>cronos-system</artifactId> 22 <artifactId>cronos-system</artifactId>
23 <version>${cronos.version}</version> 23 <version>${cronos.version}</version>
24 </dependency> 24 </dependency>-->
25
25 <!--代码生成器--> 26 <!--代码生成器-->
26 <dependency> 27 <!--<dependency>
27 <groupId>com.topdraw</groupId> 28 <groupId>com.topdraw</groupId>
28 <artifactId>cronos-generator</artifactId> 29 <artifactId>cronos-generator</artifactId>
29 <version>${cronos.version}</version> 30 <version>${cronos.version}</version>
30 </dependency> 31 </dependency>-->
31 </dependencies> 32 </dependencies>
32 33
33 </project> 34 </project>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -15,11 +15,24 @@ ...@@ -15,11 +15,24 @@
15 <maven.compiler.source>8</maven.compiler.source> 15 <maven.compiler.source>8</maven.compiler.source>
16 <maven.compiler.target>8</maven.compiler.target> 16 <maven.compiler.target>8</maven.compiler.target>
17 <jjwt.version>0.9.1</jjwt.version> 17 <jjwt.version>0.9.1</jjwt.version>
18 <cronos.version>1.1.0</cronos.version>
18 </properties> 19 </properties>
19 20
20 21
21 <dependencies> 22 <dependencies>
22 23
24 <!--<dependency>
25 <groupId>com.topdraw</groupId>
26 <artifactId>cronos-system</artifactId>
27 <version>${cronos.version}</version>
28 </dependency>-->
29
30 <dependency>
31 <groupId>com.topdraw</groupId>
32 <artifactId>code-generator</artifactId>
33 <version>3.1.0</version>
34 </dependency>
35
23 <dependency> 36 <dependency>
24 <groupId>org.springframework.boot</groupId> 37 <groupId>org.springframework.boot</groupId>
25 <artifactId>spring-boot-starter-cache</artifactId> 38 <artifactId>spring-boot-starter-cache</artifactId>
......
1 package com.topdraw.business.module.contact.vis.rest; 1 package com.topdraw.business.module.contact.vis.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO; 4 import com.topdraw.business.module.contact.vis.service.dto.ActivityAddressDTO;
6 import com.topdraw.common.ResultInfo; 5 import com.topdraw.common.ResultInfo;
7 import com.topdraw.business.module.contact.vis.domain.ActivityAddress; 6 import com.topdraw.business.module.contact.vis.domain.ActivityAddress;
...@@ -62,7 +61,6 @@ public class ActivityAddressController { ...@@ -62,7 +61,6 @@ public class ActivityAddressController {
62 return ResultInfo.success(activityAddressDTO); 61 return ResultInfo.success(activityAddressDTO);
63 } 62 }
64 63
65 @Log
66 @PostMapping(value = "/createOrUpdateActivityAddress") 64 @PostMapping(value = "/createOrUpdateActivityAddress")
67 @ApiOperation("新增ActivityAddress") 65 @ApiOperation("新增ActivityAddress")
68 @AnonymousAccess 66 @AnonymousAccess
...@@ -100,7 +98,7 @@ public class ActivityAddressController { ...@@ -100,7 +98,7 @@ public class ActivityAddressController {
100 return ResultInfo.success(activityAddressDTO); 98 return ResultInfo.success(activityAddressDTO);
101 } 99 }
102 100
103 @Log 101 // @Log
104 @PostMapping(value = "/create") 102 @PostMapping(value = "/create")
105 @ApiOperation("新增ActivityAddress") 103 @ApiOperation("新增ActivityAddress")
106 @AnonymousAccess 104 @AnonymousAccess
...@@ -109,7 +107,7 @@ public class ActivityAddressController { ...@@ -109,7 +107,7 @@ public class ActivityAddressController {
109 return ResultInfo.success(); 107 return ResultInfo.success();
110 } 108 }
111 109
112 @Log 110 // @Log
113 @PutMapping(value = "/update") 111 @PutMapping(value = "/update")
114 @ApiOperation("修改ActivityAddress") 112 @ApiOperation("修改ActivityAddress")
115 @AnonymousAccess 113 @AnonymousAccess
...@@ -119,7 +117,7 @@ public class ActivityAddressController { ...@@ -119,7 +117,7 @@ public class ActivityAddressController {
119 } 117 }
120 118
121 119
122 @Log 120 // @Log
123 @DeleteMapping(value = "/{id}") 121 @DeleteMapping(value = "/{id}")
124 @ApiOperation("删除ActivityAddress") 122 @ApiOperation("删除ActivityAddress")
125 public ResultInfo delete(@PathVariable Long id) { 123 public ResultInfo delete(@PathVariable Long id) {
......
1 package com.topdraw.business.module.member.address.rest; 1 package com.topdraw.business.module.member.address.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.module.common.validated.CreateGroup; 4 import com.topdraw.business.module.common.validated.CreateGroup;
6 import com.topdraw.business.module.common.validated.UpdateGroup; 5 import com.topdraw.business.module.common.validated.UpdateGroup;
7 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO; 6 import com.topdraw.business.module.member.address.service.dto.BasicMemberAddressDTO;
...@@ -29,7 +28,6 @@ public class MemberAddressController { ...@@ -29,7 +28,6 @@ public class MemberAddressController {
29 @Autowired 28 @Autowired
30 private MemberAddressOperationService memberAddressOperationService; 29 private MemberAddressOperationService memberAddressOperationService;
31 30
32 @Log("新增会员地址")
33 @RequestMapping(value = "/create") 31 @RequestMapping(value = "/create")
34 @ApiOperation("新增会员地址") 32 @ApiOperation("新增会员地址")
35 @AnonymousAccess 33 @AnonymousAccess
...@@ -40,7 +38,6 @@ public class MemberAddressController { ...@@ -40,7 +38,6 @@ public class MemberAddressController {
40 return ResultInfo.success(memberAddressDTO); 38 return ResultInfo.success(memberAddressDTO);
41 } 39 }
42 40
43 @Log("修改会员地址")
44 @RequestMapping(value = "/update") 41 @RequestMapping(value = "/update")
45 @ApiOperation("修改会员地址") 42 @ApiOperation("修改会员地址")
46 @AnonymousAccess 43 @AnonymousAccess
...@@ -51,7 +48,6 @@ public class MemberAddressController { ...@@ -51,7 +48,6 @@ public class MemberAddressController {
51 return ResultInfo.success(memberAddressDTO); 48 return ResultInfo.success(memberAddressDTO);
52 } 49 }
53 50
54 @Log("删除会员地址")
55 @RequestMapping(value = "/delete") 51 @RequestMapping(value = "/delete")
56 @ApiOperation("删除会员地址") 52 @ApiOperation("删除会员地址")
57 @AnonymousAccess 53 @AnonymousAccess
......
1 package com.topdraw.business.module.member.profile.rest; 1 package com.topdraw.business.module.member.profile.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.module.common.validated.CreateGroup; 4 import com.topdraw.business.module.common.validated.CreateGroup;
6 import com.topdraw.business.module.common.validated.UpdateGroup; 5 import com.topdraw.business.module.common.validated.UpdateGroup;
7 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; 6 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
...@@ -15,7 +14,6 @@ import org.springframework.validation.annotation.Validated; ...@@ -15,7 +14,6 @@ import org.springframework.validation.annotation.Validated;
15 import org.springframework.web.bind.annotation.*; 14 import org.springframework.web.bind.annotation.*;
16 import io.swagger.annotations.*; 15 import io.swagger.annotations.*;
17 16
18 import javax.validation.constraints.NotNull;
19 17
20 /** 18 /**
21 * @author XiangHan 19 * @author XiangHan
...@@ -31,7 +29,6 @@ public class MemberProfileController { ...@@ -31,7 +29,6 @@ public class MemberProfileController {
31 @Autowired 29 @Autowired
32 private MemberProfileOperationService memberProfileOperationService; 30 private MemberProfileOperationService memberProfileOperationService;
33 31
34 @Log("修改会员属性")
35 @RequestMapping(value = "/update") 32 @RequestMapping(value = "/update")
36 @ApiOperation("修改会员属性") 33 @ApiOperation("修改会员属性")
37 @AnonymousAccess 34 @AnonymousAccess
...@@ -45,7 +42,6 @@ public class MemberProfileController { ...@@ -45,7 +42,6 @@ public class MemberProfileController {
45 return ResultInfo.success(memberProfileDTO); 42 return ResultInfo.success(memberProfileDTO);
46 } 43 }
47 44
48 @Log("修改会员属性并同步会员信息")
49 @PutMapping(value = "/updateMemberProfileAndMember") 45 @PutMapping(value = "/updateMemberProfileAndMember")
50 @ApiOperation("修改会员属性并同步会员信息") 46 @ApiOperation("修改会员属性并同步会员信息")
51 @AnonymousAccess 47 @AnonymousAccess
...@@ -55,8 +51,6 @@ public class MemberProfileController { ...@@ -55,8 +51,6 @@ public class MemberProfileController {
55 return ResultInfo.success(memberProfileDTO); 51 return ResultInfo.success(memberProfileDTO);
56 } 52 }
57 53
58
59 @Log("新增会员属性")
60 @RequestMapping(value = "/create") 54 @RequestMapping(value = "/create")
61 @ApiOperation("新增会员属性") 55 @ApiOperation("新增会员属性")
62 @AnonymousAccess 56 @AnonymousAccess
......
1 package com.topdraw.business.module.member.relatedinfo.rest; 1 package com.topdraw.business.module.member.relatedinfo.rest;
2 2
3 import com.topdraw.annotation.AnonymousAccess; 3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.module.common.validated.CreateGroup; 4 import com.topdraw.business.module.common.validated.CreateGroup;
6 import com.topdraw.business.module.common.validated.UpdateGroup; 5 import com.topdraw.business.module.common.validated.UpdateGroup;
7 import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO; 6 import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
8 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
9 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService; 7 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService;
10 import com.topdraw.common.ResultInfo; 8 import com.topdraw.common.ResultInfo;
11 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 9 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
...@@ -29,7 +27,6 @@ public class MemberRelatedInfoController { ...@@ -29,7 +27,6 @@ public class MemberRelatedInfoController {
29 @Autowired 27 @Autowired
30 private MemberRelatedInfoOperationService memberRelatedInfoOperationService; 28 private MemberRelatedInfoOperationService memberRelatedInfoOperationService;
31 29
32 @Log("新增相关人员")
33 @RequestMapping(value = "/create") 30 @RequestMapping(value = "/create")
34 @ApiOperation("新增相关人员") 31 @ApiOperation("新增相关人员")
35 @AnonymousAccess 32 @AnonymousAccess
...@@ -41,7 +38,6 @@ public class MemberRelatedInfoController { ...@@ -41,7 +38,6 @@ public class MemberRelatedInfoController {
41 return ResultInfo.success(memberRelatedInfoDTO); 38 return ResultInfo.success(memberRelatedInfoDTO);
42 } 39 }
43 40
44 @Log("修改相关人员")
45 @RequestMapping(value = "/update") 41 @RequestMapping(value = "/update")
46 @ApiOperation("修改相关人员") 42 @ApiOperation("修改相关人员")
47 @AnonymousAccess 43 @AnonymousAccess
...@@ -54,7 +50,6 @@ public class MemberRelatedInfoController { ...@@ -54,7 +50,6 @@ public class MemberRelatedInfoController {
54 } 50 }
55 51
56 52
57 @Log("删除相关人员")
58 @RequestMapping(value = "/delete") 53 @RequestMapping(value = "/delete")
59 @ApiOperation("删除相关人员") 54 @ApiOperation("删除相关人员")
60 @AnonymousAccess 55 @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.aop.log.Log;
5 import com.topdraw.business.module.common.validated.CreateGroup; 4 import com.topdraw.business.module.common.validated.CreateGroup;
6 import com.topdraw.business.module.common.validated.UpdateGroup; 5 import com.topdraw.business.module.common.validated.UpdateGroup;
7 import com.topdraw.business.module.member.domain.Member; 6 import com.topdraw.business.module.member.domain.Member;
...@@ -14,7 +13,6 @@ import io.swagger.annotations.Api; ...@@ -14,7 +13,6 @@ import io.swagger.annotations.Api;
14 import io.swagger.annotations.ApiOperation; 13 import io.swagger.annotations.ApiOperation;
15 import lombok.extern.slf4j.Slf4j; 14 import lombok.extern.slf4j.Slf4j;
16 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
17 import org.springframework.util.Assert;
18 import org.springframework.validation.annotation.Validated; 16 import org.springframework.validation.annotation.Validated;
19 import org.springframework.web.bind.annotation.*; 17 import org.springframework.web.bind.annotation.*;
20 18
...@@ -37,7 +35,6 @@ public class MemberController { ...@@ -37,7 +35,6 @@ public class MemberController {
37 private UserOperationService userOperationService; 35 private UserOperationService userOperationService;
38 36
39 37
40 @Log("为大屏账户创建会员")
41 @RequestMapping(value = "/createMemberByUserTv") 38 @RequestMapping(value = "/createMemberByUserTv")
42 @ApiOperation("为大屏账户创建会员") 39 @ApiOperation("为大屏账户创建会员")
43 @AnonymousAccess 40 @AnonymousAccess
...@@ -49,7 +46,6 @@ public class MemberController { ...@@ -49,7 +46,6 @@ public class MemberController {
49 return ResultInfo.success(); 46 return ResultInfo.success();
50 } 47 }
51 48
52 @Log("手动修改vip")
53 @RequestMapping(value = "/doUpdateVipByCode") 49 @RequestMapping(value = "/doUpdateVipByCode")
54 @AnonymousAccess 50 @AnonymousAccess
55 @ApiOperation("手动修改vip") 51 @ApiOperation("手动修改vip")
...@@ -59,7 +55,6 @@ public class MemberController { ...@@ -59,7 +55,6 @@ public class MemberController {
59 return ResultInfo.success(); 55 return ResultInfo.success();
60 } 56 }
61 57
62 @Log("修改会员信息")
63 @PutMapping(value = "/update") 58 @PutMapping(value = "/update")
64 @ApiOperation("修改会员信息") 59 @ApiOperation("修改会员信息")
65 @AnonymousAccess 60 @AnonymousAccess
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.aop.log.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.aop.log.Log;
4 import com.topdraw.business.process.domian.TempExp; 3 import com.topdraw.business.process.domian.TempExp;
5 import com.topdraw.business.process.service.ExpOperationService; 4 import com.topdraw.business.process.service.ExpOperationService;
6 import com.topdraw.common.ResultInfo; 5 import com.topdraw.common.ResultInfo;
...@@ -28,7 +27,6 @@ public class ExpOperationController { ...@@ -28,7 +27,6 @@ public class ExpOperationController {
28 @Autowired 27 @Autowired
29 private ExpOperationService expOperationService; 28 private ExpOperationService expOperationService;
30 29
31 @Log("手动发放成长值")
32 @PostMapping(value = "/grantExpByManual") 30 @PostMapping(value = "/grantExpByManual")
33 @ApiOperation("手动发放成长值") 31 @ApiOperation("手动发放成长值")
34 public ResultInfo grantExpByManual(@Validated @RequestBody TempExp tempExp) { 32 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.aop.log.Log;
5 import com.topdraw.business.module.common.validated.UpdateGroup; 4 import com.topdraw.business.module.common.validated.UpdateGroup;
6 import com.topdraw.business.module.member.domain.Member; 5 import com.topdraw.business.module.member.domain.Member;
7 import com.topdraw.business.module.member.profile.domain.MemberProfile;
8 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; 6 import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
9 import com.topdraw.business.module.member.service.dto.MemberDTO; 7 import com.topdraw.business.module.member.service.dto.MemberDTO;
10 import com.topdraw.business.process.domian.member.MemberOperationBean; 8 import com.topdraw.business.process.domian.member.MemberOperationBean;
11 import com.topdraw.business.process.domian.weixin.BuyVipBean; 9 import com.topdraw.business.process.domian.weixin.BuyVipBean;
12 import com.topdraw.business.process.service.member.MemberOperationService; 10 import com.topdraw.business.process.service.member.MemberOperationService;
13 import com.topdraw.business.process.service.member.MemberProfileOperationService;
14 import com.topdraw.common.IResultInfo; 11 import com.topdraw.common.IResultInfo;
15 import com.topdraw.common.ResultInfo; 12 import com.topdraw.common.ResultInfo;
16 import com.topdraw.exception.BadRequestException; 13 import com.topdraw.exception.BadRequestException;
...@@ -23,7 +20,6 @@ import org.springframework.validation.annotation.Validated; ...@@ -23,7 +20,6 @@ import org.springframework.validation.annotation.Validated;
23 import org.springframework.web.bind.annotation.*; 20 import org.springframework.web.bind.annotation.*;
24 21
25 import java.sql.Timestamp; 22 import java.sql.Timestamp;
26 import java.time.LocalDateTime;
27 import java.util.Objects; 23 import java.util.Objects;
28 24
29 @Api("会员处理") 25 @Api("会员处理")
...@@ -36,8 +32,6 @@ public class MemberOperationController { ...@@ -36,8 +32,6 @@ public class MemberOperationController {
36 @Autowired 32 @Autowired
37 private MemberOperationService memberOperationService; 33 private MemberOperationService memberOperationService;
38 34
39
40 @Log("手动修改vip")
41 @RequestMapping(value = "/updateVipByMemberId") 35 @RequestMapping(value = "/updateVipByMemberId")
42 @ApiOperation("手动修改vip") 36 @ApiOperation("手动修改vip")
43 @AnonymousAccess 37 @AnonymousAccess
......
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.aop.log.Log;
5 import com.topdraw.business.module.member.service.MemberService; 4 import com.topdraw.business.module.member.service.MemberService;
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.iptv.service.UserTvService; 6 import com.topdraw.business.module.user.iptv.service.UserTvService;
...@@ -46,7 +45,7 @@ public class PointsOperationController { ...@@ -46,7 +45,7 @@ public class PointsOperationController {
46 @Autowired 45 @Autowired
47 private PointsOperationService pointsOperationService; 46 private PointsOperationService pointsOperationService;
48 47
49 @Log("清除过期积分并计算总积分，供客户端会员查询积分时调用") 48 // @Log("清除过期积分并计算总积分，供客户端会员查询积分时调用")
50 @GetMapping(value = "/cleanInvalidPointsAndCalculateCurrentPoints/{id}") 49 @GetMapping(value = "/cleanInvalidPointsAndCalculateCurrentPoints/{id}")
51 @ApiOperation("清除过期积分并计算总积分，供客户端会员查询积分时调用") 50 @ApiOperation("清除过期积分并计算总积分，供客户端会员查询积分时调用")
52 @AnonymousAccess 51 @AnonymousAccess
...@@ -55,7 +54,7 @@ public class PointsOperationController { ...@@ -55,7 +54,7 @@ public class PointsOperationController {
55 return ResultInfo.success(Objects.isNull(aLong) ? 0L : aLong); 54 return ResultInfo.success(Objects.isNull(aLong) ? 0L : aLong);
56 } 55 }
57 56
58 @Log("手动发放积分") 57 // @Log("手动发放积分")
59 @PostMapping(value = "/addPoints") 58 @PostMapping(value = "/addPoints")
60 @ApiOperation("手动发放积分") 59 @ApiOperation("手动发放积分")
61 @AnonymousAccess 60 @AnonymousAccess
...@@ -96,12 +95,14 @@ public class PointsOperationController { ...@@ -96,12 +95,14 @@ public class PointsOperationController {
96 if (Objects.nonNull(userTvDTO)) { 95 if (Objects.nonNull(userTvDTO)) {
97 Long memberId = userTvDTO.getMemberId(); 96 Long memberId = userTvDTO.getMemberId();
98 if (Objects.isNull(memberId)) { 97 if (Objects.isNull(memberId)) {
99 return ResultInfo.failed("会员信息不存在"); 98 // return ResultInfo.failed("会员信息不存在");
99 return ResultInfo.failure("会员信息不存在");
100 } 100 }
101 MemberDTO memberDTO = this.memberService.findById(memberId); 101 MemberDTO memberDTO = this.memberService.findById(memberId);
102 tempPoints.setMemberCode(memberDTO.getCode()); 102 tempPoints.setMemberCode(memberDTO.getCode());
103 tempPoints.setMemberId(memberId); 103 tempPoints.setMemberId(memberId);
104 } 104 }
105
105 tempPoints.setPoints(points); 106 tempPoints.setPoints(points);
106 tempPoints.setDeviceType(deviceType); 107 tempPoints.setDeviceType(deviceType);
107 tempPoints.setAppCode(LocalConstants.APP_CODE_CHONGQING_CHONGSHU_VIS); 108 tempPoints.setAppCode(LocalConstants.APP_CODE_CHONGQING_CHONGSHU_VIS);
...@@ -132,7 +133,8 @@ public class PointsOperationController { ...@@ -132,7 +133,8 @@ public class PointsOperationController {
132 memberId = this.getMemberIdByWeiXinUserId(userId); 133 memberId = this.getMemberIdByWeiXinUserId(userId);
133 } 134 }
134 if (Objects.isNull(memberId)) { 135 if (Objects.isNull(memberId)) {
135 return ResultInfo.failed("会员信息不存在"); 136 // return ResultInfo.failed("会员信息不存在");
137 return ResultInfo.failure("会员信息不存在");
136 } 138 }
137 tempPoints.setMemberId(memberId); 139 tempPoints.setMemberId(memberId);
138 return this.customPoints(tempPoints); 140 return this.customPoints(tempPoints);
...@@ -174,7 +176,7 @@ public class PointsOperationController { ...@@ -174,7 +176,7 @@ public class PointsOperationController {
174 return ResultInfo.success(Arrays.asList(b),description); 176 return ResultInfo.success(Arrays.asList(b),description);
175 } 177 }
176 178
177 @Log("积分兑换商品") 179 // @Log("积分兑换商品")
178 @PostMapping(value = "/consumeItemPoints") 180 @PostMapping(value = "/consumeItemPoints")
179 @ApiOperation("积分兑换商品") 181 @ApiOperation("积分兑换商品")
180 @AnonymousAccess 182 @AnonymousAccess
......
1 package com.topdraw.business.process.rest; 1 package com.topdraw.business.process.rest;
2 2
3 import com.topdraw.aop.log.Log;
4 import com.topdraw.business.module.rights.history.domain.RightsHistory; 3 import com.topdraw.business.module.rights.history.domain.RightsHistory;
5 import com.topdraw.business.process.service.RightsOperationService; 4 import com.topdraw.business.process.service.RightsOperationService;
6 import com.topdraw.common.ResultInfo; 5 import com.topdraw.common.ResultInfo;
...@@ -30,7 +29,6 @@ public class RightsOperationController { ...@@ -30,7 +29,6 @@ public class RightsOperationController {
30 * @param rightsHistory 29 * @param rightsHistory
31 * @return 30 * @return
32 */ 31 */
33 @Log("手动发放优惠券")
34 @PostMapping(value = "/grantRightsByManual") 32 @PostMapping(value = "/grantRightsByManual")
35 @ApiOperation("手动发放优惠券") 33 @ApiOperation("手动发放优惠券")
36 public ResultInfo grantRightsByManual(@Validated @RequestBody RightsHistory rightsHistory) { 34 public ResultInfo grantRightsByManual(@Validated @RequestBody RightsHistory rightsHistory) {
......
...@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; ...@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
5 5
6 import com.alibaba.fastjson.JSONObject; 6 import com.alibaba.fastjson.JSONObject;
7 import com.topdraw.annotation.AnonymousAccess; 7 import com.topdraw.annotation.AnonymousAccess;
8 import com.topdraw.aop.log.Log;
9 import com.topdraw.business.module.common.validated.CreateGroup; 8 import com.topdraw.business.module.common.validated.CreateGroup;
10 import com.topdraw.business.module.common.validated.UpdateGroup; 9 import com.topdraw.business.module.common.validated.UpdateGroup;
11 import com.topdraw.business.module.member.service.MemberService; 10 import com.topdraw.business.module.member.service.MemberService;
...@@ -58,7 +57,6 @@ public class UserOperationController { ...@@ -58,7 +57,6 @@ public class UserOperationController {
58 private static final String UNSUBSCRIBE = "unsubscribe"; 57 private static final String UNSUBSCRIBE = "unsubscribe";
59 private static final Integer SUBSCRIBE_STATUS = 1; 58 private static final Integer SUBSCRIBE_STATUS = 1;
60 59
61 @Log("新增小屏账户同时创建会员信息")
62 @PostMapping(value = "/createWeixinUserAndCreateMember") 60 @PostMapping(value = "/createWeixinUserAndCreateMember")
63 @ApiOperation("新增小屏账户同时创建会员信息") 61 @ApiOperation("新增小屏账户同时创建会员信息")
64 @AnonymousAccess 62 @AnonymousAccess
...@@ -69,7 +67,6 @@ public class UserOperationController { ...@@ -69,7 +67,6 @@ public class UserOperationController {
69 return ResultInfo.success(result); 67 return ResultInfo.success(result);
70 } 68 }
71 69
72 @Log("微信服务号(H5)登录")
73 @PostMapping("/serviceLogin") 70 @PostMapping("/serviceLogin")
74 @ApiOperation("微信服务号(H5)登录") 71 @ApiOperation("微信服务号(H5)登录")
75 @AnonymousAccess 72 @AnonymousAccess
...@@ -80,7 +77,6 @@ public class UserOperationController { ...@@ -80,7 +77,6 @@ public class UserOperationController {
80 return ResultInfo.success(result); 77 return ResultInfo.success(result);
81 } 78 }
82 79
83 @Log("微信小程序登录")
84 @PostMapping("/appletLogin") 80 @PostMapping("/appletLogin")
85 @ApiOperation("微信小程序登录") 81 @ApiOperation("微信小程序登录")
86 @AnonymousAccess 82 @AnonymousAccess
...@@ -91,7 +87,6 @@ public class UserOperationController { ...@@ -91,7 +87,6 @@ public class UserOperationController {
91 return ResultInfo.success(result); 87 return ResultInfo.success(result);
92 } 88 }
93 89
94 @Log("微信公众号关注")
95 @PostMapping("/subscribe") 90 @PostMapping("/subscribe")
96 @ApiOperation("微信公众号关注") 91 @ApiOperation("微信公众号关注")
97 @AnonymousAccess 92 @AnonymousAccess
...@@ -163,7 +158,6 @@ public class UserOperationController { ...@@ -163,7 +158,6 @@ public class UserOperationController {
163 } 158 }
164 } 159 }
165 160
166 @Log("微信公众号取关")
167 @PostMapping("/unsubscribe") 161 @PostMapping("/unsubscribe")
168 @ApiOperation("微信公众号取关") 162 @ApiOperation("微信公众号取关")
169 @AnonymousAccess 163 @AnonymousAccess
...@@ -185,7 +179,6 @@ public class UserOperationController { ...@@ -185,7 +179,6 @@ public class UserOperationController {
185 return ResultInfo.success(result); 179 return ResultInfo.success(result);
186 } 180 }
187 181
188 @Log("微信小程序绑定大屏")
189 @PostMapping("/minaBind") 182 @PostMapping("/minaBind")
190 @ApiOperation("微信小程序绑定大屏") 183 @ApiOperation("微信小程序绑定大屏")
191 @AnonymousAccess 184 @AnonymousAccess
...@@ -196,7 +189,6 @@ public class UserOperationController { ...@@ -196,7 +189,6 @@ public class UserOperationController {
196 return ResultInfo.success(result); 189 return ResultInfo.success(result);
197 } 190 }
198 191
199 @Log("小屏解绑")
200 @PostMapping("/minaUnbind") 192 @PostMapping("/minaUnbind")
201 @ApiOperation("小屏解绑") 193 @ApiOperation("小屏解绑")
202 @AnonymousAccess 194 @AnonymousAccess
...@@ -207,7 +199,6 @@ public class UserOperationController { ...@@ -207,7 +199,6 @@ public class UserOperationController {
207 return ResultInfo.success(); 199 return ResultInfo.success();
208 } 200 }
209 201
210 @Log("暂存大小屏信息并检查关注与绑定状态")
211 @PostMapping(value = "/memberPreprocess") 202 @PostMapping(value = "/memberPreprocess")
212 @ApiOperation("暂存大小屏信息并检查关注与绑定状态") 203 @ApiOperation("暂存大小屏信息并检查关注与绑定状态")
213 @AnonymousAccess 204 @AnonymousAccess
...@@ -325,7 +316,6 @@ public class UserOperationController { ...@@ -325,7 +316,6 @@ public class UserOperationController {
325 316
326 /******************************************************* IPTV ************************************/ 317 /******************************************************* IPTV ************************************/
327 318
328 @Log("保存大屏账户同时创建会员")
329 @PostMapping(value = "/createTvUserAndMember") 319 @PostMapping(value = "/createTvUserAndMember")
330 @ApiOperation("保存大屏账户同时创建会员信息") 320 @ApiOperation("保存大屏账户同时创建会员信息")
331 @AnonymousAccess 321 @AnonymousAccess
...@@ -336,7 +326,6 @@ public class UserOperationController { ...@@ -336,7 +326,6 @@ public class UserOperationController {
336 return ResultInfo.success(result); 326 return ResultInfo.success(result);
337 } 327 }
338 328
339 @Log("大屏解绑")
340 @RequestMapping(value = "/tvUnbind") 329 @RequestMapping(value = "/tvUnbind")
341 @ApiOperation("大屏解绑") 330 @ApiOperation("大屏解绑")
342 @AnonymousAccess 331 @AnonymousAccess
...@@ -347,7 +336,6 @@ public class UserOperationController { ...@@ -347,7 +336,6 @@ public class UserOperationController {
347 return ResultInfo.success(); 336 return ResultInfo.success();
348 } 337 }
349 338
350 @Log("大屏更换主账号")
351 @RequestMapping(value = "/changeMainAccount") 339 @RequestMapping(value = "/changeMainAccount")
352 @ApiOperation("大屏更换主账号") 340 @ApiOperation("大屏更换主账号")
353 @AnonymousAccess 341 @AnonymousAccess
...@@ -366,7 +354,6 @@ public class UserOperationController { ...@@ -366,7 +354,6 @@ public class UserOperationController {
366 return ResultInfo.success(); 354 return ResultInfo.success();
367 } 355 }
368 356
369 @Log("删除全部收藏")
370 @PostMapping(value = "/deleteAllCollection") 357 @PostMapping(value = "/deleteAllCollection")
371 @ApiOperation("删除全部收藏") 358 @ApiOperation("删除全部收藏")
372 @AnonymousAccess 359 @AnonymousAccess
...@@ -377,7 +364,6 @@ public class UserOperationController { ...@@ -377,7 +364,6 @@ public class UserOperationController {
377 return ResultInfo.success(result); 364 return ResultInfo.success(result);
378 } 365 }
379 366
380 @Log("删除收藏")
381 @PostMapping(value = "/deleteCollection") 367 @PostMapping(value = "/deleteCollection")
382 @ApiOperation("删除收藏") 368 @ApiOperation("删除收藏")
383 @AnonymousAccess 369 @AnonymousAccess
...@@ -388,7 +374,6 @@ public class UserOperationController { ...@@ -388,7 +374,6 @@ public class UserOperationController {
388 return ResultInfo.success(result); 374 return ResultInfo.success(result);
389 } 375 }
390 376
391 @Log("添加收藏")
392 @PostMapping(value = "/addCollection") 377 @PostMapping(value = "/addCollection")
393 @ApiOperation("添加收藏") 378 @ApiOperation("添加收藏")
394 @AnonymousAccess 379 @AnonymousAccess
......
...@@ -37,7 +37,7 @@ import com.topdraw.business.process.domian.*; ...@@ -37,7 +37,7 @@ import com.topdraw.business.process.domian.*;
37 import com.topdraw.business.process.service.UserOperationService; 37 import com.topdraw.business.process.service.UserOperationService;
38 import com.topdraw.common.ResultInfo; 38 import com.topdraw.common.ResultInfo;
39 import com.topdraw.exception.BadRequestException; 39 import com.topdraw.exception.BadRequestException;
40 import com.topdraw.module.mq.DataSyncMsg; 40 import com.topdraw.mq.module.mq.DataSyncMsg;
41 import com.topdraw.util.*; 41 import com.topdraw.util.*;
42 import lombok.extern.slf4j.Slf4j; 42 import lombok.extern.slf4j.Slf4j;
43 import org.apache.commons.lang3.StringUtils; 43 import org.apache.commons.lang3.StringUtils;
...@@ -49,7 +49,6 @@ import org.springframework.data.redis.core.ValueOperations; ...@@ -49,7 +49,6 @@ import org.springframework.data.redis.core.ValueOperations;
49 import org.springframework.stereotype.Service; 49 import org.springframework.stereotype.Service;
50 import org.springframework.util.CollectionUtils; 50 import org.springframework.util.CollectionUtils;
51 51
52 import javax.validation.constraints.NotNull;
53 import java.sql.Timestamp; 52 import java.sql.Timestamp;
54 import java.time.LocalDate; 53 import java.time.LocalDate;
55 import java.time.LocalDateTime; 54 import java.time.LocalDateTime;
......
...@@ -40,7 +40,6 @@ import com.topdraw.util.TimestampUtil; ...@@ -40,7 +40,6 @@ import com.topdraw.util.TimestampUtil;
40 import com.topdraw.utils.QueryHelp; 40 import com.topdraw.utils.QueryHelp;
41 import com.topdraw.utils.RedisUtils; 41 import com.topdraw.utils.RedisUtils;
42 import lombok.extern.slf4j.Slf4j; 42 import lombok.extern.slf4j.Slf4j;
43 import org.apache.commons.collections4.CollectionUtils;
44 import org.apache.commons.lang3.StringUtils; 43 import org.apache.commons.lang3.StringUtils;
45 import org.springframework.aop.framework.AopContext; 44 import org.springframework.aop.framework.AopContext;
46 import org.springframework.beans.BeanUtils; 45 import org.springframework.beans.BeanUtils;
...@@ -52,9 +51,8 @@ import org.springframework.stereotype.Service; ...@@ -52,9 +51,8 @@ import org.springframework.stereotype.Service;
52 import org.springframework.transaction.annotation.Propagation; 51 import org.springframework.transaction.annotation.Propagation;
53 import org.springframework.transaction.annotation.Transactional; 52 import org.springframework.transaction.annotation.Transactional;
54 import org.springframework.util.Assert; 53 import org.springframework.util.Assert;
54 import org.springframework.util.CollectionUtils;
55 55
56 import java.nio.charset.StandardCharsets;
57 import java.time.LocalDateTime;
58 import java.util.*; 56 import java.util.*;
59 import java.util.stream.Collectors; 57 import java.util.stream.Collectors;
60 58
...@@ -952,7 +950,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -952,7 +950,7 @@ public class UserOperationServiceImpl implements UserOperationService {
952 950
953 // 有其他绑定的小程序会员 951 // 有其他绑定的小程序会员
954 List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id); 952 List<MemberDTO> memberDTOList = this.memberService.findByUserIptvId(id);
955 if (CollectionUtils.isNotEmpty(memberDTOList)) { 953 if (!CollectionUtils.isEmpty(memberDTOList)) {
956 954
957 // 按绑定时间倒排 955 // 按绑定时间倒排
958 memberDTOList.sort(new Comparator<MemberDTO>() { 956 memberDTOList.sort(new Comparator<MemberDTO>() {
......
1 package com.topdraw.module.mq; 1 package com.topdraw.mq.module.mq;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Data; 4 import lombok.Data;
......
1 package com.topdraw.module.mq; 1 package com.topdraw.mq.module.mq;
2 2
3 import lombok.Getter; 3 import lombok.Getter;
4 4
......
1 package com.topdraw.module.mq; 1 package com.topdraw.mq.module.mq;
2
3 import javax.annotation.Resource;
4 2
5 // 关注的事件 3 // 关注的事件
6 public enum EventType { 4 public enum EventType {
......
1 package com.topdraw.weixin.domain;
2
3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions;
5 import lombok.Data;
6 import lombok.experimental.Accessors;
7 import org.springframework.data.annotation.CreatedDate;
8 import org.springframework.data.annotation.LastModifiedDate;
9 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
10
11 import javax.persistence.*;
12 import java.io.Serializable;
13 import java.sql.Timestamp;
14
15 /**
16 * @author pengmengqing
17 * @date 2021-01-28
18 */
19 @Entity
20 @Data
21 @EntityListeners(AuditingEntityListener.class)
22 @Accessors(chain = true)
23 @Table(name="uc_user_weixin__weixin_message_template")
24 public class UserWeixinWeixinMessageTemplate implements Serializable {
25
26 // ID
27 @Id
28 @GeneratedValue(strategy = GenerationType.IDENTITY)
29 @Column(name = "id")
30 private Long id;
31
32 // 用户id
33 @Column(name = "user_weixin_id", nullable = false)
34 private Long userWeixinId;
35
36 // 微信消息模板id
37 @Column(name = "weixin_message_template_id", nullable = false)
38 private Long weixinMessageTemplateId;
39
40 // 用户是否订阅： 0-否， 1-是
41 @Column(name = "status", nullable = false)
42 private Integer status;
43
44 // 创建时间
45 @CreatedDate
46 @Column(name = "create_time")
47 private Timestamp createTime;
48
49 // 更新时间
50 @LastModifiedDate
51 @Column(name = "update_time")
52 private Timestamp updateTime;
53
54 public void copy(UserWeixinWeixinMessageTemplate source){
55 BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
56 }
57 }
1 package com.topdraw.weixin.domain;
2
3 import cn.hutool.core.bean.BeanUtil;
4 import cn.hutool.core.bean.copier.CopyOptions;
5 import lombok.Data;
6 import lombok.experimental.Accessors;
7 import org.springframework.data.annotation.CreatedDate;
8 import org.springframework.data.annotation.LastModifiedDate;
9 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
10
11 import javax.persistence.*;
12 import java.io.Serializable;
13 import java.sql.Timestamp;
14
15 /**
16 * @author pengmengqing
17 * @date 2021-01-28
18 */
19 @Entity
20 @Data
21 @EntityListeners(AuditingEntityListener.class)
22 @Accessors(chain = true)
23 @Table(name="uc_weixin_message_template")
24 public class WeixinMessageTemplate implements Serializable {
25
26 // ID
27 @Id
28 @GeneratedValue(strategy = GenerationType.IDENTITY)
29 @Column(name = "id")
30 private Long id;
31
32 // 标识 order-下单成功通知，cancellation-核销成功通知
33 @Column(name = "code", nullable = false)
34 private String code;
35
36 // 微信appid
37 @Column(name = "appid", nullable = false)
38 private String appid;
39
40 // 微信模板id
41 @Column(name = "template_id", nullable = false)
42 private String templateId;
43
44 // 状态：0-无效，1-有效
45 @Column(name = "status", nullable = false)
46 private Integer status;
47
48 // 描述
49 @Column(name = "description")
50 private String description;
51
52 // 创建时间
53 @CreatedDate
54 @Column(name = "create_time")
55 private Timestamp createTime;
56
57 // 更新时间
58 @LastModifiedDate
59 @Column(name = "update_time")
60 private Timestamp updateTime;
61
62 public void copy(WeixinMessageTemplate source){
63 BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
64 }
65 }
1 package com.topdraw.weixin.repository;
2
3 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate;
4 import org.springframework.data.jpa.repository.JpaRepository;
5 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
6
7
8 /**
9 * @author pengmengqing
10 * @date 2021-01-28
11 */
12 public interface UserWeixinWeixinMessageTemplateRepository extends JpaRepository<UserWeixinWeixinMessageTemplate, Long>, JpaSpecificationExecutor<UserWeixinWeixinMessageTemplate> {
13
14 }
1 package com.topdraw.weixin.repository;
2
3
4 import com.topdraw.weixin.domain.WeixinMessageTemplate;
5 import org.springframework.data.jpa.repository.JpaRepository;
6 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
7
8 import java.util.Optional;
9
10 /**
11 * @author pengmengqing
12 * @date 2021-01-28
13 */
14 public interface WeixinMessageTemplateRepository extends JpaRepository<WeixinMessageTemplate, Long>, JpaSpecificationExecutor<WeixinMessageTemplate> {
15
16 Optional<WeixinMessageTemplate> findFirstByCode(String code);
17
18 Optional<WeixinMessageTemplate> findFirstByCodeAndAppid(String code, String appid);
19
20 Optional<WeixinMessageTemplate> findFirstByTemplateId(String templateId);
21 }
1 package com.topdraw.weixin.rest;
2
3 import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.common.ResultInfo;
5 import com.topdraw.weixin.service.UserWeixinWeixinMessageTemplateService;
6 import com.topdraw.weixin.service.dto.UpdateUserWeixinWeixinMessageTemplateQueryCriteria;
7 import io.swagger.annotations.Api;
8 import io.swagger.annotations.ApiOperation;
9 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.web.bind.annotation.PostMapping;
11 import org.springframework.web.bind.annotation.RequestBody;
12 import org.springframework.web.bind.annotation.RequestMapping;
13 import org.springframework.web.bind.annotation.RestController;
14
15 import java.util.ArrayList;
16
17 /**
18 * @author pengmengqing
19 * @date 2021-01-28
20 */
21 @Api(tags = "UserWeixinWeixinMessageTemplate管理")
22 @RestController
23 @RequestMapping("/uce/UserWeixinWeixinMessageTemplate")
24 public class UserWeixinWeixinMessageTemplateController {
25
26 @Autowired
27 private UserWeixinWeixinMessageTemplateService userWeixinWeixinMessageTemplateService;
28
29 @AnonymousAccess
30 @PostMapping
31 @ApiOperation("新增或修改MemberWeixinMessageTemplate")
32 public ResultInfo createOrUpdate(@RequestBody UpdateUserWeixinWeixinMessageTemplateQueryCriteria criteria) {
33 userWeixinWeixinMessageTemplateService.createOrUpdate(criteria);
34 return ResultInfo.success(new ArrayList<>());
35 }
36
37 }
1 package com.topdraw.weixin.service;
2
3 import com.topdraw.weixin.service.dto.UpdateUserWeixinWeixinMessageTemplateQueryCriteria;
4
5 /**
6 * @author pengmengqing
7 * @date 2021-01-28
8 */
9 public interface UserWeixinWeixinMessageTemplateService {
10
11 void createOrUpdate(UpdateUserWeixinWeixinMessageTemplateQueryCriteria criteria);
12 }
1 package com.topdraw.weixin.service.dto;
2
3 import lombok.Data;
4
5 import java.util.List;
6
7 @Data
8 public class UpdateUserWeixinWeixinMessageTemplateQueryCriteria {
9 private Long memberId;
10
11 private List<UserWeixinWeixinMessageTemplateQueryCriteria> templateList;
12
13 }
1 package com.topdraw.weixin.service.dto;
2
3 import lombok.Data;
4
5 import java.io.Serializable;
6 import java.sql.Timestamp;
7
8
9 /**
10 * @author pengmengqing
11 * @date 2021-01-28
12 */
13 @Data
14 public class UserWeixinWeixinMessageTemplateDTO implements Serializable {
15
16 // ID
17 private Long id;
18
19 // 用户id
20 private Long userWeixinId;
21
22 // 微信消息模板id
23 private Long weixinMessageTemplateId;
24
25 // 用户是否订阅： 0-否， 1-是
26 private Integer status;
27
28 // 创建时间
29 private Timestamp createTime;
30
31 // 更新时间
32 private Timestamp updateTime;
33 }
1 package com.topdraw.weixin.service.dto;
2
3 import com.topdraw.annotation.Query;
4 import lombok.Data;
5
6 /**
7 * @author pengmengqing
8 * @date 2021-01-28
9 */
10 @Data
11 public class UserWeixinWeixinMessageTemplateQueryCriteria {
12 // 用户id
13 @Query(propName = "userWeixinId")
14 private Long memberId;
15
16 // 微信消息模板id
17 @Query
18 private Long weixinMessageTemplateId;
19
20 // 用户是否订阅： 0-否， 1-是
21 @Query
22 private Integer status = 1;
23
24 private String templateId;
25 }
1 package com.topdraw.weixin.service.dto;
2
3 import lombok.Data;
4
5 import java.io.Serializable;
6
7
8 /**
9 * @author pengmengqing
10 * @date 2021-01-28
11 */
12 @Data
13 public class WeixinMessageTemplateDTO implements Serializable {
14
15 // ID
16 private Long id;
17
18 // 标识 order-下单成功通知，cancellation-核销成功通知
19 private String code;
20
21 // 微信模板id
22 private String templateId;
23
24 // 描述
25 private String description;
26 }
1 package com.topdraw.weixin.service.dto;
2
3 import com.topdraw.annotation.Query;
4 import lombok.Data;
5
6 import java.util.List;
7
8 /**
9 * @author pengmengqing
10 * @date 2021-01-28
11 */
12 @Data
13 public class WeixinMessageTemplateQueryCriteria{
14
15 private String codes;
16
17 @Query(propName = "code", type = Query.Type.IN)
18 private List<String> codeList;
19
20 @Query
21 private String appid;
22
23 @Query
24 private Integer status = 1;
25 }
1 package com.topdraw.weixin.service.impl;
2
3
4 import com.topdraw.utils.QueryHelp;
5 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate;
6 import com.topdraw.weixin.domain.WeixinMessageTemplate;
7 import com.topdraw.weixin.repository.UserWeixinWeixinMessageTemplateRepository;
8 import com.topdraw.weixin.repository.WeixinMessageTemplateRepository;
9 import com.topdraw.weixin.service.UserWeixinWeixinMessageTemplateService;
10 import com.topdraw.weixin.service.dto.UpdateUserWeixinWeixinMessageTemplateQueryCriteria;
11 import com.topdraw.weixin.service.dto.UserWeixinWeixinMessageTemplateQueryCriteria;
12 import lombok.extern.slf4j.Slf4j;
13 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Service;
15 import org.springframework.transaction.annotation.Propagation;
16 import org.springframework.transaction.annotation.Transactional;
17 import java.util.*;
18
19 /**
20 * @author pengmengqing
21 * @date 2021-01-28
22 */
23 @Service
24 @Slf4j
25 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
26 public class UserWeixinWeixinMessageTemplateServiceImpl implements UserWeixinWeixinMessageTemplateService {
27
28 @Autowired
29 private UserWeixinWeixinMessageTemplateRepository userWeixinWeixinMessageTemplateRepository;
30
31 @Autowired
32 private WeixinMessageTemplateRepository weixinMessageTemplateRepository;
33
34 @Override
35 @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = Exception.class)
36 public void createOrUpdate(UpdateUserWeixinWeixinMessageTemplateQueryCriteria criteria) {
37 for (UserWeixinWeixinMessageTemplateQueryCriteria queryCriteria : criteria.getTemplateList()) {
38 queryCriteria.setMemberId(criteria.getMemberId());
39 Integer status = queryCriteria.getStatus();
40 queryCriteria.setStatus(null);
41 String templateId = queryCriteria.getTemplateId();
42 Optional<WeixinMessageTemplate> templateOptional = weixinMessageTemplateRepository.findFirstByTemplateId(templateId);
43 if (!templateOptional.isPresent()) {
44 log.info("template " + templateId + " not exist");
45 continue;
46 }
47 Long id = templateOptional.get().getId();
48 queryCriteria.setWeixinMessageTemplateId(id);
49 Optional<UserWeixinWeixinMessageTemplate> optional = userWeixinWeixinMessageTemplateRepository.findOne(((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, queryCriteria, criteriaBuilder)));
50 if (!optional.isPresent()) {
51 UserWeixinWeixinMessageTemplate userWeixinWeixinMessageTemplate = new UserWeixinWeixinMessageTemplate();
52 userWeixinWeixinMessageTemplate.setUserWeixinId(queryCriteria.getMemberId())
53 .setWeixinMessageTemplateId(queryCriteria.getWeixinMessageTemplateId())
54 .setStatus(status);
55 userWeixinWeixinMessageTemplateRepository.save(userWeixinWeixinMessageTemplate);
56 } else {
57 UserWeixinWeixinMessageTemplate UserWeixinWeixinMessageTemplate = optional.get();
58 if (!status.equals(UserWeixinWeixinMessageTemplate.getStatus())) {
59 UserWeixinWeixinMessageTemplate.setStatus(status);
60 userWeixinWeixinMessageTemplateRepository.save(UserWeixinWeixinMessageTemplate);
61 }
62 }
63 }
64 }
65 }
...\ No newline at end of file ...\ No newline at end of file
1 package com.topdraw.weixin.service.mapper;
2
3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.weixin.domain.UserWeixinWeixinMessageTemplate;
5 import com.topdraw.weixin.service.dto.UserWeixinWeixinMessageTemplateDTO;
6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy;
8
9 /**
10 * @author pengmengqing
11 * @date 2021-01-28
12 */
13 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
14 public interface UserWeixinWeixinMessageTemplateMapper extends BaseMapper<UserWeixinWeixinMessageTemplateDTO, UserWeixinWeixinMessageTemplate> {
15
16 }
1 package com.topdraw.weixin.service.mapper;
2
3 import com.topdraw.base.BaseMapper;
4 import com.topdraw.weixin.domain.WeixinMessageTemplate;
5 import com.topdraw.weixin.service.dto.WeixinMessageTemplateDTO;
6 import org.mapstruct.Mapper;
7 import org.mapstruct.ReportingPolicy;
8
9 /**
10 * @author pengmengqing
11 * @date 2021-01-28
12 */
13 @Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
14 public interface WeixinMessageTemplateMapper extends BaseMapper<WeixinMessageTemplateDTO, WeixinMessageTemplate> {
15
16 }
17
...@@ -2,17 +2,12 @@ package com.topdraw; ...@@ -2,17 +2,12 @@ package com.topdraw;
2 2
3 3
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.topdraw.module.mq.DataSyncMsg;
6 import org.junit.runner.RunWith; 5 import org.junit.runner.RunWith;
7 import org.slf4j.Logger; 6 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
9 import org.springframework.boot.test.context.SpringBootTest; 8 import org.springframework.boot.test.context.SpringBootTest;
10 import org.springframework.test.context.junit4.SpringRunner; 9 import org.springframework.test.context.junit4.SpringRunner;
11 10
12 import java.sql.Timestamp;
13 import java.time.LocalDateTime;
14 import java.util.Collection;
15 import java.util.HashMap;
16 import java.util.Map; 11 import java.util.Map;
17 12
18 @SpringBootTest(classes= MemberServiceApplication.class) 13 @SpringBootTest(classes= MemberServiceApplication.class)
......
...@@ -6,8 +6,6 @@ import com.topdraw.business.module.task.service.dto.TaskDTO; ...@@ -6,8 +6,6 @@ import com.topdraw.business.module.task.service.dto.TaskDTO;
6 import com.topdraw.business.process.rest.TaskOperationController; 6 import com.topdraw.business.process.rest.TaskOperationController;
7 import com.topdraw.business.process.service.TaskOperationService; 7 import com.topdraw.business.process.service.TaskOperationService;
8 import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria; 8 import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria;
9 import com.topdraw.module.mq.DataSyncMsg;
10 import com.topdraw.module.mq.EventType;
11 import com.topdraw.BaseTest; 9 import com.topdraw.BaseTest;
12 import com.topdraw.util.TimestampUtil; 10 import com.topdraw.util.TimestampUtil;
13 import org.junit.Test; 11 import org.junit.Test;
...@@ -15,7 +13,6 @@ import org.springframework.beans.BeanUtils; ...@@ -15,7 +13,6 @@ import org.springframework.beans.BeanUtils;
15 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; 14 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
17 15
18 import java.time.LocalDateTime;
19 import java.util.concurrent.FutureTask; 16 import java.util.concurrent.FutureTask;
20 17
21 public class TaskOperationControllerTest extends BaseTest { 18 public class TaskOperationControllerTest extends BaseTest {
......
1 package com.topdraw.test.business.process.rest; 1 package com.topdraw.test.business.process.rest;
2 2
3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
5 import com.topdraw.BaseTest; 4 import com.topdraw.BaseTest;
6 import com.topdraw.business.module.user.iptv.domain.UserTv; 5 import com.topdraw.business.module.user.iptv.domain.UserTv;
...@@ -8,18 +7,12 @@ import com.topdraw.business.module.user.weixin.domain.UserWeixin; ...@@ -8,18 +7,12 @@ import com.topdraw.business.module.user.weixin.domain.UserWeixin;
8 import com.topdraw.business.process.domian.weixin.BindBean; 7 import com.topdraw.business.process.domian.weixin.BindBean;
9 import com.topdraw.business.process.domian.weixin.TvUnBindBean; 8 import com.topdraw.business.process.domian.weixin.TvUnBindBean;
10 import com.topdraw.business.process.domian.weixin.WeixinUnBindBean; 9 import com.topdraw.business.process.domian.weixin.WeixinUnBindBean;
11 import com.topdraw.business.process.rest.TaskOperationController;
12 import com.topdraw.business.process.rest.UserOperationController; 10 import com.topdraw.business.process.rest.UserOperationController;
13 import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria;
14 import com.topdraw.common.ResultInfo; 11 import com.topdraw.common.ResultInfo;
15 import com.topdraw.module.mq.DataSyncMsg;
16 import com.topdraw.module.mq.EventType;
17 import org.junit.Test; 12 import org.junit.Test;
18 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
19 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
20 14
21 import java.sql.Timestamp; 15 import java.sql.Timestamp;
22 import java.util.concurrent.FutureTask;
23 16
24 public class UserOperationControllerTest extends BaseTest { 17 public class UserOperationControllerTest extends BaseTest {
25 18
......
...@@ -4,10 +4,6 @@ import com.alibaba.fastjson.JSON; ...@@ -4,10 +4,6 @@ import com.alibaba.fastjson.JSON;
4 import com.topdraw.BaseTest; 4 import com.topdraw.BaseTest;
5 import com.topdraw.business.process.domian.TempPoints; 5 import com.topdraw.business.process.domian.TempPoints;
6 import com.topdraw.business.process.service.PointsOperationService; 6 import com.topdraw.business.process.service.PointsOperationService;
7 import com.topdraw.business.process.service.TaskOperationService;
8 import com.topdraw.module.mq.DataSyncMsg;
9 import com.topdraw.module.mq.EntityType;
10 import com.topdraw.module.mq.EventType;
11 import org.junit.Test; 7 import org.junit.Test;
12 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
13 9
......
...@@ -2,9 +2,8 @@ package com.topdraw.test.business.process.service; ...@@ -2,9 +2,8 @@ package com.topdraw.test.business.process.service;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.business.process.service.TaskOperationService; 4 import com.topdraw.business.process.service.TaskOperationService;
5 import com.topdraw.module.mq.DataSyncMsg; 5 import com.topdraw.mq.module.mq.DataSyncMsg;
6 import com.topdraw.module.mq.EntityType; 6 import com.topdraw.mq.module.mq.EventType;
7 import com.topdraw.module.mq.EventType;
8 import com.topdraw.BaseTest; 7 import com.topdraw.BaseTest;
9 import org.junit.Test; 8 import org.junit.Test;
10 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
......
1 package com.topdraw.test.business.process.service; 1 package com.topdraw.test.business.process.service;
2 2
3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.BaseTest; 3 import com.topdraw.BaseTest;
5 import com.topdraw.business.module.user.weixin.domain.UserWeixin; 4 import com.topdraw.business.module.user.weixin.domain.UserWeixin;
6 import com.topdraw.business.process.domian.weixin.WeiXinUserBean;
7 import com.topdraw.business.process.service.UserOperationService; 5 import com.topdraw.business.process.service.UserOperationService;
8 import com.topdraw.module.mq.DataSyncMsg;
9 import com.topdraw.module.mq.EventType;
10 import org.junit.Test; 6 import org.junit.Test;
11 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
12 8
......
...@@ -2,9 +2,8 @@ package com.topdraw.test.mq; ...@@ -2,9 +2,8 @@ package com.topdraw.test.mq;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.topdraw.BaseTest; 4 import com.topdraw.BaseTest;
5 import com.topdraw.module.mq.DataSyncMsg; 5 import com.topdraw.mq.module.mq.DataSyncMsg;
6 import com.topdraw.module.mq.EventType; 6 import com.topdraw.mq.module.mq.EventType;
7 import com.topdraw.mq.config.RabbitMqConfig;
8 import com.topdraw.mq.producer.MessageProducer; 7 import com.topdraw.mq.producer.MessageProducer;
9 import org.junit.Test; 8 import org.junit.Test;
10 import org.springframework.amqp.core.AmqpTemplate; 9 import org.springframework.amqp.core.AmqpTemplate;
......