# 2022-02-12

### 1.3.5 开源社区版：无 ### 0.1.7 会员专业版：【新增】表【CoreCmsUserShip】增加【精度longitude】【纬度latitude】【街道street】三字段。【新增】用户地址新增及编辑增加地图选择获取街道及经纬度坐标功能。【新增】【平台设置-订单管理】，新增【同城配送运费设置】，可设置2公里内，5公里内，10公里内，15公里内，20公里内不同距离运费。根据用户地址坐标与门店坐标进行计算。【新增】商品详情轮播图增加视频图片混播结合功能，类似淘宝打开商品详情后显示视频并支持播放，左右滑动切换图片，实现混播。【新增】商品添加/删除面板增加视频上传功能。
2025-12-06 17:43:26 +08:00 · 2022-02-12 02:25:01 +08:00
parent 534cf303ba
commit a07106127e
31 changed files with 924 additions and 181 deletions
--- a/CoreCms.Net.Model/Entities/User/CoreCmsUserShip.cs
+++ b/CoreCms.Net.Model/Entities/User/CoreCmsUserShip.cs
@@ -3,88 +3,113 @@
 *        ProjectName: 核心内容管理系统                                
 *                Web: https://www.corecms.net                      
 *             Author: 大灰灰                                          
- *              Email: jianweie@163.com
- *         CreateTime: 2021-06-08 22:14:59
+ *              Email: jianweie@163.com                                
+ *         CreateTime: 2022/2/11 22:59:40
 *        Description: 暂无
-***********************************************************************/ 
-using SqlSugar;
-using System.ComponentModel.DataAnnotations;
+ ***********************************************************************/

-namespace CoreCms.Net.Model.Entities
+using System;
+using System.ComponentModel.DataAnnotations;
+using SqlSugar;
+
+namespace CoreCms.Net.Model.Entities;
+
+/// <summary>
+///     用户地址表
+/// </summary>
+public partial class CoreCmsUserShip
 {
    /// <summary>
-    /// 用户地址表
+    ///     序列
    /// </summary>
-    [SugarTable("CoreCmsUserShip",TableDescription = "用户地址表")]
-    public partial class CoreCmsUserShip
-    {
-        /// <summary>
-        /// 用户地址表
-        /// </summary>
-        public CoreCmsUserShip()
-        {
-        }
+    [Display(Name = "序列")]
+    [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+    [Required(ErrorMessage = "请输入{0}")]
+    public int id { get; set; }

-        /// <summary>
-        /// 序列
-        /// </summary>
-        [Display(Name = "序列")]
-        [SugarColumn(ColumnDescription = "序列", IsPrimaryKey = true, IsIdentity = true)]
-        [Required(ErrorMessage = "请输入{0}")]
-        public System.Int32 id { get; set; }
-        /// <summary>
-        /// 用户id 关联user.id
-        /// </summary>
-        [Display(Name = "用户id 关联user.id")]
-        [SugarColumn(ColumnDescription = "用户id 关联user.id")]
-        [Required(ErrorMessage = "请输入{0}")]
-        public System.Int32 userId { get; set; }
-        /// <summary>
-        /// 收货地区ID
-        /// </summary>
-        [Display(Name = "收货地区ID")]
-        [SugarColumn(ColumnDescription = "收货地区ID")]
-        [Required(ErrorMessage = "请输入{0}")]
-        public System.Int32 areaId { get; set; }
-        /// <summary>
-        /// 收货详细地址
-        /// </summary>
-        [Display(Name = "收货详细地址")]
-        [SugarColumn(ColumnDescription = "收货详细地址", IsNullable = true)]
-        [StringLength(200, ErrorMessage = "【{0}】不能超过{1}字符长度")]
-        public System.String address { get; set; }
-        /// <summary>
-        /// 收货人姓名
-        /// </summary>
-        [Display(Name = "收货人姓名")]
-        [SugarColumn(ColumnDescription = "收货人姓名", IsNullable = true)]
-        [StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")]
-        public System.String name { get; set; }
-        /// <summary>
-        /// 收货电话
-        /// </summary>
-        [Display(Name = "收货电话")]
-        [SugarColumn(ColumnDescription = "收货电话", IsNullable = true)]
-        [StringLength(50, ErrorMessage = "【{0}】不能超过{1}字符长度")]
-        public System.String mobile { get; set; }
-        /// <summary>
-        /// 是否默认
-        /// </summary>
-        [Display(Name = "是否默认")]
-        [SugarColumn(ColumnDescription = "是否默认")]
-        [Required(ErrorMessage = "请输入{0}")]
-        public System.Boolean isDefault { get; set; }
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        [Display(Name = "创建时间")]
-        [SugarColumn(ColumnDescription = "创建时间", IsNullable = true)]
-        public System.DateTime? createTime { get; set; }
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        [Display(Name = "更新时间")]
-        [SugarColumn(ColumnDescription = "更新时间", IsNullable = true)]
-        public System.DateTime? updateTime { get; set; }
-    }
+
+    /// <summary>
+    ///     用户id 关联user.id
+    /// </summary>
+    [Display(Name = "用户id 关联user.id")]
+    [Required(ErrorMessage = "请输入{0}")]
+    public int userId { get; set; }
+
+
+    /// <summary>
+    ///     收货地区ID
+    /// </summary>
+    [Display(Name = "收货地区ID")]
+    [Required(ErrorMessage = "请输入{0}")]
+    public int areaId { get; set; }
+
+
+    /// <summary>
+    ///     收货详细地址
+    /// </summary>
+    [Display(Name = "收货详细地址")]
+    [StringLength(200, ErrorMessage = "{0}不能超过{1}字")]
+    public string address { get; set; }
+
+
+    /// <summary>
+    ///     收货人姓名
+    /// </summary>
+    [Display(Name = "收货人姓名")]
+    [StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
+    public string name { get; set; }
+
+
+    /// <summary>
+    ///     收货电话
+    /// </summary>
+    [Display(Name = "收货电话")]
+    [StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
+    public string mobile { get; set; }
+
+
+    /// <summary>
+    ///     是否默认
+    /// </summary>
+    [Display(Name = "是否默认")]
+    [Required(ErrorMessage = "请输入{0}")]
+    public bool isDefault { get; set; }
+
+
+    /// <summary>
+    ///     创建时间
+    /// </summary>
+    [Display(Name = "创建时间")]
+    public DateTime? createTime { get; set; }
+
+
+    /// <summary>
+    ///     更新时间
+    /// </summary>
+    [Display(Name = "更新时间")]
+    public DateTime? updateTime { get; set; }
+
+
+    /// <summary>
+    ///     经度
+    /// </summary>
+    [Display(Name = "经度")]
+    [StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
+    public string longitude { get; set; }
+
+
+    /// <summary>
+    ///     纬度
+    /// </summary>
+    [Display(Name = "纬度")]
+    [StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
+    public string latitude { get; set; }
+
+
+    /// <summary>
+    ///     街道
+    /// </summary>
+    [Display(Name = "街道")]
+    [StringLength(50, ErrorMessage = "{0}不能超过{1}字")]
+    public string street { get; set; }
 }
--- a/CoreCms.Net.Model/FromBody/FMCart.cs
+++ b/CoreCms.Net.Model/FromBody/FMCart.cs
@@ -86,6 +86,11 @@ namespace CoreCms.Net.Model.FromBody
        /// </summary>
        public int receiptType { get; set; } = 1;

+        /// <summary>
+        /// 用户收货地址
+        /// </summary>
+        public int userShipId { get; set; } = 0;
+

        /// <summary>
        /// 关联非普通订单对象序列
--- a/CoreCms.Net.Model/ViewModels/DTO/UserDto.cs
+++ b/CoreCms.Net.Model/ViewModels/DTO/UserDto.cs
@@ -49,6 +49,10 @@ namespace CoreCms.Net.Model.ViewModels.DTO
        public int isDefault { get; set; } = 2;
        public string mobile { get; set; }
        public string name { get; set; }
+        public string longitude { get; set; }
+        public string latitude { get; set; }
+        public string street { get; set; }
+
    }

    /// <summary>