diff --git a/doc/运维语句.sql b/doc/运维语句.sql index 1799709..c8bf475 100644 --- a/doc/运维语句.sql +++ b/doc/运维语句.sql @@ -38,10 +38,32 @@ WHERE whatsapp_phone_number_bak IS not NULL * --------------------------------------------------------- * 分配会话到某个订单 */ + -- title: query order info +SELECT cli.COLI_ID,cli.COLI_SN + ,cli.COLI_GRI_SN + ,mi.MEI_SN +-- ,cl.CUL_SN + ,oi.OPI2_Name AS 顾问 + ,'#-------#' + ,cli.COLI_OrderStartDate + ,(mi.MEI_FirstName + ' | '+ mi.MEI_LastName) AS member_name + ,cli.* + ,'#-------#',cl.* + ,'#-------#', mi.* +FROM ConfirmLineInfo AS cli +LEFT JOIN CUstomerList AS cl ON cli.COLI_SN = cl.CUL_COLI_SN +LEFT JOIN MEmberInfo AS mi ON mi.MEI_SN = cl.CUL_CUI_SN +LEFT JOIN OperatorInfo2 AS oi ON oi.opi2_opi_sn = cli.COLI_OPI_ID AND oi.OPI2_LGC =2 +WHERE 1 = 1 + -- AND mi.MEI_FirstName = 'CHEN WANG' + AND COLI_ID = 'Lib231120146' +-- AND CUL_COLI_SN = 1086888 + -- + ; + UPDATE whatsapp_session -SET coli_sn = 1074885 -WHERE sn = 47 - AND msg.froms = @S_WAID; +SET coli_sn = 1075451 +WHERE sn = 57 AND whatsapp_phone_number = '14048496022'; UPDATE whatsapp_inboundmessage msg INNER JOIN whatsapp_session s ON s.whatsapp_phone_number = msg.froms @@ -66,27 +88,12 @@ WHERE ifnull(msg.coli_sn, 0) = 0 /** * --------------------------------------------------------- - * 未分配会话 - 处理 + * 新增会话给顾问 */ --- 查找未分配顾问的会话 -SELECT s.sn as S_SN, s.whatsapp_phone_number as S_WAID, s.* -FROM whatsapp_session s -WHERE opi_sn IS NULL OR opi_sn = 0 - --- 更新 会话表顾问 -UPDATE sale_system.whatsapp_session -SET opi_sn = @OPI_SN - ,coli_sn = @COLI_SN -WHERE sn = @S_SN; - --- 更新 消息表顾问 -UPDATE sale_system.whatsapp_inboundmessage msg -SET opi_sn = @OPI_SN - ,coli_sn = @COLI_SN -WHERE IFNULL(msg.opi_sn, 0) <= 0 - AND msg.msg_direction = 'inbound' - AND msg.froms = @S_WAID; +INSERT INTO sale_system.whatsapp_session ( + whatsapp_phone_number,opi_sn,coli_sn,session_enable) +VALUES ('6282145142470',162,0,1); /** - * end 未分配会话 - 处理 + * end 新增会话给顾问 * --------------------------------------------------------- */ diff --git a/src/views/Standlone.jsx b/src/views/Standlone.jsx index c26304e..1982ad5 100644 --- a/src/views/Standlone.jsx +++ b/src/views/Standlone.jsx @@ -1,5 +1,5 @@ import '@/assets/App.css' -import AppLogo from '@/assets/logo-gh.png' +import AppLogo from '@/assets/highlights_travel_300_300.png' import { useThemeContext } from '@/stores/ThemeContext' import { App as AntApp, Col, ConfigProvider, Empty, Layout, Row, Typography, theme } from 'antd' import { NavLink, Outlet } from 'react-router-dom' diff --git a/src/views/dingding/Callback.jsx b/src/views/dingding/Callback.jsx index f4e7d01..4d32edb 100644 --- a/src/views/dingding/Callback.jsx +++ b/src/views/dingding/Callback.jsx @@ -44,7 +44,7 @@ function Callback() { } else if (loginStatus === 302) { const isMobileApp = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i) !== null - if (isNotEmpty(originUrl)){ + if (isNotEmpty(originUrl)) { navigate(originUrl) } else { if (isMobileApp) { diff --git a/src/views/dingding/Login.jsx b/src/views/dingding/Login.jsx index da0ce64..eb98198 100644 --- a/src/views/dingding/Login.jsx +++ b/src/views/dingding/Login.jsx @@ -1,11 +1,16 @@ import { Flex, Result, Spin } from 'antd' +import { isNotEmpty } from '@/utils/commons' function Login() { const urlSearch = new URLSearchParams(location.search) const originUrl = urlSearch.get('origin_url') - window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D' + originUrl + '&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent' + if (isNotEmpty(originUrl)) { + window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D' + originUrl + '&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent' + } else { + window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent' + } return (