From 627306c2fb0ea4180930127140ce18a0599cf3f8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 06 May 2022 15:40:03 +0800
Subject: [PATCH] 20220505
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.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/PadSkinDto.java | 3 +++
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java | 3 +++
4 files changed, 12 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 4cd5937..03ef7dd 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
@@ -184,6 +184,7 @@
SysProjUse sysProjUse = new SysProjUse();
sysProjUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
sysProjUse.setTaocanId(-1L);
+ sysProjUse.setVipId(padProjectDto.getVipId());
return new AjaxResult(AjaxResult.STATUS_SUCCESS,
projUseService.findInPage(sysProjUse, pageVo), projUseService.findTotal(sysProjUse));
}
@@ -202,6 +203,7 @@
pageVo.setLimit(limit);
MoneyCardUse moneyCardUse = new MoneyCardUse();
+ moneyCardUse.setVipId(padVipCardDto.getVipId());
return new AjaxResult(AjaxResult.STATUS_SUCCESS, cardUseService.findVipCardUseInPage(
moneyCardUse, pageVo), cardUseService.findTotalVipCardUse(moneyCardUse));
}
@@ -267,6 +269,7 @@
pageVo.setLimit(limit);
SysSkinCheckRecord sysSkinCheckRecord = new SysSkinCheckRecord();
+ sysSkinCheckRecord.setUserId(padSkinDto.getVipId());
List<SysSkinCheckRecord> dataList = sysSkinCheckRecordDao.selectInPage(sysSkinCheckRecord, pageVo);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList,
sysSkinCheckRecordDao.selectTotalRecord(sysSkinCheckRecord));
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 14567b4..746e83b 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
@@ -9,6 +9,9 @@
@Data
public class PadProjectDto extends BasePageDto {
+ @ApiModelProperty(value = "会员id", example = "1")
+ private Long vipId;
+
@ApiModelProperty(hidden = true)
private Long shopId;
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSkinDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSkinDto.java
index b3d3467..70e44b7 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSkinDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSkinDto.java
@@ -9,6 +9,9 @@
@Data
public class PadSkinDto extends BasePageDto {
+ @ApiModelProperty(value = "会员id", example = "1")
+ private Long vipId;
+
@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 92ecd5a..0dcefd1 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
@@ -9,6 +9,9 @@
@Data
public class PadVipCardDto extends BasePageDto {
+ @ApiModelProperty(value = "会员id", example = "1")
+ private Long vipId;
+
@ApiModelProperty(hidden = true)
private Long shopId;
--
Gitblit v1.9.1