From 42f05d2b835ed1ee41ca32cf76fe11849a890cb4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 06 五月 2021 14:26:03 +0800
Subject: [PATCH] 金币完善

---
 service-goldcorn/src/main/java/com/ks/goldcorn/service/remote/GoldCornRecordServiceImpl.java |   51 +++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/service-goldcorn/src/main/java/com/ks/goldcorn/service/remote/GoldCornRecordServiceImpl.java b/service-goldcorn/src/main/java/com/ks/goldcorn/service/remote/GoldCornRecordServiceImpl.java
index 0d448f1..a020c82 100644
--- a/service-goldcorn/src/main/java/com/ks/goldcorn/service/remote/GoldCornRecordServiceImpl.java
+++ b/service-goldcorn/src/main/java/com/ks/goldcorn/service/remote/GoldCornRecordServiceImpl.java
@@ -1,12 +1,16 @@
 package com.ks.goldcorn.service.remote;
 
+import com.ks.goldcorn.mapper.GoldCornRecordMapper;
 import com.ks.goldcorn.pojo.DO.GoldCornRecord;
+import com.ks.goldcorn.pojo.DO.GoldCornRecordCountMap;
+import com.ks.goldcorn.pojo.Query.GoldCornRecordQuery;
 import com.ks.goldcorn.query.RecordQuery;
 import com.ks.goldcorn.service.GoldCornAppManager;
 import com.ks.goldcorn.service.GoldCornRecordManager;
 import org.apache.dubbo.config.annotation.Service;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 
 @Service(version = "1.0")
@@ -15,33 +19,60 @@
     private GoldCornRecordManager goldCornRecordManager;
 
     @Resource
+    private GoldCornRecordMapper goldCornRecordMapper;
+
+    @Resource
     private GoldCornAppManager goldCornAppManager;
 
     @Override
-    public List<GoldCornRecord> listUserRecord(String appCode, String uid, Integer type, int page, int pageSize) {
-        Long appId = goldCornAppManager.selectAppIdByAppCode(appCode);
+    public List<GoldCornRecord> listUserRecord(GoldCornRecordQuery q) {
+        Long appId = goldCornAppManager.selectAppIdByAppCode(q.getAppCode());
         if (appId == null) {
             return null;
         }
         RecordQuery query = new RecordQuery();
         query.setAppId(appId);
-        query.setStart((page - 1) * pageSize);
-        query.setCount(pageSize);
-        query.setType(type);
-        query.setUid(uid);
+        query.setStart((q.getPage() - 1) * q.getPageSize());
+        query.setCount(q.getPageSize());
+        query.setType(q.getType());
+        query.setUid(q.getUid());
+        query.setSourceCodes(q.getSourceCodes());
+        query.setSortList(Arrays.asList(new String[]{"create_time desc"}));
         return goldCornRecordManager.list(query);
     }
 
     @Override
-    public long countUserRecord(String appCode, String uid, Integer type) {
-        Long appId = goldCornAppManager.selectAppIdByAppCode(appCode);
+    public long countUserRecord(GoldCornRecordQuery q) {
+        Long appId = goldCornAppManager.selectAppIdByAppCode(q.getAppCode());
         if (appId == null) {
             return 0;
         }
+
         RecordQuery query = new RecordQuery();
         query.setAppId(appId);
-        query.setType(type);
-        query.setUid(uid);
+        query.setType(q.getType());
+        query.setUid(q.getUid());
+        query.setSourceCodes(q.getSourceCodes());
+        query.setMinCreateTime(q.getMinCreateTime());
+        query.setMaxCreateTime(q.getMaxCreateTime());
+
         return goldCornRecordManager.count(query);
     }
+
+    @Override
+    public List<GoldCornRecordCountMap> countUserRecordBySource(GoldCornRecordQuery q) {
+        Long appId = goldCornAppManager.selectAppIdByAppCode(q.getAppCode());
+        if (appId == null) {
+            return null;
+        }
+
+        RecordQuery query = new RecordQuery();
+        query.setAppId(appId);
+        query.setType(q.getType());
+        query.setUid(q.getUid());
+        query.setSourceCodes(q.getSourceCodes());
+        query.setMinCreateTime(q.getMinCreateTime());
+        query.setMaxCreateTime(q.getMaxCreateTime());
+        return goldCornRecordMapper.countList(query);
+    }
 }

--
Gitblit v1.8.0