From 6593a67fdfb688c70365b419c0e9658c690524b5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 16 十月 2023 09:50:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java
index eb072a7..e0c9309 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/PointsMerchandiseServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.activity.entity.PointsMerchandise;
import com.dsh.activity.mapper.PointsMerchandiseMapper;
+import com.dsh.activity.model.CoachChangeStateVO;
import com.dsh.activity.model.request.IntegralGoodsOfSearch;
import com.dsh.activity.service.PointsMerchandiseService;
import org.springframework.stereotype.Service;
@@ -26,9 +27,25 @@
return this.baseMapper.queryGoodsListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getRedemptionMethod(),
ofSearch.getUserPopulation(),ofSearch.getActiveStatus(),ofSearch.getState(),ofSearch.getPage());
}
+ @Override
+ public List<Map<String, Object>> queryGoodsListOfSearchAudit(IntegralGoodsOfSearch ofSearch) {
+ return this.baseMapper.queryGoodsListOfSearchAudit(ofSearch.getName(),ofSearch.getType(),ofSearch.getRedemptionMethod(),
+ ofSearch.getUserPopulation(),ofSearch.getActiveStatus(),ofSearch.getState(),ofSearch.getPage());
+ }
+
@Override
public void saveCity(Integer id, String province, String provinceCode, String city, String cityCode) {
this.baseMapper.saveCity(id,province,provinceCode,city,cityCode);
}
+
+ @Override
+ public List<Map<String, Object>> ticketList(IntegralGoodsOfSearch ofSearch) {
+ return this.baseMapper.ticketList(ofSearch);
+ }
+
+ @Override
+ public Object changeState(CoachChangeStateVO dto) {
+ return this.baseMapper.changeState(dto);
+ }
}
--
Gitblit v1.7.1