From c9fdff7d45ae118eac10397d8f34661e9f2e968a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 一月 2022 10:28:18 +0800
Subject: [PATCH] 礼金bug修复

---
 service-vip/src/main/java/com/ks/vip/service/remote/VipGradePotenceServiceImpl.java |   55 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/service-vip/src/main/java/com/ks/vip/service/remote/VipGradePotenceServiceImpl.java b/service-vip/src/main/java/com/ks/vip/service/remote/VipGradePotenceServiceImpl.java
index 44a617d..276448d 100644
--- a/service-vip/src/main/java/com/ks/vip/service/remote/VipGradePotenceServiceImpl.java
+++ b/service-vip/src/main/java/com/ks/vip/service/remote/VipGradePotenceServiceImpl.java
@@ -1,17 +1,15 @@
 package com.ks.vip.service.remote;
 
 
+import org.apache.dubbo.config.annotation.Service;
 import com.ks.vip.exception.VipGradePotenceException;
-import com.ks.vip.mapper.VipGradePotenceMapper;
 import com.ks.vip.mapper.VipGradePotenceMapper;
 import com.ks.vip.pojo.DO.VipGrade;
 import com.ks.vip.pojo.DO.VipGradePotence;
 import com.ks.vip.pojo.Enums.VIPEnum;
 import com.ks.vip.query.VipGradePotenceQuery;
 import com.ks.vip.service.VipGradePotenceService;
-import com.ks.vip.service.VipGradePotenceService;
 import com.ks.vip.service.VipGradeService;
-import org.apache.dubbo.config.annotation.Service;
 
 import javax.annotation.Resource;
 import java.util.Date;
@@ -53,8 +51,9 @@
     @Override
     public long count(VipGradePotence t) {
         VipGradePotenceQuery query = new VipGradePotenceQuery();
-//        query.appId = appId;
-//        query.uid = uid;
+        query.id = t.getId();
+        query.effectiveTime = t.getEffectiveTime();
+        query.gradeId = t.getGradeId();
         return vipGradePotenceMapper.count(query);
     }
 
@@ -62,41 +61,37 @@
     @Override
     public List<VipGradePotence> listByPage(int page, int pageSize, VipGradePotence t) {
         VipGradePotenceQuery query = new VipGradePotenceQuery();
-//        query.appId = appId;
-//        query.uid = uid;
-//        query.drawStateList = Arrays.asList(new Integer[]{LuckyActivityJoinRecord.DRAW_STATE_UNOPEN});
+        query.id = t.getId();
+        query.effectiveTime = t.getEffectiveTime();
+        query.gradeId = t.getGradeId();
         query.start = (page - 1) * pageSize;
         query.count = pageSize;
         return vipGradePotenceMapper.listByPage(query);
     }
 
     @Override
-    public VipGradePotence getPotenceByGradeId(Long gradeId) {
-        return vipGradePotenceMapper.getByGradeId(gradeId);
+    public VipGradePotence getByGradeIdAndTime(Long gradeId, Date time) {
+        return vipGradePotenceMapper.getByGradeId(gradeId, time);
+    }
+
+    @Override
+    public VipGradePotence getCurrentByGradeId(Long gradeId) {
+        return vipGradePotenceMapper.getByGradeId(gradeId, new Date());
     }
 
 
     @Override
-    public void save(VipGradePotence t) throws VipGradePotenceException {
+    public void add(VipGradePotence t) throws VipGradePotenceException {
         Long gradeId = t.getGradeId();
         if (gradeId == null) {
             throw new VipGradePotenceException(1, "绛夌骇ID涓虹┖");
         }
 
-        if(t.getId() != null && t.getId().longValue() > 0) {
-            t.setUpdateTime(new Date());
-            vipGradePotenceMapper.updateByPrimaryKeySelective(t);
-        } else {
-            VipGradePotence obj = vipGradePotenceMapper.getByGradeId(gradeId);
-            if (obj == null) {
-                t.setCreateTime(new Date());
-                vipGradePotenceMapper.insertSelective(t);
-            } else {
-                t.setId(obj.getId());
-                t.setUpdateTime(new Date());
-                vipGradePotenceMapper.updateByPrimaryKeySelective(t);
-            }
+        if (t.getEffectiveTime() == null) {
+            t.setEffectiveTime(new Date());
         }
+        t.setCreateTime(new Date());
+        vipGradePotenceMapper.insertSelective(t);
     }
 
 
@@ -107,7 +102,7 @@
         if (grade == null) {
             return null;
         }
-       return vipGradePotenceMapper.getByGradeId(grade.getId());
+       return vipGradePotenceMapper.getByGradeId(grade.getId(), new Date());
     }
 
 
@@ -117,7 +112,15 @@
         if (grade == null) {
             return null;
         }
-        return vipGradePotenceMapper.getByGradeId(grade.getId());
+        return getCurrentByGradeId(grade.getId());
     }
 
+    @Override
+    public VipGradePotence getPotenceByVipEnum(VIPEnum vipEnum, Date time) {
+        VipGrade grade = vipGradeService.getByVipEnum(vipEnum);
+        if (grade == null) {
+            return null;
+        }
+        return getByGradeIdAndTime(grade.getId(), time);
+    }
 }

--
Gitblit v1.8.0