hetong

mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java

@@ -58,5 +58,5 @@ public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> {
 
 	int recordedAmount(WxMerchant record);
 
-	Map<String, Object> findMerchantByShop(@Param("shopId")Long shopId);
+	List<Map<String, Object>> findMerchantByShop(@Param("shopId")Long shopId);
 }

mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

@@ -1142,7 +1142,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
 
     @Override
     public Map<String, Object> findMerchantByShop(Long shopId) {
-        return wxMerchantMapper.findMerchantByShop(shopId);
+        List<Map<String, Object>> merchantByShop = wxMerchantMapper.findMerchantByShop(shopId);
+        if(merchantByShop != null && merchantByShop.size() > 0){
+            return merchantByShop.get(0);
+        }
+        return null;
     }
 
 }