update

qa_shell_script/script_by_Contorller/delete_All_Data.sh

@@ -71,6 +71,22 @@ function deleteAlldata()
 				echo "删除cash-loan-flow数据"
 				mysql  $mysqld cash_loan_flow -e "delete from order_progress_record where loan_id in ($loan_id)"
 			fi
+			echo "删除redis缓存"
+			redis_key=`redis-cli -h $ip -p 6379 keys *$phone_no*`
+			if [ -n "$redis_key" ];then
+				echo $redis_key
+				redis-cli -h $ip -p 6379 del $redis_key
+			fi
+			redis_key=`redis-cli -h $ip -p 6379 keys *$xyqb_user_id*`
+			if [ -n "$redis_key" ];then
+				echo $redis_key
+				token=`redis-cli -h $ip -p 6379 get userid-sessionvalue:cache::$xyqb_user_id:xyqb`
+				redis-cli -h $ip -p 6379 del $redis_key
+				redis_key=`redis-cli -h $ip -p 6379 keys *$token*`
+				echo $redis_key
+				redis-cli -h $ip -p 6379 del $redis_key
+				#redis-cli -h $ip -p 6379 keys *$token* | xargs redis-cli -h $ip -p 6379 del
+			fi
 		fi
 
 		#支付中心id
@@ -104,7 +120,9 @@ function deleteAlldata()
 			mysql  $mysqld ${DBNAME3} -e "delete from ${TABLENAME} where phone_no=$phone_no"
 			mysql  $mysqld ${DBNAME3} -e "delete from user_detail where phone_no=$phone_no"
 			merchant_order_no=`mysql -N $mysqld ${DBNAME3} -e "select merchant_order_no from merchant_auth_rel where user_id=${spider_id}"`
-			mysql  $mysqld ${DBNAME3} -e "delete from notify_message where merchant_order_no=$merchant_order_no"
+			if [ -n "$merchant_order_no" ];then
+				mysql  $mysqld ${DBNAME3} -e "delete from notify_message where merchant_order_no=$merchant_order_no"
+			fi
 		fi
 
 		echo "删除红包系统数据"
@@ -114,22 +132,6 @@ function deleteAlldata()
 		echo "删除谛听中心数据"
 		mysql  $mysqld risk_control -e "delete from review_history where phone_no=$phone_no"
 
-		echo "删除redis缓存"
-		redis_key=`redis-cli -h $ip -p 6379 keys *$phone_no*`
-		if [ -n "$redis_key" ];then
-			echo $redis_key
-			redis-cli -h $ip -p 6379 del $redis_key
-		fi
-		redis_key=`redis-cli -h $ip -p 6379 keys *$xyqb_user_id*`
-		if [ -n "$redis_key" ];then
-			echo $redis_key
-			token=`redis-cli -h $ip -p 6379 get userid-sessionvalue:cache::$xyqb_user_id:xyqb`
-			redis-cli -h $ip -p 6379 del $redis_key
-			redis_key=`redis-cli -h $ip -p 6379 keys *$token*`
-			echo $redis_key
-			redis-cli -h $ip -p 6379 del $redis_key
-			#redis-cli -h $ip -p 6379 keys *$token* | xargs redis-cli -h $ip -p 6379 del
-		fi
 	fi
 }