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

Commit 1816ad76 authored by 张国柄's avatar 张国柄

Merge remote-tracking branch 'origin/dev_member_voucher_social' into dev_member_voucher_social

parents faee3eb8 c591e4ba
...@@ -2,6 +2,7 @@ package com.liquidnet.service.candy.service.impl; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.candy.service.impl;
import com.liquidnet.commons.lang.util.CollectionUtil; import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.CurrentUtil; import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.SqlMapping; import com.liquidnet.service.base.SqlMapping;
...@@ -49,7 +50,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -49,7 +50,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -88,7 +89,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -88,7 +89,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
ArrayList<CandyCouponPreVo> voArrayList = ObjectUtil.getCandyCouponPreVoArrayList(); ArrayList<CandyCouponPreVo> voArrayList = ObjectUtil.getCandyCouponPreVoArrayList();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -108,7 +109,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -108,7 +109,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -134,7 +135,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -134,7 +135,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -177,7 +178,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -177,7 +178,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -203,7 +204,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -203,7 +204,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -247,7 +248,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -247,7 +248,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -273,7 +274,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -273,7 +274,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -299,7 +300,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -299,7 +300,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -315,7 +316,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -315,7 +316,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -420,7 +421,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -420,7 +421,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = item.getUid(); String uid = item.getUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -454,7 +455,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -454,7 +455,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime = DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
...@@ -522,7 +523,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService { ...@@ -522,7 +523,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
LocalDateTime userCreateTime; LocalDateTime userCreateTime;
try { try {
userCreateTime = LocalDateTime.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString()); userCreateTime =DateUtil.Formatter.yyyyMMddHHmmssSSS.parse(CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_UCREATED).toString());
} catch (Exception e) { } catch (Exception e) {
userCreateTime = null; userCreateTime = null;
} }
......
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