From 821fc2f632f8b974a2c0fc37630e13c5fbe6086c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 26 九月 2025 17:26:16 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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..279ce39 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();
@@ -308,9 +308,12 @@
@Override
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();
- List<Map<String, Object>> list = userActivityMapper.queryUserActivityList(objectId, start, end, name, status, offset, limit);
- int i = userActivityMapper.queryUserActivityListCount(objectId, start, end, name, status);
+ Integer companyId = null;
+ if(1 != ShiroKit.getUser().getRoleType()){
+ companyId = ShiroKit.getUser().getObjectId();
+ }
+ List<Map<String, Object>> list = userActivityMapper.queryUserActivityList(companyId, start, end, name, status, offset, limit);
+ int i = userActivityMapper.queryUserActivityListCount(companyId, start, end, name, status);
map.put("rows", list);
map.put("total", i);
return map;
--
Gitblit v1.7.1