用户头像问题

application/controllers/Member.php

@@ -47,8 +47,9 @@ class MemberController extends \Our\Controller_AbstractApi {
 
         $data = $this->req[\Our\NameConst::data];
         $result = $this->memberService->saveMemberAvatar($data,$this->memberId);
+        $member = $this->memberService->getMemberInfo($this->memberId);
         if($result!==false){
-            $this->success(array('memberAvatar'=>$result));
+            $this->success(array('memberAvatar'=>$member['memberAvatar']));
         }
         \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveMemberAvatarFailed);
     }

application/library/Order/OrderConfirmUtil.php

@@ -62,7 +62,7 @@ class OrderConfirmUtil {
     public function checkPostData($data,$memberId,$currentAddress){
         $dbName = \Our\DbNameConst::masterDBConnectName;
         $this->memberId = $memberId;
-        $this->member = \DAO\MemberModel::getInstance()->find($this->memberId);
+        $this->member = \DAO\MemberModel::getInstance()->getInfo($this->memberId);
         $this ->address = $this->checkCurrentAddress($currentAddress,$this->memberId);
         if(!$this->address){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::noAddressForOrder);
@@ -353,8 +353,8 @@ class OrderConfirmUtil {
             $order['store_id'] = $storeId;
             $order['store_name'] = $storeCarts['storeName'];
             $order['buyer_id'] = $this->memberId;
-            $order['buyer_name'] = $this->member['member_name'];
-            $order['buyer_email'] = $this->member['member_email'];
+            $order['buyer_name'] = $this->member['memberName'];
+            $order['buyer_email'] = $this->member['memberEmail'];
             $order['add_time'] = TIMESTAMP;
             $order['payment_type'] = $storeCarts['payway'];
             $order['order_amount'] = $storeCarts['orderAmount'];
@@ -393,7 +393,7 @@ class OrderConfirmUtil {
             $orderLog['log_msg'] = \Our\DescribeConst::addOrderLog;
             $orderLog['log_time']  = TIMESTAMP;
             $orderLog['log_role'] = \Our\DescribeConst::buyer;
-            $orderLog['log_user'] = $this->member['member_name'];
+            $orderLog['log_user'] = $this->member['memberName'];
             $orderLog['log_msg'] = $logMsg;
             $orderLog['log_orderstate'] = $order['order_state'];
             $orderLogList[] = $orderLog;

application/models/Business/User/MemberService.php

@@ -193,17 +193,26 @@ class MemberServiceModel extends \Business\AbstractModel
      */
     public function saveMemberAvatar($where,$memberId){
         $memberAvatar = $where['memberAvatar'];
-        if(!$memberAvatar){
+        $memberImage = $where['memberImage'];
+        if(!($memberAvatar||$memberImage)){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emtpyMemberAvatar);
         }
-        $memberAvatarName = \Our\ImageConst::memberAvatarPrefix.$memberId;
-        $result = \Our\ImageUtil::uploadBase64Image($memberAvatar,\Our\ImageConst::memberAvatar,$memberAvatarName);
-        if($result){
-            $data['member_avatar'] = $memberAvatarName;
+        if($memberAvatar){
+            $memberAvatarName = \Our\ImageConst::memberAvatarPrefix.$memberId;
+            $result = \Our\ImageUtil::uploadBase64Image($memberAvatar,\Our\ImageConst::memberAvatar,$memberAvatarName);
+            if($result){
+                $data['member_avatar'] = $memberAvatarName;
+                $memberDao=\DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+                $result = $memberDao->saveInfo($data,$memberId);
+            }
+            return $result;
+        }
+        if($memberImage){
+            $data['member_avatar'] = $memberImage;
             $memberDao=\DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
             $result = $memberDao->saveInfo($data,$memberId);
+            return $result;
         }
-        return $result;
     }
 
 

application/models/DAO/Member.php

@@ -63,8 +63,10 @@ class MemberModel extends \DAO\AbstractModel
         if ($memberAvatar) {
             if (strpos($memberAvatar, \Our\NameConst::http) === 0) {
                 return $memberAvatar;
+            }else{
+                $filename = $memberAvatar;
             }
-            $filename = \Our\ImageConst::memberAvatarPrefix . $memberId;
+            //$filename = \Our\ImageConst::memberAvatarPrefix . $memberId;
         }
         return \Our\Common::getStaticFile($filename, \Our\ImageConst::memberAvatar);
     }