From 45149c4de50d945a27cbc7324ec0699f5b15df14 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 27 二月 2024 13:57:47 +0800
Subject: [PATCH] 取消空格问题

---
 service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayInGoOutSMOImpl.java |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayInGoOutSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayInGoOutSMOImpl.java
index 3e10823..98c834c 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayInGoOutSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayInGoOutSMOImpl.java
@@ -1,14 +1,16 @@
 package com.java110.api.smo.payment.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.core.context.IPageData;
 import com.java110.api.properties.WechatAuthProperties;
 import com.java110.api.smo.AppAbstractComponentSMO;
 import com.java110.api.smo.payment.IToPayInGoOutSMO;
-import com.java110.utils.cache.MappingCache;
+import com.java110.core.context.IPageData;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
+import com.java110.utils.cache.UrlCache;
 import com.java110.utils.util.Assert;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,11 +18,12 @@
 import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service("toPayInGoOutSMOImpl")
 public class ToPayInGoOutSMOImpl extends AppAbstractComponentSMO implements IToPayInGoOutSMO {
-    private static final Logger logger = LoggerFactory.getLogger( ToPayInGoOutSMOImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(ToPayInGoOutSMOImpl.class);
 
 
     @Autowired
@@ -32,6 +35,9 @@
 
     @Autowired
     private WechatAuthProperties wechatAuthProperties;
+
+    @Autowired
+    private ISmallWechatV1InnerServiceSMO smallWechatV1InnerServiceSMOImpl;
 
     @Override
     public ResponseEntity<String> toPay(IPageData pd) {
@@ -52,12 +58,20 @@
         ResponseEntity responseEntity = null;
 
 
-        String ownerUrl = MappingCache.getValue("OWNER_WECHAT_URL")
+        String ownerUrl = UrlCache.getOwnerUrl()
                 + "/#/pages/reportInfoDetail/reportInfoDetail?settingId=" +
-                paramIn.getString( "settingId" ) +
-                "&communityId=" + paramIn.getString( "communityId" )  ;
-        Map result = new HashMap(  );
-        result.put( "codeUrl", ownerUrl);
+                paramIn.getString("settingId") +
+                "&communityId=" + paramIn.getString("communityId");
+        SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
+        smallWeChatDto.setWeChatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
+        smallWeChatDto.setObjId(paramIn.getString("communityId"));
+        List<SmallWeChatDto> smallWeChatDtos = smallWechatV1InnerServiceSMOImpl.querySmallWechats(smallWeChatDto);
+
+        if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) {
+            ownerUrl += ("&wAppId=" + smallWeChatDtos.get(0).getAppId());
+        }
+        Map result = new HashMap();
+        result.put("codeUrl", ownerUrl);
         responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
 
         return responseEntity;

--
Gitblit v1.8.0