From 631a5aa09e0147ca81fffcb1434e57b1cd1ba6f6 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 09 八月 2023 09:34:53 +0800
Subject: [PATCH] app端口:积分变动记录增加变动类型字段，代码同步更新；积分兑换操作的数量校验功能完善
---
cloud-server-activity/src/main/java/com/dsh/activity/service/impl/CouponServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 8187b53..1da2f4b 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
@@ -10,6 +10,8 @@
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.CouponExamineListSearch;
+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;
@@ -61,7 +63,7 @@
}
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();
@@ -70,20 +72,21 @@
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) {//满减
+// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
JSONObject jsonObject = JSON.parseObject(content);
- couponListVo.setUseCondition("满" + jsonObject.getDouble("num1") + "元可用");
- couponListVo.setFavorable(jsonObject.getDouble("num2") + "元");
+ couponListVo.setUseCondition("满" + jsonObject.getDouble("conditionalAmount") + "元可用");
+ couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
}
if (coupon.getType() == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
couponListVo.setUseCondition("");
- couponListVo.setFavorable(jsonObject.getDouble("num1") + "元");
+ couponListVo.setFavorable(jsonObject.getString("conditionalAmount"));
}
if (coupon.getType() == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
couponListVo.setUseCondition("");
- couponListVo.setFavorable(jsonObject.getString("num1"));
+ couponListVo.setFavorable(jsonObject.getString("experienceName"));
}
listVos.add(couponListVo);
}
@@ -98,4 +101,14 @@
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());
+ }
+
+ @Override
+ public List<Map<String, Object>> queryCouponExamineList(CouponExamineListSearch ofSearch) {
+ return this.baseMapper.queryCouponExamineList(ofSearch.getName(),ofSearch.getType(),ofSearch.getUserPopulation(),ofSearch.getDistributionMethod(),ofSearch.getAuditStatus(),ofSearch.getPage());
+ }
+
}
--
Gitblit v1.7.1