From 583fc7b7ed2ab5961c50e24e779262f168b9d55f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:46:39 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java | 9 +++++++++
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadTcDto.java | 3 +++
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadProjectDto.java | 3 +++
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java | 3 +++
4 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
index 03ef7dd..5731447 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java
@@ -185,6 +185,9 @@
sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
sysProjUse.setTaocanId(-1L);
sysProjUse.setVipId(padProjectDto.getVipId());
+ if(StrUtil.isNotEmpty(padProjectDto.getState())){
+ sysProjUse.setStatus(padProjectDto.getState());
+ }
return new AjaxResult(AjaxResult.STATUS_SUCCESS,
projUseService.findInPage(sysProjUse, pageVo), projUseService.findTotal(sysProjUse));
}
@@ -204,6 +207,9 @@
MoneyCardUse moneyCardUse = new MoneyCardUse();
moneyCardUse.setVipId(padVipCardDto.getVipId());
+ if(StrUtil.isNotEmpty(padVipCardDto.getState())){
+ moneyCardUse.setStatus(padVipCardDto.getState());
+ }
return new AjaxResult(AjaxResult.STATUS_SUCCESS, cardUseService.findVipCardUseInPage(
moneyCardUse, pageVo), cardUseService.findTotalVipCardUse(moneyCardUse));
}
@@ -224,6 +230,9 @@
SysProjUse sysProjUse = new SysProjUse();
sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_TC);
sysProjUse.setVipId(padTcDto.getVipId());
+ if(StrUtil.isNotEmpty(padTcDto.getState())){
+ sysProjUse.setStatus(padTcDto.getState());
+ }
List<SysProjUse> projUseList =sysProjUseService.findInPage(sysProjUse,pageVo);
//设置套餐中的项目
projUseList.forEach(taocanProjUse -> {
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadProjectDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadProjectDto.java
index 746e83b..5c5a7ed 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadProjectDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadProjectDto.java
@@ -12,6 +12,9 @@
@ApiModelProperty(value = "会员id", example = "1")
private Long vipId;
+ @ApiModelProperty(value = "状态", example = "")
+ private String state;
+
@ApiModelProperty(hidden = true)
private Long shopId;
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadTcDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadTcDto.java
index 9b20474..410f37d 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadTcDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadTcDto.java
@@ -13,6 +13,9 @@
@ApiModelProperty(value = "会员id", example = "1")
private Long vipId;
+ @ApiModelProperty(value = "状态", example = "")
+ private String state;
+
@ApiModelProperty(hidden = true)
private Long shopId;
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java
index 0dcefd1..96781ab 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java
@@ -12,6 +12,9 @@
@ApiModelProperty(value = "会员id", example = "1")
private Long vipId;
+ @ApiModelProperty(value = "状态", example = "")
+ private String state;
+
@ApiModelProperty(hidden = true)
private Long shopId;
--
Gitblit v1.9.1