From ee47bcfe2e0671f4d80eac373783e9de4a8f0ac1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 二月 2024 11:11:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 09361f1..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
@@ -123,10 +123,10 @@
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();
@@ -309,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