xyvcard-order 0.0.5 → 0.0.7

package/dts/src/api/order-logistics/types.d.ts

@@ -1,80 +1,21 @@
-import type { EntityApi, EntityReq, EntityModel, EntityList, EntityPage, EntityTotal, EntityKey, EntityKeyList, EntityCreateReq, EntityUpdateReq } from "jmash-core";
+import type { EntityApi, EntityKey, EntityList, EntityModel } from "jmash-core";
 export interface OrderLogisticsApi extends EntityApi {
 }
-export interface OrderLogisticsReq extends EntityReq {
-    logisticsId?: string;
-}
 export interface OrderLogisticsModel extends EntityModel {
     logisticsId?: string;
-    orderId?: string;
-    orderItemId?: string;
-    logisticsMchCode?: string;
-    logisticsMchName?: string;
-    logisticsNo?: string;
-    deliveryTime?: string;
-    status?: string;
-    isCheck?: boolean;
-    receiverTime?: string;
-    message?: string;
-    createTime?: string;
-    createBy?: string;
-    updateBy?: string;
-    updateTime?: string;
-}
-export interface OrderLogisticsList extends EntityList {
-    results: Array<OrderLogisticsModel>;
-}
-export interface OrderLogisticsPage extends EntityPage {
-    results: Array<OrderLogisticsModel>;
-    subTotalDto: OrderLogisticsModelTotal;
-    totalDto: OrderLogisticsModelTotal;
-}
-export interface OrderLogisticsModelTotal extends EntityTotal {
-    totalSize: number;
 }
 export interface OrderLogisticsKey extends EntityKey {
     tenant?: string;
     logisticsId?: string;
 }
-export interface OrderLogisticsKeyList extends EntityKeyList {
-    tenant?: string;
-    logisticsId?: Array<string>;
-}
-export interface OrderLogisticsCreateReq extends EntityCreateReq {
-    logisticsId?: string;
-    orderId?: string;
-    orderItemId?: string;
-    logisticsMchCode?: string;
-    logisticsMchName?: string;
-    logisticsNo?: string;
-    deliveryTime?: string;
-    status?: string;
-    isCheck?: boolean;
-    receiverTime?: string;
-    message?: string;
-}
-export interface OrderLogisticsUpdateReq extends EntityUpdateReq {
-    logisticsId?: string;
-    orderId?: string;
-    orderItemId?: string;
-    logisticsMchCode?: string;
-    logisticsMchName?: string;
-    logisticsNo?: string;
-    deliveryTime?: string;
-    status?: string;
-    isCheck?: boolean;
-    receiverTime?: string;
-    message?: string;
-}
-export type OrderLogisticsFormReq = OrderLogisticsCreateReq | OrderLogisticsUpdateReq;
 export interface LogisticsQueryReq {
     orderId?: string;
     orderItemId?: string;
 }
-export interface LogisticsInfoList {
+export interface LogisticsInfoList extends EntityList {
     list: Array<LogisticsInfoModel>;
 }
-export interface LogisticsInfoModel {
+export interface LogisticsInfoModel extends EntityModel {
     time?: string;
     context?: string;
     ftime?: string;

package/dts/src/api/order-refunds/index.d.ts

@@ -1,13 +1,12 @@
 import type { AxiosPromise } from "axios";
-import type { OrderRefundsApi, OrderRefundsReq, OrderRefundsModel, OrderRefundsPage, OrderRefundsList, OrderRefundsKey, OrderInfoRefundModel, OrderRefundsUpdateReq } from "./types";
+import type { OrderRefundsApi, OrderRefundsReq, OrderRefundsModel, OrderRefundsPage, OrderRefundsList, OrderRefundsKey, OrderInfoRefundModel, OrderRefundsUpdateReq, OrderRefundReq } from "./types";
 declare class OrderRefundsApiImpl implements OrderRefundsApi {
     getKey(model: OrderInfoRefundModel): OrderRefundsKey;
     findPage(query?: OrderRefundsReq): AxiosPromise<OrderRefundsPage>;
     findList(query?: OrderRefundsReq): AxiosPromise<OrderRefundsList>;
     findById(query: OrderRefundsKey): AxiosPromise<OrderInfoRefundModel>;
-    delete(query: OrderRefundsKey): AxiosPromise<OrderInfoRefundModel>;
-    batchDelete(keys: OrderRefundsKey[]): AxiosPromise<number>;
     update(data: OrderRefundsUpdateReq): AxiosPromise<OrderRefundsModel>;
+    refund(data: OrderRefundReq): AxiosPromise<boolean>;
 }
 declare const orderRefundsApi: OrderRefundsApiImpl;
 export { orderRefundsApi };

package/dts/src/api/order-refunds/types.d.ts

@@ -66,3 +66,8 @@ export interface OrderRefundsModel extends EntityModel {
     refuseRefundReson?: string;
     auditOpinion?: boolean;
 }
+export interface OrderRefundReq {
+    tenant?: string;
+    requestId?: string;
+    refundId?: string;
+}

package/dts/src/constant.d.ts

@@ -15,19 +15,21 @@ export declare class Constant {
     static readonly ENUM_PAYMENT_WAY = "xyvcard.order.protobuf.PaymentWay";
     static readonly ENUM_DELIVERY_WAY = "xyvcard.order.protobuf.DeliveryWay";
     static readonly ENUM_POST_TYPE = "xyvcard.order.protobuf.PostType";
-    static readonly logisticsDelivery = "logistics_delivery";
+    static readonly LOGISTICS_DELIVERY = "logistics_delivery";
     static readonly EXPRESS_COMPANY_CODE = "ExpressCompanyCode";
-    static readonly unpay = "unpay";
-    static readonly unpost = "unpost";
-    static readonly unreceive = "unreceive";
-    static readonly cancel = "cancel";
-    static readonly complete = "complete";
-    static readonly unpaid = "unpaid";
-    static readonly paid = "paid";
-    static readonly partPaid = "part_paid";
+    static readonly UNPAY = "unpay";
+    static readonly UNPOST = "unpost";
+    static readonly UNRECEIVE = "unreceive";
+    static readonly CANCEL = "cancel";
+    static readonly COMPLETE = "complete";
+    static readonly UNPAID = "unpaid";
+    static readonly PAID = "paid";
+    static readonly PART_PAID = "part_paid";
     static readonly REFUND_APPLY_STATUS = "xyvcard.order.protobuf.RefundApplyStatus";
+    static readonly PASS = "pass";
+    static readonly APPLY = "apply";
     static readonly ENUM_REFUND_TYPE = "xyvcard.order.protobuf.RefundType";
-    static readonly returnRefund = "RETURN_REFUND";
+    static readonly RETURN_REFUND = "RETURN_REFUND";
     static readonly AUDIT_OPINION: globalThis.Ref<{
         key: boolean;
         value: string;

package/dts/src/lang/order/zh-cn.d.ts

@@ -77,8 +77,8 @@ declare const _default: {
         viewLogist: string;
         postType: string;
         postTypeRequired: string;
-        logisticCode: string;
-        logisticCodeRequired: string;
+        logisticsCode: string;
+        logisticCodesRequired: string;
         logisticsNo: string;
         logisticsNoRequired: string;
     };
@@ -112,6 +112,10 @@ declare const _default: {
         refuseRefundResonRequired: string;
         info: string;
         refundReview: string;
+        refund: string;
+        refundConfirm: string;
+        refundSuccess: string;
+        refundFailed: string;
         refundOperation: string;
         userName: string;
         userNameRequired: string;

package/dts/src/main.d.ts

@@ -3,4 +3,3 @@ import "element-plus/dist/index.css";
 import "jmash-core/dist/style.css";
 import "jmash-dict/dist/style.css";
 import "jmash-rbac/dist/style.css";
-import "xyvcard-shop/dist/style.css";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xyvcard-order",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "private": false,
   "module": "dist/index.mjs",
   "types": "dts/src/index.d.ts",
@@ -11,14 +11,15 @@
   "peerDependencies": {
     "axios": "^1.7.7",
     "element-plus": "^2.8.7",
-    "jmash-core": "^0.0.102",
+    "jmash-core": "^0.0.108",
     "jmash-dict": "^0.0.44",
-    "jmash-rbac": "^0.0.35",
+    "jmash-rbac": "^0.0.40",
     "pinia": "^2.2.4",
     "vue": "^3.5.11",
     "vue-i18n": "^9.14.1",
     "vue-router": "^4.4.5",
-    "xyvcard-shop": "^0.0.16"
+    "xyvcard-shop": "^0.0.17",
+    "xyvcard-shell": "^0.0.8"
   },
   "devDependencies": {
     "@eslint/js": "^9.16.0",

package/dist/index-suIgymdy.mjs

@@ -1,93 +0,0 @@
-var U = Object.defineProperty;
-var d = (E, r, s) => r in E ? U(E, r, { enumerable: !0, configurable: !0, writable: !0, value: s }) : E[r] = s;
-var t = (E, r, s) => d(E, typeof r != "symbol" ? r + "" : r, s);
-import { BizDict as y, EnumDict as i, CustomBizDict as c } from "jmash-core";
-import { ref as p } from "vue";
-import { infoApi as T } from "xyvcard-shop";
-import { EntryDict as S } from "jmash-dict";
-class o extends y {
-  // 实现 useValues 方法
-  useValues() {
-    return new Promise((r, s) => {
-      T.findList().then(({ data: _ }) => {
-        const R = _.results;
-        this.values.length = 0, this.values.push(
-          ...R.map(
-            (u) => ({
-              key: u.shopId,
-              value: u.shopName
-            })
-          )
-        ), r(this.values);
-      }).catch(s);
-    });
-  }
-}
-class e {
-}
-// 模块
-t(e, "MODULE_ORDER", "order"), // 评价状态
-t(e, "APPRAISES_STATUS", p([
-  { key: !0, value: "已评价" },
-  { key: !1, value: "未评价" }
-])), // 订单状态
-t(e, "ENUM_ORDER_STATUS", "xyvcard.order.protobuf.OrderStatus"), // 支付状态
-t(e, "ENUM_PAYMENT_STATUS", "xyvcard.order.protobuf.PaymentStatus"), // 支付方式
-t(e, "ENUM_PAYMENT_WAY", "xyvcard.order.protobuf.PaymentWay"), // 配送方式
-t(e, "ENUM_DELIVERY_WAY", "xyvcard.order.protobuf.DeliveryWay"), // 发货类型
-t(e, "ENUM_POST_TYPE", "xyvcard.order.protobuf.PostType"), // 发货类型常量
-t(e, "logisticsDelivery", "logistics_delivery"), // 物流公司
-t(e, "EXPRESS_COMPANY_CODE", "ExpressCompanyCode"), // 订单状态常量
-t(e, "unpay", "unpay"), t(e, "unpost", "unpost"), t(e, "unreceive", "unreceive"), t(e, "cancel", "cancel"), t(e, "complete", "complete"), // 支付状态常量
-t(e, "unpaid", "unpaid"), t(e, "paid", "paid"), t(e, "partPaid", "part_paid"), // 退款状态y
-t(e, "REFUND_APPLY_STATUS", "xyvcard.order.protobuf.RefundApplyStatus"), // 退款类型
-t(e, "ENUM_REFUND_TYPE", "xyvcard.order.protobuf.RefundType"), // 退货退款常量
-t(e, "returnRefund", "RETURN_REFUND"), // 审核意见
-t(e, "AUDIT_OPINION", p([
-  { key: !0, value: "同意" },
-  { key: !1, value: "不同意" }
-]));
-class a {
-}
-// 所属店铺
-t(a, "shopBizDict", new o({})), // 订单状态
-t(a, "orderStatusEnum", new i(
-  e.MODULE_ORDER,
-  e.ENUM_ORDER_STATUS
-)), // 支付状态
-t(a, "paymentStatusEnum", new i(
-  e.MODULE_ORDER,
-  e.ENUM_PAYMENT_STATUS
-)), // 评价状态
-t(a, "appraisesStatus", new c(
-  e.APPRAISES_STATUS,
-  {}
-)), // 支付方式
-t(a, "paymentWayEnum", new i(
-  e.MODULE_ORDER,
-  e.ENUM_PAYMENT_WAY
-)), // 配送方式
-t(a, "deliveryWayEnum", new i(
-  e.MODULE_ORDER,
-  e.ENUM_DELIVERY_WAY
-)), // 发货类型
-t(a, "postTypeEnum", new i(
-  e.MODULE_ORDER,
-  e.ENUM_POST_TYPE
-)), // 物流公司
-t(a, "volunteerTypeDict", new S(
-  e.EXPRESS_COMPANY_CODE
-)), // 退款状态
-t(a, "refundApplyEnum", new i(
-  e.MODULE_ORDER,
-  e.REFUND_APPLY_STATUS
-)), // 退款类型
-t(a, "refundTypeEnum", new i(
-  e.MODULE_ORDER,
-  e.ENUM_REFUND_TYPE
-)), // 审核意见
-t(a, "auditOpinion", new c(e.AUDIT_OPINION, {}));
-export {
-  e as C,
-  a as D
-};

package/dist/index.vue_vue_type_script_setup_true_lang-RpiqLerK.mjs

@@ -1,41 +0,0 @@
-import { defineComponent as s, mergeModels as c, useModel as i, resolveComponent as n, openBlock as o, createBlock as r, withCtx as u, createElementBlock as _, Fragment as f, renderList as V, unref as g, createTextVNode as k, toDisplayString as v } from "vue";
-const C = /* @__PURE__ */ s({
-  __name: "index",
-  props: /* @__PURE__ */ c({
-    data: {
-      type: Object,
-      default: function() {
-      }
-    }
-  }, {
-    modelValue: { type: [String, Boolean] },
-    modelModifiers: {}
-  }),
-  emits: ["update:modelValue"],
-  setup(t) {
-    const l = i(t, "modelValue"), d = t.data;
-    return (x, a) => {
-      const m = n("el-radio"), p = n("el-radio-group");
-      return o(), r(p, {
-        modelValue: l.value,
-        "onUpdate:modelValue": a[0] || (a[0] = (e) => l.value = e)
-      }, {
-        default: u(() => [
-          (o(!0), _(f, null, V(g(d), (e) => (o(), r(m, {
-            key: e.key,
-            value: e.key
-          }, {
-            default: u(() => [
-              k(v(e.value), 1)
-            ]),
-            _: 2
-          }, 1032, ["value"]))), 128))
-        ]),
-        _: 1
-      }, 8, ["modelValue"]);
-    };
-  }
-});
-export {
-  C as _
-};