feat: 代码重构

hjl

2024-07-18 b9da8289051937fbbbd47bbda97414ad6c769a90

 ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java

@@ -10,6 +10,8 @@
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
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.MasterWorker;
import com.ruoyi.worker.entity.WorkerProcess;
@@ -18,7 +20,6 @@
import com.ruoyi.worker.service.MasterWorkerService;
import com.ruoyi.worker.service.WorkerProcessService;
import com.ruoyi.worker.vo.HomePageInfoVO;
import com.ruoyi.worker.vo.OrderCountVO;
import com.ruoyi.worker.vo.OrderListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -58,6 +59,8 @@
    private WorkerProcessService workerProcessService;
    @Resource
    private AdminClient adminClient;
    @Resource
    private OrderClient orderClient;

    /**
     * 师傅端-密码登录
@@ -75,6 +78,19 @@
        }
        if (!Constants.ONE.equals(worker.getIsEnable())) {
            return R.notEnabled("当前手机号已禁用！");
        }
        // 校验师傅是否已提交入驻申请
        WorkerProcess process = workerProcessService.lambdaQuery()
                .eq(WorkerProcess::getPhone, phone)
                .eq(WorkerProcess::getIsDelete, 0)
                .orderByDesc(WorkerProcess::getCreateTime)
                .last("limit 1").one();
        if (null != process) {
            if (Constants.TWO.equals(process.getState())) {
                return R.fail("入驻申请暂未审核通过，请耐心等待！");
            }
        } else {
            return R.registered("当前账号未提交入驻申请，无法登录！");
        }
        // MD5加密登录密码(新)
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
@@ -140,11 +156,18 @@
            // 校验师傅是否已提交入驻申请
            WorkerProcess process = workerProcessService.lambdaQuery()
                    .eq(WorkerProcess::getPhone, phone)
                    .eq(WorkerProcess::getIsDelete, 0).one();
            if (Constants.ZERO.equals(process.getState())) {
                return R.fail("入驻申请暂未审核通过，请耐心等待！");
            } else if (Constants.TWO.equals(process.getState())) {
                return R.fail("入驻申请已驳回，请重新提交入驻申请！");
                    .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("入驻申请已驳回，请重新提交入驻申请！");
                    return R.fail("当前手机号未注册！");
                } else {
                    return R.registered("当前账号未提交入驻申请，无法登录！");
                }
            } else {
                return R.registered("当前账号未提交入驻申请，无法登录！");
            }
@@ -180,31 +203,29 @@
        // 校验手机号是否已提交申请
        WorkerProcess dbProcess = workerProcessService.lambdaQuery()
                .eq(WorkerProcess::getPhone, phone)
                .eq(WorkerProcess::getIsDelete, 0).one();
                .eq(WorkerProcess::getIsDelete, 0)
                .orderByDesc(WorkerProcess::getCreateTime).last("limit 1").one();
        if (null != dbProcess) {
            if (Constants.ZERO.equals(dbProcess.getState())) {
                return R.fail("入驻申请已提交，审核未通过，请耐心等待！");
            } else if (Constants.ONE.equals(dbProcess.getState())) {
                return R.fail("该手机号入驻申请已通过，请通过手机号登录！");
            }
        }
        // 默认状态待审核
        workerProcess.setState(Constants.ZERO);
        // 获取用户性别
        String idNumber = workerProcess.getIdNumber();
        // 判断身份证号码长度是否合法
        if (idNumber.length() == Constants.EIGHTEEN) {
            // 获取身份证号码倒数第二位的数字
            int genderNum = Integer.parseInt(idNumber.substring(16, 17));
            // 判断性别
            if (genderNum % Constants.TWO == 0) {
                workerProcess.setSex("女");
            } else {
                workerProcess.setSex("男");
            }
        } else {
            // 默认状态待审核
            workerProcess.setState(Constants.ZERO);
            // 获取用户性别
            String idNumber = workerProcess.getIdNumber();
            // 判断身份证号码长度是否合法
            if (idNumber.length() == Constants.EIGHTEEN) {
                // 获取身份证号码倒数第二位的数字
                int genderNum = Integer.parseInt(idNumber.substring(16, 17));
                // 判断性别
                if (genderNum % Constants.TWO == 0) {
                    workerProcess.setSex("女");
                } else {
                    workerProcess.setSex("男");
                }
            } else {
                return R.idNumberIllegal("身份证号码不合法！");
            }
            return R.idNumberIllegal("身份证号码不合法！");
        }
        return workerProcessService.save(workerProcess) ? R.ok("申请成功！") : R.fail("申请失败！");
    }
@@ -232,7 +253,8 @@
            return R.errorCode("验证码错误或已过期！");
        }
        // 手机号是否注册
        MasterWorker worker = masterWorkerService.lambdaQuery().eq(MasterWorker::getPhone, phone)
        MasterWorker worker = masterWorkerService.lambdaQuery()
                .eq(MasterWorker::getPhone, phone)
                .eq(MasterWorker::getIsDelete, 0).one();
        if (null == worker) {
            return R.registered("该手机号未提交入驻申请！");
@@ -294,7 +316,7 @@
            return R.registered("当前账号未注册！");
        }
        // 订单统计
        OrderCountVO orderCount = masterWorkerService.orderCount(masterWorker.getId());
        WorkerOrderCountVO orderCount = orderClient.orderStateCount(masterWorker.getId()).getData();
        // 操作指导详情
        Agreement agreement = adminClient.dataInfo(Constants.TWO).getData();
        return R.ok(new HomePageInfoVO(masterWorker, orderCount,
@@ -319,6 +341,23 @@
    }

    /**
     * 师傅端-订单列表-地图模式
     */
    @ApiOperation(value = "订单列表-地图模式", tags = {"师傅端-首页"})
    @GetMapping(value = "/orderMapMode")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "师傅所在经度", name = "longitude", dataType = "String", required = true),
            @ApiImplicitParam(value = "师傅所在纬度", name = "latitude", dataType = "String", required = true)
    })
    public R<List<OrderListVO>> orderMapMode(@RequestParam String longitude, @RequestParam String latitude) {
        LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
        if (null == loginWorker) {
            return R.loginExpire("登录已失效！");
        }
        return R.ok(masterWorkerService.orderMapMode(loginWorker.getUserid(), longitude, latitude));
    }

    /**
     * 师傅端-操作指南
     */
    @ApiOperation(value = "操作指南", tags = {"师傅端-首页"})
@@ -336,12 +375,12 @@
     */
    @ApiOperation(value = "订单置顶", tags = {"师傅端-首页"})
    @GetMapping(value = "/orderTop")
    public R<Boolean> orderTop(@RequestParam Integer orderId) {
    public R<Boolean> orderTop(@RequestParam String orderId) {
        LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
        if (null == loginWorker) {
            return R.loginExpire("登录已失效！");
        }
        return masterWorkerService.orderTop(orderId, loginWorker.getUserid()) ? R.ok() : R.fail();
        return orderClient.orderTop(orderId, loginWorker.getUserid());
    }

    /**