From d6039d44dc57bd13c1ffcd96594b9faa526a57e0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 13 九月 2023 16:29:01 +0800
Subject: [PATCH] 优化代码
---
service-user/src/main/java/com/java110/user/cmd/owner/GetQrcodeOwnerCmd.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/GetQrcodeOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/GetQrcodeOwnerCmd.java
index a565b3e..67bb6a8 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/GetQrcodeOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/GetQrcodeOwnerCmd.java
@@ -16,6 +16,7 @@
import com.java110.utils.cache.CommonCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import com.java110.utils.util.ValidatorUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,7 +73,11 @@
Assert.hasKeyAndValue(reqJson, "msgCode", "鏈寘鍚獙璇佺爜淇℃伅");
OwnerDto ownerDto = computeOwner(reqJson);
- String smsCode = CommonCache.getValue(reqJson.getString(ownerDto.getLink()) + SendSmsFactory.VALIDATE_CODE);
+ String smsCode = CommonCache.getValue(ownerDto.getLink() + SendSmsFactory.VALIDATE_CODE);
+
+ if (!StringUtil.isEmpty(smsCode) && smsCode.contains("-")) {
+ smsCode = smsCode.substring(0, smsCode.indexOf("-"));
+ }
if (!reqJson.getString("msgCode").equals(smsCode)) {
throw new CmdException("楠岃瘉鐮侀敊璇�");
@@ -85,7 +90,11 @@
OwnerDto ownerDto = computeOwner(reqJson);
- context.setResponseEntity(ResultVo.createResponseEntity(ownerDto.getOwnerId()));
+ JSONObject data = new JSONObject();
+ data.put("ownerId",ownerDto.getOwnerId());
+ data.put("roomId",ownerDto.getRoomId());
+
+ context.setResponseEntity(ResultVo.createResponseEntity(data));
}
/**
@@ -131,7 +140,7 @@
if (ownerDtos == null || ownerDtos.size() < 1) {
throw new CmdException("涓氫富涓嶅瓨鍦�");
}
-
+ ownerDtos.get(0).setRoomId(roomDtos.get(0).getRoomId());
return ownerDtos.get(0);
}
}
--
Gitblit v1.8.0