From 52d38e61813a28ceb1e4fc1de65763f078f1e5de Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期五, 23 二月 2024 14:19:16 +0800
Subject: [PATCH] 2.23
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 48 insertions(+), 9 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
index f3e7619..6e49bfd 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java
@@ -16,10 +16,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -126,20 +123,21 @@
userActivityBalance.setGeneralCouponMoney(jsonObject.getDouble("num3"));
userActivityBalance.setSpecialNum(jsonObject.getInteger("num4"));
userActivityBalance.setSpecialCouponMoney(jsonObject.getDouble("num5"));
- userActivityBalance.setTaxiNum(jsonObject.getInteger("num6"));
- userActivityBalance.setTaxiCouponMoney(jsonObject.getDouble("num7"));
- userActivityBalance.setIntercityNum(jsonObject.getInteger("num8"));
- userActivityBalance.setIntercityCouponMoney(jsonObject.getDouble("num9"));
+// userActivityBalance.setTaxiNum(jsonObject.getInteger("num6"));
+// userActivityBalance.setTaxiCouponMoney(jsonObject.getDouble("num7"));
+ userActivityBalance.setIntercityNum(jsonObject.getInteger("num6"));
+ userActivityBalance.setIntercityCouponMoney(jsonObject.getDouble("num7"));
userActivityBalance.setTotalPrice(jsonObject.getDouble("num11"));
userActivityBalance.setLavePrice(jsonObject.getDouble("num11"));
userActivityBalance.insertOrUpdate();
}
}
//添加打折活动
+ UserActivityDiscount1 userActivityDiscount1 = null;
if(SinataUtil.isNotEmpty(discountSpecial) &&
/*SinataUtil.isNotEmpty(discountTaxi) &&*/
SinataUtil.isNotEmpty(discountLogistics)){
- UserActivityDiscount1 userActivityDiscount1 = new UserActivityDiscount1();
+ userActivityDiscount1 = new UserActivityDiscount1();
userActivityDiscount1.setUserActivityId(userActivity.getId());
userActivityDiscount1.setStartTime(startTimes);
userActivityDiscount1.setEndTime(endTimes);
@@ -166,6 +164,29 @@
userActivityRedenvelope.setLavePrice(redPrice);
userActivityRedenvelope.insertOrUpdate();
}
+
+ if(SinataUtil.isNotEmpty(discountSpecial) &&
+ /*SinataUtil.isNotEmpty(discountTaxi) &&*/
+ SinataUtil.isNotEmpty(discountLogistics)){
+ UserActivityDiscount1 finalUserActivityDiscount = userActivityDiscount1;
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ Date startTime1 = userActivity.getStartTime();
+ Date endTime = userActivity.getEndTime();
+ if(System.currentTimeMillis() >= startTime1.getTime() && System.currentTimeMillis() < endTime.getTime()){
+ List<UserActivityDiscount1> list = new ArrayList();
+ list.add(finalUserActivityDiscount);
+ try {
+ userActivityDiscount1Service.sendEmail(list);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ }).start();
+ }
+
}else{
String[] timeArray = startTime.split(" - ");
Date startTimes = DateUtil.getDate_str3(timeArray[0]);
@@ -288,8 +309,26 @@
public Map<String, Object> queryUserActivityList(Integer uid, Date start, Date end, String name, Integer status, Integer offset, Integer limit) {
Map<String, Object> map = new HashMap<>();
Integer objectId = userService.selectById(uid).getObjectId();
+ boolean a = false;
+ if (status!=null&&status==5){
+ status = null;
+ a = true;
+ }
List<Map<String, Object>> list = userActivityMapper.queryUserActivityList(objectId, start, end, name, status, offset, limit);
int i = userActivityMapper.queryUserActivityListCount(objectId, start, end, name, status);
+ if (a){
+ List<Map<String, Object>> list1 = new ArrayList<>();
+ for (Map<String, Object> stringObjectMap : list) {
+ long statys = (long) stringObjectMap.get("status");
+ System.out.println(statys);
+ if (statys==6){
+ list1.add(stringObjectMap);
+ }
+ }
+ map.put("rows", list1);
+ map.put("total", list1.size());
+ return map;
+ }
map.put("rows", list);
map.put("total", i);
return map;
--
Gitblit v1.7.1