From a71099c9e86627bfe1ab07e8f52ef44654f4e5bb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Dec 2020 11:41:36 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/mapper/MoneyCardUseMapper.java | 8 +++++++-
zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java | 19 +++++++++----------
zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java | 18 ++++++++++++++----
zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java | 9 ++++++++-
4 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
index fd12c13..04226c5 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -2,8 +2,10 @@
import com.alibaba.fastjson.JSONObject;
import com.matrix.component.redis.RedisClient;
+import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.UUIDUtil;
+import com.matrix.core.tools.WebUtil;
import com.matrix.system.app.dto.LoginDto;
import com.matrix.system.app.vo.UserInfoVo;
import com.matrix.system.common.authority.DefaultAuthorityManager;
@@ -19,10 +21,7 @@
import io.swagger.annotations.ApiResponses;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author wzy
@@ -80,4 +79,15 @@
result.putInMap("token", token);
return result;
}
+
+ @ApiOperation(value = "退出登陆", notes = "退出登陆")
+ @GetMapping(value = "/loginOut")
+ public AjaxResult loginOut() {
+ SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ String token = redisClient.getCachedValue(sysUsers.getSuId().toString());
+
+ redisClient.removeObject(token);
+ redisClient.removeObject(sysUsers.getSuId().toString());
+ return AjaxResult.buildSuccessInstance("退出成功");
+ }
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
index 6ef63fc..411293c 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiVipInfoAction.java
@@ -7,6 +7,8 @@
import com.matrix.system.app.dto.AddVipDto;
import com.matrix.system.app.dto.ModifyVipDto;
import com.matrix.system.app.dto.VipInfoListDto;
+import com.matrix.system.app.mapper.MoneyCardUseMapper;
+import com.matrix.system.app.vo.VipCardListVo;
import com.matrix.system.app.vo.VipInfoDetailVo;
import com.matrix.system.app.vo.VipInfoListVo;
import com.matrix.system.app.vo.VipInfoVo;
@@ -152,11 +154,16 @@
}
@ApiOperation(value = "获取会员卡项列表")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "ok", response = VipCardListVo.class)
+ })
@GetMapping(value = "/findVipCardInfo/{vipId}")
public AjaxResult findVipCardInfo(@PathVariable("vipId") Long vipId) {
MoneyCardUse moneyCardUse = new MoneyCardUse();
moneyCardUse.setVipId(vipId);
List<MoneyCardUse> list = moneyCardUseService.findVipCardUseInPage(moneyCardUse, null);
- return null;
+
+ List<VipCardListVo> dataList = MoneyCardUseMapper.INSTANCE.entitiesToCardListVos(list);
+ return AjaxResult.buildSuccessInstance(dataList);
}
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/mapper/MoneyCardUseMapper.java b/zq-erp/src/main/java/com/matrix/system/app/mapper/MoneyCardUseMapper.java
index cc3c102..8ad6f7d 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/mapper/MoneyCardUseMapper.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/mapper/MoneyCardUseMapper.java
@@ -1,7 +1,11 @@
package com.matrix.system.app.mapper;
+import com.matrix.system.app.vo.VipCardListVo;
+import com.matrix.system.hive.bean.MoneyCardUse;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
+
+import java.util.List;
/**
* @author wzy
@@ -11,5 +15,7 @@
public abstract class MoneyCardUseMapper {
public static final MoneyCardUseMapper INSTANCE = Mappers.getMapper(MoneyCardUseMapper.class);
-// public abstract
+ public abstract VipCardListVo entityToCardListVo(MoneyCardUse moneyCardUse);
+
+ public abstract List<VipCardListVo> entitiesToCardListVos(List<MoneyCardUse> list);
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java
index 58007a1..8a26083 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java
@@ -1,6 +1,9 @@
package com.matrix.system.app.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date;
@@ -12,16 +15,20 @@
@ApiModel(value = "VipCardListVo", description = "会员卡项列表")
public class VipCardListVo {
+ @ApiModelProperty(value = "卡项名称")
private String cardName;
- private String vipNo;
-
+ @ApiModelProperty(value = "现有金额")
private BigDecimal realMoney;
+ @ApiModelProperty(value = "赠送金额")
private BigDecimal giftMoney;
+ @ApiModelProperty(value = "状态 1-有效 2-无效")
private String status;
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
+ @ApiModelProperty(value = "有效时间")
private Date failTime;
public String getCardName() {
@@ -30,14 +37,6 @@
public void setCardName(String cardName) {
this.cardName = cardName;
- }
-
- public String getVipNo() {
- return vipNo;
- }
-
- public void setVipNo(String vipNo) {
- this.vipNo = vipNo;
}
public BigDecimal getRealMoney() {
--
Gitblit v1.9.1