From 99f0b2a145ec1615143a1108db2b581c4723ab93 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 五月 2021 16:06:50 +0800
Subject: [PATCH] 订单与VIP修改
---
service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++------------
1 files changed, 34 insertions(+), 12 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 16c9ed4..f3bfce9 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
@@ -2,6 +2,7 @@
import com.ks.vip.mapper.VipCenterMapper;
+import com.ks.vip.mapper.VipCenterRecordMapper;
import com.ks.vip.mapper.VipComboMapper;
import com.ks.vip.pojo.DO.*;
import com.ks.vip.pojo.Enums.VIPEnum;
@@ -31,15 +32,17 @@
@Resource
private VipGradePotenceService vipGradePotenceService;
+ @Resource
+ private VipCenterRecordMapper vipCenterRecordMapper;
@Override
- public void insertSelective(VipCenter t){
+ public void insertSelective(VipCenter t) {
vipCenterMapper.insertSelective(t);
}
@Override
- public void updateByPrimaryKeySelective(VipCenter t){
+ public void updateByPrimaryKeySelective(VipCenter t) {
vipCenterMapper.updateByPrimaryKeySelective(t);
}
@@ -76,18 +79,19 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void saveVipCenter(String uid, Long gradeId, Integer validDays, Long orderId) {
+ public void saveVipCenter(String uid, Long gradeId, Integer validHours, Long orderId) {
VipCenterRecord record = new VipCenterRecord();
VipCenter vipCenter = vipCenterMapper.selectForUpdate(uid);
- if (vipCenter == null) {
+ if (vipCenter == null) {
+ vipCenter=new VipCenter();
Date startTime = new Date();
- Date endTime = DateUtil.plusDayDate(validDays, startTime);
+ Date endTime = new Date(startTime.getTime() + 1000 * 60 * 60L * validHours);
vipCenter.setUid(uid);
vipCenter.setGradeId(gradeId);
vipCenter.setStartTime(startTime);
- vipCenter.setEndTime(DateUtil.plusDayDate(validDays, new Date()));
+ vipCenter.setEndTime(endTime);
vipCenter.setCreateTime(new Date());
vipCenterMapper.insertSelective(vipCenter);
@@ -101,10 +105,12 @@
long nowTime = java.lang.System.currentTimeMillis();
if (gradeId.longValue() == oldGradeId.longValue() && vipCenter.getEndTime().getTime() > nowTime) {
// 涓婃浼氬憳杩樻湭宸茬粨鏉�
- endTime = DateUtil.plusDayDate(validDays, vipCenter.getEndTime());
+ record.setStartTime(endTime);
+ endTime = new Date(vipCenter.getEndTime().getTime() + 1000 * 60 * 60L * validHours);
} else {
startTime = new Date();
- endTime = DateUtil.plusDayDate(validDays, startTime);
+ record.setStartTime(startTime);
+ endTime = new Date(startTime.getTime() + 1000 * 60 * 60L * validHours);
}
vipCenter.setStartTime(startTime);
vipCenter.setEndTime(endTime);
@@ -112,7 +118,6 @@
vipCenter.setUpdateTime(new Date());
vipCenterMapper.updateByPrimaryKeySelective(vipCenter);
- record.setStartTime(new Date());
record.setEndTime(endTime);
}
@@ -120,10 +125,9 @@
record.setUid(uid);
record.setGradeId(gradeId);
record.setCreateTime(new Date());
+ record.setState(1);
vipCenterRecordService.insertSelective(record);
}
-
-
@Override
@@ -162,6 +166,24 @@
@Override
public VIPEnum getVIPEnumByUid(String uid) {
VipGrade vipGrade = getVipGrade(uid);
- return vipGrade.getIdentity();
+ if (vipGrade != null) {
+ return vipGrade.getIdentity();
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public VIPEnum getVIPEnumByUid(String uid, Date date) {
+ VipCenterRecordMapper.DaoQuery daoQuery = new VipCenterRecordMapper.DaoQuery();
+ daoQuery.uid = uid;
+ daoQuery.date = date;
+ daoQuery.start = 0;
+ daoQuery.count = 1;
+ List<VipCenterRecord> list = vipCenterRecordMapper.list(daoQuery);
+ if (list == null || list.size() == 0) {
+ return vipGradeService.getDefaultGrade().getIdentity();
+ }
+ return vipGradeService.selectByPrimaryKey(list.get(0).getGradeId()).getIdentity();
}
}
\ No newline at end of file
--
Gitblit v1.8.0