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/UserCouponServiceImpl.java | 82 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
index 0a9b304..302737d 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java
@@ -12,7 +12,9 @@
import com.dsh.activity.feignclient.account.model.AppUser;
import com.dsh.activity.feignclient.course.CoursePackageClient;
import com.dsh.activity.feignclient.course.model.CoursePackage;
+import com.dsh.activity.feignclient.other.SiteClient;
import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.model.Site;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.activity.mapper.CouponMapper;
import com.dsh.activity.mapper.CouponStoreMapper;
@@ -51,20 +53,27 @@
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
- @Autowired
+ @Resource
private AppUserClient appClient;
- @Autowired
+ @Resource
private StudentClient studentClient;
- @Autowired
+ @Resource
private CouponMapper couponMapper;
- @Autowired
+ @Resource
private StoreClient storeClient;
- @Autowired
+ @Resource
private CouponStoreMapper csMapper;
+
+ @Resource
+ private SiteClient siteClient;
+
+
+
+
/**
* 获取购买课程可用优惠券列表
@@ -91,26 +100,79 @@
String content = userCoupon.get("content").toString();
if (type == 1) {//满减{"num1":1,"num2":1}
JSONObject jsonObject = JSON.parseObject(content);
- Double num1 = jsonObject.getDouble("num1");
+ Double num1 = jsonObject.getDouble("conditionalAmount");
if(price.compareTo(num1) <= 0){
continue;
}
couponListVo.setUseCondition("满" + num1 + "元可用");
- couponListVo.setFavorable(jsonObject.getDouble("num2") + "元");
+ couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
}
if (type == 2) {//代金券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
- Double num1 = jsonObject.getDouble("num1");
+ Double num1 = jsonObject.getDouble("deductionAmount");
if(price.compareTo(num1) <= 0){
continue;
}
couponListVo.setUseCondition("");
- couponListVo.setFavorable(num1 + "元");
+ couponListVo.setFavorable(num1 + "");
}
if (type == 3) {//体验券{"num1":1}
JSONObject jsonObject = JSON.parseObject(content);
couponListVo.setUseCondition("");
- couponListVo.setFavorable(jsonObject.getString("num1"));
+ couponListVo.setFavorable(jsonObject.getString("experienceName"));
+ }
+ listVos.add(couponListVo);
+ }
+ return listVos;
+ }
+
+
+ /**
+ * 获取预约场地可用优惠券列表
+ * @param siteId
+ * @param price
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<CouponListVo> querySiteCouponList(Integer uid, Integer siteId, Double price, String lon, String lat) throws Exception {
+ Site site = siteClient.querySiteById(siteId);
+ Integer storeId = site.getStoreId();
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
+ String provinceCode = geocode.get("provinceCode");
+ String cityCode = geocode.get("cityCode");
+ List<Map<String, Object>> userCoupons = this.baseMapper.queryAvailableCouponList(uid, storeId, provinceCode, cityCode);
+ List<CouponListVo> listVos = new ArrayList<>();
+ for (Map<String, Object> userCoupon : userCoupons) {
+ Integer type = Integer.valueOf(userCoupon.get("type").toString());
+ CouponListVo couponListVo = new CouponListVo();
+ couponListVo.setId(Long.valueOf(userCoupon.get("id").toString()));
+ couponListVo.setName(userCoupon.get("name").toString());
+ couponListVo.setType(type);
+ couponListVo.setEffectiveTime(userCoupon.get("endTime").toString());
+ String content = userCoupon.get("content").toString();
+ if (type == 1) {//满减{"num1":1,"num2":1}
+ JSONObject jsonObject = JSON.parseObject(content);
+ Double num1 = jsonObject.getDouble("conditionalAmount");
+ if(price.compareTo(num1) <= 0){
+ continue;
+ }
+ couponListVo.setUseCondition("满" + num1 + "元可用");
+ couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
+ }
+ if (type == 2) {//代金券{"num1":1}
+ JSONObject jsonObject = JSON.parseObject(content);
+ Double num1 = jsonObject.getDouble("deductionAmount");
+ if(price.compareTo(num1) <= 0){
+ continue;
+ }
+ couponListVo.setUseCondition("");
+ couponListVo.setFavorable(num1 + "");
+ }
+ if (type == 3) {//体验券{"num1":1}
+ JSONObject jsonObject = JSON.parseObject(content);
+ couponListVo.setUseCondition("");
+ couponListVo.setFavorable(jsonObject.getString("experienceName"));
}
listVos.add(couponListVo);
}
--
Gitblit v1.7.1