java/IgoTravel.git

			@@ -11,14 +11,13 @@
			import com.stylefeng.guns.core.log.LogObjectHolder;
			import com.stylefeng.guns.core.shiro.ShiroKit;
			import com.stylefeng.guns.core.util.*;
			import com.stylefeng.guns.core.util.DateUtil;
			import com.stylefeng.guns.core.util.WoUtil;
			import com.stylefeng.guns.modular.system.dao.DriverPunishMapper;
			import com.stylefeng.guns.modular.system.dao.DriverTrainMapper;
			import com.stylefeng.guns.modular.system.model.*;
			import com.stylefeng.guns.modular.system.service.*;
			import com.stylefeng.guns.modular.system.util.EmailUtil;
			import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
			import com.stylefeng.guns.modular.system.util.PushURL;
			import com.stylefeng.guns.modular.system.util.ResultUtil;
			import com.stylefeng.guns.modular.system.util.*;
			import org.apache.poi.ss.usermodel.Cell;
			import org.apache.poi.ss.usermodel.Row;
			import org.apache.poi.ss.usermodel.Sheet;
			@@ -711,9 +710,9 @@
			tDriver.setPhone(phone);
			tDriver.setAccount(phone);
			tDriver.setBalance(new BigDecimal(0));
			tDriver.setCommission(new BigDecimal(0));
			tDriver.setCouponBalance(new BigDecimal(0));
			tDriver.setBackgroundBalance(new BigDecimal(0));
			// tDriver.setCommission(new BigDecimal(0));
			// tDriver.setCouponBalance(new BigDecimal(0));
			// tDriver.setBackgroundBalance(new BigDecimal(0));

			tDriverService.insert(tDriver);

			@@ -767,6 +766,9 @@
			tDriverService.updateById(driver);
			return SUCCESS_TIP;
			}

			@Autowired
			private RedisUtil redisUtil;
			/**
			* 操作司机状态
			*/
			@@ -778,6 +780,10 @@
			if (1 == optType){ //解冻
			tDriver.setAuthState(2);
			}else if (2 == optType){ //冻结
			String key = redisUtil.getValue("DRIVER_" + tDriver.getPhone());
			redisUtil.remove(key);//删除个人信息数据
			redisUtil.remove("DRIVER_" + tDriver.getPhone());//删除后台冻结相关缓存
			redisUtil.remove("DRIVER_" + driverId);//清除存储的token
			tDriver.setAuthState(3);
			}
			tDriver.setRemark(remark);