From ca1ad791b7b7b04e57db6bd4fb93f0c1066a9f99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 九月 2020 18:31:23 +0800
Subject: [PATCH] 淘口令格式兼容
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java | 192 ++++++++++++++++++++++++-----------------------
1 files changed, 98 insertions(+), 94 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java
index 4b5c5f9..058799b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractAuditRecordServiceImpl.java
@@ -5,6 +5,8 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import org.springframework.stereotype.Service;
import com.google.gson.Gson;
@@ -18,113 +20,115 @@
@Service
public class ExtractAuditRecordServiceImpl implements ExtractAuditRecordService {
- @Resource
- private ExtractAuditRecordMapper extractAuditRecordMapper;
-
- @Resource
- private CountUserInfoDao countUserInfoDao;
+ @Resource
+ private ExtractAuditRecordMapper extractAuditRecordMapper;
- @Override
- public List<ExtractAuditRecord> getList(int pageIndex, int pageSize, String key, String startTime, String endTime) {
- return extractAuditRecordMapper.getList((pageIndex - 1) * pageSize, pageSize, key, startTime, endTime);
- }
+ @Resource
+ private UserInfoService userInfoService;
- @Override
- public int getCount(String key, String startTime, String endTime) {
- return extractAuditRecordMapper.getCount(key, startTime, endTime);
- }
+ @Override
+ public List<ExtractAuditRecord> getList(int pageIndex, int pageSize, String key, String startTime, String endTime) {
+ return extractAuditRecordMapper.getList((pageIndex - 1) * pageSize, pageSize, key, startTime, endTime);
+ }
- @Override
- public List<ExtractAuditRecord> getMyAuditedAllList(int pageIndex, int pageSize, String key, Integer state,
- Long adminId) {
- return extractAuditRecordMapper.getMyAuditedAllList((pageIndex - 1) * pageSize, pageSize, key, state, adminId);
- }
+ @Override
+ public int getCount(String key, String startTime, String endTime) {
+ return extractAuditRecordMapper.getCount(key, startTime, endTime);
+ }
- @Override
- public int getMyAuditedAllCount(String key, Integer state, Long adminId) {
- return extractAuditRecordMapper.getMyAuditedAllCount(key, state, adminId);
- }
+ @Override
+ public List<ExtractAuditRecord> getMyAuditedAllList(int pageIndex, int pageSize, String key, Integer state,
+ Long adminId) {
+ return extractAuditRecordMapper.getMyAuditedAllList((pageIndex - 1) * pageSize, pageSize, key, state, adminId);
+ }
- @Override
- public List<ExtractAuditRecord> getMyAuditedTimeSlotList(int pageIndex, int pageSize, String key, Integer state,
- Long adminId, Integer 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
+ public int getMyAuditedAllCount(String key, Integer state, Long adminId) {
+ return extractAuditRecordMapper.getMyAuditedAllCount(key, state, adminId);
+ }
- @Override
- public int getMyAuditedTimeSlotCount(String key, Integer state, Long adminId, Integer days) {
- return extractAuditRecordMapper.getMyAuditedTimeSlotCount(key, state, adminId, days);
- }
+ @Override
+ public List<ExtractAuditRecord> getMyAuditedTimeSlotList(int pageIndex, int pageSize, String key, Integer state,
+ Long adminId, Integer 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));
+ SystemEnum system = userInfoService.getUserSystem(record.getExtract().getUserInfo().getId());
+ record.setSystem(system.getName());
+ }
+ }
+ return list;
+ }
- @Override
- public int getMyAuditedCountWeek(Long adminId) {
- return extractAuditRecordMapper.getMyAuditedCountWeek(adminId);
- }
+ @Override
+ public int getMyAuditedTimeSlotCount(String key, Integer state, Long adminId, Integer days) {
+ return extractAuditRecordMapper.getMyAuditedTimeSlotCount(key, state, adminId, days);
+ }
- @Override
- public int getMyAuditedCountMonth(Long adminId) {
- return extractAuditRecordMapper.getMyAuditedCountMonth(adminId);
- }
+ @Override
+ public int getMyAuditedCountWeek(Long adminId) {
+ return extractAuditRecordMapper.getMyAuditedCountWeek(adminId);
+ }
- @Override
- public int getMyAuditedCountToday(Long adminId) {
- return extractAuditRecordMapper.getMyAuditedCountToday(adminId);
- }
+ @Override
+ public int getMyAuditedCountMonth(Long adminId) {
+ return extractAuditRecordMapper.getMyAuditedCountMonth(adminId);
+ }
- @Override
- public List<ExtractAuditRecord> getByUidList(int pageIndex, int pageSize, Long 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
+ public int getMyAuditedCountToday(Long adminId) {
+ return extractAuditRecordMapper.getMyAuditedCountToday(adminId);
+ }
- @Override
- public int getByUidCount(Long key) {
- return extractAuditRecordMapper.getByUidCount(key);
- }
+ @Override
+ public List<ExtractAuditRecord> getByUidList(int pageIndex, int pageSize, Long uid) {
+ List<ExtractAuditRecord> list = extractAuditRecordMapper.getByUidList((pageIndex - 1) * pageSize, pageSize, uid);
- @Override
- public List<ExtractAuditRecord> getListbyExtractId(Long extractId) {
- return extractAuditRecordMapper.getListbyExtractId(extractId);
- }
+ 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
- public List<ExtractAuditRecord> getbyExtractId(Long extractId) {
- return extractAuditRecordMapper.getbyExtractId(extractId);
- }
+ @Override
+ public int getByUidCount(Long key) {
+ return extractAuditRecordMapper.getByUidCount(key);
+ }
-
- @Override
- public Long countAuditNumberByDay(int state, String preDay) {
- return extractAuditRecordMapper.countAuditTotal(state, preDay);
- }
-
-
- @Override
- public BigDecimal countApplyMoneyByDay(String preDay) {
- return extractAuditRecordMapper.countApplyExtractMoney(preDay);
- }
-
- @Override
- public Long countApplyNumberByDay(String preDay) {
- return extractAuditRecordMapper.countApplyNumberByDay(preDay);
- }
-
+ @Override
+ public List<ExtractAuditRecord> getListbyExtractId(Long extractId) {
+ return extractAuditRecordMapper.getListbyExtractId(extractId);
+ }
+
+ @Override
+ public List<ExtractAuditRecord> getbyExtractId(Long extractId) {
+ return extractAuditRecordMapper.getbyExtractId(extractId);
+ }
+
+
+ @Override
+ public Long countAuditNumberByDay(int state, String preDay) {
+ return extractAuditRecordMapper.countAuditTotal(state, preDay);
+ }
+
+
+ @Override
+ public BigDecimal countApplyMoneyByDay(String preDay) {
+ return extractAuditRecordMapper.countApplyExtractMoney(preDay);
+ }
+
+ @Override
+ public Long countApplyNumberByDay(String preDay) {
+ return extractAuditRecordMapper.countApplyNumberByDay(preDay);
+ }
+
}
--
Gitblit v1.8.0