From 9a60b1e59f52ab4f41e956a76eac1150f39843e3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 20:08:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html | 2 +-
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java | 2 ++
cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java | 6 ++++++
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
index 39c3612..b993330 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/THuiminCard.java
@@ -171,6 +171,12 @@
private Long current;
@TableField(exist = false)
private Long size;
+
+ /**
+ * 已购数量
+ */
+ @TableField(exist = false)
+ private Integer buyCount;
/**
* 惠民卡状态：1未开始 2已开始 3已结束
*/
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
index 98cb2b2..5a6ed10 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
@@ -207,6 +207,8 @@
Page<TSite> sitePage = tSiteService.page(page,
new LambdaQueryWrapper<TSite>()
.eq(!StringUtils.isEmpty(query.getProvinceCode()), TSite::getProvinceCode, query.getProvinceCode())
+ .ne(TSite::getState,3)
+ .eq(TSite::getSign,0)
.eq(!StringUtils.isEmpty(query.getCityCode()), TSite::getCityCode, query.getCityCode())
.in(!storeIds.isEmpty(), TSite::getStoreId, storeIds));
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html
index 5eb8e8e..2a448d4 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tHuiminCard/tHuiminCard_add.html
@@ -509,7 +509,7 @@
:page-sizes="[10, 50, 100, 200]"
:page-size="pageSiteSize"
layout="total, sizes, prev, pager, next, jumper"
- :total="siteTotal">
+ :total="tableSiteTotal">
</el-pagination>
<span slot="footer" class="dialog-footer">
--
Gitblit v1.7.1