From 7f3372fe96d927debd388a0cb285a45e6b952296 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期四, 17 七月 2025 18:23:54 +0800
Subject: [PATCH] 房产新增字段、采购去除必输项2025/07/17

---
 service-user/src/main/java/com/java110/user/cmd/owner/GetQrcodeOwnerCmd.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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..eccc4b1 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
@@ -7,7 +7,7 @@
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.SendSmsFactory;
 import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.payFeeQrcode.PayFeeQrcodeDto;
+import com.java110.dto.payFee.PayFeeQrcodeDto;
 import com.java110.dto.room.RoomDto;
 import com.java110.intf.community.IRoomV1InnerServiceSMO;
 import com.java110.intf.fee.IPayFeeQrcodeV1InnerServiceSMO;
@@ -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,15 @@
 
         OwnerDto ownerDto = computeOwner(reqJson);
 
-        context.setResponseEntity(ResultVo.createResponseEntity(ownerDto.getOwnerId()));
+        String ownerName = ownerDto.getName();
+
+
+        JSONObject data = new JSONObject();
+        data.put("ownerId",ownerDto.getOwnerId());
+        data.put("roomId",ownerDto.getRoomId());
+        data.put("ownerName",StringUtil.maskName(ownerName));
+
+        context.setResponseEntity(ResultVo.createResponseEntity(data));
     }
 
     /**
@@ -131,7 +144,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