From 120f73549d7898b8239ffc21f3320a8dbad2c2b1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 26 七月 2025 09:09:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
index bf253ed..01943e5 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -2,12 +2,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
-import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
-
-import com.stylefeng.guns.modular.system.model.DriverActivity;
import com.stylefeng.guns.modular.system.dao.DriverActivityMapper;
+import com.stylefeng.guns.modular.system.model.DriverActivity;
import com.stylefeng.guns.modular.system.model.DriverActivityOnline;
import com.stylefeng.guns.modular.system.model.DriverActivityOrder;
import com.stylefeng.guns.modular.system.model.DriverActivityRegistered;
@@ -15,12 +14,11 @@
import com.stylefeng.guns.modular.system.service.IDriverActivityOrderService;
import com.stylefeng.guns.modular.system.service.IDriverActivityRegisteredService;
import com.stylefeng.guns.modular.system.service.IDriverActivityService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.math.BigDecimal;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -35,24 +33,27 @@
*/
@Service
public class DriverActivityServiceImpl extends ServiceImpl<DriverActivityMapper, DriverActivity> implements IDriverActivityService {
-
-
+
+
@Autowired
private IDriverActivityOnlineService driverActivityOnlineService;
-
+
@Autowired
private IDriverActivityOrderService driverActivityOrderService;
-
+
@Autowired
private IDriverActivityRegisteredService driverActivityRegisteredService;
-
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
@Override
public List<Map<String, Object>> getList(Page<Map<String, Object>> page, String beginTime, String endTime, String name,
Integer companyType,
Integer companyId) {
- return this.baseMapper.getList(page,beginTime,endTime,name,companyType,companyId);
+ return this.baseMapper.getList(page, beginTime, endTime, name, companyType, companyId);
}
-
+
@Override
public void insertOrUpdate(Integer id, String staTime, String startTime, String num1, Double num2, Double num3, Integer num4, Double num5, Integer num6, Double num7, Integer num8, Double num9, Integer num10, Double num11) {
//判断id是否为空，为空执行添加，或者执行修改
@@ -60,13 +61,13 @@
String[] timeArray = startTime.split(" - ");
Date startTimes = DateUtil.getDate_str3(timeArray[0]);
Date endTimes = DateUtil.getDate_str3(timeArray[1]);
- ShiroUser user = ShiroExtUtil.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
Date nowDay = new Date();
//添加活动
DriverActivity driverActivity = new DriverActivity();
driverActivity.setInsertTime(nowDay);
- driverActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
- driverActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
+ driverActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ driverActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
driverActivity.setStatus(driverActivity.getCompanyType() == 1 ? 3 : 1);
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
@@ -141,14 +142,14 @@
String[] timeArray = startTime.split(" - ");
Date startTimes = DateUtil.getDate_str3(timeArray[0]);
Date endTimes = DateUtil.getDate_str3(timeArray[1]);
- ShiroUser user = ShiroExtUtil.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
Date nowDay = new Date();
//添加活动
DriverActivity driverActivity = new DriverActivity();
driverActivity.setId(id);
- driverActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
- driverActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
+ driverActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
+ driverActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
driverActivity.setStatus(driverActivity.getCompanyType() == 1 ? 3 : 1);
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
--
Gitblit v1.7.1