From 7ff016f6857ee5c09d51c34afcf1be48db731b41 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 19 Aug 2021 17:14:17 +0800 Subject: [PATCH] hetong --- .../src/main/java/com/iformall/mapper/WxMerchantMapper.java | 2 +- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 3cead89ae..d9bcdd2a2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -58,5 +58,5 @@ public interface WxMerchantMapper extends CommonMapper { int recordedAmount(WxMerchant record); - Map findMerchantByShop(@Param("shopId")Long shopId); + List> findMerchantByShop(@Param("shopId")Long shopId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index c5302b2f2..399836565 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1142,7 +1142,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public Map findMerchantByShop(Long shopId) { - return wxMerchantMapper.findMerchantByShop(shopId); + List> merchantByShop = wxMerchantMapper.findMerchantByShop(shopId); + if(merchantByShop != null && merchantByShop.size() > 0){ + return merchantByShop.get(0); + } + return null; } }