From 6af0c7434178ca41e727c700af8174201a865de9 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 11:55:29 +0800
Subject: [PATCH] 10.31.8
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
index dc3b928..c998d48 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.activity.entity.Coupon;
+import com.dsh.activity.entity.TStudent;
import com.dsh.activity.feignclient.account.AppUserClient;
import com.dsh.activity.feignclient.account.StudentClient;
import com.dsh.activity.feignclient.account.model.AppUser;
@@ -59,11 +60,12 @@
if (1 == appUser.getIsVip()) {
userPopulation.add(2);//年度会员
}
- List<Student> students = studentClient.queryStudentList(uid);
+ List<TStudent> students = studentClient.queryStudentList(uid);
if (students.size() > 0) {
userPopulation.add(3);//已有学员用户
}
- List<Coupon> list = this.list(new QueryWrapper<Coupon>().eq("distributionMethod", distributionMethod).in("userPopulation", userPopulation)
+ List<Coupon> list = this.list(new QueryWrapper<Coupon>().eq("distributionMethod", distributionMethod)
+ .in("userPopulation", userPopulation)
.eq("auditStatus", 2).eq("status", 2).eq("state", 1)
.last(" and now() between startTime and endTime order by insertTime desc"));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -105,7 +107,17 @@
@Override
public List<Map<String, Object>> queryCouponListOfSearch(CouponListOfSearch ofSearch) {
- return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),ofSearch.getType(),ofSearch.getDistributionMethod(),ofSearch.getUserPopulation(),ofSearch.getStatus(),ofSearch.getState(),ofSearch.getPage(),ofSearch.getCityCode(),ofSearch.getStoreId());
+ return this.baseMapper.queryCouponListOfSearch(ofSearch.getName(),
+ ofSearch.getType(),
+ ofSearch.getDistributionMethod(),
+ ofSearch.getUserPopulation(),
+ ofSearch.getStatus(),
+ ofSearch.getState(),
+ ofSearch.getPage(),
+ ofSearch.getCityCode(),
+ ofSearch.getStoreId(),
+ ofSearch.getOperatorId(),
+ ofSearch.getObjType());
}
@Override
--
Gitblit v1.7.1