From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
index 78cca7c..96a24ef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractAuditRecordServiceImpl.java
@@ -1,20 +1,18 @@
package com.yeshi.fanli.service.impl.user;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.yeshi.utils.DateUtil;
+import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.ExtractAuditRecordMapper;
+import com.yeshi.fanli.dto.money.ExtractOrderStatisticDTO;
import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;
import com.yeshi.fanli.service.inter.user.ExtractAuditRecordService;
+import com.yeshi.fanli.util.StringUtil;
@Service
public class ExtractAuditRecordServiceImpl implements ExtractAuditRecordService {
@@ -46,8 +44,16 @@
@Override
public List<ExtractAuditRecord> getMyAuditedTimeSlotList(int pageIndex, int pageSize, String key, Integer state,
Long adminId, Integer days) {
- return extractAuditRecordMapper.getMyAuditedTimeSlotList((pageIndex - 1) * pageSize, pageSize, key, state,
- adminId, days);
+ List<ExtractAuditRecord> list = extractAuditRecordMapper.getMyAuditedTimeSlotList((pageIndex - 1) * pageSize,
+ pageSize, key, state, adminId, days);
+ Gson gson = new Gson();
+ if (list != null)
+ for (ExtractAuditRecord record : list) {
+ if (!StringUtil.isNullOrEmpty(record.getExtraInfoStr())) {
+ record.setExtraInfo(gson.fromJson(record.getExtraInfoStr(), ExtractOrderStatisticDTO.class));
+ }
+ }
+ return list;
}
@Override
@@ -72,7 +78,16 @@
@Override
public List<ExtractAuditRecord> getByUidList(int pageIndex, int pageSize, Long uid) {
- return extractAuditRecordMapper.getByUidList((pageIndex - 1) * pageSize, pageSize, uid);
+ List<ExtractAuditRecord> list = extractAuditRecordMapper.getByUidList((pageIndex - 1) * pageSize, pageSize, uid);
+
+ Gson gson = new Gson();
+ if (list != null)
+ for (ExtractAuditRecord record : list) {
+ if (!StringUtil.isNullOrEmpty(record.getExtraInfoStr())) {
+ record.setExtraInfo(gson.fromJson(record.getExtraInfoStr(), ExtractOrderStatisticDTO.class));
+ }
+ }
+ return list;
}
@Override
@@ -92,23 +107,20 @@
@Override
public List<Map<String, Object>> countAuditTotal(Integer state, Integer type, String years, String startTime,
- String endTime) throws Exception{
- return extractAuditRecordMapper.countAuditTotal(state, type, years, startTime, endTime);
+ String endTime) throws Exception {
+ return extractAuditRecordMapper.countAuditTotal(state, type, years, startTime, endTime);
}
-
-
-
- @Override
- public List<Map<String, Object>> countExtractApplyMoney(Integer state, Integer type, String years, String startTime,
- String endTime) throws Exception{
- return extractAuditRecordMapper.countExtractMoney(state, type, years, startTime, endTime);
- }
-
@Override
- public List<Map<String, Object>> countExtractApplyNumber(Integer state, Integer type, String years, String startTime,
- String endTime) throws Exception{
+ public List<Map<String, Object>> countExtractApplyMoney(Integer state, Integer type, String years, String startTime,
+ String endTime) throws Exception {
+ return extractAuditRecordMapper.countExtractMoney(state, type, years, startTime, endTime);
+ }
+
+ @Override
+ public List<Map<String, Object>> countExtractApplyNumber(Integer state, Integer type, String years,
+ String startTime, String endTime) throws Exception {
return extractAuditRecordMapper.countExtractApplyNumber(state, type, years, startTime, endTime);
}
-
+
}
--
Gitblit v1.8.0