autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 19:45:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-new' into dev-new-rabbitmq

Browse Source 
# Conflicts:
#	jsowell-admin/src/test/java/PaymentTestController.java
This commit is contained in:
Guoqs
2024-12-19 13:30:11 +08:00
parent 6e2b20d21a f0f0482ffd
commit fdad5e218c
64 changed files with 2858 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jsowell-common/src/main/java/com/jsowell/common/util/YKCUtils.java
View File

@@ -394,6 +394,7 @@ public class YKCUtils {
/**
* 保存soc
* 默认保存7天
* @param transactionCode
* @param soc
*/
@@ -429,16 +430,27 @@ public class YKCUtils {
}
}
/**
* 根据交易流水号获取redis保存的soc信息
*/
public static Map<String, String> getSOCMap(String transactionCode) {
String hashKey = CacheConstants.GET_THE_SOC + transactionCode;
RedisCache staticRedisCache = StaticRedisCache.staticRedisCache;
return staticRedisCache.getCacheMap(hashKey);
}
/**
* 根据的交易码获取当前soc
* @param transactionCode
*/
public static String getCurrentSOC(String transactionCode) {
String hashKey = CacheConstants.GET_THE_SOC + transactionCode;
RedisCache staticRedisCache = StaticRedisCache.staticRedisCache;
Map<String, Object> cacheMap = staticRedisCache.getCacheMap(hashKey);
// String hashKey = CacheConstants.GET_THE_SOC + transactionCode;
// RedisCache staticRedisCache = StaticRedisCache.staticRedisCache;
// Map<String, Object> cacheMap = staticRedisCache.getCacheMap(hashKey);
Map<String, String> socMap = getSOCMap(transactionCode);
// 获取最小值和最大值, 两个值中最大的为当前soc
return (String) cacheMap.get("max");
return (String) socMap.get("max");
}
}