From 84f28e6743089c1147e078763de6eafe52d0dc31 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 12 二月 2025 14:15:40 +0800 Subject: [PATCH] 解决冲突 --- medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java index 1052bb6..b4ea5a7 100644 --- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java +++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwApplicationController.java @@ -1,14 +1,13 @@ package com.sinata.web.controller.applet; import com.sinata.common.core.domain.R; -import com.sinata.common.entity.PageDTO; +import com.sinata.common.core.redis.RedisCache; import com.sinata.system.domain.MwApplication; -import com.sinata.system.domain.query.MwCollectRecordQuery; -import com.sinata.system.domain.vo.MwCollectRecordVO; import com.sinata.system.service.MwApplicationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -32,12 +31,17 @@ @RequestMapping("/applet/mwApplication") public class AppMwApplicationController { private final MwApplicationService mwApplicationService; + @Autowired + private RedisCache redisCache; @ApiOperation("提交入驻申请") @PostMapping("/set") public R pageList(@Valid @RequestBody MwApplication mwApplication) { - mwApplication.setAuditStatus(1); - mwApplicationService.save(mwApplication); + String string = redisCache.getCacheObject(mwApplication.getPhone()).toString(); + if (!mwApplication.getCode().equals(string)){ + return R.fail("验证码错误,请重试"); + } + mwApplicationService.saveApplication(mwApplication); return R.ok(); } } -- Gitblit v1.7.1