From 50554c06ff9a5adec9c2cfcf75cb27cb4b00b483 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 6 Dec 2020 14:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/admin/model/CashDraws.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hyhproject/admin/model/CashDraws.php b/hyhproject/admin/model/CashDraws.php
index 98c471e..f054a2e 100755
--- a/hyhproject/admin/model/CashDraws.php
+++ b/hyhproject/admin/model/CashDraws.php
@@ -314,6 +314,7 @@ class CashDraws extends Base{
     //         	$user->save();
 
             	$targetId = $user->userId;
+            	$displayName = $user['userName'];
 
             }else{
 
@@ -326,6 +327,7 @@ class CashDraws extends Base{
     //         	$shop->save();
 
             	$targetId = $shop->userId;
+                $displayName = $shop['userName'];
 
             }
 
@@ -351,7 +353,11 @@ class CashDraws extends Base{
 
 				$lm['dataSrc'] = 3;
 
-				$lm['remark'] = '提现申请单【'.$cash->cashNo.'】申请提现¥'.$cash->money.'。'.(($cash->cashRemarks!='')?"【操作备注】：".$cash->cashRemarks:'');
+				if ($cash->targetType == 0) {
+                    $lm['remark'] = '提现申请单【'.$cash->cashNo.'】申请提现¥'.$cash->money.'。'.(($cash->cashRemarks!='')?"【操作备注】：".$cash->cashRemarks:'');
+                } else {
+                    $lm['remark'] = '商户【'.$displayName.'】提现'.(($cash->cashRemarks!='')?"。【操作备注】：".$cash->cashRemarks:'');
+                }
 
 				$lm['moneyType'] = 0;