From ae6035b37d8c251d59284a93916b5b409f534c92 Mon Sep 17 00:00:00 2001
From: jianbo <20397795@qq.com>
Date: Fri, 19 Apr 2019 20:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E8=B5=9E=E5=8F=8A?=
 =?UTF-8?q?=E8=B5=9E=E8=B5=8F=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/api/ram-rest-posts-controller.php | 36 +++++++++++++---------
 includes/filter/ram-custom-post-fields.php | 19 ++++++++++--
 rest-api-to-miniprogram.php                |  2 +-
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/includes/api/ram-rest-posts-controller.php b/includes/api/ram-rest-posts-controller.php
index 8d30059..12fc460 100644
--- a/includes/api/ram-rest-posts-controller.php
+++ b/includes/api/ram-rest-posts-controller.php
@@ -197,22 +197,30 @@ class RAM_REST_Posts_Controller  extends WP_REST_Controller{
     {
         global $wpdb;    
 
-        $sql="SELECT ".$wpdb->users.".display_name as avatarurl  from (SELECT substring(substring_index(".$wpdb->postmeta.".meta_key,'@',1),2) as openid,".$wpdb->postmeta.".meta_id from ".$wpdb->postmeta." where ".$wpdb->postmeta.".meta_value like '%praise' )t1  LEFT JOIN ".$wpdb->users." ON ".$wpdb->users.".user_login = t1.openid  ORDER by t1.meta_id desc";
+        $sql="SELECT ".$wpdb->users.".display_name as avatarurl ,".$wpdb->users.".id as id from (SELECT substring(substring_index(".$wpdb->postmeta.".meta_key,'@',1),2) as openid,".$wpdb->postmeta.".meta_id from ".$wpdb->postmeta." where ".$wpdb->postmeta.".meta_value like '%praise' )t1  LEFT JOIN ".$wpdb->users." ON ".$wpdb->users.".user_login = t1.openid  ORDER by t1.meta_id desc";
               
-            $avatarurls = $wpdb->get_results($sql);
-            if(!empty($avatarurls))
-            {
-                $result["code"]="success";
-                $result["message"]= "获取赞赏成功";
-                $result["status"]="200";                
-                $result["avatarurls"]=$avatarurls;   
+            $_vatarurls = $wpdb->get_results($sql);
+            $avatarurls =array();
+            foreach ($_vatarurls as $_avatarurl) {
+                $avatarurl=$_avatarurl->avatarurl;
+                $pos=stripos($avatarurl,'wx.qlogo.cn');
+                $userId = $_avatarurl->id;
+                if($pos)
+                {
+                    $avatar =$avatarurl;
+                }
+                else{
+                    $avatar= get_user_meta( $userId, 'avatar', true );
+                }
+
+                $_avatar['avatarurl']  =$avatar;
+                $avatarurls[] = $_avatar;  
+
             }
-            else
-            {
-                $result["code"]="success";
-                $result["message"]= "获取赞赏失败";
-                $result["status"]="500";
-            }                
+            $result["code"]="success";
+            $result["message"]= "获取赞赏成功";
+            $result["status"]="200";                
+            $result["avatarurls"]=$avatarurls;                           
             $response = rest_ensure_response($result);
             return $response; 
     }
diff --git a/includes/filter/ram-custom-post-fields.php b/includes/filter/ram-custom-post-fields.php
index f3a57d2..e5e01bd 100644
--- a/includes/filter/ram-custom-post-fields.php
+++ b/includes/filter/ram-custom-post-fields.php
@@ -54,11 +54,26 @@ function custom_post_fields( $data, $post, $request) {
         $_content['rendered'] =$content;
         $_data['content']= $_content;
 
-        $sql=$wpdb->prepare("SELECT meta_key , (SELECT display_name from ".$wpdb->users." WHERE user_login=substring(meta_key,2)) as avatarurl FROM ".$wpdb->postmeta." where meta_value='like' and post_id=%d",$post_id);
+        $sql=$wpdb->prepare("SELECT meta_key , (SELECT id from ".$wpdb->users." WHERE user_login=substring(meta_key,2)) as id ,(SELECT display_name from ".$wpdb->users." WHERE user_login=substring(meta_key,2)) as display_name  FROM ".$wpdb->postmeta." where meta_value='like' and post_id=%d",$post_id);
         $likes = $wpdb->get_results($sql);
+        $_data['sql']=$sql;
         $avatarurls =array();
         foreach ($likes as $like) {
-            $_avatarurl['avatarurl']  =$like->avatarurl;   
+            $userId = $like->id;
+            $display_name=$like->display_name;
+            $pos=stripos($display_name,'wx.qlogo.cn');
+            if($pos)
+            {
+
+              $avatar =$display_name;
+
+            }
+            else
+            {
+              $avatar= get_user_meta( $userId, 'avatar', true );
+            }
+            
+            $_avatarurl['avatarurl']  =$avatar;
             $avatarurls[] = $_avatarurl;        
         }
       $post_views =$post_views+1;  
diff --git a/rest-api-to-miniprogram.php b/rest-api-to-miniprogram.php
index 5bc68ea..d849b13 100644
--- a/rest-api-to-miniprogram.php
+++ b/rest-api-to-miniprogram.php
@@ -3,7 +3,7 @@
 Plugin Name: REST API TO MiniProgram
 Plugin URI: http://www.watch-life.net
 Description: 为微信小程序、app提供定制WordPress REST API 输出.支持微信支付、微信小程序模板消息.
-Version: 1.5.1
+Version: 1.5.2
 Author: jianbo
 Author URI: http://www.minapper.com
 License: GPL v3
-- 
GitLab