From 40d0d99fb89665e6e7702ea62e45fabe2d01e51a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 五月 2021 14:29:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://193.112.35.168:29418/tejia
---
service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java b/service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java
index af617ff..713b42f 100644
--- a/service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java
+++ b/service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java
@@ -1,6 +1,7 @@
package com.ks.vip.service.remote;
+import com.ks.vip.exception.VipCenterException;
import com.ks.vip.mapper.VipCenterMapper;
import com.ks.vip.mapper.VipCenterRecordMapper;
import com.ks.vip.mapper.VipComboMapper;
@@ -12,6 +13,7 @@
import org.apache.dubbo.config.annotation.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.StringUtil;
import javax.annotation.Resource;
import java.util.Date;
@@ -84,6 +86,7 @@
VipCenter vipCenter = vipCenterMapper.selectForUpdate(uid);
if (vipCenter == null) {
+ vipCenter=new VipCenter();
Date startTime = new Date();
Date endTime = new Date(startTime.getTime() + 1000 * 60 * 60L * validHours);
@@ -104,9 +107,11 @@
long nowTime = java.lang.System.currentTimeMillis();
if (gradeId.longValue() == oldGradeId.longValue() && vipCenter.getEndTime().getTime() > nowTime) {
// 涓婃浼氬憳杩樻湭宸茬粨鏉�
+ record.setStartTime(endTime);
endTime = new Date(vipCenter.getEndTime().getTime() + 1000 * 60 * 60L * validHours);
} else {
startTime = new Date();
+ record.setStartTime(startTime);
endTime = new Date(startTime.getTime() + 1000 * 60 * 60L * validHours);
}
vipCenter.setStartTime(startTime);
@@ -115,7 +120,6 @@
vipCenter.setUpdateTime(new Date());
vipCenterMapper.updateByPrimaryKeySelective(vipCenter);
- record.setStartTime(new Date());
record.setEndTime(endTime);
}
@@ -123,6 +127,7 @@
record.setUid(uid);
record.setGradeId(gradeId);
record.setCreateTime(new Date());
+ record.setState(1);
vipCenterRecordService.insertSelective(record);
}
@@ -131,7 +136,7 @@
public VipGradePotence getVipPotence(String uid) {
VipGradePotence potence = null;
VipCenter vipCenter = vipCenterMapper.getByUid(uid);
- if (vipCenter != null || vipCenter.getGradeId() != null) {
+ if (vipCenter != null && vipCenter.getGradeId() != null) {
long nowTime = java.lang.System.currentTimeMillis();
if (vipCenter.getStartTime().getTime() <= nowTime && vipCenter.getEndTime().getTime() >= nowTime) {
potence = vipGradePotenceService.getPotenceByGradeId(vipCenter.getGradeId());
@@ -183,4 +188,45 @@
}
return vipGradeService.selectByPrimaryKey(list.get(0).getGradeId()).getIdentity();
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveManageWeb(VipCenter t) throws VipCenterException {
+ if (t== null || StringUtil.isNullOrEmpty(t.getUid())) {
+ throw new VipCenterException(1, "鐢ㄦ埛ID涓嶅瓨鍦�");
+ }
+
+ if (t.getGradeId() == null) {
+ throw new VipCenterException(1, "璇烽�夋嫨鐢ㄦ埛绛夌骇");
+ }
+
+ if (t.getStartTime() == null) {
+ throw new VipCenterException(1, "璇烽�夋嫨寮�濮嬫椂闂�");
+ }
+
+ if (t.getEndTime() == null) {
+ throw new VipCenterException(1, "璇烽�夋嫨缁撴潫鏃堕棿");
+ }
+
+ VipCenter vipCenter = vipCenterMapper.selectForUpdate(t.getUid());
+ if (vipCenter == null) {
+ t.setCreateTime(new Date());
+ vipCenterMapper.insertSelective(t);
+ } else {
+ t.setUpdateTime(new Date());
+ vipCenterMapper.updateByPrimaryKeySelective(t);
+ }
+
+ // 淇濆瓨璁板綍
+ VipCenterRecord record = new VipCenterRecord();
+ record.setStartTime(t.getStartTime());
+ record.setEndTime(t.getEndTime());
+ record.setUid(t.getUid());
+ record.setGradeId(t.getGradeId());
+ record.setCreateTime(new Date());
+ vipCenterRecordService.insertSelective(record);
+ }
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0