From b1e207a90d3f395973b4cd1eee92dbcbbafd6e78 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 14:57:35 +0800
Subject: [PATCH] jsapi支付修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java
index 3296fe4..e9072ee 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsInformationServiceImpl.java
@@ -8,6 +8,7 @@
 
 import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
 import com.panzhihua.common.model.vos.community.microCommercialStreet.McsGameVO;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsMerchantVO;
 import com.panzhihua.common.utlis.DateUtils;
 import com.panzhihua.service_community.util.NearbyUtil;
 import com.spatial4j.core.shape.Rectangle;
@@ -249,6 +250,18 @@
         }
         McsInformationVO mcsInformationVO = new McsInformationVO();
         BeanUtils.copyProperties(mcsInformation, mcsInformationVO);
+        McsMerchant mcsMerchant = mcsMerchantDAO.selectById(mcsInformation.getMerchantId());
+        McsMerchantVO mcsMerchantVO = new McsMerchantVO();
+        if (nonNull(mcsMerchant)) {
+            mcsMerchantVO.setId(mcsMerchant.getId());
+            mcsMerchantVO.setName(mcsMerchant.getName());
+            mcsMerchantVO.setLogo(mcsMerchant.getLogo());
+            mcsMerchantVO.setIntroduction(mcsMerchant.getIntroduction());
+            mcsMerchantVO.setLat(mcsMerchant.getLat());
+            mcsMerchantVO.setLon(mcsMerchant.getLon());
+            mcsMerchantVO.setAddress(mcsMerchant.getAddress());
+        }
+        mcsInformationVO.setMerchantInfo(mcsMerchantVO);
         return R.ok(mcsInformationVO);
     }
 }

--
Gitblit v1.7.1