From 1428284ade391f33c6fea64d87b2366af5c50aee Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 25 六月 2024 09:05:32 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 158 insertions(+), 2 deletions(-)
diff --git a/CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs b/CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs
index 8a29c18..e38ac5d 100644
--- a/CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs
+++ b/CoreCms.Net.Model/ViewModels/DTO/OrderDTO.cs
@@ -1,7 +1,7 @@
锘�/***********************************************************************
- * Project: CoreCms
+ * Project: baifenBinfa
* ProjectName: 鐧惧垎鍏垫硶绠＄悊绯荤粺
- * Web: hhtp://chuanyin.com
+ * Web: http://chuanyin.com
* Author:
* Email:
* CreateTime: 202403/02
@@ -11,8 +11,10 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using CoreCms.Net.Model.Entities;
using Newtonsoft.Json.Linq;
+using SqlSugar;
namespace CoreCms.Net.Model.ViewModels.DTO
{
@@ -52,6 +54,26 @@
/// 鍖哄煙搴忓垪
/// </summary>
public int areaId { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟缂栧彿
+ /// </summary>
+ public string orderId { get; set; }
+
+ /// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public int status { get; set; } = 0;
+
+ /// <summary>
+ /// 鏄庣粏id
+ /// </summary>
+ public string itemIds { get; set; }
+
+ /// <summary>
+ /// 鏄庣粏鏁伴噺
+ /// </summary>
+ public string itemNums { get; set; }
/// <summary>
/// 璐墿杞﹀簭鍒�
@@ -152,8 +174,21 @@
/// 璺熻釜ID锛屾湁鏁堟湡鍗佸垎閽燂紝浼氬奖鍝嶄富鎾綊鍥犮�佸垎浜憳褰掑洜绛夛紝闇�鍒涘缓璁㈠崟鍓嶈皟鐢紝璋冪敤鐢熸垚璁㈠崟 api 鏃堕渶浼犲叆璇ュ弬鏁�
/// </summary>
public string traceId { get; set; }
+ /// <summary>
+ /// 鏄庣粏ids
+ /// </summary>
+ public int[] itemIdarray { get; set; }
+
+ /// <summary>
+ /// 鏄庣粏鏁伴噺
+ /// </summary>
+ public int[] itemNumarray { get; set; }
+ /// <summary>
+ /// 璁″垝璁㈠崟id
+ /// </summary>
+ public string planorderId { get; set; }
}
/// <summary>
@@ -212,6 +247,11 @@
/// 鐘舵��
/// </summary>
public int status { get; set; } = 0;
+
+ /// <summary>
+ /// 鏄惁澶т簬0
+ /// </summary>
+ public int money { get; set; } = 0;
}
/// <summary>
@@ -399,6 +439,11 @@
public string logisticsName { get; set; }
public List<CoreCmsOrderItem> items { get; set; }
public List<CoreCmsOrder> orders { get; set; }
+ /// <summary>
+ /// 瀹氫綅淇℃伅锛岀敤閫楀彿鍒嗗壊
+ /// liao20240605
+ /// </summary>
+ public string? Coordinate { get; set; }
}
/// <summary>
@@ -458,4 +503,115 @@
/// </summary>
public decimal refund { get; set; } = 0;
}
+
+
+
+
+ /// <summary>
+ /// 璁″垝璁㈠崟
+ /// </summary>
+ public class JiHuaOrder
+ {
+
+
+ /// <summary>
+ /// 瀛︽牎
+ /// </summary>
+
+
+
+ public System.String shipAddress { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴浜�
+ /// </summary>
+
+
+ public System.String shipName { get; set; }
+
+
+
+ /// <summary>
+ /// 鑱旂郴鐢佃瘽
+ /// </summary>
+
+
+
+ public System.String shipMobile { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鍦板潃
+ /// </summary>
+
+
+
+ public System.String shouhuoAddress { get; set; }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /// <summary>
+ /// quxian
+ /// </summary>
+
+ public System.String shi { get; set; }
+
+
+ /// <summary>
+ /// quxian
+ /// </summary>
+
+ public System.String quxian { get; set; }
+
+
+ /// <summary>
+ /// 鐗囧尯
+ /// </summary>
+
+ public System.String pianqu { get; set; }
+
+
+
+ /// <summary>
+ /// 鍟嗗搧鍚嶇О
+ /// </summary>
+
+ public System.String name { get; set; }
+
+
+ /// <summary>
+ /// 鍟嗗搧瑙勬牸
+ /// </summary>
+
+ public System.String specification { get; set; }
+
+
+ /// <summary>
+ /// 璐у搧浠锋牸鍗曚环
+ /// </summary>
+
+ public System.Decimal price { get; set; }
+
+
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+
+ public System.Int32 nums { get; set; }
+
+
+
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1