Merge branch 'dev' into merge_adapay

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java

jsowell-common/src/main/java/com/jsowell/common/core/redis/RedisCache.java

@@ -168,6 +168,9 @@ public class RedisCache {
 	public Long getCacheLong(final String key) {
 		Long l = null;
 		Object cacheObject = getCacheObject(key);
+		if (Objects.isNull(cacheObject)) {
+			return null;
+		}
 		if (cacheObject instanceof Integer) {
 			l = ((Integer) cacheObject).longValue();
 		} else if (cacheObject instanceof Long) {

jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ScenarioEnum.java

@@ -7,6 +7,8 @@ public enum ScenarioEnum {
 	ORDER("order", "支付订单"),
 
 	BALANCE("balance", "支付余额"),
+
+	OCCUPY("occupy", "占桩订单"),
 	;
 
 	private String value;