From 83922fdf31ad5fbcc7a84fb8f9d379b80f7e916b Mon Sep 17 00:00:00 2001 From: hucs Date: Tue, 30 Jul 2024 11:01:22 +0800 Subject: [PATCH] fix --- .../modules/weichat/controller/WxClerkController.java | 8 +++++--- .../modules/weichat/entity/PlayClerkUserByWxAddVo.java | 2 ++ .../src/main/java/com/starry/admin/utils/SmsUtils.java | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java index f3dd48f..46d784a 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkController.java @@ -33,6 +33,7 @@ import com.starry.admin.modules.weichat.entity.order.PlayClerkOrderInfoQueryVo; import com.starry.admin.modules.weichat.entity.order.PlayClerkOrderListReturnVo; import com.starry.admin.modules.weichat.service.WxCustomUserService; import com.starry.admin.utils.SecurityUtils; +import com.starry.admin.utils.SmsUtils; import com.starry.common.redis.RedisCache; import com.starry.common.result.R; import com.starry.common.utils.ConvertUtil; @@ -100,6 +101,8 @@ public class WxClerkController { @Resource private IPlayPersonnelGroupInfoService playPersonnelGroupInfoService; + @Resource + private SmsUtils smsUtils; /** @@ -198,6 +201,8 @@ public class WxClerkController { if (entity != null) { throw new CustomException("已有申请未审核"); } + smsUtils.checkSmsCode(vo.getPhone(), vo.getSmsCode()); + entity = ConvertUtil.entityToVo(vo, PlayClerkUserReviewInfoEntity.class); entity.setReviewState("0"); entity.setClerkId(clerkId); @@ -378,9 +383,6 @@ public class WxClerkController { } - - - /** * 店员分页查询本人订单列表 * diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxAddVo.java index 9673066..2374f3b 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayClerkUserByWxAddVo.java @@ -93,4 +93,6 @@ public class PlayClerkUserByWxAddVo { */ private String remark; + private String smsCode; + } diff --git a/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java b/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java index 11699e3..002f663 100644 --- a/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java +++ b/play-admin/src/main/java/com/starry/admin/utils/SmsUtils.java @@ -2,6 +2,7 @@ package com.starry.admin.utils; import cn.hutool.core.util.RandomUtil; import com.starry.common.redis.RedisCache; +import com.starry.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; @@ -34,6 +35,9 @@ public class SmsUtils { // 校验短信验证码是否正确 public void checkSmsCode(String phone, String code) { + if(StringUtils.isEmpty(code)){ + throw new RuntimeException("短信验证码必填"); + } String key = "sms:phone:" + phone; Object data = redisCache.getCacheObject(key); if (Objects.isNull(data)) {