You've already forked FrameTour-BE
Merge branch 'jackson'
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
package com.ycwl.basic.service.mobile.impl;
|
||||
|
||||
import cn.hutool.http.HttpUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.ycwl.basic.utils.JacksonUtil;
|
||||
import com.ycwl.basic.constant.BaseContextHandler;
|
||||
import com.ycwl.basic.constant.NumberConstant;
|
||||
import com.ycwl.basic.enums.BizCodeEnum;
|
||||
@@ -61,7 +61,7 @@ public class AppMemberServiceImpl implements AppMemberService {
|
||||
if (StringUtils.isBlank(response)) {
|
||||
return null;
|
||||
}
|
||||
return JSONObject.parseObject(response);
|
||||
return JacksonUtil.parseObject(response, Map.class);
|
||||
} catch (Exception e) {
|
||||
log.error("getOpenId", e);
|
||||
throw new AppException(BizCodeEnum.SERVER_INTERNAL_ERROR);
|
||||
|
@@ -3,8 +3,7 @@ package com.ycwl.basic.service.mobile.impl;
|
||||
import cn.hutool.core.date.DateField;
|
||||
import cn.hutool.core.date.DateUnit;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.ycwl.basic.utils.JacksonUtil;
|
||||
import com.ycwl.basic.enums.StatisticEnum;
|
||||
import com.ycwl.basic.mapper.StatisticsMapper;
|
||||
import com.ycwl.basic.model.jwt.JwtInfo;
|
||||
@@ -188,8 +187,8 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
|
||||
// 缓存
|
||||
if (redisTemplate.hasKey(redisKey)) {
|
||||
String s = redisTemplate.opsForValue().get(redisKey);
|
||||
JSONObject cacheObj = JSON.parseObject(s);
|
||||
return ApiResponse.success(cacheObj.toJavaObject(AppStatisticsFunnelVO.class));
|
||||
Map<String, Object> cacheObj = JacksonUtil.parseObject(s, Map.class);
|
||||
return ApiResponse.success(JacksonUtil.toJavaObject(cacheObj, AppStatisticsFunnelVO.class));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -202,8 +201,8 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
|
||||
// 缓存
|
||||
if (redisTemplate.hasKey(redisKey)) {
|
||||
String s = redisTemplate.opsForValue().get(redisKey);
|
||||
JSONObject cacheObj = JSON.parseObject(s);
|
||||
return ApiResponse.success(cacheObj.toJavaObject(AppStatisticsFunnelVO.class));
|
||||
Map<String, Object> cacheObj = JacksonUtil.parseObject(s, Map.class);
|
||||
return ApiResponse.success(JacksonUtil.toJavaObject(cacheObj, AppStatisticsFunnelVO.class));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -266,7 +265,7 @@ public class AppStatisticsServiceImpl implements AppStatisticsService {
|
||||
vo.setRefundOfOrderNum(refundOfOrderNum);
|
||||
vo.setRefundOfOrderAmount(refundOfOrderAmount.setScale(2, RoundingMode.HALF_UP));
|
||||
statisticsMapper.insertStat(query.getScenicId(), new Date(), vo);
|
||||
redisTemplate.opsForValue().set(redisKey, JSON.toJSONString(vo), 60, TimeUnit.SECONDS);
|
||||
redisTemplate.opsForValue().set(redisKey, JacksonUtil.toJSONString(vo), 60, TimeUnit.SECONDS);
|
||||
return ApiResponse.success(vo);
|
||||
} finally {
|
||||
lock.unlock();
|
||||
|
@@ -3,9 +3,7 @@ package com.ycwl.basic.service.mobile.impl;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.extra.qrcode.QrCodeUtil;
|
||||
import cn.hutool.http.HttpUtil;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.ycwl.basic.utils.JacksonUtil;
|
||||
import com.ycwl.basic.biz.CouponBiz;
|
||||
import com.ycwl.basic.biz.OrderBiz;
|
||||
import com.ycwl.basic.biz.TaskStatusBiz;
|
||||
@@ -287,7 +285,7 @@ public class GoodsServiceImpl implements GoodsService {
|
||||
if (task == null) {
|
||||
return ApiResponse.fail("该vlog不存在或已失效");
|
||||
}
|
||||
JSONObject paramJson = JSON.parseObject(task.getTaskParams());
|
||||
Map<String, Object> paramJson = JacksonUtil.parseObject(task.getTaskParams(), Map.class);
|
||||
AtomicInteger deviceCount = new AtomicInteger();
|
||||
goodsDetailVO.setShotTime(taskTaskService.getTaskShotDate(task.getId()));
|
||||
if (paramJson == null) {
|
||||
@@ -297,7 +295,7 @@ public class GoodsServiceImpl implements GoodsService {
|
||||
paramJson.entrySet().stream()
|
||||
.filter(entry -> StringUtils.isNumeric(entry.getKey()))
|
||||
.forEach(entry -> {
|
||||
JSONArray jsonArray = paramJson.getJSONArray(entry.getKey());
|
||||
List<Object> jsonArray = JacksonUtil.parseArray(JacksonUtil.toJSONString(entry.getValue()), Object.class);
|
||||
if (jsonArray != null && !jsonArray.isEmpty()) {
|
||||
for (Object ignored : jsonArray) {
|
||||
if (templatePlaceholder.contains(entry.getKey())) {
|
||||
@@ -565,7 +563,7 @@ public class GoodsServiceImpl implements GoodsService {
|
||||
IStorageAdapter adapter;
|
||||
if (scenicConfig != null && scenicConfig.getStoreType() != null) {
|
||||
adapter = StorageFactory.get(scenicConfig.getStoreType());
|
||||
adapter.loadConfig(JSONObject.parseObject(scenicConfig.getStoreConfigJson(), Map.class));
|
||||
adapter.loadConfig(JacksonUtil.parseObject(scenicConfig.getStoreConfigJson(), Map.class));
|
||||
} else {
|
||||
adapter = StorageFactory.use("assets-ext");
|
||||
}
|
||||
@@ -674,7 +672,7 @@ public class GoodsServiceImpl implements GoodsService {
|
||||
IStorageAdapter adapter;
|
||||
if (scenicConfig.getStoreType() != null) {
|
||||
adapter = StorageFactory.get(scenicConfig.getStoreType());
|
||||
adapter.loadConfig(JSONObject.parseObject(scenicConfig.getStoreConfigJson(), Map.class));
|
||||
adapter.loadConfig(JacksonUtil.parseObject(scenicConfig.getStoreConfigJson(), Map.class));
|
||||
} else {
|
||||
adapter = StorageFactory.use("assets-ext");
|
||||
}
|
||||
|
Reference in New Issue
Block a user