Commit 13f3b8a0 by Sixong.Zhu

comment

parent 7ede10fd
Showing with 64 additions and 17 deletions
...@@ -58,7 +58,7 @@ export interface OrderTableListItem { ...@@ -58,7 +58,7 @@ export interface OrderTableListItem {
lastMsgContent: string; lastMsgContent: string;
lastMsgTime: string; lastMsgTime: string;
unreadCount: number; unreadCount: number;
PayPaymentNum?: string | number; //付款笔数 PayPaymentNum?: string | number; //付款笔数
} }
export const orderPredict = { export const orderPredict = {
...@@ -80,7 +80,7 @@ export const orderPredict = { ...@@ -80,7 +80,7 @@ export const orderPredict = {
lastMsgContent: "UniplatLastMsgContent", lastMsgContent: "UniplatLastMsgContent",
lastMsgTime: "UniplatLastMsgTime", lastMsgTime: "UniplatLastMsgTime",
unreadCount: 0, unreadCount: 0,
PayPaymentNum: "PayPaymentNum" PayPaymentNum: "PayPaymentNum",
}; };
export const enum PayStatus { export const enum PayStatus {
...@@ -136,6 +136,15 @@ export interface OrderPayItem { ...@@ -136,6 +136,15 @@ export interface OrderPayItem {
paymentItemId?: number; paymentItemId?: number;
} }
export interface OrderComment {
id: number;
content: string;
user: string;
attachment: string;
attachment_label: string;
time: string;
}
export const orderPayItemPredict = { export const orderPayItemPredict = {
status: "Status", status: "Status",
time: "PaymentDate", time: "PaymentDate",
...@@ -153,7 +162,7 @@ export const orderPayItemPredict = { ...@@ -153,7 +162,7 @@ export const orderPayItemPredict = {
OpenningBankName: "ProviderHandleId#ServiceProviderBank.OpenningBankName", OpenningBankName: "ProviderHandleId#ServiceProviderBank.OpenningBankName",
bankAccountNo: "ProviderHandleId#ServiceProviderBank.AccountNo", bankAccountNo: "ProviderHandleId#ServiceProviderBank.AccountNo",
paymentItemId: "PaymentItemId", paymentItemId: "PaymentItemId",
} };
export const enum ChatOpenDirection { export const enum ChatOpenDirection {
/** /**
......
...@@ -9,12 +9,14 @@ import { ...@@ -9,12 +9,14 @@ import {
OrderPayItem, OrderPayItem,
UploadImageItem, UploadImageItem,
orderPayItemPredict, orderPayItemPredict,
OrderComment,
} from "../model"; } from "../model";
import { GeneralOrderDirection } from '../model/order-product'; import { GeneralOrderDirection } from "../model/order-product";
class OrderService { class OrderService {
public readonly generalOrder = "general_order_info"; public readonly generalOrder = "general_order_info";
public readonly generalOrderPaymentModel = "general_order_payment_info"; public readonly generalOrderPaymentModel = "general_order_payment_info";
private readonly commentModel = "uniplat_model_remark@general_order";
private readonly handler = new UniplatSdkExtender(); private readonly handler = new UniplatSdkExtender();
private innerSdk: UniplatSdk | null = null; private innerSdk: UniplatSdk | null = null;
...@@ -65,17 +67,19 @@ class OrderService { ...@@ -65,17 +67,19 @@ class OrderService {
} }
/** 专项工单 */ /** 专项工单 */
public getOrders(params: { public getOrders(
productCode?: GeneralOrderDirection; params: {
index: number; productCode?: GeneralOrderDirection;
size?: number; index: number;
size?: number;
}, isHrs = false) { },
isHrs = false
) {
const list = this.getSdk() const list = this.getSdk()
.model(this.generalOrder) .model(this.generalOrder)
.list(isHrs ? "hroOrgOrderList" : "userOrderList"); .list(isHrs ? "hroOrgOrderList" : "userOrderList");
if (params.productCode) { if (params.productCode) {
list.addPrefilter({ 'ProductId#product.Code': params.productCode }); list.addPrefilter({ "ProductId#product.Code": params.productCode });
} }
return list return list
.query({ item_size: params.size || 100, pageIndex: params.index }) .query({ item_size: params.size || 100, pageIndex: params.index })
...@@ -99,7 +103,7 @@ class OrderService { ...@@ -99,7 +103,7 @@ class OrderService {
.model(this.generalOrder) .model(this.generalOrder)
.list("hroOrgDoingOrderList"); .list("hroOrgDoingOrderList");
if (params.productCode) { if (params.productCode) {
list.addPrefilter({ 'ProductId#product.Code': params.productCode }); list.addPrefilter({ "ProductId#product.Code": params.productCode });
} }
return list return list
.query({ item_size: params.size || 100, pageIndex: params.index }) .query({ item_size: params.size || 100, pageIndex: params.index })
...@@ -207,13 +211,47 @@ class OrderService { ...@@ -207,13 +211,47 @@ class OrderService {
} }
public sendPayAccountInfo(params: { send: string }) { public sendPayAccountInfo(params: { send: string }) {
return this.getSdk().domainService("hro_spview", "OrderSetting", "sendPayAccountInfo") return this.getSdk()
.request("get", { params }) .domainService("hro_spview", "OrderSetting", "sendPayAccountInfo")
.request("get", { params });
} }
public sendPayAccountInfoForAgent(params: { send: string; userOrderPaymentId: number }) { public sendPayAccountInfoForAgent(params: {
return this.getSdk().domainService("hro_spview", "OrderSetting", "sendPayAccountInfoForAgent") send: string;
.request("get", { params }) userOrderPaymentId: number;
}) {
return this.getSdk()
.domainService(
"hro_spview",
"OrderSetting",
"sendPayAccountInfoForAgent"
)
.request("get", { params });
}
public getComments(order: number | string) {
return this.getSdk()
.model(orderService.commentModel)
.list("system_remark")
.addPrefilter({ associate_id: order })
.query({ pageIndex: 1, item_size: 100 })
.then((r) => {
if (r && r.pageData && r.pageData.rows) {
const items = this.handler.buildRows<OrderComment>(
r.pageData.rows,
{
id: "",
time: "create_time",
attachment: "attachments_label",
user: "dealer_name",
content: "",
}
);
return items;
}
return [];
});
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment