记得上下班打卡 | git大法好,push需谨慎

Commit 9c918b55 authored by 张国柄's avatar 张国柄

修复会员过期时间记录23:59:59.999,数据库存储为次日00:00:00问题;

parent 2df6cdf3
...@@ -229,7 +229,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -229,7 +229,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
initUserMemberVo.setMemberId(handleMemberOrderVo.getMemberId()); initUserMemberVo.setMemberId(handleMemberOrderVo.getMemberId());
initUserMemberVo.setMemberNo(memberNo); initUserMemberVo.setMemberNo(memberNo);
initUserMemberVo.setState(1);// 1-正常,2-失效 initUserMemberVo.setState(1);// 1-正常,2-失效
initUserMemberVo.setExpiryAt(now.plusDays(memberPriceVo.getDays()).with(LocalTime.MAX)); initUserMemberVo.setExpiryAt(now.plusDays(memberPriceVo.getDays()).withHour(23).withMinute(59).withSecond(59));
initUserMemberVo.setCreatedAt(now); initUserMemberVo.setCreatedAt(now);
long s = System.currentTimeMillis(); long s = System.currentTimeMillis();
...@@ -247,7 +247,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -247,7 +247,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
AdamUserMemberVo updateExistUserMemberVo = AdamUserMemberVo.getNew(); AdamUserMemberVo updateExistUserMemberVo = AdamUserMemberVo.getNew();
BeanUtils.copyProperties(existUserMemberVo, updateExistUserMemberVo); BeanUtils.copyProperties(existUserMemberVo, updateExistUserMemberVo);
LocalDateTime currentExpiryAt = existUserMemberVo.getExpiryAt(); LocalDateTime currentExpiryAt = existUserMemberVo.getExpiryAt();
LocalDateTime expiryAt = (currentExpiryAt.isBefore(now) ? now : currentExpiryAt).plusDays(memberPriceVo.getDays()).with(LocalTime.MAX); LocalDateTime expiryAt = (currentExpiryAt.isBefore(now) ? now : currentExpiryAt)
.plusDays(memberPriceVo.getDays()).withHour(23).withMinute(59).withSecond(59);
updateExistUserMemberVo.setState(1); updateExistUserMemberVo.setState(1);
updateExistUserMemberVo.setExpiryAt(expiryAt); updateExistUserMemberVo.setExpiryAt(expiryAt);
...@@ -419,7 +420,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -419,7 +420,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
updateExistUserMemberVo.setState(1); updateExistUserMemberVo.setState(1);
LocalDateTime expiryAt = existUserMemberVo.getExpiryAt(); LocalDateTime expiryAt = existUserMemberVo.getExpiryAt();
updateExistUserMemberVo.setExpiryAt( updateExistUserMemberVo.setExpiryAt(
(expiryAt.isBefore(now) ? now : expiryAt).plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX) (expiryAt.isBefore(now) ? now : expiryAt).plusDays(initMemberOrderVo.getDays())
.withHour(23).withMinute(59).withSecond(59)
); );
toMqSqls.add(SqlMapping.get("adam_user_member.update")); toMqSqls.add(SqlMapping.get("adam_user_member.update"));
upsertUserMemberObjs.add(new Object[]{ upsertUserMemberObjs.add(new Object[]{
...@@ -432,7 +434,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService { ...@@ -432,7 +434,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
initUserMemberVo.setMemberId(memberCodeVo.getMemberId()); initUserMemberVo.setMemberId(memberCodeVo.getMemberId());
initUserMemberVo.setMemberNo(memberCodeVo.getMemberNo()); initUserMemberVo.setMemberNo(memberCodeVo.getMemberNo());
initUserMemberVo.setState(1); initUserMemberVo.setState(1);
initUserMemberVo.setExpiryAt(now.plusDays(initMemberOrderVo.getDays()).with(LocalTime.MAX)); initUserMemberVo.setExpiryAt(now.plusDays(initMemberOrderVo.getDays()).withHour(23).withMinute(59).withSecond(59));
initUserMemberVo.setCreatedAt(now); initUserMemberVo.setCreatedAt(now);
toMqSqls.add(SqlMapping.get("adam_user_member.add")); toMqSqls.add(SqlMapping.get("adam_user_member.add"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment