Merge branch 'master' into pre

89e76ac1 · zhousil · 2a016425 · 959d9b39 · 89e76ac1 · 89e76ac1
Commit 89e76ac1 authored Dec 13, 2021 by zhousil
Showing with 99 additions and 30 deletions
components/controller/index.ts
components/message-item/notify-message.vue
components/message-item/pay-message.vue
components/message.vue
model/index.ts
model/order.ts
service/order.ts
utils/index.ts
utils/user-info.ts
xim/models/chat.ts
xim/xim.ts
--- a/components/controller/index.ts
+++ b/components/controller/index.ts
@@ -14,6 +14,7 @@ const mapping = new Map<MessageType, string>([
    [MessageType.PayV1, '付款通知'],
    [MessageType.Refund, '退款通知'],
    [MessageType.RefundV1, '退款通知'],
+    [MessageType.Notify, '通知'],
 ])
 export function parserMessage(type: MessageType, rawMsg: string) {

--- a/components/message-item/notify-message.vue
+++ b/components/message-item/notify-message.vue
+<template>
+    <div class="msg-detail inline-text" v-html="notifyMessage"></div>
+</template>
+<script lang="ts">
+    import { Component } from "vue-property-decorator";
+    import BaseMessage from "./index";
+    @Component({ components: {} })
+    export default class Index extends BaseMessage {
+        private get notifyData() {
+            return this.messageBody.msg as {
+                text: string;
+                remark: string;
+                resultId: string;
+            };
+        }
+        private get notifyMessage() {
+            return this.notifyData
+                ? this.notifyData.text ||
+                      `${this.notifyData.remark}, 工单ID ${
+                          this.notifyData.resultId || "无"
+                      }`
+                : "[通知消息]";
+        }
+    }
+</script>
+<style lang="less" scoped>
+    .inline-text {
+        display: inline-block;
+        white-space: pre-wrap;
+        text-align: left;
+        /deep/ .highlight {
+            color: #e87005;
+        }
+    }
+</style>
\ No newline at end of file
--- a/components/message-item/pay-message.vue
+++ b/components/message-item/pay-message.vue
@@ -46,11 +46,11 @@
        }
        private get title() {
-            return this.payData.itemName;
+            return this.payData.itemName || this.payData.totalName;
        }
        private get amount() {
-            return +this.payData.amount;
+            return +this.payData.amount || this.payData.totalMoney;
        }
        private get status() {

--- a/components/message.vue
+++ b/components/message.vue
@@ -165,6 +165,7 @@
    import MyWelfareMessage from "./message-item/my-welfare-message.vue";
    import QuestionAnswerMessage from "./message-item/question-answer-message.vue";
    import PayMessage from "./message-item/pay-message.vue";
+    import NotifyMessage from "./message-item/notify-message.vue";
    import { ChatRole } from "@/customer-service/model";
    import { getUserMapping } from "../utils/user-info";
    import Xim from "@/customer-service/xim";
@@ -187,6 +188,8 @@
        [dto.MessageType.PayV1, "pay-message"],
        [dto.MessageType.Refund, "pay-message"],
        [dto.MessageType.RefundV1, "pay-message"],
+        [dto.MessageType.PayResult, "notify-message"],
+        [dto.MessageType.Notify, "notify-message"],
    ]);
    @Component({
@@ -204,6 +207,7 @@
            QuestionAnswerMessage,
            ActionMessage,
            PayMessage,
+            NotifyMessage
        },
    })
    export default class Message extends Vue {

--- a/model/index.ts
+++ b/model/index.ts
@@ -117,6 +117,7 @@ export const enum MessageType {
    MpNavigate = "mp-navigate",
    PayV1 = 'gpay',
    Pay = "gpay2",
+    PayResult = "gresult",
    RefundV1 = 'grefund',
    Refund = "grefund2",
    Card = 'card'

--- a/model/order.ts
+++ b/model/order.ts
@@ -58,6 +58,7 @@ export interface OrderTableListItem {
    lastMsgContent: string;
    lastMsgTime: string;
    unreadCount: number;
+    PayPaymentNum?: string | number;  //付款笔数
 }
 export const orderPredict = {
@@ -78,7 +79,8 @@ export const orderPredict = {
    chatTypeCode: "UniplatChatTypeCode",
    lastMsgContent: "UniplatLastMsgContent",
    lastMsgTime: "UniplatLastMsgTime",
-    unreadCount: 0
+    unreadCount: 0,
+    PayPaymentNum: "PayPaymentNum"
 };
 export const enum PayStatus {
@@ -131,7 +133,7 @@ export interface OrderPayItem {
    bankAccountName?: string;
    OpenningBankName?: string;
    bankAccountNo?: string;
-    providerHandleId?: number;
+    paymentItemId?: number;
 }
 export const orderPayItemPredict = {
@@ -150,7 +152,7 @@ export const orderPayItemPredict = {
    bankAccountName: "ProviderHandleId#ServiceProviderBank.AccountName",
    OpenningBankName: "ProviderHandleId#ServiceProviderBank.OpenningBankName",
    bankAccountNo: "ProviderHandleId#ServiceProviderBank.AccountNo",
-    providerHandleId: "ProviderHandleId#ServiceProviderBank.ID",
+    paymentItemId: "PaymentItemId",
 }
 export const enum ChatOpenDirection {

--- a/service/order.ts
+++ b/service/order.ts
@@ -206,7 +206,7 @@ class OrderService {
            .query();
    }
-    public sendPayAccountInfo(params: { send: string; accountId: number }) {
+    public sendPayAccountInfo(params: { send: string }) {
        return this.getSdk().domainService("hro_spview", "OrderSetting", "sendPayAccountInfo")
            .request("get", { params })
    }

--- a/utils/index.ts
+++ b/utils/index.ts
 /* eslint-disable */
 export function throttle(time: number = 100) {
    let pending = false
-    return function (target: any, name: string): any {
+    return function(target: any, name: string): any {
        const originFunc = target[name]
-        const newFunc = function (this: Vue, ...params: any[]) {
+        const newFunc = function(this: Vue, ...params: any[]) {
            if (pending) {
                return
            }
@@ -22,7 +22,7 @@ export function throttle(time: number = 100) {
 }
 export function unique<T>(arr: T[], existed: (item: T, all: T[]) => number) {
-    return arr.filter(function (item, index, arr) {
+    return arr.filter(function(item, index, arr) {
        return index === existed(item, arr)
    })
 }
@@ -62,10 +62,20 @@ const URL_REGEX =
 const LINE_URL_REGEX =
    /((?:(?:https?|ftp|file):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/i
+const mobile_reg = /(1[0-9_]{8,14})/ig
 export function replaceText2Link(text: string) {
    return text.replace(URL_REGEX, '<a href="$1" target="_blank">$1</a>')
 }
+export function replaceText2Dom(text: string, className: string) {
+    return text.replace(URL_REGEX, `<span class="${className}">$1</span>`)
+}
+export function replacePhone2Dom(text: string, className: string) {
+    return text.replace(mobile_reg, `<a href="tel:$1" class="${className}">$1</a>`)
+}
 export function isUrl(text: string) {
    return LINE_URL_REGEX.test(text)
 }
--- a/utils/user-info.ts
+++ b/utils/user-info.ts
@@ -11,30 +11,36 @@ export type UserMapping = {
 const userMapping: UserMapping = {};
+interface UserInfo {
+    avatar_url: string;
+    email: string;
+    id: string;
+    mobile: string;
+    realname: string;
+    uniplatId: string;
+    username: string;
+}
 export const getUserMapping = () => userMapping;
 export async function getUserInfo(eid: string, sdk?: UniplatSdk) {
    if (userMapping[eid]) {
        return userMapping[eid];
    }
-    if (!+eid) {
+    if (!+eid || +eid < 0) {
-        return { name: '', phone: '', icon: '' };
+        return { name: "", phone: "", icon: "" };
    }
    const info = await (sdk || Chat.getSdk())
-        .domainService('passport', 'anonymous', `oidc.account/user_info?id=${eid}`)
+        .domainService(
-        .request<any, any, {
+            "passport",
-            avatar_url: string;
+            "anonymous",
-            email: string;
+            `oidc.account/user_info?id=${eid}`
-            id: string;
+        )
-            mobile: string;
+        .request<any, any, UserInfo>("get");
-            realname: string;
-            uniplatId: string;
-            username: string;
-        }>('get');
    const data = {
        name: info.username || info.realname || info.mobile || info.mobile,
        phone: info.mobile,
-        icon: info.avatar_url
+        icon: info.avatar_url,
    };
    userMapping[eid] = data;
    return data;

--- a/xim/models/chat.ts
+++ b/xim/models/chat.ts
@@ -2,7 +2,7 @@ import {
    MessageHandled,
    MessageType,
    PayMethod,
-    PayStatus
+    PayStatus,
 } from "@/customer-service/model";
 export interface Chat {
@@ -208,6 +208,15 @@ export interface PayMessageBody {
    itemName: string;
    amount: string;
    paymentId: string;
+    /**
+     * 对应v1版本itemName
+     */
+    totalName?: string;
+    /**
+     * 对应v1版本amount
+     */
+    totalMoney?: string;
 }
 export interface CsUser {

--- a/xim/xim.ts
+++ b/xim/xim.ts
@@ -194,13 +194,9 @@ export class Xim {
        return chat
            .getSdk()
            .getAxios()
-            .get(
+            .get<any, Message[]>(
-                `/general/xim/model/${p.model}/${
+                `/general/xim/model/${p.model}/${p.obj}/msgs?lid=${lid}&rid=${rid}&limit=${limit}&desc=${desc ? 0 : 1}`
-                    p.obj
+            )
-                }/msgs?lid=${lid}&rid=${rid}&limit=${limit}&desc=${
-                    desc ? 0 : 1
-                }`
-            );
    }
    private setMessagesRead(chatId: number, msg: Message[]) {