From ae42d2da37fe9d161e7058b51367b95f24c3d97a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:11:36 +0800
Subject: [PATCH] optimize
---
service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java b/service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java
index cae727e..f254a36 100644
--- a/service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java
+++ b/service-common/src/main/java/com/java110/common/cmd/machine/GetCarMachineQrCodeUrl.java
@@ -21,12 +21,13 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.log.LoggerFactory;
-import com.java110.dto.parkingBoxArea.ParkingBoxAreaDto;
+import com.java110.dto.parking.ParkingBoxAreaDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
-import com.java110.utils.cache.MappingCache;
+import com.java110.utils.cache.UrlCache;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.StringUtil;
@@ -75,8 +76,8 @@
smallWeChatDto.setObjId(reqJson.getString("communityId"));
smallWeChatDto.setWeChatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
- String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL");
- ownerUrl += ("/#/pages/tempParkingFee/tempParkingFee?paId=" + getPaIds(reqJson));
+ String ownerUrl = UrlCache.getOwnerUrl();
+ ownerUrl += ("/#/pages/fee/tempParkingFee?paId=" + getPaIds(reqJson)+"&communityId="+reqJson.getString("communityId"));
if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) {
ownerUrl += ("&appId=" + smallWeChatDtos.get(0).getAppId());
}
@@ -84,6 +85,11 @@
if (reqJson.containsKey("machineId") && !"-1".equals(reqJson.getString("machineId"))) {
ownerUrl += ("&machineId=" + reqJson.getString("machineId"));
}
+
+ String aliAppId = CommunitySettingFactory.getValue(reqJson.getString("communityId"),"APP_ID");
+ if( !StringUtil.isEmpty(aliAppId)){
+ ownerUrl += ("&aliAppId=" + aliAppId);
+ }
reqJson.put("url", ownerUrl);
cmdDataFlowContext.setResponseEntity(ResultVo.createResponseEntity(reqJson));
}
--
Gitblit v1.8.0