diff --git a/CoreCms.Net.Configuration/SystemSettingConstVars.cs b/CoreCms.Net.Configuration/SystemSettingConstVars.cs
index 29ed9ee9..6c225c62 100644
--- a/CoreCms.Net.Configuration/SystemSettingConstVars.cs
+++ b/CoreCms.Net.Configuration/SystemSettingConstVars.cs
@@ -9,6 +9,8 @@
  ***********************************************************************/
 
 
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.ChannelsECMerchantAddressAddRequest.Types.AddressDetail.Types;
+
 namespace CoreCms.Net.Configuration
 {
     /// <summary>
@@ -591,6 +593,11 @@ namespace CoreCms.Net.Configuration
         /// </summary>
         public const string ShowCustomForm = "showCustomForm";
 
+        /// <summary>
+        /// 用户地址开启坐标功能
+        /// </summary>
+        public const string AllowAddressToUseMap = "allowAddressToUseMap";
+
 
         /// <summary>
         /// 显示首页弹窗
diff --git a/CoreCms.Net.Configuration/SystemSettingDictionary.cs b/CoreCms.Net.Configuration/SystemSettingDictionary.cs
index 26712f72..d5371c87 100644
--- a/CoreCms.Net.Configuration/SystemSettingDictionary.cs
+++ b/CoreCms.Net.Configuration/SystemSettingDictionary.cs
@@ -64,6 +64,7 @@ namespace CoreCms.Net.Configuration
             di.Add(SystemSettingConstVars.ShowSolitaire, new DictionaryKeyValues() { sKey = "显示接龙按钮", sValue = "2" });
             di.Add(SystemSettingConstVars.ShowCalendar, new DictionaryKeyValues() { sKey = "显示签到按钮", sValue = "2" });
             di.Add(SystemSettingConstVars.ShowCustomForm, new DictionaryKeyValues() { sKey = "显示自定义表单按钮", sValue = "2" });
+            di.Add(SystemSettingConstVars.AllowAddressToUseMap, new DictionaryKeyValues() { sKey = "用户地址开启坐标", sValue = "1" });
 
             di.Add(SystemSettingConstVars.ShowIndexPopupWindow, new DictionaryKeyValues() { sKey = "显示首页弹窗", sValue = "2" });
             di.Add(SystemSettingConstVars.IndexPopupWindowImageUrl, new DictionaryKeyValues() { sKey = "图片地址", sValue = "" });
diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
index 77f7dbf4..5bf798fd 100644
--- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
+++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
@@ -2521,7 +2521,7 @@
              订单表
             </summary>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsStoreServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices,CoreCms.Net.IServices.ICoreCmsPaymentsServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsUserWeChatInfoServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsOrderItemServices,CoreCms.Net.IServices.IWeChatShippingDeliveryServices)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsStoreServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices,CoreCms.Net.IServices.ICoreCmsPaymentsServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsUserWeChatInfoServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsOrderItemServices,CoreCms.Net.IServices.IWeChatShippingDeliveryServices,CoreCms.Net.IServices.ICoreCmsDistributionOrderServices,CoreCms.Net.IServices.ICoreCmsAgentOrderServices)">
              <summary>
              构造函数
             </summary>
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
index d154f437..7fbebd0d 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
@@ -53,7 +53,8 @@
                                         <blockquote class="layui-elem-quote">
                                             1、如果开启【显示门店列表】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序涉及多个商家提供商品的在线交易及配送，请补充选择：电商平台-电商平台类目。】</text>”，可先关闭，审核后再开启。<br />
                                             2、如果开启【显示充值】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉及账户充值服务，需补充商家自营-预付卡销售-发行方类目。】</text>”，可先关闭，审核后再开启。<br />
-                                            2、如果开启【是否允许提现】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉嫌收集用户信息，包括但不限于银行卡，手机号码等。】</text>”，可先关闭，审核后再开启。<br />
+                                            3、如果开启【是否允许提现】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉嫌收集用户信息，包括但不限于银行卡，手机号码等。】</text>”，可先关闭，审核后再开启。<br />
+                                            4、如果关闭【用户地址开启坐标功能】模块，则用户在录入地址位置将不会走腾讯地图去获取坐标，“<text style="color: #ff0000;">将导致【同城配送】订单模式下获取不到正确的公里数</text>”，不要同城配送的可以关闭。<br />
                                         </blockquote>
                                         <div class="layui-form-item">
                                             <label class="layui-form-label">{{d.data.configs['showStoresSwitch']['sKey']}}</label>
@@ -76,6 +77,13 @@
                                                 <input type="radio" lay-filter="isAllowWithdrawCash" name="isAllowWithdrawCash" value="2" title="不开启" {{d.data.configs['isAllowWithdrawCash']['sValue']==="2" ? 'checked':''}}>
                                             </div>
                                         </div>
+                                        <div class="layui-form-item">
+                                            <label class="layui-form-label">{{d.data.configs['allowAddressToUseMap']['sKey']}}</label>
+                                            <div class="layui-input-inline layui-inline-7">
+                                                <input type="radio" lay-filter="allowAddressToUseMap" name="allowAddressToUseMap" value="1" title="开启" {{d.data.configs['allowAddressToUseMap']['sValue']==="1" ? 'checked':''}}>
+                                                <input type="radio" lay-filter="allowAddressToUseMap" name="allowAddressToUseMap" value="2" title="不开启" {{d.data.configs['allowAddressToUseMap']['sValue']==="2" ? 'checked':''}}>
+                                            </div>
+                                        </div>
                                         <blockquote class="layui-elem-quote">
                                             控制首页是否弹出弹窗广告
                                         </blockquote>
diff --git a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
index 8f07f1c7..41c29a17 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
@@ -112,6 +112,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             var showSolitaire = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowSolitaire).ObjectToInt(2);   //显示接龙按钮
             var showCalendar = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowCalendar).ObjectToInt(2);   //显示签到按钮
             var showLiveBroadCast = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowLiveBroadCast).ObjectToInt(2);   //显示小程序直播入口
+            var allowAddressToUseMap = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.AllowAddressToUseMap).ObjectToInt(2);   //用户地址开启坐标功能
 
             var showIndexPopupWindow = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowIndexPopupWindow).ObjectToInt(2);   //显示首页弹窗
             var indexPopupWindowImageUrl = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IndexPopupWindowImageUrl);   //首页弹窗图片地址
@@ -254,7 +255,8 @@ namespace CoreCms.Net.Web.WebApi.Controllers
                 indexPopupWindowImageUrl,
                 indexPopupWindowHrefUrl,
                 showCustomForm,
-                showLiveBroadCast
+                showLiveBroadCast,
+                allowAddressToUseMap
             };
             jm.data = model;
             return jm;
diff --git a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
index f89c4cfe..7e60327b 100644
--- a/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
+++ b/CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
@@ -193,6 +193,12 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:CoreCms.Net.Web.WebApi.Controllers.CartController.DoDeleteByIds(CoreCms.Net.Model.FromBody.FMArrayIntIds)">
+            <summary>
+            批量删除购物车信息
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:CoreCms.Net.Web.WebApi.Controllers.CartController.SetCartNum(CoreCms.Net.Model.ViewModels.DTO.FMSetCartNum)">
             <summary>
             设置购物车商品数量
@@ -597,7 +603,7 @@
             订单调用接口数据
             </summary>
         </member>
-        <member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillReshipServices,CoreCms.Net.IServices.ICoreCmsShipServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsOrderDistributionModelServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsClerkServices,CoreCms.Net.IServices.ICoreCmsInvoiceServices)">
+        <member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.#ctor(CoreCms.Net.Auth.HttpContextUser.IHttpContextUser,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillReshipServices,CoreCms.Net.IServices.ICoreCmsShipServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsOrderDistributionModelServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsClerkServices,CoreCms.Net.IServices.ICoreCmsInvoiceServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsUserWeChatInfoServices,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices)">
             <summary>
             构造函数
             </summary>
@@ -716,6 +722,20 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.OrderShippingList(CoreCms.Net.Model.FromBody.FMStringId)">
+            <summary>
+            查询当前订单是否接入微信发货信息管理
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.WebApi.Controllers.OrderController.GetOrderPayInfo(CoreCms.Net.Model.FromBody.FMStringId)">
+            <summary>
+            根据订单编号获取当前订单的支付信息
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="T:CoreCms.Net.Web.WebApi.Controllers.PageController">
             <summary>
             页面接口