1.优化
Showing
15 changed files
with
73 additions
and
22 deletions
... | @@ -68,7 +68,7 @@ public class MemberAddressServiceImpl implements MemberAddressService { | ... | @@ -68,7 +68,7 @@ public class MemberAddressServiceImpl implements MemberAddressService { |
68 | log.info("MemberAddressServiceImpl ==>> update ==>> param ==>> [{}]",resources); | 68 | log.info("MemberAddressServiceImpl ==>> update ==>> param ==>> [{}]",resources); |
69 | Assert.notNull(resources.getId(),"id can't be null"); | 69 | Assert.notNull(resources.getId(),"id can't be null"); |
70 | try { | 70 | try { |
71 | this.redisUtils.doLock("MemberAddress::id" + resources.getId()); | 71 | this.redisUtils.doLock("memberAddress::memberId::" + resources.getMemberId()); |
72 | 72 | ||
73 | MemberAddress _memberAddress = this.memberAddressRepository.findById(resources.getId()).orElseGet(MemberAddress::new); | 73 | MemberAddress _memberAddress = this.memberAddressRepository.findById(resources.getId()).orElseGet(MemberAddress::new); |
74 | ValidationUtil.isNull( _memberAddress.getId(),"MemberAddress","id",resources.getId()); | 74 | ValidationUtil.isNull( _memberAddress.getId(),"MemberAddress","id",resources.getId()); |
... | @@ -87,7 +87,7 @@ public class MemberAddressServiceImpl implements MemberAddressService { | ... | @@ -87,7 +87,7 @@ public class MemberAddressServiceImpl implements MemberAddressService { |
87 | e.printStackTrace(); | 87 | e.printStackTrace(); |
88 | throw e; | 88 | throw e; |
89 | } finally { | 89 | } finally { |
90 | this.redisUtils.doUnLock("MemberAddress::update::code" + resources.getId()); | 90 | this.redisUtils.doUnLock("memberAddress::memberId::" + resources.getMemberId()); |
91 | } | 91 | } |
92 | } | 92 | } |
93 | 93 | ... | ... |
... | @@ -12,6 +12,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; | ... | @@ -12,6 +12,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; |
12 | import javax.persistence.*; | 12 | import javax.persistence.*; |
13 | import javax.validation.constraints.NotNull; | 13 | import javax.validation.constraints.NotNull; |
14 | import java.io.Serializable; | 14 | import java.io.Serializable; |
15 | import java.sql.Timestamp; | ||
15 | import java.time.LocalDateTime; | 16 | import java.time.LocalDateTime; |
16 | 17 | ||
17 | /** | 18 | /** |
... | @@ -123,12 +124,12 @@ public class Member implements Serializable { | ... | @@ -123,12 +124,12 @@ public class Member implements Serializable { |
123 | /** 创建时间 */ | 124 | /** 创建时间 */ |
124 | @CreatedDate | 125 | @CreatedDate |
125 | @Column(name = "create_time") | 126 | @Column(name = "create_time") |
126 | private LocalDateTime createTime; | 127 | private Timestamp createTime; |
127 | 128 | ||
128 | /** 更新时间 */ | 129 | /** 更新时间 */ |
129 | @LastModifiedDate | 130 | @LastModifiedDate |
130 | @Column(name = "update_time") | 131 | @Column(name = "update_time") |
131 | private LocalDateTime updateTime; | 132 | private Timestamp updateTime; |
132 | 133 | ||
133 | /** 是否在黑名单 1:是;0否 */ | 134 | /** 是否在黑名单 1:是;0否 */ |
134 | @Column(name = "black_status") | 135 | @Column(name = "black_status") | ... | ... |
... | @@ -110,7 +110,7 @@ public class MemberProfileServiceImpl implements MemberProfileService { | ... | @@ -110,7 +110,7 @@ public class MemberProfileServiceImpl implements MemberProfileService { |
110 | public MemberProfileDTO update(MemberProfile resources) { | 110 | public MemberProfileDTO update(MemberProfile resources) { |
111 | 111 | ||
112 | log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources); | 112 | log.info("MemberProfileServiceImpl ==>> update ==>> resources ===>> [{}]",resources); |
113 | this.redisUtils.doLock("memberProfile::update::memberId" + resources.getMemberId()); | 113 | this.redisUtils.doLock("memberProfile::memberId::" + resources.getMemberId()); |
114 | try { | 114 | try { |
115 | 115 | ||
116 | MemberProfileDTO _memberProfileDTO1 = this.findById(resources.getId()); | 116 | MemberProfileDTO _memberProfileDTO1 = this.findById(resources.getId()); |
... | @@ -141,7 +141,7 @@ public class MemberProfileServiceImpl implements MemberProfileService { | ... | @@ -141,7 +141,7 @@ public class MemberProfileServiceImpl implements MemberProfileService { |
141 | e.printStackTrace(); | 141 | e.printStackTrace(); |
142 | throw e; | 142 | throw e; |
143 | } finally { | 143 | } finally { |
144 | this.redisUtils.doUnLock("memberProfile::update::id" + resources.getId()); | 144 | this.redisUtils.doUnLock("memberProfile::memberId::" + resources.getId()); |
145 | } | 145 | } |
146 | 146 | ||
147 | } | 147 | } | ... | ... |
member-service-impl/src/main/java/com/topdraw/business/module/member/service/dto/BasicMemberDTO.java
... | @@ -3,6 +3,7 @@ package com.topdraw.business.module.member.service.dto; | ... | @@ -3,6 +3,7 @@ package com.topdraw.business.module.member.service.dto; |
3 | import lombok.Data; | 3 | import lombok.Data; |
4 | 4 | ||
5 | import java.io.Serializable; | 5 | import java.io.Serializable; |
6 | import java.sql.Timestamp; | ||
6 | import java.time.LocalDateTime; | 7 | import java.time.LocalDateTime; |
7 | 8 | ||
8 | 9 | ||
... | @@ -85,10 +86,10 @@ public class BasicMemberDTO implements Serializable { | ... | @@ -85,10 +86,10 @@ public class BasicMemberDTO implements Serializable { |
85 | private LocalDateTime bindIptvTime; | 86 | private LocalDateTime bindIptvTime; |
86 | 87 | ||
87 | /** 创建时间 */ | 88 | /** 创建时间 */ |
88 | private LocalDateTime createTime; | 89 | private Timestamp createTime; |
89 | 90 | ||
90 | /** 更新时间 */ | 91 | /** 更新时间 */ |
91 | private LocalDateTime updateTime; | 92 | private Timestamp updateTime; |
92 | 93 | ||
93 | /** 是否在黑名单 1:是;0否 */ | 94 | /** 是否在黑名单 1:是;0否 */ |
94 | private Long blackStatus; | 95 | private Long blackStatus; | ... | ... |
... | @@ -86,10 +86,10 @@ public class MemberDTO implements Serializable { | ... | @@ -86,10 +86,10 @@ public class MemberDTO implements Serializable { |
86 | private LocalDateTime bindIptvTime; | 86 | private LocalDateTime bindIptvTime; |
87 | 87 | ||
88 | /** 创建时间 */ | 88 | /** 创建时间 */ |
89 | private LocalDateTime createTime; | 89 | private Timestamp createTime; |
90 | 90 | ||
91 | /** 更新时间 */ | 91 | /** 更新时间 */ |
92 | private LocalDateTime updateTime; | 92 | private Timestamp updateTime; |
93 | 93 | ||
94 | /** 是否在黑名单 1:是;0否 */ | 94 | /** 是否在黑名单 1:是;0否 */ |
95 | private Long blackStatus; | 95 | private Long blackStatus; | ... | ... |
... | @@ -148,7 +148,7 @@ public class MemberServiceImpl implements MemberService { | ... | @@ -148,7 +148,7 @@ public class MemberServiceImpl implements MemberService { |
148 | public MemberDTO update(Member resources) { | 148 | public MemberDTO update(Member resources) { |
149 | 149 | ||
150 | log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources); | 150 | log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources); |
151 | this.redisUtils.doLock("member::update::code" + resources.getCode()); | 151 | this.redisUtils.doLock("member::code" + resources.getCode()); |
152 | try { | 152 | try { |
153 | MemberDTO memberDTO = this.checkMember(resources); | 153 | MemberDTO memberDTO = this.checkMember(resources); |
154 | 154 | ||
... | @@ -164,7 +164,7 @@ public class MemberServiceImpl implements MemberService { | ... | @@ -164,7 +164,7 @@ public class MemberServiceImpl implements MemberService { |
164 | e.printStackTrace(); | 164 | e.printStackTrace(); |
165 | throw e; | 165 | throw e; |
166 | } finally { | 166 | } finally { |
167 | this.redisUtils.doUnLock("member::update::code" + resources.getCode()); | 167 | this.redisUtils.doUnLock("member::code" + resources.getCode()); |
168 | } | 168 | } |
169 | 169 | ||
170 | } | 170 | } | ... | ... |
... | @@ -11,6 +11,7 @@ import com.topdraw.business.process.service.CouponOperationService; | ... | @@ -11,6 +11,7 @@ import com.topdraw.business.process.service.CouponOperationService; |
11 | import com.topdraw.business.process.service.member.MemberOperationService; | 11 | import com.topdraw.business.process.service.member.MemberOperationService; |
12 | import com.topdraw.business.process.domian.TempCoupon; | 12 | import com.topdraw.business.process.domian.TempCoupon; |
13 | import com.topdraw.business.process.service.RightsOperationService; | 13 | import com.topdraw.business.process.service.RightsOperationService; |
14 | import com.topdraw.util.TimestampUtil; | ||
14 | import com.topdraw.utils.RedisUtils; | 15 | import com.topdraw.utils.RedisUtils; |
15 | import org.springframework.beans.BeanUtils; | 16 | import org.springframework.beans.BeanUtils; |
16 | import org.springframework.beans.factory.annotation.Autowired; | 17 | import org.springframework.beans.factory.annotation.Autowired; |
... | @@ -129,7 +130,7 @@ public class CouponOperationServiceImpl implements CouponOperationService { | ... | @@ -129,7 +130,7 @@ public class CouponOperationServiceImpl implements CouponOperationService { |
129 | 130 | ||
130 | member.setCouponAmount(currentCoupon); | 131 | member.setCouponAmount(currentCoupon); |
131 | member.setDueCouponAmount(expireSoonCouponCount); | 132 | member.setDueCouponAmount(expireSoonCouponCount); |
132 | member.setUpdateTime(LocalDateTime.now()); | 133 | member.setUpdateTime(TimestampUtil.now()); |
133 | this.memberOperationService.doUpdateMember(member); | 134 | this.memberOperationService.doUpdateMember(member); |
134 | } | 135 | } |
135 | 136 | ... | ... |
... | @@ -12,6 +12,7 @@ import com.topdraw.business.process.service.ExpOperationService; | ... | @@ -12,6 +12,7 @@ import com.topdraw.business.process.service.ExpOperationService; |
12 | import com.topdraw.business.process.service.member.MemberOperationService; | 12 | import com.topdraw.business.process.service.member.MemberOperationService; |
13 | import com.topdraw.business.process.domian.TempExp; | 13 | import com.topdraw.business.process.domian.TempExp; |
14 | import com.topdraw.util.IdWorker; | 14 | import com.topdraw.util.IdWorker; |
15 | import com.topdraw.util.TimestampUtil; | ||
15 | import com.topdraw.utils.RedisUtils; | 16 | import com.topdraw.utils.RedisUtils; |
16 | import com.topdraw.utils.StringUtils; | 17 | import com.topdraw.utils.StringUtils; |
17 | import org.slf4j.Logger; | 18 | import org.slf4j.Logger; |
... | @@ -149,7 +150,7 @@ public class ExpOperationServiceImpl implements ExpOperationService { | ... | @@ -149,7 +150,7 @@ public class ExpOperationServiceImpl implements ExpOperationService { |
149 | 150 | ||
150 | member.setExp(totalExp); | 151 | member.setExp(totalExp); |
151 | member.setLevel(level); | 152 | member.setLevel(level); |
152 | member.setUpdateTime(LocalDateTime.now()); | 153 | member.setUpdateTime(TimestampUtil.now()); |
153 | this.memberOperationService.doUpdateMember(member); | 154 | this.memberOperationService.doUpdateMember(member); |
154 | } | 155 | } |
155 | 156 | ... | ... |
... | @@ -488,7 +488,7 @@ public class PointsOperationServiceImpl implements PointsOperationService { | ... | @@ -488,7 +488,7 @@ public class PointsOperationServiceImpl implements PointsOperationService { |
488 | 488 | ||
489 | member.setPoints(Objects.nonNull(currentPoints)?currentPoints:0); | 489 | member.setPoints(Objects.nonNull(currentPoints)?currentPoints:0); |
490 | member.setDuePoints(duePoints); | 490 | member.setDuePoints(duePoints); |
491 | member.setUpdateTime(LocalDateTime.now()); | 491 | member.setUpdateTime(TimestampUtil.now()); |
492 | try { | 492 | try { |
493 | this.memberOperationService.doUpdateMemberPoints(member); | 493 | this.memberOperationService.doUpdateMemberPoints(member); |
494 | } catch (Exception e){ | 494 | } catch (Exception e){ | ... | ... |
1 | package com.topdraw.business.process.service.impl; | 1 | package com.topdraw.business.process.service.impl; |
2 | 2 | ||
3 | import com.alibaba.fastjson.JSON; | ||
3 | import com.alibaba.fastjson.JSONArray; | 4 | import com.alibaba.fastjson.JSONArray; |
4 | import com.alibaba.fastjson.JSONObject; | 5 | import com.alibaba.fastjson.JSONObject; |
5 | import com.topdraw.business.module.coupon.service.CouponService; | 6 | import com.topdraw.business.module.coupon.service.CouponService; |
... | @@ -31,9 +32,11 @@ import com.topdraw.business.module.task.template.domain.TaskTemplate; | ... | @@ -31,9 +32,11 @@ import com.topdraw.business.module.task.template.domain.TaskTemplate; |
31 | import com.topdraw.business.module.task.template.service.TaskTemplateService; | 32 | import com.topdraw.business.module.task.template.service.TaskTemplateService; |
32 | import com.topdraw.business.process.domian.*; | 33 | import com.topdraw.business.process.domian.*; |
33 | import com.topdraw.business.process.service.UserOperationService; | 34 | import com.topdraw.business.process.service.UserOperationService; |
35 | import com.topdraw.business.process.service.dto.TaskOperationQueryCriteria; | ||
34 | import com.topdraw.common.ResultInfo; | 36 | import com.topdraw.common.ResultInfo; |
35 | import com.topdraw.exception.BadRequestException; | 37 | import com.topdraw.exception.BadRequestException; |
36 | import com.topdraw.module.mq.DataSyncMsg; | 38 | import com.topdraw.module.mq.DataSyncMsg; |
39 | import com.topdraw.module.mq.EventType; | ||
37 | import com.topdraw.util.*; | 40 | import com.topdraw.util.*; |
38 | import lombok.extern.slf4j.Slf4j; | 41 | import lombok.extern.slf4j.Slf4j; |
39 | import org.springframework.beans.BeanUtils; | 42 | import org.springframework.beans.BeanUtils; |
... | @@ -92,6 +95,36 @@ public class TaskOperationServiceImpl implements TaskOperationService { | ... | @@ -92,6 +95,36 @@ public class TaskOperationServiceImpl implements TaskOperationService { |
92 | private static final Integer POINTS_TYPE_RANDOM = 1; | 95 | private static final Integer POINTS_TYPE_RANDOM = 1; |
93 | private static final Integer POINTS_MIN = 1; | 96 | private static final Integer POINTS_MIN = 1; |
94 | 97 | ||
98 | |||
99 | public static void main(String[] args) { | ||
100 | /*String s = "{\\\"eventType\\\":\\\"PLAY\\\",\\\"msg\\\":{\\\"description\\\":\\\"{\\\\\\\"playDuration\\\\\\\":60,\\\\\\\"time\\\\\\\":\\\\\\\"2022-04-01 00:10:09\\\\\\\",\\\\\\\"mediaId\\\\\\\":3433,\\\\\\\"mediaCode\\\\\\\":\\\\\\\"media_123\\\\\\\",\\\\\\\"mediaName\\\\\\\":\\\\\\\"白宫陷落\\\\\\\"}\\\",\\\"deviceType\\\":1,\\\"event\\\":8,\\\"memberCode\\\":\\\"1511275342935937024\\\",\\\"param\\\":\\\"{\\\\\\\"playDuration\\\\\\\":60}\\\"}}"; | ||
101 | TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria(); | ||
102 | pointsQueryCriteria.setContent(s); | ||
103 | String s1 = JSON.toJSONString(pointsQueryCriteria); | ||
104 | DataSyncMsg dataSyncMsg = JSONUtil.parseMsg2Object(s1, DataSyncMsg.class); | ||
105 | System.out.println(dataSyncMsg);*/ | ||
106 | |||
107 | DataSyncMsg dataSyncMsg = new DataSyncMsg(); | ||
108 | dataSyncMsg.setEventType(EventType.PLAY.name()); | ||
109 | DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData(); | ||
110 | msgData.setEvent(8); // 类型 1-登录 2-观影 3-参加活动 4-订购 5-优享会员 6-签到 | ||
111 | msgData.setMemberCode("1511275342935937024"); | ||
112 | // 1:大屏;2:小屏(微信)3.小屏(xx) | ||
113 | msgData.setDeviceType(1); | ||
114 | String param = "{\"playDuration\":60}"; | ||
115 | msgData.setParam(param); | ||
116 | String des = "{\"playDuration\":60,\"time\":\"2022-04-01 00:10:09\",\"mediaId\":3433,\"mediaCode\":\"media_123\",\"mediaName\":\"白宫陷落\"}"; | ||
117 | msgData.setDescription(des); | ||
118 | dataSyncMsg.setMsg(msgData); | ||
119 | String a = JSON.toJSONString(dataSyncMsg); | ||
120 | TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria(); | ||
121 | pointsQueryCriteria.setContent(a); | ||
122 | String s1 = JSON.toJSONString(pointsQueryCriteria); | ||
123 | System.out.println(s1); | ||
124 | DataSyncMsg dataSyncMsg1 = JSONUtil.parseMsg2Object(s1, DataSyncMsg.class); | ||
125 | System.out.println(dataSyncMsg1); | ||
126 | } | ||
127 | |||
95 | @Override | 128 | @Override |
96 | public ResultInfo dealTask(String content) { | 129 | public ResultInfo dealTask(String content) { |
97 | 130 | ... | ... |
... | @@ -1010,7 +1010,7 @@ public class UserOperationServiceImpl implements UserOperationService { | ... | @@ -1010,7 +1010,7 @@ public class UserOperationServiceImpl implements UserOperationService { |
1010 | private MemberDTO doUpdateMemberByMemberDTO(MemberDTO memberDTO){ | 1010 | private MemberDTO doUpdateMemberByMemberDTO(MemberDTO memberDTO){ |
1011 | Member member = new Member(); | 1011 | Member member = new Member(); |
1012 | BeanUtils.copyProperties(memberDTO,member); | 1012 | BeanUtils.copyProperties(memberDTO,member); |
1013 | member.setUpdateTime(LocalDateTime.now()); | 1013 | member.setUpdateTime(TimestampUtil.now()); |
1014 | log.info("doUpdateMemberByMemberDTO=====?>>member ==>> [{}]",member); | 1014 | log.info("doUpdateMemberByMemberDTO=====?>>member ==>> [{}]",member); |
1015 | return this.doUpdateMember(member); | 1015 | return this.doUpdateMember(member); |
1016 | } | 1016 | } | ... | ... |
... | @@ -77,7 +77,6 @@ public class MemberControllerTest extends BaseTest { | ... | @@ -77,7 +77,6 @@ public class MemberControllerTest extends BaseTest { |
77 | member.setDueCouponAmount(0L); | 77 | member.setDueCouponAmount(0L); |
78 | member.setUserIptvId(1L); | 78 | member.setUserIptvId(1L); |
79 | member.setBindIptvPlatformType(0); | 79 | member.setBindIptvPlatformType(0); |
80 | member.setUpdateTime(LocalDateTime.now()); | ||
81 | String s = JSON.toJSONString(member); | 80 | String s = JSON.toJSONString(member); |
82 | ResultInfo byId = null;//this.memberController.create(member); | 81 | ResultInfo byId = null;//this.memberController.create(member); |
83 | LOG.info("===>>>"+byId); | 82 | LOG.info("===>>>"+byId); | ... | ... |
... | @@ -20,7 +20,7 @@ public class TaskOperationControllerTest extends BaseTest { | ... | @@ -20,7 +20,7 @@ public class TaskOperationControllerTest extends BaseTest { |
20 | @Test | 20 | @Test |
21 | public void dealTask() { | 21 | public void dealTask() { |
22 | try { | 22 | try { |
23 | DataSyncMsg dataSyncMsg = new DataSyncMsg(); | 23 | /* DataSyncMsg dataSyncMsg = new DataSyncMsg(); |
24 | dataSyncMsg.setEventType(EventType.VIEWING.name()); | 24 | dataSyncMsg.setEventType(EventType.VIEWING.name()); |
25 | DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData(); | 25 | DataSyncMsg.MsgData msgData = new DataSyncMsg.MsgData(); |
26 | msgData.setEvent(2); // 类型 1-登录 2-观影 3-参加活动 4-订购 5-优享会员 6-签到 | 26 | msgData.setEvent(2); // 类型 1-登录 2-观影 3-参加活动 4-订购 5-优享会员 6-签到 |
... | @@ -34,7 +34,21 @@ public class TaskOperationControllerTest extends BaseTest { | ... | @@ -34,7 +34,21 @@ public class TaskOperationControllerTest extends BaseTest { |
34 | TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria(); | 34 | TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria(); |
35 | pointsQueryCriteria.setContent(s); | 35 | pointsQueryCriteria.setContent(s); |
36 | String s1 = JSON.toJSONString(pointsQueryCriteria); | 36 | String s1 = JSON.toJSONString(pointsQueryCriteria); |
37 | System.out.println(s1); | 37 | System.out.println(s1);*/ |
38 | String s = "{\n" + | ||
39 | " \"eventType\": \"play\",\n" + | ||
40 | " \"msg\": {\n" + | ||
41 | " \"description\": \"{\\\"playDuration\\\":60,\\\"time\\\":\\\"2022-04-01 00:10:09\\\",\\\"mediaId\\\":3433,\\\"mediaCode\\\":\\\"media_123\\\",\\\"mediaName\\\":\\\"白宫陷落\\\"}\",\n" + | ||
42 | " \"deviceType\": 1,\n" + | ||
43 | " \"event\": 8,\n" + | ||
44 | " \"mediaId\": 3433,\n" + | ||
45 | " \"memberCode\": \"1511275342935937024\",\n" + | ||
46 | " \"param\":\\\"{\\\"playDuration\\\":60}\\\"\n" + | ||
47 | " }\n" + | ||
48 | "}"; | ||
49 | TaskOperationQueryCriteria pointsQueryCriteria = new TaskOperationQueryCriteria(); | ||
50 | pointsQueryCriteria.setContent(s); | ||
51 | String s1 = JSON.toJSONString(pointsQueryCriteria); | ||
38 | this.taskOperationController.dealTask(pointsQueryCriteria); | 52 | this.taskOperationController.dealTask(pointsQueryCriteria); |
39 | } catch (Exception e) { | 53 | } catch (Exception e) { |
40 | e.printStackTrace(); | 54 | e.printStackTrace(); | ... | ... |
... | @@ -5,6 +5,7 @@ import com.topdraw.business.module.member.domain.Member; | ... | @@ -5,6 +5,7 @@ import com.topdraw.business.module.member.domain.Member; |
5 | import com.topdraw.business.process.service.member.MemberOperationService; | 5 | import com.topdraw.business.process.service.member.MemberOperationService; |
6 | import com.topdraw.BaseTest; | 6 | import com.topdraw.BaseTest; |
7 | import com.topdraw.util.IdWorker; | 7 | import com.topdraw.util.IdWorker; |
8 | import com.topdraw.util.TimestampUtil; | ||
8 | import org.junit.Test; | 9 | import org.junit.Test; |
9 | import org.springframework.beans.factory.annotation.Autowired; | 10 | import org.springframework.beans.factory.annotation.Autowired; |
10 | 11 | ||
... | @@ -44,7 +45,7 @@ public class MemberOperationServiceTest extends BaseTest { | ... | @@ -44,7 +45,7 @@ public class MemberOperationServiceTest extends BaseTest { |
44 | member.setDueCouponAmount(0L); | 45 | member.setDueCouponAmount(0L); |
45 | member.setUserIptvId(1L); | 46 | member.setUserIptvId(1L); |
46 | member.setBindIptvPlatformType(0); | 47 | member.setBindIptvPlatformType(0); |
47 | member.setUpdateTime(LocalDateTime.now()); | 48 | member.setUpdateTime(TimestampUtil.now()); |
48 | String s = JSONObject.toJSONString(member); | 49 | String s = JSONObject.toJSONString(member); |
49 | 50 | ||
50 | this.memberOperationService.doUpdateMember(member); | 51 | this.memberOperationService.doUpdateMember(member); |
... | @@ -73,8 +74,6 @@ public class MemberOperationServiceTest extends BaseTest { | ... | @@ -73,8 +74,6 @@ public class MemberOperationServiceTest extends BaseTest { |
73 | member.setUserIptvId(1L); | 74 | member.setUserIptvId(1L); |
74 | member.setBindIptvPlatformType(0); | 75 | member.setBindIptvPlatformType(0); |
75 | member.setBindIptvTime(LocalDateTime.now()); | 76 | member.setBindIptvTime(LocalDateTime.now()); |
76 | member.setCreateTime(LocalDateTime.now()); | ||
77 | member.setUpdateTime(LocalDateTime.now()); | ||
78 | // member.setUpdateTime(Timestamp.valueOf(LocalDateTime.now())); | 77 | // member.setUpdateTime(Timestamp.valueOf(LocalDateTime.now())); |
79 | this.memberOperationService.doInsertMember(member); | 78 | this.memberOperationService.doInsertMember(member); |
80 | } | 79 | } | ... | ... |
-
Please register or sign in to post a comment