评价图域名

app/admin/controller/client/EvaluateController.php

@@ -2,10 +2,12 @@
 
 namespace app\admin\controller\client;
 
+use app\admin\service\member\MemberService;
 use app\controller\Curd;
 use app\model\ClientFavorite;
 use app\model\Goods;
 use app\model\GoodsEvaluate;
+use app\model\Member;
 use support\exception\BusinessException;
 use support\Request;
 use support\Response;
@@ -142,7 +144,7 @@ class EvaluateController extends Curd
             if (isset($goodsEvaluateJson['photo'])){
                 foreach($goodsEvaluateJson['photo'] as $file){
                     if (isset($file['file'])){
-                        $imagesStr .= getenv('APP_IMAGE_DOMAIN').$file['file']['file_savepath'].$file['file']['file_savename'].',';
+                        $imagesStr .= getenv('APP_IMAGE_DOMAIN_LOCAL').$file['file']['file_savepath'].$file['file']['file_savename'].',';
                     }
                 }
                 $evaluate->photos = rtrim($imagesStr,',');
@@ -153,7 +155,7 @@ class EvaluateController extends Curd
         }
 
         if (!empty($evaluate->info)){
-            $evaluate->info->member_info_headimg = $evaluate->info->member_info_headimg ?? getenv('STORAGE_DOMAIN').'/images/avatar_default.png';
+            $evaluate->info->member_info_headimg = MemberService::getAvatarUrl($evaluate->info->member_info_headimg);
             $evaluate->info->member_info_nickname ?? substr($evaluate->member->member_mobile,-4).'会员';
         }
         if (!empty($evaluate->goods)){

app/admin/service/member/MemberService.php

@@ -102,7 +102,7 @@ class MemberService
                     $query->where('member_is_referrer', 'Y');
                 }
             })
-            ->select('member_id', 'member_is_vip', 'member_is_owner','join_invite_member_id', 'member_is_partner', 'member_is_referrer', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
+            ->select('member_id', 'member_is_vip', 'member_is_owner', 'join_invite_member_id', 'member_is_partner', 'member_is_referrer', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
                 'member_info.member_info_nickname', 'member_info.member_info_headimg', 'member_info.member_info_referee', 'member_info.member_info_business', 'member_info.member_info_service', 'member_info.member_info_city', 'member_info.member_info_address', 'member_info.member_info_gender', 'member_info.member_info_birthday',
                 'member_role.member_role_id', 'member_role.member_role_name',
                 'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation'
@@ -119,7 +119,7 @@ class MemberService
             $row['coupon_count'] = CouponDetail::where('join_coupon_detail_member_id', $row['member_id'])->count();
             $row['member_mobile'] = substr($row['member_mobile'], 0, 3) . '****' . substr($row['member_mobile'], 7);
             // 推荐人
-            if (!empty($row['join_invite_member_id'])){
+            if (!empty($row['join_invite_member_id'])) {
                 $row['referrer_name'] = MemberService::getMemberNameByMemberId($row['join_invite_member_id']);
             }
             $row['info'] = [
@@ -254,8 +254,8 @@ class MemberService
         $level = $request->get('level', '');
         $isAuth = $request->get('is_auth', '');
         $addtime = $request->get('member_addtimes', []);
-        $isPartner = $request->get('member_is_partner','');
-        $isReferrer = $request->get('member_is_referrer','');
+        $isPartner = $request->get('member_is_partner', '');
+        $isReferrer = $request->get('member_is_referrer', '');
 
         $rows = Member::with('account')
             ->where('member_is_owner', 'N')
@@ -291,7 +291,7 @@ class MemberService
                 $addtime[0] = strtotime($addtime[0]);
                 $addtime[1] = strtotime($addtime[1]);
                 $query->whereBetween('member.member_addtimes', $addtime);
-            })->select('member_id','join_invite_member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
+            })->select('member_id', 'join_invite_member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
                 'member_info.member_info_nickname', 'member_info.member_info_headimg', 'member_info.member_info_referee', 'member_info.member_info_business', 'member_info.member_info_service',
                 'member_role.member_role_id', 'member_role.member_role_name',
                 'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation',
@@ -302,7 +302,7 @@ class MemberService
 
         $exportData = [];
         foreach ($rows as $row) {// 推荐人
-            if (!empty($row['join_invite_member_id'])){
+            if (!empty($row['join_invite_member_id'])) {
                 $row['referrer_name'] = MemberService::getMemberNameByMemberId($row['join_invite_member_id']);
             }
             $row['info'] = [
@@ -919,12 +919,12 @@ class MemberService
             $query->where('join_pay_member_id', $memberId)
                 ->where('pay_prepayid', 'like', '%CASH%')
                 ->where('pay_status', 'SUCCESS');
-        })->select('join_pay_object_json','join_pay_member_id','pay_category','join_pay_order_id','pay_extend_json','pay_addtimes','pay_amount');
+        })->select('join_pay_object_json', 'join_pay_member_id', 'pay_category', 'join_pay_order_id', 'pay_extend_json', 'pay_addtimes', 'pay_amount');
 //            ->orderByDesc('pay_addtimes')
 //            ->get()
 //            ->toArray();
 
-        $memberAccountList = MemberAccountList::where('join_member_account_list_member_id',$memberId)
+        $memberAccountList = MemberAccountList::where('join_member_account_list_member_id', $memberId)
             ->selectRaw('
                 member_account_list_extend_json as join_pay_object_json,
                 join_member_account_list_member_id as join_pay_member_id,
@@ -974,7 +974,7 @@ class MemberService
             if (mb_substr($item['goods_category'], 0, 7) == '自定义金额充值') {
                 $item['goods_category'] = '自定义金额充值';
             }
-            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER','IN'])) {
+            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER', 'IN'])) {
                 $item['balance_type'] = 'add';
             } else {
                 $item['balance_type'] = 'cut';
@@ -1011,7 +1011,7 @@ class MemberService
                 continue;
             }
 
-            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER', 'COMBINE','IN'])) {
+            if (in_array($item['pay_category'], ['RECHARGE', 'REFUND', 'GIVE', 'PARTNER', 'COMBINE', 'IN'])) {
                 if (!empty($item['pay_extend_json'])) {
                     $extendJson = json_decode($item['pay_extend_json'], true);
                     if (isset($extendJson['added_amount']) && floatval($extendJson['added_amount']) > 0) {
@@ -1594,6 +1594,15 @@ class MemberService
         }
     }
 
+    public static function getAvatarUrl($url)
+    {
+        if (substr($url, 0, 1) == '.' || substr($url, 0, 1) == '/' || empty($url)) {
+            $url = "https://img.wanyuewellness.com.cn/images/avatar_default.png";
+        }
+
+        return $url;
+    }
+
     /**
      * @Desc 获取身份-合伙人，推荐官
      * @Author Gorden
@@ -1605,11 +1614,11 @@ class MemberService
      */
     public static function getIdentity($isPartner, $isReferrer)
     {
-        if ($isPartner == 'Y'){
+        if ($isPartner == 'Y') {
             return "PARTNER";
-        }elseif ($isReferrer == 'Y'){
+        } elseif ($isReferrer == 'Y') {
             return "REFERRER";
-        }else{
+        } else {
             return 'NON';
         }
     }