From 616bb172913fae2199d398d6974ce0992dcc65ca Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sun, 20 Jun 2021 02:06:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=85=85=E5=80=BC=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E9=85=8D=E7=BD=AE=E9=87=8C=E7=9A=84=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../co/yixiang/modules/user/rest/UserRechargeController.java   | 2 ++
 .../shop/service/dto/YxSystemGroupDataQueryCriteria.java       | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
index 92626b07..ea1f2da0 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java
@@ -11,6 +11,7 @@ package co.yixiang.modules.user.rest;
 import cn.hutool.core.bean.BeanUtil;
 import co.yixiang.api.ApiResult;
 import co.yixiang.api.YshopException;
+import co.yixiang.enums.ShopCommonEnum;
 import co.yixiang.logging.aop.log.AppLog;
 import co.yixiang.common.bean.LocalUser;
 import co.yixiang.common.interceptor.AuthCheck;
@@ -73,6 +74,7 @@ public class UserRechargeController {
     public ApiResult<Object> getWays(){
         YxSystemGroupDataQueryCriteria queryCriteria = new YxSystemGroupDataQueryCriteria();
         queryCriteria.setGroupName(ShopConstants.YSHOP_RECHARGE_PRICE_WAYS);
+        queryCriteria.setStatus(ShopCommonEnum.IS_STATUS_1.getValue());
         List<YxSystemGroupData> yxSystemGroupDataList = systemGroupDataService.queryAll(queryCriteria);
 
         List<YxSystemGroupDataVo> systemGroupDataVoList = yxSystemGroupDataList.stream().map(s->{
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java
index 29fdb90f..91f348fe 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java
@@ -18,4 +18,7 @@ public class YxSystemGroupDataQueryCriteria{
     // 精确
     @Query
     private String groupName;
+
+    @Query
+    private Integer status;
 }