From 81932e21cb584b992bdbde80df84eb81f77073d0 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期四, 27 七月 2023 11:36:18 +0800
Subject: [PATCH] 管理后台的优惠券管理的角色模块修复
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 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 294b9ab..4278dd6 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
@@ -1,24 +1,26 @@
package com.dsh.activity.service.impl;
+
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.activity.entity.Coupon;
-import com.dsh.activity.feginClient.account.AppUserClient;
-import com.dsh.activity.feginClient.account.StudentClient;
-import com.dsh.activity.feginClient.account.model.AppUser;
-import com.dsh.activity.feginClient.account.model.Student;
+import com.dsh.activity.feignclient.account.AppUserClient;
+import com.dsh.activity.feignclient.account.StudentClient;
+import com.dsh.activity.feignclient.account.model.AppUser;
+import com.dsh.activity.feignclient.account.model.Student;
+import com.dsh.activity.feignclient.model.CouponListOfSearch;
import com.dsh.activity.mapper.CouponMapper;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.service.ICouponService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @author zhibing.pu
@@ -48,38 +50,38 @@
public List<CouponListVo> queryCouponList(Integer uid, Integer distributionMethod) throws Exception {
AppUser appUser = appUserClient.queryAppUser(uid);
List<CouponListVo> listVos = new ArrayList<>();
- if(null != appUser){
+ if (null != appUser) {
List<Integer> userPopulation = new ArrayList<>();
userPopulation.add(1);//全部用户
- if(1 == appUser.getIsVip()){
+ if (1 == appUser.getIsVip()) {
userPopulation.add(2);//年度会员
}
List<Student> students = studentClient.queryStudentList(uid);
- if(students.size() > 0){
+ if (students.size() > 0) {
userPopulation.add(3);//已有学员用户
}
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").orderByDesc("insertTime"));
+ .last(" and now() between startTime and endTime order by insertTime desc"));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (Coupon coupon : list) {
CouponListVo couponListVo = new CouponListVo();
- couponListVo.setId(coupon.getId());
+ couponListVo.setId(coupon.getId().longValue());
couponListVo.setName(coupon.getName());
couponListVo.setType(coupon.getType());
couponListVo.setEffectiveTime(sdf.format(coupon.getStartTime()) + "-" + sdf.format(coupon.getEndTime()));
String content = coupon.getContent();
- if(coupon.getType() == 1){//满减{"num1":1,"num2":1}
+ if (coupon.getType() == 1) {//满减{"num1":1,"num2":1}
JSONObject jsonObject = JSON.parseObject(content);
couponListVo.setUseCondition("满" + jsonObject.getDouble("num1") + "元可用");
- couponListVo.setFavorable(jsonObject.getDouble("num2") + "元");
+ couponListVo.setFavorable(jsonObject.getString("num2"));
}
- if(coupon.getType() == 2){//满减{"num1":1}
+ if (coupon.getType() == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
couponListVo.setUseCondition("");
- couponListVo.setFavorable(jsonObject.getDouble("num1") + "元");
+ couponListVo.setFavorable(jsonObject.getString("num1"));
}
- if(coupon.getType() == 3){//体验券{"num1":1}
+ if (coupon.getType() == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
couponListVo.setUseCondition("");
couponListVo.setFavorable(jsonObject.getString("num1"));
@@ -89,4 +91,17 @@
}
return listVos;
}
+
+
+
+ @Override
+ public Map<String, Object> queryConponRuleOfJson(Integer id) {
+ return this.baseMapper.queryConponRuleOfJson(id);
+ }
+
+ @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());
+ }
+
}
--
Gitblit v1.7.1