suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
This commit is contained in:
俞扬
2023-06-21 10:25:03 +08:00
parent 57af6a656b 60315342d5
commit b9c9bc2bae
51 changed files with 551 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-common/src/main/java/com/cool/store/constants/RedisConstant.java
View File

@@ -214,9 +214,11 @@ public class RedisConstant {
public static final String ENTERPRISE_OPEN_STATUS_KEY = "enterprise_open_status:{0}_{1}";
public static final String STOREWORK_BUILD_CACHE_KEY = "storeworkBuildDataCache:{0}:{1}:{2}";
public static final String PARTNER_BASEINFO_CACHE_KEY = "partnerBaseInfoCache:{0}:{1}";
public static final String STORE_WORK_COMMENT_CACHE_KEY = "storeWorkCommentCache:{0}:{1}:{2}";
public static final String PARTNER_CLERKINFO_CACHE_KEY = "partnerClerkInfoCache:{0}:{1}";
public static final String PARTNER_INTENTINFO_CACHE_KEY = "partnerIntentInfoCache:{0}:{1}";
public static final String DEVICE_OPEN_TOKEN = "device_open_token:{0}:{1}:{2}";

14
coolstore-partner-common/src/main/java/com/cool/store/utils/CoolDateUtils.java
View File

@@ -1,5 +1,8 @@
package com.cool.store.utils;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.Calendar;
@@ -51,5 +54,16 @@ public class CoolDateUtils {
}
public static final Date parseDate(String dateString ){
DateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT_SEC);
Date date = null;
try {
date = dateFormat.parse(dateString);
} catch (ParseException e) {
e.printStackTrace();
}
return date;
}
}