java/JiaDianHuiShou.git

			@@ -1,6 +1,7 @@
			package com.ruoyi.worker.controller;


			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.ruoyi.admin.api.entity.Agreement;
			import com.ruoyi.admin.api.feignClient.AdminClient;
			import com.ruoyi.common.core.constant.Constants;
			@@ -13,8 +14,10 @@
			import com.ruoyi.order.api.entity.WorkerOrderCountVO;
			import com.ruoyi.order.api.feignClient.OrderClient;
			import com.ruoyi.system.api.model.LoginUserInfo;
			import com.ruoyi.worker.entity.AppVersion;
			import com.ruoyi.worker.entity.MasterWorker;
			import com.ruoyi.worker.entity.WorkerProcess;
			import com.ruoyi.worker.mapper.AppMapper;
			import com.ruoyi.worker.request.LoginPasswordRequest;
			import com.ruoyi.worker.request.LoginPhoneRequest;
			import com.ruoyi.worker.service.MasterWorkerService;
			@@ -25,16 +28,20 @@
			import io.swagger.annotations.ApiImplicitParam;
			import io.swagger.annotations.ApiImplicitParams;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.*;

			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.regex.Pattern;
			import javax.annotation.Resource;
			import javax.servlet.http.HttpServletRequest;
			import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
			import org.springframework.validation.annotation.Validated;
			import org.springframework.web.bind.annotation.GetMapping;
			import org.springframework.web.bind.annotation.PostMapping;
			import org.springframework.web.bind.annotation.RequestBody;
			import org.springframework.web.bind.annotation.RequestMapping;
			import org.springframework.web.bind.annotation.RequestParam;
			import org.springframework.web.bind.annotation.RestController;

			/**
			* <p>
			@@ -61,7 +68,17 @@
			private AdminClient adminClient;
			@Resource
			private OrderClient orderClient;
			@Resource
			private AppMapper appMapper;


			@PostMapping("/version/check")
			@ApiOperation(value = "获取最新的版本信息", tags = {"自动更新"})
			public R check() {
			AppVersion appVersion = appMapper.selectOne(new QueryWrapper<AppVersion>().orderByDesc("createTime").eq("is_delete", 0).last("limit 1"));
			// Object version = redisService.getCacheObject("version");
			return R.ok(appVersion);
			}
			/**
			* 师傅端-密码登录
			*
			@@ -103,6 +120,42 @@
			boolean matches = passwordEncoder.matches(password, worker.getPassword());
			if (!matches) {
			return R.passwordError("登录密码错误！");
			}
			return R.ok(generateLoginToken(worker));
			}
			/**
			* 师傅端-密码登录
			*
			* @param loginPasswordRequest 手机号及密码信息
			*/
			@ApiOperation(value = "2.0新增登录师傅切换", tags = {"2.0新增登录师傅切换"})
			@PostMapping(value = "/loginApp")
			public R<Object> loginApp(@RequestBody LoginPasswordRequest loginPasswordRequest) {
			String phone = loginPasswordRequest.getPhone();
			MasterWorker worker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
			.eq(MasterWorker::getIsDelete, 0).one();
			if (null != worker) {
			if (!Constants.ONE.equals(worker.getIsEnable())) {
			return R.notEnabled("登录失败，当前账号未启用!");
			}
			} else {
			// 校验师傅是否已提交入驻申请
			WorkerProcess process = workerProcessService.lambdaQuery()
			.eq(WorkerProcess::getPhone, phone)
			.eq(WorkerProcess::getIsDelete, 0)
			.orderByDesc(WorkerProcess::getCreateTime)
			.last("limit 1").one();
			if (null != process) {
			if (Constants.ZERO.equals(process.getState())) {
			return R.fail("入驻申请暂未审核通过，请耐心等待！");
			} else if (Constants.TWO.equals(process.getState())) {
			return R.fail("当前手机号未注册！");
			} else {
			return R.registered("当前账号未提交入驻申请，无法登录！");
			}
			} else {
			return R.registered("当前账号未提交入驻申请，无法登录！");
			}
			}
			return R.ok(generateLoginToken(worker));
			}
			@@ -355,11 +408,20 @@
			@ApiImplicitParam(value = "师傅所在纬度", name = "latitude", dataType = "String", required = true)
			})
			public R<List<OrderListVO>> orderNotHandle(@RequestParam String longitude, @RequestParam String latitude) {

			LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
			if (null == loginWorker) {
			return R.loginExpire("登录已失效！");
			}
			return R.ok(masterWorkerService.orderNotHandle(loginWorker.getUserid(), longitude, latitude));
			}

			@ApiOperation(value = "下拉框", tags = {"后台-下拉框"})
			@GetMapping(value = "/workSelect")
			public R<List<MasterWorker>> workSelect() {

			List<MasterWorker> list = masterWorkerService.lambdaQuery().eq(MasterWorker::getIsEnable, 1).eq(MasterWorker::getIsDelete, 0).list();
			return R.ok(list);
			}

			/**
			@@ -550,4 +612,39 @@
			return update ? R.ok("修改成功！") : R.fail("修改失败！");
			}

			/**
			* 师傅端-修改性别
			*/
			// @ApiOperation(value = "修改师傅实时位置", tags = {"师傅端-个人中心[2.0]"})
			// @GetMapping(value = "/updateLonLat")
			// @ApiImplicitParams({
			// @ApiImplicitParam(value = "经度", name = "workerLon", dataType = "String", required = true),
			// @ApiImplicitParam(value = "纬度", name = "workerLat", dataType = "String", required = true),
			// })
			// public R<String> updateLonLat(@RequestParam("workerLon") String workerLon, @RequestParam("workerLat") String workerLat) {
			// LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
			// if (null == loginWorker) {
			// return R.loginExpire("登录已失效！");
			// }
			// boolean update = masterWorkerService.lambdaUpdate()
			// .set(MasterWorker::getWorkerLon, workerLon)
			// .set(MasterWorker::getWorkerLat, workerLat)
			// .eq(MasterWorker::getId, loginWorker.getUserid())
			// .eq(MasterWorker::getIsDelete, 0).update();
			// return update ? R.ok("修改成功！") : R.fail("修改失败！");
			// }

			/**
			* 师傅端-打电话
			*/
			@ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
			@GetMapping(value = "/workerCall")
			@ApiImplicitParams({
			@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
			})
			public R<String> workerCall(@RequestParam String orderId) {
			orderClient.call(orderId);
			return R.ok();
			}

			}