diff --git a/niucloud/addon/shop/admin/api/delivery.ts b/niucloud/addon/shop/admin/api/delivery.ts
index b05526c6c..050a22333 100644
--- a/niucloud/addon/shop/admin/api/delivery.ts
+++ b/niucloud/addon/shop/admin/api/delivery.ts
@@ -211,13 +211,23 @@ export function setShopDeliveryConfig(params: Record<string, any>) {
     return request.put(`shop/delivery/setConfig`, params, { showSuccessMessage: true })
 }
 
+/*********************************  配送员  ***************************************/
 /**
  * 获取 配送员列表
  * @param params
  * @returns
  */
 export function getShopDelivery(params: Record<string, any>) {
-    return request.get('shop/delivery/staff', { params })
+    return request.get('shop/shop_delivery/staff', { params })
+}
+
+/**
+ * 获取 配送员列表
+ * @param params
+ * @returns
+ */
+export function getShopDeliverList(params: Record<string, any>) {
+    return request.get('shop/shop_delivery/staff/list', { params })
 }
 
 /**
@@ -226,7 +236,7 @@ export function getShopDelivery(params: Record<string, any>) {
  * @returns
  */
 export function getShopDeliverInfo(staff_id: number) {
-    return request.get(`shop/delivery/staff/${ staff_id }`);
+    return request.get(`shop/shop_delivery/staff/${ staff_id }`);
 }
 
 /**
@@ -235,7 +245,7 @@ export function getShopDeliverInfo(staff_id: number) {
  * @returns
  */
 export function addShopDeliver(params: Record<string, any>) {
-    return request.post('shop/delivery/staff', params, { showSuccessMessage: true })
+    return request.post('shop/shop_delivery/staff', params, { showSuccessMessage: true })
 }
 
 /**
@@ -244,7 +254,7 @@ export function addShopDeliver(params: Record<string, any>) {
  * @returns
  */
 export function editShopDeliver(params: Record<string, any>) {
-    return request.put(`shop/delivery/staff/${ params.deliver_id }`, params, { showSuccessMessage: true })
+    return request.put(`shop/shop_delivery/staff/${ params.deliver_id }`, params, { showSuccessMessage: true })
 }
 
 /**
@@ -253,15 +263,48 @@ export function editShopDeliver(params: Record<string, any>) {
  * @returns
  */
 export function deleteShopDeliver(staff_id: number) {
-    return request.delete(`shop/delivery/staff/${ staff_id }`)
+    return request.delete(`shop/shop_delivery/staff/${ staff_id }`)
 }
 
+
+/*********************************  配送服务商  ***************************************/
+
+/**
+ * 获取配送服务商列表
+ * @param params
+ * @returns
+ */
+export function getDeliveryServiceList(id: number) {
+    return request.get(`shop/delivery_store/delivery_service_list/${id}`)
+}
+
+/**
+ * 服务商开通门店
+ * @param params
+ * @returns
+ */
+export function deliveryShopOpen(params: Record<string, any>) {
+    return request.put(`shop/delivery_store/delivery_shop_open/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 服务商门店品类修改
+ * @param params
+ * @returns
+ */
+export function deliveryShopEdit(params: Record<string, any>) {
+    return request.put(`shop/delivery_store/delivery_shop_edit/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+
+/*********************************  同城配送设置  ***************************************/
+
 /**
  * 获取同城配送设置
  * @returns
  */
 export function getLocal() {
-    return request.get('shop/local');
+    return request.get('shop/local_delivery/config');
 }
 
 /**
@@ -270,7 +313,42 @@ export function getLocal() {
  * @returns
  */
 export function setLocal(params: Record<string, any>) {
-    return request.put('shop/local', params, { showSuccessMessage: true })
+    return request.put('shop/local_delivery/config', params, { showSuccessMessage: true })
+}
+
+/**
+ * 获取三方配送列表
+ * @param params
+ * @returns
+ */
+export function getInUseLocalDeliveryList(params: Record<string, any>) {
+    return request.get('shop/local_delivery/list', {params})
+}
+
+/**
+ * 获取同城配送平台列表
+ */
+export function getLocalDeliveryServiceList() {
+    return request.get(`shop/local_delivery/service`)
+}
+
+
+/**
+ * 同城配送平台设置
+ * @param params
+ * @returns
+ */
+export function setLocalDeliveryService(params: Record<string, any>) {
+    return request.put(`shop/local_delivery/service/${params.delivery_type}`, params, {showSuccessMessage: true})
+}
+
+/**
+ * 同城配送平台详情
+ * @param delivery_type
+ * @returns
+ */
+export function getLocalDeliveryServiceInfo(delivery_type: string) {
+    return request.get(`shop/local_delivery/service/${delivery_type}`,)
 }
 
 /**
@@ -280,3 +358,218 @@ export function setLocal(params: Record<string, any>) {
 export function getThird() {
     return request.get('shop/third/init')
 }
+
+
+
+
+/*********************************  同城配送记录  ***************************************/
+
+/**
+ * 获取配送记录状态
+ * @param params
+ * @returns
+ */
+export function getLocalDeliveryStatus() {
+    return request.get('shop/local_delivery/order/status')
+}
+
+/**
+ * 获取配送记录分页列表
+ * @param params
+ * @returns
+ */
+export function getLocalDeliveryList(params: Record<string, any>) {
+    return request.get(`shop/local_delivery/order`, {params})
+}
+
+/**
+ * 获取同城配送订单详情
+ * @param id
+ * @returns
+ */
+export function getLocalDeliveryInfo(id: number) {
+    return request.get(`shop/local_delivery/order/${ id }`);
+}
+
+/**
+ * 获取同城配送订单取消原因
+ * @param params
+ * @returns
+ */
+export function getLocalDeliveryCancelReason(params: Record<string, any>) {
+    return request.get('shop/local_delivery/order/cancel_reason', {params})
+}
+
+/**
+ * 获取同城配送订单同步
+ * @param staff_id
+ * @returns
+ */
+export function getLocalDeliverySync(id: number) {
+    return request.put(`shop/local_delivery/order/sync/${ id }`);
+}
+
+/**
+ * 同城配送订单取消
+ * @param params
+ * @returns
+ */
+export function setLocalDeliveryCancel(params: Record<string, any>) {
+   return request.put(`shop/local_delivery/order/cancel/${ params.id }`, params, { showSuccessMessage: true })
+}
+
+
+/*********************************  商家配送记录  ***************************************/
+/**
+ * 获取配送记录状态
+ * @param params
+ * @returns
+ */
+export function getShopDeliveryStatus() {
+    return request.get('shop/shop_delivery/order/status')
+}
+
+/**
+ * 获取商家配送记录分页列表
+ * @param params
+ * @returns
+ */
+export function getShopDeliveryOrderList(params: Record<string, any>) {
+    return request.get(`shop/shop_delivery/order`, {params})
+}
+
+/**
+ * 获取同城配送订单详情
+ * @param id
+ * @returns
+ */
+export function getShopDeliveryInfo(id: number) {
+    return request.get(`shop/shop_delivery/order/${ id }`);
+}
+
+/**
+ * 获取商家配送记录订单完成
+ * @param staff_id
+ * @returns
+ */
+export function getShopDeliveryFinish(id: number) {
+    return request.put(`shop/shop_delivery/order/finish/${ id }`);
+}
+
+/**
+ * 获取商家配送记录订单完成
+ * @param staff_id
+ * @returns
+ */
+export function getDeliveryFinish(id: number) {
+    return request.put(`shop/local_delivery/order/finish/${ id }`);
+}
+
+/**
+ * 商家配送记录订单取消
+ * @param params
+ * @returns
+ */
+export function setShopDeliveryCancel(params: Record<string, any>) {
+   return request.put(`shop/shop_delivery/order/cancel/${ params.id }`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 获取配送方式
+ * @param id
+ * @returns
+ */
+export function getShopDeliveryType() {
+    return request.get(`shop/delivery/type`);
+}
+
+
+/*********************************  门店自提  ***************************************/
+
+/**
+ * 获取门店自提分页列表
+ * @param params
+ * @returns
+ */
+export function getDeliveryStoreList(params: Record<string, any>) {
+    return request.get(`shop/delivery/store`, {params})
+}
+
+/**
+ * 获取门店选择列表
+ * @param params
+ * @returns
+ */
+export function getDeliveryStoreListAll(params: Record<string, any>) {
+    return request.get(`shop/delivery/store/list`, {params})
+}
+
+/**
+ * 获取提货方式
+ * @returns
+ */
+export function getStorePickUpType() {
+    return request.get(`shop/delivery/store/pick_up_type`);
+}
+
+/**
+ * 获取配送门店详情
+ * @returns
+ */
+export function getDeliveryStoreDetail(id: number) {
+    return request.get(`shop/delivery/store/${ id }`);
+}
+
+/**
+ * 添加配送门店
+ * @param params
+ * @returns
+ */
+export function addDeliveryStore(params: Record<string, any>) {
+    return request.post('shop/delivery/store', params, {showErrorMessage: true, showSuccessMessage: true})
+}
+
+/**
+ * 编辑配送门店
+ * @param params
+ * @returns
+ */
+export function editDeliveryStore(params: Record<string, any>) {
+    return request.put(`shop/delivery/store/${params.store_id}`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+/**
+ * 删除运费模版
+ * @param template_id
+ * @returns
+ */
+export function deleteDeliveryStore(store_id: number) {
+    return request.delete(`shop/delivery/store/${store_id}`, {showErrorMessage: true, showSuccessMessage: true})
+}
+
+/**
+ * 编辑配送门店状态
+ * @param params
+ * @returns
+ */
+export function editDeliveryStoreStatus(params: Record<string, any>) {
+    return request.put(`shop/delivery/store/modify_status`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取距离配置
+ * @returns
+ */
+export function getDeliveryConfig() {
+    return request.get('shop/local_delivery/base_config')
+}
+
+
+/**
+ * 编辑距离配置
+ * @param params
+ * @returns
+ */
+export function setDeliveryConfig(params: Record<string, any>) {
+    return request.put('shop/local_delivery/base_config', params, {showSuccessMessage: true})
+}
+
diff --git a/niucloud/addon/shop/admin/api/goods.ts b/niucloud/addon/shop/admin/api/goods.ts
index 0ff4b7ecf..c61f69504 100644
--- a/niucloud/addon/shop/admin/api/goods.ts
+++ b/niucloud/addon/shop/admin/api/goods.ts
@@ -129,7 +129,7 @@ export function editGoodsStatus(params: Record<string, any>) {
  * @param params
  */
 export function copyGoods(params: Record<string, any>) {
-    return request.put(`shop/goods/copy/${ params.goods_id }`, params, { showSuccessMessage: true })
+    return request.put(`shop/goods/copy/${ params.goods_id }`, params)
 }
 
 /**
diff --git a/niucloud/addon/shop/admin/api/order.ts b/niucloud/addon/shop/admin/api/order.ts
index fecc0a4fc..c8c3af39f 100644
--- a/niucloud/addon/shop/admin/api/order.ts
+++ b/niucloud/addon/shop/admin/api/order.ts
@@ -278,4 +278,20 @@ export function getOrderBatchDeliveryType() {
  */
 export function closeRefund(order_refund_no: number) {
     return request.put(`shop/order/refund/close/${order_refund_no}`)
+}
+
+/**
+ * 获取已选订单项总重量
+ * @return
+ */
+export function getSelectOrderGoodsWeight(params: Record<string, any>) {
+    return request.get(`shop/order/select/weight`, {params})
+}
+
+/**
+ * 获取已选订单项配送费用
+ * @return
+ */
+export function getDeliveryFee(params: Record<string, any>) {
+    return request.get(`shop/order/delivery/fee`, {params})
 }
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local.json
index b6fe7d276..40d7444e9 100644
--- a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local.json
+++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local.json
@@ -87,5 +87,6 @@
   "notLessThanZero": "不能小于0",
   "mustBeGreaterThanZero": "必须大于0",
   "thridRequire": "请选择一个三方配送服务",
-  "thridSeting": "请填写完整的三方配送配置"
+  "thridSeting": "请填写完整的三方配送配置",
+  "deliveryArea": "配送区域"
 }
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_config.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_config.json
new file mode 100644
index 000000000..254cfe8c5
--- /dev/null
+++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_config.json
@@ -0,0 +1,4 @@
+{
+    "isStoreSelect":"是否开启门店选择",
+    "isShowPolyline":"是否显示配送轨迹"
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_delivery_service.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_delivery_service.json
new file mode 100644
index 000000000..de3374c1a
--- /dev/null
+++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_delivery_service.json
@@ -0,0 +1,12 @@
+{
+    "name": "三方配送类型",
+    "dadaThirdDelivery":"达达秒送",
+    "isUse":"是否启用",
+    "config":"设置",
+    "dadaAppKey": "APP_KEY",
+    "dadaAppSecret":"APP_SECRET",
+    "dadaSourceId": "商户ID",
+    "dadaAppKeyPlaceholder": "请输入APP_KEY",
+    "dadaAppSecretPlaceholder":"请输入APP_SECRET",
+    "dadaSourceIdPlaceholder":"请输入商户ID"
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_record.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_record.json
new file mode 100644
index 000000000..ea204d695
--- /dev/null
+++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.local_record.json
@@ -0,0 +1,33 @@
+{
+  "deliveryNo": "配送单号",
+  "tradeNo": "交易单号",
+  "tradeNoPlaceholder":"请输入交易单号",
+  "deliveryNoPlaceholder":"请输入配送单号",
+  "createTime":"配送时间",
+  "startDate":"开始日期",
+  "endDate":"结束日期",
+  "deliveryServiceName":"配送服务名称",
+  "goodsInfo":"商品信息",
+  "deliveryStart":"配送起点",
+  "deliveryEnd":"配送终点",
+  "deliveryStatus":"状态",
+  "deliveryStatusPlaceholder":"请选择状态",
+  "deliveryDistance":"配送距离",
+  "deliveryMoney":"配送费用",
+  "remark":"备注",
+  "detail": "详情",
+  "sync":"同步",
+  "syncTips":"您确定要同步配送订单吗？",
+  "finish":"完成",
+  "finishTips":"您确定要完成配送订单吗？",
+  "cancelTime":"取消时间",
+  "riderName":"配送员姓名",
+  "riderMobile":"配送员手机号",
+  "outDeliveryNo":"外部配送单号",
+  "deliveryCancel":"取消配送",
+  "cancelReasonSelectPlaceholder":"请选择取消原因类型",
+  "cancelReasonType":"取消原因类型",
+  "cancelReason":"取消原因",
+  "cancelReasonPlaceholder":"请输入取消原因"
+ 
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery.merchant_record.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery.merchant_record.json
new file mode 100644
index 000000000..896564958
--- /dev/null
+++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery.merchant_record.json
@@ -0,0 +1,31 @@
+{
+  "deliveryNo": "配送单号",
+  "tradeNo": "交易单号",
+  "tradeNoPlaceholder":"请输入交易单号",
+  "deliveryNoPlaceholder":"请输入配送单号",
+  "createTime":"配送时间",
+  "startDate":"开始日期",
+  "endDate":"结束日期",
+  "deliveryServiceName":"配送服务名称",
+  "goodsInfo":"商品信息",
+  "deliveryStart":"配送起点",
+  "deliveryEnd":"配送终点",
+  "deliveryStatus":"状态",
+  "deliveryStatusPlaceholder":"请选择状态",
+  "deliveryDistance":"配送距离",
+  "deliveryMoney":"配送费用",
+  "remark":"备注",
+  "detail": "详情",
+  "finish":"完成",
+  "finishTips":"您确定要完成配送订单吗？",
+  "cancelTime":"取消时间",
+  "riderName":"配送员姓名",
+  "riderMobile":"配送员手机号",
+  "outDeliveryNo":"外部配送单号",
+  "deliveryCancel":"取消配送",
+  "cancelReasonSelectPlaceholder":"请选择取消原因类型",
+  "cancelReasonType":"取消原因类型",
+  "cancelReason":"取消原因",
+  "cancelReasonPlaceholder":"请输入取消原因"
+ 
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.delivery_set.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.delivery_set.json
new file mode 100644
index 000000000..7cf284b31
--- /dev/null
+++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.delivery_set.json
@@ -0,0 +1,12 @@
+{
+  "deliveryServiceName": "服务商",
+  "openService": "开通",
+  "editService": "修改品类",
+  "business": "门店品类",
+  "businessPlaceholder": "请选择门店品类",
+  "openStatus": "开通状态",
+  "editStatus": "门店信息变更状态",
+  "reason": "备注",
+  "pass": "通过",
+  "notPass": "未通过"
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.edit.json b/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.edit.json
new file mode 100644
index 000000000..5373b7054
--- /dev/null
+++ b/niucloud/addon/shop/admin/lang/zh-cn/delivery_store.edit.json
@@ -0,0 +1,103 @@
+{
+  "basicSettings": "同城配送基础设置",
+  "timeIsOpen": "配送时间设置",
+  "timeIsOpenTips": "开启后，买家下单选择同城配送时，可选择配送时间，提交订单后，将在买家备注中显示。关闭后，买家下单默认为立即配送",
+  "close": "关闭",
+  "open": "开启",
+  "everyDay": "每天",
+  "monday": "周一",
+  "tuesday": "周二",
+  "wednesday": "周三",
+  "thursday": "周四",
+  "friday": "周五",
+  "saturday": "周六",
+  "sunday": "周日",
+  "timeWeekRequire": "请选择配送时间",
+  "deliveryTimeSetting": "配送时间设置",
+  "feeType": "收费标准",
+  "region": "按区域收取配送费",
+  "distance": "按距离收取配送费",
+  "district": "按行政区域收取配送费",
+  "feeSetting": "费用设置",
+  "weightFee": "续重收费",
+  "feeSettingTextOne": "km内按",
+  "feeSettingTextTwo": "元收取配送费，每超出",
+  "feeSettingTextThree": "km费用增加",
+  "priceUnit": "元",
+  "weightFeeTextOne": "商品重量",
+  "weightFeeTextTwo": "kg 内不额外收费，每超出",
+  "weightFeeTextThree": "kg 费用增加",
+  "areaName": "区域名称",
+  "startPrice": "起送价",
+  "deliveryPrice": "配送费",
+  "areaType": "划分方式",
+  "radius": "半径",
+  "custom": "自定义",
+  "addDeliveryArea": "添加配送区域",
+  "baseDistRequire": "请输入起始公里数",
+  "gradDistRequire": "请输入超出公里数",
+  "basePriceRequire": "请输入起始公里内的配送费用",
+  "gradPriceRequire": "请输入每超出公里部分的费用",
+  "areaNameRequire": "请输入区域名称",
+  "startPriceRequire": "请输入起送价",
+  "startPriceMin": "起送价不能小于0",
+  "deliveryPriceRequire": "请输入配送费",
+  "deliveryPriceMin": "配送费不能小于0",
+  "areaPlaceholder": "请添加配送区域",
+  "deliveryType": "配送方式",
+  "business": "商家自配送",
+  "deliveryTypeRequire": "至少需选择一种配送方式",
+  "deliveryAddress": "取货地址",
+  "defaultDeliveryAddressEmpty": "请先配置默认发货地址",
+  "toSetting": "去配置",
+  "update": "修改",
+  "deliveryAddressChange": "取货地址已变更请注意是否需重新调整配送区域",
+  "tradeTimePlaceholderTwo": "请选择提货时段",
+  "tradeTimePlaceholderThree": "请选择细分时段",
+  "tradeTimePlaceholderFour": "结束时间不能小于或等于开始时间",
+  "tradeTimePlaceholderFive": "后一个时间段的开始时间不能小于前一个时间段的结束时间",
+  "thrid":"三方配送",
+  "AppKey":"AppKey",
+  "AppSecret":"AppSecret",
+  "shopId":"商户ID",
+  "shopStoreNo":"商户门店编号",
+  "AppKeyRequire":"请输入AppKey",
+  "AppSecretRequire":"请输入AppSecret",
+  "shopIdRequire":"请输入商户ID",
+  "shopStoreNoRequire":"请输入商户门店编号",
+  "deliveryTime":"配送时段设置",
+  "startTime":"开始时间",
+  "endTime":"结束时间",
+  "timeInterval":"细分时段",
+  "addTime":"添加配送时段",
+  "deliveryTimeTips":"配送时段设置，若不在配送时段内，则无法进行配送",
+  "30minute": "30分钟",
+  "90minute": "90分钟",
+  "oneHour": "一小时",
+  "twoHour": "两小时",
+  "advancaDay": "提前预约",
+  "advance": "提前",
+  "day": "天",
+  "reservationAvailable":"可预约",
+  "withinDays":"天内",
+  "advanceTips": "若设置了提前预约,则用户在当前日期前多少天可以预约配送，不可以立即配送",
+  "mostDays": "最长预约",
+  "mostDaysTips": "预约配送最长可预约多少天内进行提货",
+  "formatError": "格式不正确",
+  "notLessThanZero": "不能小于0",
+  "mustBeGreaterThanZero": "必须大于0",
+  "thridRequire": "请选择一个三方配送服务",
+  "thridSeting": "请填写完整的三方配送配置",
+  "addressPlaceholder":"请输入详细地址",
+	"fullAddressPlaceholder":"请输入地址",
+  "storeName": "提货点名称",
+  "storeNamePlaceholder": "请输入提货点名称",
+  "contactName": "联系人姓名",
+  "contactNamePlaceholder": "请输入联系人姓名",
+  "storeMobile": "联系人电话",
+  "storeMobilePlaceholder": "请输入联系人电话",
+  "tradeTime": "营业时间",
+  "tradeTimePlaceholder": "请输入营业时间",
+  "tradeTimeTips": "例：上午9:00-12:00，下午2:00-6:00",
+  "deliveryStoreTips": "当前提货点为系统自建提货点，无法删除且提货点名称、联系人电话、营业时间及地址只能在店铺设置中统一配置。"
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/order.detail.json b/niucloud/addon/shop/admin/lang/zh-cn/order.detail.json
index 622fd9be7..2f423f02f 100644
--- a/niucloud/addon/shop/admin/lang/zh-cn/order.detail.json
+++ b/niucloud/addon/shop/admin/lang/zh-cn/order.detail.json
@@ -116,6 +116,22 @@
   "refundInstructionsOne": "1、如果是退部分金额，退款后可以是部分退款状态或退款完成状态",
   "refundInstructionsTwo": "2、如果是退全部金额，则退款后一定是退款完成状态",
   "refundInstructionsThree": "3、退款完成才会执行相关业务如核销码失效，卡包失效等操作",
+  "storeDeliveryWay": "商家配送",
+  "thirdPartyDeliveryWay": "第三方配送",
+  "deliverName": "配送员",
+  "deliverNamePlaceholder": "请选择配送员",
+  "deliverMobile": "配送员手机号",
+  "deliverMobilePlaceholder": "请输入配送员手机号",
+  "thirdDeliveryName": "配送平台",
+  "thirdDeliveryNamePlaceholder": "请选择配送平台",
+  "goodsWeight": "商品重量",
+  "goodsWeightPlaceholder": "请输入商品重量",
+  "weightTips": "[商品重量(kg)]格式输入错误",
+  "weightNotZeroTips": "商品重量(kg)必须大于0",
+  "deliveryAddress": "发货地址",
+  "deliveryPlatform": "配送平台",
+  "deliveryStatus": "配送状态",
+  "modifyDelivery": "修改发货信息",
   "backRefund": "原路退款",
   "offlineRefund": "线下退款",
   "refundToBalance": "退款到余额",
diff --git a/niucloud/addon/shop/admin/lang/zh-cn/order.list.json b/niucloud/addon/shop/admin/lang/zh-cn/order.list.json
index 93f90197b..a20f8181d 100644
--- a/niucloud/addon/shop/admin/lang/zh-cn/order.list.json
+++ b/niucloud/addon/shop/admin/lang/zh-cn/order.list.json
@@ -160,5 +160,22 @@
   "orderInfoEmpty": "暂无数据",
   "buyerAskDeliveryTime": "要求自提时间",
   "deleteTips": "是否确认删除该订单？",
-  "batchDeleteTips": "是否确认批量删除选中的订单？"
+  "batchDeleteTips": "是否确认批量删除选中的订单？",
+  "storeDeliveryWay": "商家配送",
+  "thirdPartyDeliveryWay": "第三方配送",
+  "deliverName": "配送员",
+  "deliverNamePlaceholder": "请选择配送员",
+  "deliverMobile": "配送员手机号",
+  "deliverMobilePlaceholder": "请输入配送员手机号",
+  "thirdDeliveryName": "配送平台",
+  "thirdDeliveryNamePlaceholder": "请选择配送平台",
+  "goodsWeight": "商品重量",
+  "goodsWeightPlaceholder": "请输入商品重量",
+  "weightTips": "[商品重量(kg)]格式输入错误",
+  "weightNotZeroTips": "商品重量(kg)必须大于0",
+  "deliveryStore": "提货点",
+  "deliveryStorePlaceholder": "请选择提货点",
+  "deliveryPlatform": "配送平台",
+  "deliveryStatus": "配送状态",
+  "goActive":"去开通"
 }
diff --git a/niucloud/addon/shop/admin/views/address/list.vue b/niucloud/addon/shop/admin/views/address/list.vue
index b50b57526..2cec99c9c 100644
--- a/niucloud/addon/shop/admin/views/address/list.vue
+++ b/niucloud/addon/shop/admin/views/address/list.vue
@@ -117,7 +117,7 @@ const router = useRouter()
  * 添加商家地址库
  */
 const addEvent = () => {
-    router.push('/shop/order/address/edit')
+    router.push('/shop/address/edit')
 }
 
 /**
@@ -125,7 +125,7 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-    router.push('/shop/order/address/edit?id=' + data.id)
+    router.push('/shop/address/edit?id=' + data.id)
 }
 
 /**
diff --git a/niucloud/addon/shop/admin/views/delivery/company.vue b/niucloud/addon/shop/admin/views/delivery/company.vue
index f68afcf51..ec4fa4e2a 100644
--- a/niucloud/addon/shop/admin/views/delivery/company.vue
+++ b/niucloud/addon/shop/admin/views/delivery/company.vue
@@ -2,7 +2,7 @@
     <div class="main-container">
 
         <el-card class="box-card !border-none" shadow="never">
-            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push('/shop/order/delivery')" />
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push('/shop/delivery/config')" />
         </el-card>
 
         <el-card class="box-card mt-[15px] !border-none" shadow="never">
@@ -118,7 +118,7 @@ loadCompanyList(getTablePageStorage(companyTable.searchParam).page);
  * 添加物流公司
  */
 const addEvent = () => {
-    router.push('/shop/order/delivery/company_add')
+    router.push('/shop/delivery/company_add')
 }
 
 /**
@@ -126,7 +126,7 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-    router.push('/shop/order/delivery/company_edit?company_id=' + data.company_id)
+    router.push('/shop/delivery/company_edit?company_id=' + data.company_id)
 }
 
 /**
diff --git a/niucloud/addon/shop/admin/views/delivery/company_edit.vue b/niucloud/addon/shop/admin/views/delivery/company_edit.vue
index dfe4f45d1..2bbd1730d 100644
--- a/niucloud/addon/shop/admin/views/delivery/company_edit.vue
+++ b/niucloud/addon/shop/admin/views/delivery/company_edit.vue
@@ -135,7 +135,7 @@ const router = useRouter()
 const loading = ref(true)
 
 const back = () => {
-    router.push('/shop/order/delivery/company')
+    router.push('/shop/delivery/company')
 }
 
 /**
@@ -301,7 +301,7 @@ const save = async(formEl: FormInstance | undefined) => {
 
             const data = formData
             api(data).then(res => {
-                router.push('/shop/order/delivery/company')
+                router.push('/shop/delivery/company')
                 repeat.value = false
             }).catch(() => {
                 repeat.value = false
diff --git a/niucloud/addon/shop/admin/views/delivery/components/local-delivery-service-dada.vue b/niucloud/addon/shop/admin/views/delivery/components/local-delivery-service-dada.vue
new file mode 100644
index 000000000..97f0798df
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery/components/local-delivery-service-dada.vue
@@ -0,0 +1,118 @@
+<template>
+    <el-dialog v-model="showDialog" :title="t('dadaThirdDelivery')" width="580px" :destroy-on-close="true">
+        <el-form :model="formData" label-width="140px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+            <el-form-item :label="t('isUse')">
+                <el-radio-group v-model="formData.is_use">
+                    <el-radio :label="1">{{ t('startUsing') }}</el-radio>
+                    <el-radio :label="0">{{ t('statusDeactivate') }}</el-radio>
+                </el-radio-group>
+            </el-form-item>
+
+            <el-form-item :label="t('dadaAppKey')" prop="app_key">
+                <el-input v-model.trim="formData.app_key" :placeholder="t('dadaAppKeyPlaceholder')" class="input-width" show-word-limit clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('dadaAppSecret')" prop="app_secret">
+                <el-input v-model.trim="formData.app_secret" :placeholder="t('dadaAppSecretPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+            <el-form-item :label="t('dadaSourceId')" prop="source_id">
+                <el-input v-model.trim="formData.source_id" :placeholder="t('dadaSourceIdPlaceholder')" class="input-width" clearable />
+            </el-form-item>
+
+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{t('confirm')}}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed } from 'vue'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { setLocalDeliveryService, getLocalDeliveryServiceInfo } from '@/addon/shop/api/delivery'
+
+const showDialog = ref(false)
+const loading = ref(true)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    delivery_type: '',
+    app_key: '',
+    app_secret: '',
+    source_id: '',
+    is_use: ''
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+        app_key: [
+            { required: true, message: t('dadaAppKeyPlaceholder'), trigger: 'blur' }
+        ],
+        app_secret: [
+            { required: true, message: t('dadaAppSecretPlaceholder'), trigger: 'blur' }
+        ],
+        source_id: [
+            { required: true, message: t('dadaSourceIdPlaceholder'), trigger: 'blur' }
+        ]
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            const data = formData
+
+            setLocalDeliveryService(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(() => {
+                loading.value = false
+                // showDialog.value = false
+            })
+        }
+    })
+}
+
+const setFormData = async (row: any = null) => {
+    loading.value = true
+    Object.assign(formData, initialFormData)
+    if (row) {
+        const data = await (await getLocalDeliveryServiceInfo(row.delivery_type)).data
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+            if (data.params[key] != undefined) formData[key] = data.params[key].value
+        })
+    }
+    loading.value = false
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/niucloud/addon/shop/admin/views/delivery/components/local_record_detail.vue b/niucloud/addon/shop/admin/views/delivery/components/local_record_detail.vue
new file mode 100644
index 000000000..24e0fb8a7
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery/components/local_record_detail.vue
@@ -0,0 +1,141 @@
+<template>
+    <el-drawer v-model="showDialog" :title="popTitle" direction="rtl" :before-close="handleClose" class="local-record-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <el-form :model="detailData" label-width="100px" ref="formRef" class="page-form"  label-position="left">
+                <div class="row-bg px-[20px] mb-[20px] multiple-layout">
+                    <el-form-item :label="t('deliveryServiceName')">
+						<div class="input-width">{{ detailData.delivery_service_name }}</div>
+					</el-form-item>
+					<el-form-item :label="t('goodsInfo')">
+						<div class="input-width">{{ detailData.body }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryNo')">
+						<div class="input-width">{{ detailData.delivery_no }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('tradeNo')">
+						<div class="input-width text-primary cursor-pointer" @click="toLink">{{ detailData.trade_no }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryStart')">
+						<div class="input-width">{{ detailData.delivery_start }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryEnd')">
+						<div class="input-width">{{ detailData.delivery_end }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryStatus')">
+						<div class="input-width">{{ detailData.status_name }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryDistance')">
+						<div class="input-width">{{ distance(detailData.delivery_distance) }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryMoney')">
+						<div class="input-width">￥{{ detailData.delivery_money }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('cancelTime')" v-if="detailData.cancel_time">
+						<div class="input-width">{{ detailData.cancel_time }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('riderName')" v-if="detailData.rider_name">
+						<div class="input-width">{{ detailData.rider_name }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('riderMobile')" v-if="detailData.rider_mobile">
+						<div class="input-width">{{ detailData.rider_mobile }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('outDeliveryNo')">
+						<div class="input-width">{{ detailData.out_delivery_no }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('remark')">
+						<div class="input-width">{{ detailData.remark }}</div>
+					</el-form-item>
+                </div>
+            </el-form>
+            <div>
+                <h3 class="mt-[50px] mb-[20px]" v-if="detailData.orderLog.length > 0">配送日志</h3>
+				<div class="mb-[100px]" style="min-height: 100px" v-if="detailData.orderLog.length > 0">
+					<div class="flex" v-for="(items, index) in detailData.orderLog" :key="index">
+						<div class="mr-[20px] min-w-[71px]">
+							<div class="leading-[1] w-full text-[14px] w-[100px] flex justify-end">
+								{{ items.create_time && items.create_time.split(' ')[0] }}
+							</div>
+							<div class="leading-[1] w-full text-[14px]  w-[100px] flex justify-end mt-[15px]">
+								{{ items.create_time && items.create_time.split(' ')[1] }}
+							</div>
+						</div>
+						<div>
+							<div class="w-[16px] h-[16px] flex items-center bg-[#D1EBFF] border-[1px] border-[#0091FF] rounded-[999px]">
+								<div class="w-[8px] h-[8px] mx-auto bg-[#0091FF] rounded-[999px]"></div>
+							</div>
+							<div v-if="(index + 1) != detailData.orderLog.length" class="w-[2px] h-[50px] bg-[#D1EBFF] mx-auto">
+							</div>
+						</div>
+						<div>
+							<div class="leading-[1] ml-[20px] text-[14px]">
+								{{ items.main_type_name }}{{ items.main_name }}
+							</div>
+							<div class="leading-[1] ml-[20px] text-[14px] mt-[15px]">
+								<span>{{ items.remark }}</span>
+							</div>
+						</div>
+					</div>
+				</div>
+            </div>
+        </div>
+    </el-drawer>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { t } from '@/lang'
+import { distance } from '@/utils/common'
+import { getLocalDeliveryInfo } from '@/addon/shop/api/delivery'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+const showDialog = ref(false)
+const loading = ref(false)
+const popTitle: string = '配送详情'
+const detailData = ref<any>({})
+let id: any = ''
+
+const handleClose = (done: () => void) => {
+    showDialog.value = false
+}
+
+const getLocalDeliveryInfoFn = async () => {
+    loading.value = true
+    if (id) {
+        detailData.value = await (await getLocalDeliveryInfo(id)).data
+        loading.value = false
+    } else {
+        loading.value = false
+    }
+    showDialog.value = true
+}
+const setFormData = async (row: any = null) => {
+    id = row.id
+    getLocalDeliveryInfoFn()
+}
+
+const toLink = () => {
+    const url = router.resolve({
+        path: '/shop/order/detail',
+        query: {
+            order_id: detailData.value.trade_id
+        }
+    })
+    window.open(url.href)
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss">
+.local-record-detail-drawer{
+    width: 1300px !important;
+    .input-width{
+        width: 280px;
+    }
+}
+
+</style>
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/views/delivery/components/shop_record_detail.vue b/niucloud/addon/shop/admin/views/delivery/components/shop_record_detail.vue
new file mode 100644
index 000000000..719efcd82
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery/components/shop_record_detail.vue
@@ -0,0 +1,139 @@
+<template>
+    <el-drawer v-model="showDialog" :title="popTitle" direction="rtl" :before-close="handleClose" class="local-record-detail-drawer">
+        <div class="main-container" v-loading="loading">
+            <el-form :model="detailData" label-width="100px" ref="formRef" class="page-form"  label-position="left">
+                <div class="row-bg px-[20px] mb-[20px] multiple-layout">
+                    <el-form-item :label="t('deliveryNo')">
+						<div class="input-width">{{ detailData.delivery_no }}</div>
+					</el-form-item>
+					<el-form-item :label="t('goodsInfo')">
+						<div class="input-width">{{ detailData.body }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('tradeNo')">
+						<div class="input-width text-primary cursor-pointer" @click="toLink">{{ detailData.trade_no }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryStart')">
+						<div class="input-width">{{ detailData.delivery_start }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryEnd')">
+						<div class="input-width">{{ detailData.delivery_end }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryStatus')">
+						<div class="input-width">{{ detailData.status_name }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryDistance')">
+						<div class="input-width">{{ distance(detailData.delivery_distance) }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('deliveryMoney')">
+						<div class="input-width">￥{{ detailData.delivery_money }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('cancelTime')" v-if="detailData.cancel_time">
+						<div class="input-width">{{ detailData.cancel_time }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('riderName')" v-if="detailData.rider_name">
+						<div class="input-width">{{ detailData.rider_name }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('riderMobile')" v-if="detailData.rider_mobile">
+						<div class="input-width">{{ detailData.rider_mobile }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('outDeliveryNo')">
+						<div class="input-width">{{ detailData.out_delivery_no }}</div>
+					</el-form-item>
+                    <el-form-item :label="t('remark')">
+						<div class="input-width">{{ detailData.remark }}</div>
+					</el-form-item>
+                </div>
+            </el-form>
+            <div>
+                <h3 class="mt-[50px] mb-[20px]" v-if="detailData.orderLog.length > 0">配送日志</h3>
+				<div class="mb-[100px]" style="min-height: 100px" v-if="detailData.orderLog.length > 0">
+					<div class="flex" v-for="(items, index) in detailData.orderLog" :key="index">
+						<div class="mr-[20px] min-w-[71px]">
+							<div class="leading-[1] w-full text-[14px] w-[100px] flex justify-end">
+								{{ items.create_time && items.create_time.split(' ')[0] }}
+							</div>
+							<div class="leading-[1] w-full text-[14px]  w-[100px] flex justify-end mt-[15px]">
+								{{ items.create_time && items.create_time.split(' ')[1] }}
+							</div>
+						</div>
+						<div>
+							<div class="w-[16px] h-[16px] flex items-center bg-[#D1EBFF] border-[1px] border-[#0091FF] rounded-[999px]">
+								<div class="w-[8px] h-[8px] mx-auto bg-[#0091FF] rounded-[999px]"></div>
+							</div>
+							<div v-if="index + 1 != detailData.orderLog.length" class="w-[2px] h-[50px] bg-[#D1EBFF] mx-auto">
+							</div>
+						</div>
+						<div>
+							<div class="leading-[1] ml-[20px] text-[14px]">
+								{{ items.main_type_name }}{{ items.main_name }}
+							</div>
+							<div class="leading-[1] ml-[20px] text-[14px] mt-[15px]">
+								<span>{{ items.remark }}</span>
+							</div>
+						</div>
+					</div>
+				</div>
+            </div>
+        </div>
+    </el-drawer>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { t } from '@/lang'
+import { distance } from '@/utils/common'
+import { getShopDeliveryInfo } from '@/addon/shop/api/delivery'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+const showDialog = ref(false)
+const loading = ref(false)
+const popTitle: string = '配送详情'
+const detailData = ref<any>({})
+let id: any = ''
+
+const handleClose = (done: () => void) => {
+    showDialog.value = false
+}
+
+const getShopDeliveryInfoFn = async () => {
+    loading.value = true
+    if (id) {
+        detailData.value = await (await getShopDeliveryInfo(id)).data
+        loading.value = false
+    } else {
+        loading.value = false
+    }
+    showDialog.value = true
+}
+const setFormData = async (row: any = null) => {
+    id = row.id
+    getShopDeliveryInfoFn()
+}
+
+const toLink = () => {
+    const path = '/shop/order/detail'
+    const url = router.resolve({
+        path,
+        query: {
+            order_id: detailData.value.trade_id
+        }
+    })
+    window.open(url.href)
+}
+
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss">
+.local-record-detail-drawer{
+    width: 1300px !important;
+    .input-width{
+        width: 280px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/views/delivery/config.vue b/niucloud/addon/shop/admin/views/delivery/config.vue
index da66460b7..15ba2e281 100644
--- a/niucloud/addon/shop/admin/views/delivery/config.vue
+++ b/niucloud/addon/shop/admin/views/delivery/config.vue
@@ -25,16 +25,16 @@
                                 <span class="text-[#666666] text-[14px]">{{ t(item.key) }}</span>
                                 <div>
                                     <template v-if="item.key === 'local_delivery'">
-                                        <el-button type="primary" link @click="goRouter('/shop/order/delivery/staff')">{{ t('deliveryStaff') }}</el-button>
-                                        <el-button type="primary" link @click="goRouter('/shop/order/delivery/local')">{{ t('localConfig') }}</el-button>
+                                        <el-button type="primary" link @click="goRouter('/shop/delivery/local_config')">基础配置</el-button>
+                                        <el-button type="primary" link @click="goRouter('/shop/delivery/local')">{{ t('localConfig') }}</el-button>
                                     </template>
                                     <template v-if="item.key === 'express'">
-                                        <el-button type="primary" link @click="goRouter('/shop/order/delivery/company')">{{ t('deliveryCompany') }}</el-button>
-                                        <el-button type="primary" link @click="goRouter('/shop/order/shipping/template')">{{ t('deliveryTemplate') }}</el-button>
-                                        <el-button type="primary" link @click="goRouter('/shop/order/delivery/search')">{{ t('deliverySearch') }}</el-button>
+                                        <el-button type="primary" link @click="goRouter('/shop/delivery/company')">{{ t('deliveryCompany') }}</el-button>
+                                        <el-button type="primary" link @click="goRouter('/shop/shipping/template')">{{ t('deliveryTemplate') }}</el-button>
+                                        <el-button type="primary" link @click="goRouter('/shop/delivery/search')">{{ t('deliverySearch') }}</el-button>
                                     </template>
                                     <template v-if="item.key === 'store'">
-                                        <el-button type="primary" link @click="goRouter('/shop/order/delivery/store')">{{ t('deliveryStore') }}</el-button>
+                                        <el-button type="primary" link @click="goRouter('/shop/delivery_store')">{{ t('deliveryStore') }}</el-button>
                                     </template>
                                 </div>
                             </div>
diff --git a/niucloud/addon/shop/admin/views/delivery/local.vue b/niucloud/addon/shop/admin/views/delivery/local.vue
index d9feec95f..1dda31125 100644
--- a/niucloud/addon/shop/admin/views/delivery/local.vue
+++ b/niucloud/addon/shop/admin/views/delivery/local.vue
@@ -5,141 +5,7 @@
         </el-card>
 
         <el-card class="box-card !border-none" shadow="never">
-            <el-form label-width="120px" ref="formRef" :rules="formRules" :model="formData" class="page-form"
-                v-loading="loading">
-                <!-- <h3 class="panel-title">{{t('basicSettings')}}</h3> -->
-                <el-form-item :label="t('deliveryType')" prop="delivery_type">
-                    <!-- <el-checkbox-group v-model="formData.delivery_type">
-                        <el-checkbox label="business">{{ t('business') }}</el-checkbox>
-                        <el-checkbox label="third">{{ t('三方配送') }}</el-checkbox>
-                    </el-checkbox-group> -->
-                    <el-radio-group v-model="formData.delivery_type">
-                        <el-radio :label="'business'">{{ t('business') }}</el-radio>
-                        <el-radio :label="'third'">{{ t('thrid') }}</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item :label="t('thrid')" prop="time_is_open" v-if="formData.delivery_type=='third'">
-                    <div v-for="(service, index) in thirdPartyData" :key="service.type">
-                        <div class="flex items-center mr-[20px]">
-                            <span class="mr-[10px]">{{ service.name }}</span>
-                            <el-switch v-model="service.isEnabled" @change="handleServiceChange(index)"></el-switch>
-                        </div>
-                    </div>
-                </el-form-item>
-                <template v-if="activeService && formData.delivery_type=='third'">
-                    <el-form-item :label="t('AppKey')" prop="app_key">
-                        <el-input v-model="activeService.config.app_key" clearable :placeholder="t('AppKeyRequire')" class="input-width" maxlength="100" show-word-limit />
-                    </el-form-item>
-                    <el-form-item :label="t('AppSecret')" prop="app_secret">
-                        <el-input v-model="activeService.config.app_secret" clearable :placeholder="t('AppSecretRequire')" class="input-width" maxlength="100" show-word-limit />
-                    </el-form-item>
-                    <el-form-item :label="t('shopId')" prop="shop_id">
-                        <el-input v-model="activeService.config.shop_id" clearable :placeholder="t('shopIdRequire')" class="input-width" maxlength="100" show-word-limit />
-                    </el-form-item>
-                    <el-form-item :label="t('shopStoreNo')" prop="shop_store_no">
-                        <el-input v-model="activeService.config.shop_store_no" clearable :placeholder="t('shopStoreNoRequire')" class="input-width" maxlength="100" show-word-limit />
-                    </el-form-item>
-                </template>
-                <el-form-item :label="t('timeIsOpen')" prop="time_is_open">
-                    <div>
-                        <el-radio-group v-model="formData.time_is_open">
-                            <el-radio :label="1">{{ t('open') }}</el-radio>
-                            <el-radio :label="0">{{ t('close') }}</el-radio>
-                        </el-radio-group>
-                        <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{t('timeIsOpenTips')}}</div>
-                    </div>
-                </el-form-item>
-                <template v-if="formData.time_is_open === 1">
-                    <el-form-item>
-                        <el-radio-group v-model="formData.time_type">
-                            <el-radio :label="0">{{ t('everyDay') }}</el-radio>
-                            <el-radio :label="1">{{ t('custom') }}</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-                    <el-form-item prop="time_week" v-if="formData.time_type===1">
-                        <el-checkbox-group v-model="formData.time_week">
-                            <el-checkbox label="1">{{ t('monday') }}</el-checkbox>
-                            <el-checkbox label="2">{{ t('tuesday') }}</el-checkbox>
-                            <el-checkbox label="3">{{ t('wednesday') }}</el-checkbox>
-                            <el-checkbox label="4">{{ t('thursday') }}</el-checkbox>
-                            <el-checkbox label="5">{{ t('friday') }}</el-checkbox>
-                            <el-checkbox label="6">{{ t('saturday') }}</el-checkbox>
-                            <el-checkbox label="0">{{ t('sunday') }}</el-checkbox>
-                        </el-checkbox-group>
-                    </el-form-item>
-                    <el-form-item :label="t('deliveryTime')" prop="delivery_time">
-                        <div>
-                            <div>
-                                <div v-for="(timeRange, index) in formData.delivery_time" :key="index" class="mb-3">
-                                    <el-time-picker v-model="timeRange.start_time" :placeholder="t('startTime')"
-                                        format="HH:mm" value-format="HH:mm"
-                                        :picker-options="{selectableRange: '00:00 - 23:59'}" />
-                                    <span class="mx-2">-</span>
-                                    <el-time-picker v-model="timeRange.end_time" :placeholder="t('endTime')" format="HH:mm"
-                                        value-format="HH:mm" :picker-options="{selectableRange: '00:00 - 23:59'}" />
-                                    <span v-if="index > 0" class="text-primary cursor-pointer ml-[10px]"
-                                        @click="removeTimeRange(index)"> {{ t('delete') }}</span>
-                                </div>
-                                <span class="text-primary cursor-pointer mr-[10px]" @click="addTimeRange"
-                                    v-if="formData.delivery_time.length < 3"> {{ t('addTime') }}</span>
-                            </div>
-                            <div class="text-[12px] text-[#999]">{{ t('deliveryTimeTips') }}</div>
-                        </div>
-
-                    </el-form-item>
-
-                    <el-form-item :label="t('timeInterval')" prop="time_interval">
-                        <div>
-                            <el-radio-group v-model="formData.time_interval">
-                                <el-radio :label="30">{{ t('30minute') }}</el-radio>
-                                <el-radio :label="60">{{ t('oneHour') }}</el-radio>
-                                <el-radio :label="90">{{ t('90minute') }}</el-radio>
-                                <el-radio :label="120">{{ t('twoHour') }}</el-radio>
-                            </el-radio-group>
-                            <!-- <p class="text-[12px] text-[#999]">{{ t('storeTimeIntervalTips') }}</p> -->
-                        </div>
-
-                    </el-form-item>
-                    <el-form-item :label="t('advancaDay')" prop="advance_day">
-                        <div>
-                            <div class="flex">
-                                {{ t('advance') }}
-                                <div class="w-[100px] mx-[5px]">
-                                    <el-input v-model.trim="formData.advance_day" />
-                                </div>
-                                {{ t('day') }}
-                            </div>
-                            <p class="text-[12px] text-[#999]">{{ t('advanceTips') }}</p>
-                        </div>
-                    </el-form-item>
-                    <el-form-item :label="t('mostDays')" prop="most_day">
-                        <div>
-                            <div class="flex">
-                               {{ t('reservationAvailable') }}
-                                <div class="w-[100px] mx-[5px]">
-                                    <el-input v-model.trim="formData.most_day" />
-                                </div>
-                              {{ t('withinDays') }}
-                            </div>
-                            <p class="text-[12px] text-[#999]">{{ t('mostDaysTips') }}</p>
-                        </div>
-                    </el-form-item>
-                </template>
-
-                <el-form-item :label="t('deliveryAddress')" prop="delivery_address">
-                    <div class="flex flex-col">
-                        <div class="flex">
-                            {{ defaultDeliveryAddress ? defaultDeliveryAddress.full_address :
-                            t('defaultDeliveryAddressEmpty') }}
-                            <el-button type="primary" @click="router.push('/shop/order/address')" link
-                                class="ml-[10px]">{{ defaultDeliveryAddress ? t('update') : t('toSetting')
-                                }}</el-button>
-                        </div>
-                        <div class="text-error leading-none"
-                            v-if="formData.center.lat && defaultDeliveryAddress && (formData.center.lat != defaultDeliveryAddress.lat || formData.center.lng != defaultDeliveryAddress.lng)">
-                            {{ t('deliveryAddressChange') }}</div>
-                    </div>
-                </el-form-item>
+            <el-form label-width="80px" ref="formRef" :rules="formRules" :model="formData" class="page-form" v-loading="loading">
                 <el-form-item :label="t('feeType')">
                     <el-radio-group v-model="formData.fee_type">
                         <el-radio label="region">{{ t('region') }}</el-radio>
@@ -166,7 +32,7 @@
                         {{ t('priceUnit') }}
                     </div>
                 </el-form-item>
-                <el-form-item :label="t('weightFee')" prop="">
+                <el-form-item :label="t('weightFee')" prop="weight">
                     <div class="flex">
                         {{ t('weightFeeTextOne') }}
                         <div class="w-[60px] mx-[5px]">
@@ -183,36 +49,53 @@
                         {{ t('priceUnit') }}
                     </div>
                 </el-form-item>
-
-                <el-form-item prop="area" v-loading="mapLoading">
-                    <div class="relative w-full">
-                        <div id="container" class="w-full h-[520px]"></div>
-                        <div class="absolute bg-white w-[270px] h-[500px] top-[10px] left-[10px] region-list">
-                            <el-scrollbar>
-                                <div class="p-[10px] region-item pr-[50px] relative"
-                                    v-for="(item, index) in formData.area" :key="index"
-                                    :class="{ '!border-primary': index == currArea }" @click="selectArea(index)">
-                                    <el-form label-width="80px" :model="item" :rules="formRules" class="page-form"
-                                        ref="areaFromRef">
-                                        <div class="pb-[18px]">
-                                            <el-form-item :label="t('areaName')" prop="area_name">
-                                                <el-input v-model.trim="formData.area[index].area_name" type="text" />
-                                            </el-form-item>
+                <el-form-item :label="t('deliveryArea')" prop="delivery_area">
+                     <div class="w-full border-[1px] border-solid border-[#dcdfe6] flex" v-loading="mapLoading">
+                        <div class="store-wrap  w-[270px] h-[520px] border-r-[1px] border-solid border-[#dcdfe6]">
+                            <div class="relative h-[520px]" v-if="deliveryStoreList.length">
+                                <div class="h-[450px] overflow-y-auto">
+                                    <div class="h-[70px] cursor-pointer px-[10px] flex flex flex-col justify-center border-b-[1px] border-solid border-[#dcdfe6] box-border" :class="{'bg-[#E6F1FE] text-primary': curDelivery.store_id == item.store_id }" v-for="(item,index) in deliveryStoreList" :key="index" @click="handleMap(item)">
+                                        <div class="text-[16px] leading-[20px] mb-[6px] flex items-center justify-between">
+                                            <span class="using-hidden">{{ item.store_name  }}</span>
+                                            <el-button type="primary" @click.stop="toLink(item)" link class="ml-[10px] !text-[12px]">配置</el-button>
                                         </div>
-                                        <div class="pb-[18px]">
-                                            <el-form-item :label="t('startPrice')" prop="start_price">
-                                                <el-input v-model.trim="formData.area[index].start_price"  maxlength="8" type="text"
-                                                    @keyup="filterDigit($event)" />
+                                        <div class="text-[12px] text-[#999] leading-[16px] multi-hidden" :class="{'!text-primary': curDelivery.store_id == item.store_id }">地址：{{ item.full_address }}</div>
+                                    </div>
+                                </div>
+                                <div class="absolute left-0 right-0 bottom-0 h-[70px] flex items-center bg-[#fff] px-[20px]">
+                                    <el-button type="primary" @click="newWindow()" class="w-full box-border">新增配送点</el-button>
+                                </div>
+                            </div>
+                            <div v-else  class="h-full flex flex-col items-center justify-center">
+                                <span class="text-[14px] mb-[10px]">请到配送点中添加配送区域</span>
+                                <el-button type="primary" @click="newWindow()" link class="ml-[10px]">{{ t('toSetting') }}</el-button>
+                            </div>
+                        </div>
+                        <div class="relative flex-1">
+                            <div id="container" class="w-full h-[520px]"></div>
+                            <div class="absolute bg-white w-[270px] h-[500px] top-[10px] left-[10px] region-list" v-if="deliveryStoreList.length">
+                                <el-scrollbar>
+                                    <div class="p-[10px] region-item pr-[50px] relative"  v-for="(item, index) in curDelivery.area" :key="index" :class="{ '!border-primary': index == currArea }" @click="selectArea(index)">
+                                        <el-form label-width="80px" :model="item" :rules="formRules" class="page-form" ref="areaFromRef">
+                                            <div class="pb-[18px]">
+                                                <el-form-item :label="t('areaName')" prop="area_name">
+                                                    <el-input v-model.trim="curDelivery.area[index].area_name" type="text" @click.stop=""/>
+                                                </el-form-item>
+                                            </div>
+                                            <div class="pb-[18px]">
+                                                <el-form-item :label="t('startPrice')" prop="start_price">
+                                                <el-input v-model.trim="curDelivery.area[index].start_price"  maxlength="8" type="text"
+                                                    @keyup="filterDigit($event)" @click.stop="" />
                                             </el-form-item>
                                         </div>
                                         <div class="pb-[10px]" v-show="formData.fee_type == 'region'">
                                             <el-form-item :label="t('deliveryPrice')" prop="delivery_price">
-                                                <el-input v-model.trim="formData.area[index].delivery_price" type="text"
-                                                    @keyup="filterDigit($event)" />
+                                                <el-input v-model.trim="curDelivery.area[index].delivery_price" type="text"
+                                                    @keyup="filterDigit($event)"  @click.stop=""/>
                                             </el-form-item>
                                         </div>
                                         <el-form-item :label="t('areaType')">
-                                            <el-radio-group v-model="formData.area[index].area_type" @change="areaTypeChange(index)">
+                                            <el-radio-group v-model="curDelivery.area[index].area_type" @change="areaTypeChange(index)">
                                                 <el-radio label="radius" size="large" class="!mr-[10px]">{{ t('radius') }}</el-radio>
                                                 <el-radio label="custom" size="large" class="!mr-[0px]">{{ t('custom') }}</el-radio>
                                             </el-radio-group>
@@ -225,6 +108,7 @@
                                     <el-button plain @click="addArea">{{ t('addDeliveryArea') }}</el-button>
                                 </div>
                             </el-scrollbar>
+                            </div>
                         </div>
                     </div>
                 </el-form-item>
@@ -240,111 +124,25 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, onMounted, onBeforeUnmount,toRaw } from 'vue'
+import { ref, computed, onMounted, onBeforeUnmount, toRaw } from 'vue'
 import { t } from '@/lang'
-import { ArrowLeft } from "@element-plus/icons-vue"
+import { ArrowLeft } from '@element-plus/icons-vue'
 import { useRoute, useRouter } from 'vue-router'
 import { getMap } from '@/app/api/sys'
 import { guid, filterDigit, deepClone } from '@/utils/common'
 import { createCircle, deleteGeometry, createPolygon, selectGeometry, createMarker } from '@/utils/qqmap'
-import { setLocal, getLocal ,getThird} from '@/addon/shop/api/delivery'
-import { FormInstance } from 'element-plus'
+import { setLocal, getLocal, getDeliveryStoreListAll } from '@/addon/shop/api/delivery'
+import { FormInstance, ElMessage } from 'element-plus'
 import Test from '@/utils/test'
-import { getShopDefaultDeliveryAddressInfo } from '@/addon/shop/api/shop_address'
 
 const route = useRoute()
 const router = useRouter()
 const loading = ref(true)
 const pageName = route.meta.title
 const formRef = ref<FormInstance>()
-const areaFromRef: any = ref<FormInstance[]>()
-interface addressType{
-    full_address:string
-    lat:string
-    lng:string
-}
-const defaultDeliveryAddress:any = ref<addressType|null>(null)
-const getDefaultDeliveryAddress = async () => {
-    await getShopDefaultDeliveryAddressInfo().then(({ data }) => {
-        defaultDeliveryAddress.value = data
-    }).catch()
-}
-getDefaultDeliveryAddress()
-const thirdPartyData = ref<any>(null)
 
-const getThirdFn = ()=> {
-    getThird().then((res) => {
-        thirdPartyData.value = res.data.map((item: any) => ({
-            ...item,
-            isEnabled: false, // 默认关闭
-            config: {
-                app_key: '',
-                app_secret: '',
-                shop_id: '',
-                shop_store_id: ''
-            }
-        }));
-    })
-}
-
-const activeService = computed(() => {
-    if (!thirdPartyData.value || thirdPartyData.value.length === 0) {
-        return null;
-    }
-    return thirdPartyData.value.find(service => service.isEnabled) || null;
-});
-
-// 处理服务开关变化（只能开启一个服务）
-const handleServiceChange = (index: number) => {
-    const service = thirdPartyData.value[index];
-    if (service.isEnabled) {
-        thirdPartyData.value.forEach((s, i) => {
-        if (i !== index) {
-            s.isEnabled = false;
-        }
-        });
-    }
-};
-
-const buildThirdPartyConfig = () => {
-    const config: Record<string, any> = {};
-
-    thirdPartyData.value.forEach(service => {
-        config[service.type] = {
-            app_key: service.config.app_key,
-            app_secret: service.config.app_secret,
-            shop_id: service.config.shop_id,
-            shop_store_no: service.config.shop_store_no
-        };
-
-        if (service.isEnabled) {
-            config.default = service.type;
-        }
-    });
-
-    return config;
-};
-
-
-getThirdFn()
-const formData = ref({
-    center: {
-        lat: '',
-        lng: ''
-    },
-    // delivery_type: ['business'],
-    delivery_type: 'business',
-    fee_type: 'region',
-    time_is_open:1,
-    time_type:0,
-    time_week: <any>[],
-    base_dist: '',
-    base_price: '',
-    grad_dist: '',
-    grad_price: '',
-    weight_start: 0.000,
-    weight_unit: 0,
-    weight_price: 0,
+const deliveryStoreList = ref<any>([])
+const curDelivery = ref<any>({
     area: [
         {
             area_name: '',
@@ -355,16 +153,27 @@ const formData = ref({
                 key: guid()
             }
         }
-    ],
-    delivery_time: [
-        { start_time: '', end_time: '' } // 初始一个时间段
-    ],
-    time_interval: 30,
-    most_day: 7,
-    advance_day: 0,
-    time_most: 1,
-    time_advance:1,
-    third_party_config:{}
+    ]
+})
+const getDeliveryStoreListAllFn = async () => {
+    deliveryStoreList.value = await (await getDeliveryStoreListAll({ pick_up_type: 'local_delivery' })).data
+    curDelivery.value = deliveryStoreList.value[0]
+}
+getDeliveryStoreListAllFn()
+
+const formData = ref({
+    center: {
+        lat: '',
+        lng: ''
+    },
+    fee_type: 'region',
+    base_dist: '',
+    base_price: '',
+    grad_dist: '',
+    grad_price: '',
+    weight_start: 0.000,
+    weight_unit: 0,
+    weight_price: 0
 })
 
 // 正则表达式
@@ -378,39 +187,22 @@ const regExp = {
 // 表单验证规则
 const formRules = computed(() => {
     return {
-        time_week: [{ required: true, message: t('timeWeekRequire'), trigger: 'change' }],
-        delivery_address: [
-            {
-                validator: (rule: any, value: any, callback: any) => {
-                    if (!defaultDeliveryAddress.value) {
-                        callback(new Error(t('defaultDeliveryAddressEmpty')))
-                    }
-                    callback()
-                }
-            }
-        ],
-        // delivery_type: [
-        //     {
-        //         validator: (rule: any, value: any, callback: any) => {
-        //             if (!formData.value.delivery_type.length) {
-        //                 callback(new Error(t('deliveryTypeRequire')))
-        //             }
-        //             callback()
-        //         }
-        //     }
-        // ],
         distance: [
             {
                 validator: (rule: any, value: any, callback: any) => {
                     if (formData.value.fee_type == 'distance') {
                         if (Test.require(formData.value.base_dist)) {
                             callback(new Error(t('baseDistRequire')))
+                        } else if (Number(formData.value.base_dist) <= 0) {
+                            callback(new Error(t('起始公里数不能小于等于0')))
                         }
                         if (Test.require(formData.value.base_price)) {
                             callback(new Error(t('basePriceRequire')))
                         }
                         if (Test.require(formData.value.grad_dist)) {
                             callback(new Error(t('gradDistRequire')))
+                        } else if (Number(formData.value.grad_dist) <= 0) {
+                            callback(new Error(t('超出公里数不能小于等于0')))
                         }
                         if (Test.require(formData.value.grad_price)) {
                             callback(new Error(t('gradPriceRequire')))
@@ -418,187 +210,32 @@ const formRules = computed(() => {
                     }
                     callback()
                 },
-                trigger: 'blur'
+                trigger: ['blur', 'change']
             }
         ],
-        area_name: [{ required: true, message: t('areaNameRequire'), trigger: 'blur' }],
-        start_price: [
-            { required: true, message: t('startPriceRequire'), trigger: 'blur' },
+        weight: [
             {
                 validator: (rule: any, value: any, callback: any) => {
-                    if (parseInt(value) < 0) {
-                        callback(new Error(t('startPriceMin')))
-                    }
-                    callback()
-                },
-                trigger: 'blur'
-            }
-        ],
-        delivery_price: [
-            { required: formData.value.fee_type == 'region', message: t('deliveryPriceRequire'), trigger: 'blur' },
-            {
-                validator: (rule: any, value: any, callback: any) => {
-                    if (parseInt(value) < 0) {
-                        callback(new Error(t('deliveryPriceMin')))
-                    }
-                    callback()
-                },
-                trigger: 'blur'
-            }
-        ],
-        area: [
-            {
-                validator: (rule: any, value: any, callback: any) => {
-                    if (Test.empty(formData.value.area)) {
-                        callback(new Error(t('areaPlaceholder')))
-                    }
-                    callback()
-                },
-                trigger: 'blur'
-            }
-        ],
-        delivery_time: [
-            {
-                validator: (rule: any, value: any, callback: any) => {
-                    if (!value || value.length === 0) {
-                        return callback(new Error(t('tradeTimePlaceholderTwo')))
-                    }
-                    for (let i = 0; i < value.length; i++) {
-                        const timeRange = value[i]
-                        if (!timeRange.start_time || !timeRange.end_time) {
-                            return callback(new Error(t('tradeTimePlaceholderTwo')))
+                    if (formData.value.fee_type == 'distance') {
+                        if (Number(formData.value.weight_start) <= 0) { // 重量不能小于等于0
+                            callback(new Error(t('商品重量不能小于等于0')))
                         }
-                        // 结束时间不能小于或等于开始时间
-                        if (timeRange.end_time <= timeRange.start_time) {
-                            return callback(new Error(t('tradeTimePlaceholderFour')))
-                        }
-                        // 确保后一个时间段的开始时间不能小于前一个时间段的结束时间
-                        if (i > 0 && value[i].start_time < value[i - 1].end_time) {
-                            return callback(new Error(t('tradeTimePlaceholderFive')))
+                        if (Number(formData.value.weight_unit) <= 0) { // 超出重量不能小于等于0
+                            callback(new Error(t('商品超出重量不能小于等于0')))
                         }
                     }
                     callback()
                 },
-                trigger: 'change',
-                required: true
-            }
-        ],
-        time_interval: [
-            { required: true, message: t('tradeTimePlaceholderThree'), trigger: 'change' }
-        ],
-        advance_day:[
-            {
-                validator(rule, value, callback) {
-                    if (value === null || value === '') {
-                        callback()
-                    } else if (isNaN(value) || !regExp.number.test(value)) {
-                        callback(t('formatError'))
-                    } else if (value < 0) {
-                        callback(t('notLessThanZero'))
-                    } else {
-                        callback();
-                    }
-                },
-                trigger: 'blur'
-            }
-        ],
-        most_day:[
-            {
-                validator(rule, value, callback) {
-                    if (value === null || value === '') {
-                        callback()
-                    } else if (isNaN(value) || !regExp.number.test(value)) {
-                        callback(t('formatError'))
-                    } else if (value <= 0) {
-                        callback(t('mustBeGreaterThanZero'))
-                    } else {
-                        callback();
-                    }
-                },
-                trigger: 'blur'
+                trigger: ['blur', 'change']
             }
         ]
     }
 })
-const validateThirdPartyConfig = () => {
-    if (formData.value.delivery_type !== 'third') return true;
-
-    const active = thirdPartyData.value.find(item => item.isEnabled);
-    if (!active) {
-        ElMessage.error(t('thridRequire'));
-        return false;
-    }
-
-    const { app_key, app_secret, shop_id ,shop_store_no} = active.config;
-    if (!app_key || !app_secret || !shop_id || !shop_store_no) {
-        ElMessage.error(t('thridSeting'));
-        return false;
-    }
-
-    return true;
-};
-
-// 添加时间段
-const addTimeRange = () => {
-    formData.value.delivery_time.push({ start_time: '', end_time: '' })
-}
-
-// 删除时间段
-const removeTimeRange = (index: number) => {
-    formData.value.delivery_time.splice(index, 1)
-}
-
-const timeTransition = (time:any) => {
-    const arr = time.split(':')
-    const num = arr[0] * 60 * 60 + arr[1] * 60
-    return num
-}
-
-const timestampTransition = (timeStamp:any) => {
-    let hour = Math.floor(timeStamp / (60 * 60))
-    let minute = Math.floor(timeStamp / 60) - (hour * 60)
-    hour = hour < 10 ? ('0' + hour) : hour
-    minute = minute < 10 ? ('0' + minute) : minute
-
-    return hour + ':' + minute
-}
 
 getLocal().then(({ data }) => {
     loading.value = false
     if (data) Object.assign(formData.value, data)
-    formData.value.time_week = formData.value.time_week?formData.value.time_week.split(','):[]
-    if (Array.isArray(data.delivery_type) && data.delivery_type.length > 0) {
-        formData.value.delivery_type = data.delivery_type[0];
-    } else {
-        formData.value.delivery_type = data.delivery_type || 'business';
-    }
-     // 处理 delivery_time 格式
-    if (data.delivery_time === '' || data.delivery_time === null) {
-        formData.value.delivery_time = [{ start_time: '', end_time: '' }];
-    } else if (Array.isArray(data.delivery_time)) {
-        formData.value.delivery_time = data.delivery_time.map((item: any) => ({
-            start_time: timestampTransition(item.start_time),
-            end_time: timestampTransition(item.end_time)
-        }));
-    }
-
-    // 回显 third_party_config 到 thirdPartyData
-    if (data.third_party_config) {
-        thirdPartyData.value.forEach(service => {
-            const config = data.third_party_config[service.type];
-            if (config) {
-                service.isEnabled = service.type == data.third_party_config.default;
-                service.config = {
-                    app_key: config.app_key || '',
-                    app_secret: config.app_secret || '',
-                    shop_id: config.shop_id || '',
-                    shop_store_id: config.shop_store_id || '',
-                    shop_store_no: config.shop_store_no || '',
-                };
-            }
-        });
-    }
-}).catch(()=>{
+}).catch(() => {
     loading.value = false
 })
 
@@ -620,34 +257,37 @@ onMounted(() => {
  * 初始化地图
  */
 let map: any
+let marker: any
 const mapLoading = ref(true)
 const initMap = () => {
     const TMap = (window as any).TMap
     const LatLng = TMap.LatLng
-    const center = new LatLng(defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lat : 39.980619, defaultDeliveryAddress.value ? defaultDeliveryAddress.value.lng : 116.321277)
+    const center = new LatLng(
+        curDelivery.value ? curDelivery.value.latitude : 39.980619,
+        curDelivery.value ? curDelivery.value.longitude : 116.321277
+    )
 
     map = new TMap.Map('container', {
         center,
         zoom: 14
     })
-    createMarker(map)
+
+    marker = createMarker(map)
 
     map.on('tilesloaded', () => {
         mapLoading.value = false
     })
 
-    formData.value.area.forEach(item => {
-        item.area_type == 'radius' ? createCircle(map, item.area_json) : createPolygon(map, item.area_json)
-    })
+    if (curDelivery.value) {
+        curDelivery.value.area.forEach((item: any) => {
+            item.area_type == 'radius' ? createCircle(map, item.area_json) : createPolygon(map, item.area_json)
+        })
+    }
 }
-
 const currArea = ref<number>(0)
 
-/**
- * 添加配送区域
- */
 const addArea = () => {
-    formData.value.area.push({
+    curDelivery.value.area.push({
         area_name: '',
         area_type: 'radius',
         start_price: 0,
@@ -656,68 +296,109 @@ const addArea = () => {
             key: guid()
         }
     })
-    const index = formData.value.area.length - 1
-    createCircle(map, formData.value.area[index].area_json)
+    const index = curDelivery.value.area.length - 1
+    createCircle(map, curDelivery.value.area[index].area_json)
 }
 
 /**
  * 删除配送区域
  */
 const deleteArea = (index: number) => {
-    const data = formData.value.area[index]
+    const data = curDelivery.value.area[index]
     deleteGeometry(data.area_json.key)
-    formData.value.area.splice(index, 1)
+    curDelivery.value.area.splice(index, 1)
 }
 
 const selectArea = (index: number) => {
     currArea.value = index
-    const data = formData.value.area[index]
+    const data = curDelivery.value.area[index]
     selectGeometry(data.area_json.key)
 }
 
 const areaTypeChange = (index: number) => {
-    const data = formData.value.area[index]
+    const data = curDelivery.value.area[index]
     deleteGeometry(data.area_json.key)
     data.area_type == 'radius' ? createCircle(map, data.area_json) : createPolygon(map, data.area_json)
 }
+const handleMap = (data:any) => {
+    deliveryStoreList.value.forEach((item: any) => {
+        if (item.store_id == curDelivery.value.store_id) {
+            item = deepClone(toRaw(item))
+        }
+    })
+    curDelivery.value.area.forEach((item: any) => {
+        deleteGeometry(item.area_json.key)
+    })
+    curDelivery.value = data
+    setTimeout(() => {
+        const latLng = new (window as any).TMap.LatLng(curDelivery.value.latitude, curDelivery.value.longitude)
+        map.setCenter(latLng)
+        marker.updateGeometries({
+            id: 'center',
+            position: latLng
+        })
+        curDelivery.value.area.forEach((item: any) => {
+            // 重新创建图形
+            item.area_json.center = {
+                lat: curDelivery.value.latitude,
+                lng: curDelivery.value.longitude
+            }
+            item.area_type == 'radius' ? createCircle(map, item.area_json) : createPolygon(map, item.area_json)
+        })
+    }, 500)
+}
 
 onBeforeUnmount(() => {
-    map.destroy()
+    map?.destroy()
 })
 
+const verify = () => {
+    let flag = true
+    for (let i = 0; i < deliveryStoreList.value.length; i++) {
+        const temp = deliveryStoreList.value[i].area
+        if (Test.require(temp)) {
+            flag = false
+            ElMessage({ type: 'warning', message: `门店${deliveryStoreList.value[i].store_name}的配送区域不能为空` })
+            break
+        }
+        for (let j = 0; j < temp.length; j++) {
+            const val = temp[j]
+            if (Test.require(val.area_name)) {
+                flag = false
+                ElMessage({ type: 'warning', message: `门店${deliveryStoreList.value[i].store_name}${j + 1}的配送区域名称不能为空` })
+                break
+            }
+            if (parseInt(val.start_price) < 0) {
+                flag = false
+                ElMessage({ type: 'warning', message: `门店${deliveryStoreList.value[i].store_name}${j + 1}的起送价不能小于0` })
+                break
+            }
+            if (parseInt(val.delivery_price) < 0 && formData.value.fee_type == 'region') {
+                flag = false
+                ElMessage({ type: 'warning', message: `门店${deliveryStoreList.value[i].store_name}${j + 1}的配送费不能小于0` })
+                break
+            }
+        }
+        if (!flag) break
+    }
+    return flag
+}
 const onSave = async (formEl: FormInstance | undefined) => {
+    if (!verify()) return
+
     if (loading.value || !formEl) return
 
     await formEl.validate(async (valid) => {
-        let areaValidate = true
-
-        for (let i = 0; i < areaFromRef.value?.length; i++) {
-            const ref = areaFromRef.value[i]
-            await ref.validate(async (valid) => {
-                areaValidate = valid
-            })
-            if (!areaValidate) break
-        }
-        if (!areaValidate) return
-        if (!validateThirdPartyConfig()) return;
-
         if (valid) {
             loading.value = true
-
-            formData.value.center = {
-                lat: defaultDeliveryAddress.value.lat,
-                lng: defaultDeliveryAddress.value.lng
-            }
-            
             await formEl.validate(async (valid) => {
                 const param = deepClone(toRaw(formData.value))
-                param.time_week = param.time_week.toString()
-                param.delivery_time = param.delivery_time.map(range => ({
-                    start_time: range.start_time ? timeTransition(range.start_time) : null,
-                    end_time: range.end_time ? timeTransition(range.end_time) : null
-                }))
-                param.third_party_config = buildThirdPartyConfig()
-                param.delivery_type = [param.delivery_type]
+                const data: any = {}
+                deliveryStoreList.value.forEach((item: any) => {
+                    item = deepClone(toRaw(item))
+                    data[item.store_id] = item.area
+                })
+                param.area_data = data
                 setLocal(param).then(() => {
                     loading.value = false
                 }).catch(() => {
@@ -727,9 +408,25 @@ const onSave = async (formEl: FormInstance | undefined) => {
         }
     })
 }
-
+// 新窗口打开
+const newWindow = () => {
+    const url = router.resolve({
+        path: '/shop/delivery_store'
+    })
+    window.open(url.href)
+}
 const back = () => {
-    router.push({ path: '/shop/order/delivery' })
+    router.push({ path: '/shop/delivery/config' })
+}
+
+const toLink = (data: any) => {
+    const url = router.resolve({
+        path: '/shop/delivery_store/edit',
+        query: {
+            store_id: data.store_id
+        }
+    })
+    window.open(url.href)
 }
 </script>
 
@@ -746,4 +443,14 @@ const back = () => {
 #container :deep(div){
     z-index: 2 !important;
 }
+
+.store-wrap::-webkit-scrollbar{
+    width:4px;
+    border-radius:2px;
+    background-color:#f1f1f1;
+}
+.store-wrap::-webkit-scrollbar-thumb{
+    background-color:#c1c1c1;
+    border-radius:2px;
+}
 </style>
diff --git a/niucloud/addon/shop/admin/views/delivery/local_config.vue b/niucloud/addon/shop/admin/views/delivery/local_config.vue
new file mode 100644
index 000000000..6ffcab073
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery/local_config.vue
@@ -0,0 +1,80 @@
+<template>
+    <div class="main-container bg-[#fff] rounded-[4px]">
+        <div class="flex ml-[18px] justify-between items-center pt-[20px]">
+			<span class="text-page-title">{{ pageName }}</span>
+		</div>
+        <el-form :model="formData" label-width="150px" ref="formRef" class="page-form" v-loading="loading">
+            <el-card class="box-card !border-none" shadow="never">
+                <el-form-item :label="t('isStoreSelect')">
+                    <div>
+                        <el-switch v-model="formData.is_local_delivery_store_select" :active-value="1" :inactive-value="0" />
+                        <div class="text-[12px] text-[#999]">不开启时将默认选择就近配送门店，开启后同城配送下单时可主动选择配送门店</div>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('isShowPolyline')">
+                    <div>
+                        <el-switch v-model="formData.is_show_polyline" :active-value="1" :inactive-value="0" />
+                        <div class="text-[12px] text-[#999]">此功能需耗费配额,需要具备"驾车路线规划"接口的调用权限和配额方可使用</div>
+                    </div>
+                </el-form-item>
+            </el-card>
+        </el-form>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" :loading="loading" @click="save(formRef)">{{ t('save') }}</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import { setDeliveryConfig, getDeliveryConfig } from '@/addon/shop/api/delivery'
+import { FormInstance } from 'element-plus'
+import { useRoute } from 'vue-router'
+
+const route = useRoute()
+const pageName = route.meta.title
+
+const loading = ref(true)
+
+const formData = reactive<any>({
+    is_local_delivery_store_select: 1,
+    is_show_polyline: 1
+})
+
+const formRef = ref<FormInstance>()
+
+/**
+ * 获取配置
+ */
+getDeliveryConfig().then(res => {
+    Object.assign(formData, res.data)
+    loading.value = false
+}).catch(() => {
+    loading.value = false
+})
+
+/**
+ * 保存
+ */
+const save = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+            setDeliveryConfig(formData).then(() => {
+                loading.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/views/delivery/local_delivery_service.vue b/niucloud/addon/shop/admin/views/delivery/local_delivery_service.vue
new file mode 100644
index 000000000..573e4f2ee
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery/local_delivery_service.vue
@@ -0,0 +1,93 @@
+<template>
+    <!--三方配送设置-->
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-page-title">{{ pageName }}</span>
+            </div>
+
+            <div class="mt-[20px]">
+                <el-table :data="thirdDeliveryTableData.data" size="large" v-loading="thirdDeliveryTableData.loading">
+                    <template #empty>
+                        <span>{{ !thirdDeliveryTableData.loading ? t('emptyData') : '' }}</span>
+                    </template>
+
+                    <el-table-column prop="name" :label="t('name')" min-width="100" :show-overflow-tooltip="true"/>
+                    <el-table-column :label="t('isUse')" min-width="180" align="center">
+                        <template #default="{ row }">
+                            <el-tag class="ml-2" :type="row.is_use == 1 ? 'success': 'error'">{{ row.is_use == 1 ?  t('statusNormal') : t('statusDeactivate')}}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" align="right" fixed="right" min-width="200">
+                       <template #default="{ row, $index }">
+                            <template v-if="row.is_merchant">
+                                <el-button type="primary" link @click="toStaff">配送员</el-button>
+                                <el-button type="primary" link @click="toRecord">配送记录</el-button>
+                            </template>
+                           <el-button type="primary" link @click="editEvent(row, $index)" v-if="!row.is_merchant">{{ t('config') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+            </div>
+
+            <template v-for="(item, index) in thirdDeliveryTableData.data">
+                <component :is="item.component" :ref="(el) => setThirdDeliveryTypeRefs(el, index)" v-if="item.component" @complete="loadThirdDeliveryList()"/>
+            </template>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { defineAsyncComponent, reactive, ref } from 'vue'
+import { t } from '@/lang'
+import { getLocalDeliveryServiceList } from '@/addon/shop/api/delivery'
+import { useRoute, useRouter } from 'vue-router'
+
+const route = useRoute()
+const router = useRouter()
+const pageName = route.meta.title
+const thirdDeliveryTypeRefs = ref([])
+
+const thirdDeliveryTableData = reactive({
+    loading: true,
+    data: []
+})
+
+const modules: any = import.meta.glob('@/addon/**/views/delivery/components/*.vue')
+/**
+ * 获取配置信息
+ */
+const loadThirdDeliveryList = () => {
+    thirdDeliveryTableData.loading = true
+    getLocalDeliveryServiceList().then(({ data }) => {
+        Object.keys(data).forEach((key: string) => {
+            data[key].component && (data[key].component = defineAsyncComponent(modules[data[key].component]))
+        })
+        thirdDeliveryTableData.data = data
+        thirdDeliveryTableData.loading = false
+    }).catch(() => {
+        thirdDeliveryTableData.loading = false
+    })
+}
+
+const setThirdDeliveryTypeRefs = (el, index) => {
+    thirdDeliveryTypeRefs.value[index] = (el)
+}
+
+loadThirdDeliveryList()
+const editEvent = (data: any, index: number) => {
+    thirdDeliveryTypeRefs.value[index].setFormData(data)
+    thirdDeliveryTypeRefs.value[index].showDialog = true
+}
+
+const toStaff = () => {
+    router.push('/shop/delivery/staff')
+}
+const toRecord = () => {
+    router.push('/shop/delivery/merchant/record')
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/niucloud/addon/shop/admin/views/delivery/local_record.vue b/niucloud/addon/shop/admin/views/delivery/local_record.vue
new file mode 100644
index 000000000..e0a50a1d0
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery/local_record.vue
@@ -0,0 +1,287 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="right">{{ pageName }}</span>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="localRecordTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('deliveryNo')" prop="delivery_no">
+                        <el-input v-model.trim="localRecordTable.searchParam.delivery_no" :placeholder="t('deliveryNoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('tradeNo')" prop="trade_no">
+                        <el-input v-model.trim="localRecordTable.searchParam.trade_no" :placeholder="t('tradeNoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('deliveryStatus')" prop="status">
+                        <el-select v-model="localRecordTable.searchParam.status" :placeholder="t('deliveryStatusPlaceholder')" clearable>
+                            <el-option v-for="(item,key) in statusList" :key="key" :label="item" :value="key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="localRecordTable.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadLocalDeliveryList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+            <div class="mt-[10px]">
+                <el-table :data="localRecordTable.data" size="large" v-loading="localRecordTable.loading">
+                    <template #empty>
+                        <span>{{ !localRecordTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="delivery_service_name" :label="t('deliveryServiceName')" min-width="120" />
+                    <el-table-column prop="body" :label="t('goodsInfo')" min-width="120" />
+                    <el-table-column prop="delivery_no" :label="t('deliveryNo')" min-width="120" />
+                    <el-table-column prop="trade_no" :label="t('tradeNo')" min-width="120" />
+                    <el-table-column prop="delivery_start" :label="t('deliveryStart')" min-width="120">
+                        <template #default="{ row }">
+                            <div class="cursor-pointer" @click="openMap(row,'start')">
+                                <span>{{ row.delivery_start }}</span>
+                                <span class="text-primary ml-[4px] nc-iconfont nc-icon-chakandituV6xx" ></span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="delivery_end" :label="t('deliveryEnd')" min-width="120">
+                        <template #default="{ row }">
+                            <div class="cursor-pointer" @click="openMap(row, 'end')">
+                                <span>{{ row.delivery_end }}</span>
+                                <span class="text-primary ml-[4px] nc-iconfont nc-icon-chakandituV6xx" ></span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status_name" :label="t('deliveryStatus')" min-width="120" />
+                    <el-table-column prop="" :label="t('deliveryDistance')" min-width="120">
+                        <template #default="{ row }">
+                            {{ distance(row.delivery_distance) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('deliveryMoney')" min-width="120">
+                        <template #default="{ row }">
+                            ￥{{ row.delivery_money }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
+                    <el-table-column prop="remark" :label="t('remark')" min-width="120" />
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                            <el-button type="primary" link @click="syncEvent(row)" v-if="row.pre_status_name?.sync && row.pre_status_name?.sync.indexOf(Number(row.status)) != -1">{{ t('sync') }}</el-button>
+                            <el-button type="primary" link @click="finishEvent(row)" v-if="row.pre_status_name?.finish && row.pre_status_name?.finish.indexOf(Number(row.status)) != -1">{{ t('finish') }}</el-button>
+                            <el-button type="primary" link @click="cancelEvent(row)" v-if="row.pre_status_name?.cancel && row.pre_status_name?.cancel.indexOf(Number(row.status)) != -1">{{ t('cancel') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="localRecordTable.page" v-model:page-size="localRecordTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="localRecordTable.total"
+                        @size-change="loadLocalDeliveryList()" @current-change="loadLocalDeliveryList" />
+                </div>
+            </div>
+        </el-card>
+        <local-record-detail ref="localRecordDetailRef" />
+        <!-- 查看地图 -->
+        <map-info ref="mapInfoRef" />
+        <el-dialog v-model="showDialog" :title="t('deliveryCancel')" width="480" class="diy-dialog-wrap" :destroy-on-close="true">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <template v-if="formData.cancel_type != 'merchant'">
+                    <el-form-item :label="t('cancelReason')" prop="cancel_reason_id">
+                        <el-select v-model="formData.cancel_reason_id" clearable class="input-item" :placeholder="t('cancelReasonSelectPlaceholder')">
+                            <el-option v-for="(item, index) in reasonList" :key="index" :label="item" :value="index"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item  prop="cancel_reason" v-if="formData.cancel_reason_id == 10000">
+                    <el-input v-model="formData.cancel_reason" type="textarea" rows="4" maxlength="200" clearable class="input-width" :placeholder="t('cancelReasonPlaceholder')" />
+                    </el-form-item>
+                </template>
+                <el-form-item :label="t('cancelReason')" prop="cancel_reason" v-if="formData.cancel_type == 'merchant'">
+                   <el-input v-model="formData.cancel_reason" type="textarea" rows="4" maxlength="200" clearable class="input-width" :placeholder="t('cancelReasonPlaceholder')" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ElMessageBox, FormInstance } from 'element-plus'
+import { t } from '@/lang'
+import { distance } from '@/utils/common'
+import { computed, reactive, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { getLocalDeliveryList, getLocalDeliveryStatus, getLocalDeliverySync, getLocalDeliveryCancelReason, getDeliveryFinish, setLocalDeliveryCancel } from '@/addon/shop/api/delivery'
+import LocalRecordDetail from '@/addon/shop/views/delivery/components/local_record_detail.vue'
+
+const route = useRoute()
+const router = useRouter()
+const pageName = route.meta.title
+
+const localRecordTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        delivery_no: '',
+        trade_no: route.query.trade_no || '',
+        trade_type: route.query.trade_type || '',
+        status: '',
+        create_time: ''
+    }
+})
+const statusList = ref<any>([])
+const searchFormRef = ref<FormInstance>()
+
+const getLocalDeliveryStatusFn = () => {
+    getLocalDeliveryStatus().then(res => {
+        statusList.value = res.data
+    })
+}
+getLocalDeliveryStatusFn()
+/**
+ * 获取配送记录列表
+ */
+const loadLocalDeliveryList = (page: number = 1) => {
+    localRecordTable.loading = true
+    localRecordTable.page = page
+
+    getLocalDeliveryList({
+        page: localRecordTable.page,
+        limit: localRecordTable.limit,
+        ...localRecordTable.searchParam
+    }).then((res: any) => {
+        localRecordTable.loading = false
+        localRecordTable.data = res.data.data
+        localRecordTable.total = res.data.total
+    }).catch(() => {
+        localRecordTable.loading = false
+    })
+}
+loadLocalDeliveryList()
+
+// 详情
+const localRecordDetailRef = ref()
+const detailEvent = (row: any) => {
+    localRecordDetailRef.value?.setFormData(row)
+}
+
+// 查看地图
+const mapInfoRef = ref()
+const openMap = (data: any, type: string) => {
+    const obj: any = {}
+    if (type == 'start') {
+        obj.taker_latitude = data.delivery_start_lat
+        obj.taker_longitude = data.delivery_start_lng
+        obj.taker_address = data.delivery_start
+    } else {
+        obj.taker_latitude = data.delivery_end_lat
+        obj.taker_longitude = data.delivery_start_lng
+        obj.taker_address = data.delivery_end
+    }
+    mapInfoRef.value?.setFormData(obj)
+}
+
+// 同步
+const syncEvent = (data: any) => {
+    ElMessageBox.confirm(t('syncTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+        getLocalDeliverySync(data.id).then(() => {
+            loadLocalDeliveryList()
+        })
+    })
+}
+
+// 完成
+const finishEvent = (data: any) => {
+    ElMessageBox.confirm(t('finishTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+        getDeliveryFinish(data.id).then(() => {
+            loadLocalDeliveryList()
+        })
+    })
+}
+// 取消
+const showDialog = ref(false)
+const reasonList = ref([])
+const loading = ref(false)
+const formData = reactive<any>({
+    id: '',
+    cancel_reason_id: '',
+    cancel_reason: '',
+    cancel_type: ''
+})
+const formRef = ref<FormInstance>()
+
+const cancelEvent = async (data: any) => {
+    formData.id = data.id
+    formData.cancel_type = data.delivery_service
+    if (data.delivery_service != 'merchant') {
+        reasonList.value = await (await getLocalDeliveryCancelReason({ service: data.delivery_service })).data
+    }
+    showDialog.value = true
+}
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+        cancel_reason_id: [
+            { required: formData.cancel_type != 'merchant', message: t('cancelReasonSelectPlaceholder'), trigger: 'blur' }
+        ],
+        cancel_reason: [
+            { required: formData.cancel_reason_id == 10000 || formData.cancel_type == 'merchant', message: t('cancelReasonPlaceholder'), trigger: 'blur' }
+        ]
+    }
+})
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            setLocalDeliveryCancel(formData).then(res => {
+                loading.value = false
+                showDialog.value = false
+                setTimeout(() => {
+                    loadLocalDeliveryList()
+                }, 1500)
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
+}
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadLocalDeliveryList()
+}
+</script>
+
+<style scoped lang="scss">
+:deep(.el-form-item){
+    align-items: flex-start;
+}
+</style>
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/views/delivery/merchant_record.vue b/niucloud/addon/shop/admin/views/delivery/merchant_record.vue
new file mode 100644
index 000000000..9168fa441
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery/merchant_record.vue
@@ -0,0 +1,249 @@
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="right">{{ pageName }}</span>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="shopRecordTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('deliveryNo')" prop="delivery_no">
+                        <el-input v-model.trim="shopRecordTable.searchParam.delivery_no" :placeholder="t('deliveryNoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('tradeNo')" prop="trade_no">
+                        <el-input v-model.trim="shopRecordTable.searchParam.trade_no" :placeholder="t('tradeNoPlaceholder')" />
+                    </el-form-item>
+                    <el-form-item :label="t('deliveryStatus')" prop="status">
+                        <el-select v-model="shopRecordTable.searchParam.status" :placeholder="t('deliveryStatusPlaceholder')" clearable>
+                            <el-option v-for="(item,key) in statusList" :key="key" :label="item" :value="key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item :label="t('createTime')" prop="create_time">
+                        <el-date-picker v-model="shopRecordTable.searchParam.create_time" type="datetimerange"
+                            value-format="YYYY-MM-DD HH:mm:ss" :start-placeholder="t('startDate')"
+                            :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadShopDeliveryList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+            <div class="mt-[10px]">
+                <el-table :data="shopRecordTable.data" size="large" v-loading="shopRecordTable.loading">
+                    <template #empty>
+                        <span>{{ !shopRecordTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="delivery_no" :label="t('deliveryNo')" min-width="120" />
+                    <el-table-column prop="body" :label="t('goodsInfo')" min-width="120" />
+                    <el-table-column prop="trade_no" :label="t('tradeNo')" min-width="120" />
+                    <el-table-column prop="delivery_start" :label="t('deliveryStart')" min-width="120">
+                        <template #default="{ row }">
+                            <div class="cursor-pointer" @click="openMap(row,'start')">
+                                <span>{{ row.delivery_start }}</span>
+                                <span class="text-primary ml-[4px] nc-iconfont nc-icon-chakandituV6xx"></span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="delivery_end" :label="t('deliveryEnd')" min-width="120">
+                        <template #default="{ row }">
+                            <div class="cursor-pointer" @click="openMap(row, 'end')">
+                                <span>{{ row.delivery_end }}</span>
+                                <span class="text-primary ml-[4px] cursor-pointer nc-iconfont nc-icon-chakandituV6xx"></span>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="status_name" :label="t('deliveryStatus')" min-width="120" />
+                    <el-table-column prop="delivery_distance" :label="t('deliveryDistance')" min-width="120">
+                        <template #default="{ row }">
+                             {{ distance(row.delivery_distance) }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="delivery_money" :label="t('deliveryMoney')" min-width="120">
+                        <template #default="{ row }">
+                            ￥{{ row.delivery_money }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="create_time" :label="t('createTime')" min-width="120" />
+                    <el-table-column prop="remark" :label="t('remark')" min-width="120" />
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="detailEvent(row)">{{ t('detail') }}</el-button>
+                            <el-button type="primary" link @click="finishEvent(row)" v-if="row.pre_status_name?.finish && row.pre_status_name?.finish.indexOf(Number(row.status)) != -1">{{ t('finish') }}</el-button>
+                            <el-button type="primary" link @click="cancelEvent(row)" v-if="row.pre_status_name?.cancel && row.pre_status_name?.cancel.indexOf(Number(row.status)) != -1">{{ t('cancel') }}</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="shopRecordTable.page" v-model:page-size="shopRecordTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="shopRecordTable.total"
+                        @size-change="loadShopDeliveryList()" @current-change="loadShopDeliveryList" />
+                </div>
+            </div>
+        </el-card>
+        <shop-record-detail ref="shopRecordDetailRef" />
+        <!-- 查看地图 -->
+        <map-info ref="mapInfoRef" />
+        <el-dialog v-model="showDialog" :title="t('deliveryCancel')" width="480" class="diy-dialog-wrap" :destroy-on-close="true">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('cancelReason')" prop="cancel_reason">
+                   <el-input v-model="formData.cancel_reason" type="textarea" rows="4" maxlength="200" clearable class="input-width" :placeholder="t('cancelReasonPlaceholder')" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                    <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ElMessageBox, FormInstance } from 'element-plus'
+import { t } from '@/lang'
+import { distance } from '@/utils/common'
+import { computed, reactive, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { getShopDeliveryOrderList, getShopDeliveryStatus, getShopDeliveryFinish, setShopDeliveryCancel } from '@/addon/shop/api/delivery'
+import ShopRecordDetail from '@/addon/shop/views/delivery/components/shop_record_detail.vue'
+
+const route = useRoute()
+const router = useRouter()
+const pageName = route.meta.title
+
+const shopRecordTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        delivery_no: '',
+        trade_no: route.query.trade_no || '',
+        trade_type: route.query.trade_type || '',
+        status: '',
+        create_time: ''
+    }
+})
+const statusList = ref<any>([])
+const searchFormRef = ref<FormInstance>()
+
+const getShopDeliveryStatusFn = () => {
+    getShopDeliveryStatus().then(res => {
+        statusList.value = res.data
+    })
+}
+getShopDeliveryStatusFn()
+
+/**
+ * 获取配送记录列表
+ */
+const loadShopDeliveryList = (page: number = 1) => {
+    shopRecordTable.loading = true
+    shopRecordTable.page = page
+
+    getShopDeliveryOrderList({
+        page: shopRecordTable.page,
+        limit: shopRecordTable.limit,
+        ...shopRecordTable.searchParam
+    }).then((res: any) => {
+        shopRecordTable.loading = false
+        shopRecordTable.data = res.data.data
+        shopRecordTable.total = res.data.total
+    }).catch(() => {
+        shopRecordTable.loading = false
+    })
+}
+loadShopDeliveryList()
+
+// 详情
+const shopRecordDetailRef = ref()
+const detailEvent = (row: any) => {
+    shopRecordDetailRef.value?.setFormData(row)
+}
+
+// 查看地图
+const mapInfoRef = ref()
+const openMap = (data: any, type: string) => {
+    const obj: any = {}
+    if (type == 'start') {
+        obj.taker_latitude = data.delivery_start_lat
+        obj.taker_longitude = data.delivery_start_lng
+        obj.taker_address = data.delivery_start
+    } else {
+        obj.taker_latitude = data.delivery_end_lat
+        obj.taker_longitude = data.delivery_start_lng
+        obj.taker_address = data.delivery_end
+    }
+    mapInfoRef.value?.setFormData(obj)
+}
+
+// 完成
+const finishEvent = (data: any) => {
+    ElMessageBox.confirm(t('finishTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning'
+        }).then(() => {
+        getShopDeliveryFinish(data.id).then(() => {
+            loadShopDeliveryList()
+        })
+    })
+}
+// 取消
+const showDialog = ref(false)
+const loading = ref(false)
+const formData = reactive<any>({
+    id: '',
+    cancel_reason: ''
+})
+const formRef = ref<FormInstance>()
+const cancelEvent = async (data: any) => {
+    formData.id = data.id
+    showDialog.value = true
+}
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+        cancel_reason: [
+            { required: true, message: t('cancelReasonPlaceholder'), trigger: 'blur' }
+        ]
+    }
+})
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            setShopDeliveryCancel(formData).then(res => {
+                loading.value = false
+                showDialog.value = false
+                loadShopDeliveryList()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
+}
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadShopDeliveryList()
+}
+</script>
+
+<style scoped lang="scss">
+:deep(.el-form-item){
+    align-items: flex-start;
+}
+</style>
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/views/delivery/search.vue b/niucloud/addon/shop/admin/views/delivery/search.vue
index 801876024..1af326312 100644
--- a/niucloud/addon/shop/admin/views/delivery/search.vue
+++ b/niucloud/addon/shop/admin/views/delivery/search.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="main-container">
         <el-card class="card !border-none mb-[15px]" shadow="never">
-            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push({ path: '/shop/order/delivery' })" />
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push({ path: '/shop/delivery/config' })" />
         </el-card>
         <el-form :model="formData" label-width="150px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
             <el-card class="box-card !border-none" shadow="never">
diff --git a/niucloud/addon/shop/admin/views/delivery/template.vue b/niucloud/addon/shop/admin/views/delivery/template.vue
index 78d229d01..f531fba04 100644
--- a/niucloud/addon/shop/admin/views/delivery/template.vue
+++ b/niucloud/addon/shop/admin/views/delivery/template.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="main-container">
         <el-card class="box-card !border-none" shadow="never">
-            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push('/shop/order/delivery')" />
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push('/shop/delivery/config')" />
         </el-card>
 
         <el-card class="box-card mt-[15px] !border-none" shadow="never">
@@ -104,7 +104,7 @@ loadTemplateList(getTablePageStorage(templateTable.searchParam).page);
  * 添加运费模板
  */
 const addEvent = () => {
-    router.push({ path: '/shop/order/shipping/template_edit' })
+    router.push({ path: '/shop/shipping/template_edit' })
 }
 
 /**
@@ -112,7 +112,7 @@ const addEvent = () => {
  * @param data
  */
 const editEvent = (data: any) => {
-    router.push({ path: '/shop/order/shipping/template_edit', query: { id: data.template_id } })
+    router.push({ path: '/shop/shipping/template_edit', query: { id: data.template_id } })
 }
 
 /**
diff --git a/niucloud/addon/shop/admin/views/delivery/template_edit.vue b/niucloud/addon/shop/admin/views/delivery/template_edit.vue
index 91031345b..f462add00 100644
--- a/niucloud/addon/shop/admin/views/delivery/template_edit.vue
+++ b/niucloud/addon/shop/admin/views/delivery/template_edit.vue
@@ -474,7 +474,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
             data.area = Object.values(area)
             save(data).then(() => {
                 loading.value = false
-                router.push({ path: '/shop/order/shipping/template' })
+                router.push({ path: '/shop/shipping/template' })
             }).catch(() => {
                 loading.value = false
             })
@@ -483,7 +483,7 @@ const onSave = async (formEl: FormInstance | undefined) => {
 }
 
 const back = () => {
-    router.push({ path: '/shop/order/shipping/template' })
+    router.push({ path: '/shop/shipping/template' })
 }
 </script>
 
diff --git a/niucloud/addon/shop/admin/views/delivery_store/delivery_set.vue b/niucloud/addon/shop/admin/views/delivery_store/delivery_set.vue
new file mode 100644
index 000000000..5a39647ee
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery_store/delivery_set.vue
@@ -0,0 +1,164 @@
+<template>
+    <div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="router.push(`/shop/delivery_store`)" />
+        </el-card>
+        <el-card class="box-card !border-none" shadow="never">
+
+            <el-table :data="deliveryServiceTable.data" size="large" v-loading="deliveryServiceTable.loading">
+                <template #empty>
+                    <span>{{ !deliveryServiceTable.loading ? t('emptyData') : '' }}</span>
+                </template>
+
+                <el-table-column prop="name" :label="t('deliveryServiceName')" min-width="200" :show-overflow-tooltip="true"/>
+
+                <el-table-column prop="open_status" :label="t('openStatus')" width="200">
+                    <template #default="{ row }">
+                        <div v-if="row.open_status == ''">—</div>
+                        <el-tag v-else class="cursor-pointer" :type="row.open_status == 1 ? 'success' : 'danger'">{{ row.open_status == 1 ? t('pass') : t('notPass') }}</el-tag>
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="edit_status" :label="t('editStatus')" width="200">
+                    <template #default="{ row }">
+                        <div v-if="row.edit_status == ''">—</div>
+                        <el-tag v-else class="cursor-pointer" :type="row.edit_status == 1 ? 'success' : 'danger'">{{ row.edit_status == 1 ? t('pass') : t('notPass') }}</el-tag>
+                    </template>
+                </el-table-column>
+
+                <el-table-column prop="reason" :label="t('reason')" :show-overflow-tooltip="true" min-width="500"/>
+
+                <el-table-column :label="t('operation')" fixed="right" align="right" min-width="120">
+                   <template #default="{ row }">
+                       <el-button type="primary" link @click="openEvent(row)" v-if="row.is_merchant == 0 && row.open_status != 1">{{ t('openService') }}</el-button>
+                       <el-button type="primary" link @click="editEvent(row)" v-if="row.is_merchant == 0 && row.open_status == 1">{{ t('editService') }}</el-button>
+
+                   </template>
+                </el-table-column>
+
+            </el-table>
+
+        </el-card>
+
+        <!-- 开通/修改品类 -->
+        <el-dialog v-model="showDialog" :title="title" width="500px" :destroy-on-close="true">
+            <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRulesDeliverySet" class="page-form" v-loading="loadingDeliverySet">
+                <el-form-item :label="t('business')" prop="business">
+					<el-select v-model="formData.business" clearable :placeholder="t('businessPlaceholder')">
+                        <el-option :label="value" :value="key" v-for="(value, key, index) in businessOptions" :key="index"/>
+                    </el-select>
+				</el-form-item>
+
+            </el-form>
+
+            <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loadingDeliverySet" @click="confirmDeliverySet(formRef)">{{ t('confirm') }}</el-button>
+            </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, computed } from 'vue'
+import { t } from '@/lang'
+import { ArrowLeft } from '@element-plus/icons-vue'
+import { FormInstance } from 'element-plus'
+import { useRoute, useRouter } from 'vue-router'
+import { getDeliveryServiceList, deliveryShopOpen, deliveryShopEdit } from '@/addon/shop/api/delivery'
+
+import { cloneDeep } from 'lodash-es'
+
+const route = useRoute()
+const router = useRouter()
+
+const pageName = route.meta.title
+
+const id:any = ref(route.query.id || 0)
+
+const deliveryServiceTable = reactive({
+    loading: true,
+    data: []
+})
+
+const loadDeliveryServiceList = () => {
+    // 查询配送服务商列表
+    getDeliveryServiceList(id.value).then((res: any) => {
+        deliveryServiceTable.data = cloneDeep(res.data)
+        deliveryServiceTable.loading = false
+    })
+}
+
+loadDeliveryServiceList()
+
+const businessOptions = ref({})
+
+const showDialog = ref(false)
+const loadingDeliverySet = ref(false)
+const formRef = ref<FormInstance>()
+const formData = reactive({
+    id: id.value,
+    delivery_type: '',
+    business: '',
+    extend_data: {},
+})
+
+// 表单验证规则
+const formRulesDeliverySet = computed(() => {
+    return {
+        business: [
+            { required: true, message: t('businessPlaceholder'), trigger: 'blur' }
+        ]
+    }
+})
+
+
+const title = ref('')
+const isOpen = ref(false)
+// 开通
+const openEvent = (data:any) => {
+    title.value = t('openService') + data.name
+    businessOptions.value = data.business_list
+    formData.delivery_type = data.key
+    formData.extend_data = data.extend_data
+    showDialog.value = true
+}
+
+// 修改品类
+const editEvent = (data:any) => {
+    title.value = t('editService')
+    businessOptions.value = data.business_list
+    formData.delivery_type = data.key
+    formData.business = data.business
+    showDialog.value = true
+    isOpen.value = data.open_status == 1
+}
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirmDeliverySet = async (formEl: FormInstance | undefined) => {
+    if (loadingDeliverySet.value || !formEl) return
+    const save = isOpen.value ? deliveryShopEdit : deliveryShopOpen
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loadingDeliverySet.value = true
+            save(formData).then(res => {
+                loadingDeliverySet.value = false
+                showDialog.value = false
+                loadDeliveryServiceList()
+            }).catch(() => {
+                loadingDeliverySet.value = false
+            })
+        }
+    })
+}
+
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/niucloud/addon/shop/admin/views/delivery_store/edit.vue b/niucloud/addon/shop/admin/views/delivery_store/edit.vue
new file mode 100644
index 000000000..3936f196c
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery_store/edit.vue
@@ -0,0 +1,898 @@
+<template>
+    <div class="main-container">
+        <el-card class="card !border-none mb-[15px]" shadow="never">
+            <el-page-header :content="pageName" :icon="ArrowLeft" @back="back" />
+        </el-card>
+
+        <el-card class="box-card !border-none" shadow="never">
+            <el-alert type="warning" :closable="false" class="!mb-[15px]" v-if="formData.is_system === 1">
+                <template #default>
+                    <p>{{ t('deliveryStoreTips') }}<span class="text-primary cursor-pointer" @click="newWindow()">去修改</span><span class="text-primary cursor-pointer ml-[10px]" @click="refreshAddress(true)">刷新</span></p>
+                </template>
+            </el-alert>
+            <el-form label-width="120px" ref="formRef" :rules="formRules" :model="formData" class="page-form" v-loading="loading">
+                <el-form-item :label="t('提货类型')" prop="pick_up_type">
+                    <el-checkbox-group v-model="formData.pick_up_type" @change="changePickUpType">
+                        <el-checkbox :label="index" v-for="(item,index) in pickUpType" :key="index">{{ item }}</el-checkbox>
+                    </el-checkbox-group>
+                </el-form-item>
+                <el-form-item :label="t('storeName')" prop="store_name">
+                    <el-input v-model.trim="formData.store_name" clearable :placeholder="t('storeNamePlaceholder')" class="input-width" maxlength="30" :disabled="formData.is_system === 1" />
+                </el-form-item>
+                <el-form-item :label="t('contactName')" prop="contact_name">
+                    <el-input v-model.trim="formData.contact_name" clearable :placeholder="t('contactNamePlaceholder')" class="input-width" maxlength="30" :disabled="formData.is_system === 1" />
+                </el-form-item>
+                <el-form-item :label="t('storeMobile')" prop="store_mobile">
+                    <el-input v-model.trim="formData.store_mobile" clearable :placeholder="t('storeMobilePlaceholder')" class="input-width" @keyup="filterNumber($event)" @blur="formData.store_mobile = $event.target.value" maxlength="11" :disabled="formData.is_system === 1" />
+                </el-form-item>
+                <el-form-item :label="t('tradeTime')" prop="trade_time">
+                    <div>
+                        <el-input v-model.trim="formData.trade_time" clearable :placeholder="t('tradeTimePlaceholder')" class="input-width" :disabled="formData.is_system === 1" />
+                        <p class="text-[12px] text-[#999]">{{ t('tradeTimeTips') }}</p>
+                    </div>
+                </el-form-item>
+                <el-form-item :label="t('开启状态')" prop="status">
+                    <el-switch v-model="formData.status" :active-value="1" :inactive-value="0" />
+                </el-form-item>
+                <el-form-item :label="t('timeIsOpen')" prop="time_is_open">
+                    <div>
+                        <el-radio-group v-model="formData.time_is_open">
+                            <el-radio :label="1">{{ t('open') }}</el-radio>
+                            <el-radio :label="0">{{ t('close') }}</el-radio>
+                        </el-radio-group>
+                        <div class="mt-[10px] text-[12px] text-[#999] leading-[20px]">{{t('timeIsOpenTips')}}</div>
+                    </div>
+                </el-form-item>
+                <template v-if="formData.time_is_open === 1">
+                    <el-form-item :label="t('自提日期')" prop="time_week" >
+                        <el-checkbox-group v-model="formData.time_week">
+                            <el-checkbox :label="'1'">{{ t('monday') }}</el-checkbox>
+                            <el-checkbox :label="'2'">{{ t('tuesday') }}</el-checkbox>
+                            <el-checkbox :label="'3'">{{ t('wednesday') }}</el-checkbox>
+                            <el-checkbox :label="'4'">{{ t('thursday') }}</el-checkbox>
+                            <el-checkbox :label="'5'">{{ t('friday') }}</el-checkbox>
+                            <el-checkbox :label="'6'">{{ t('saturday') }}</el-checkbox>
+                            <el-checkbox :label="'0'">{{ t('sunday') }}</el-checkbox>
+                            <br />
+                        </el-checkbox-group>
+                    </el-form-item>
+                    <el-form-item :label="t('deliveryTime')" prop="trade_time_json">
+                        <div>
+                            <div>
+                                <div v-for="(timeRange, index) in formData.trade_time_json" :key="index" class="mb-3">
+                                    <el-time-picker v-model="timeRange.start_time" :placeholder="t('startTime')"
+                                        format="HH:mm" value-format="HH:mm"
+                                        :picker-options="{selectableRange: '00:00 - 23:59'}" />
+                                    <span class="mx-2">-</span>
+                                    <el-time-picker v-model="timeRange.end_time" :placeholder="t('endTime')" format="HH:mm"
+                                        value-format="HH:mm" :picker-options="{selectableRange: '00:00 - 23:59'}" />
+                                    <span v-if="index > 0" class="text-primary cursor-pointer ml-[10px]"
+                                        @click="removeTimeRange(index)"> {{ t('delete') }}</span>
+                                </div>
+                                <span class="text-primary cursor-pointer mr-[10px]" @click="addTimeRange"
+                                    v-if="formData.trade_time_json.length < 3"> {{ t('addTime') }}</span>
+                            </div>
+                            <div class="text-[12px] text-[#999]">{{ t('deliveryTimeTips') }}</div>
+                        </div>
+
+                    </el-form-item>
+
+                    <el-form-item :label="t('timeInterval')" prop="time_interval">
+                        <div>
+                            <el-radio-group v-model="formData.time_interval">
+                                <el-radio v-for="(item, key) in time_interval_list" :key="key" :label="item.type">{{ item.name }}</el-radio>
+                            </el-radio-group>
+                        </div>
+
+                    </el-form-item>
+                </template>
+                <template v-if="formData.pick_up_type.indexOf('local_delivery') != -1">
+                    <el-form-item :label="t('feeType')">
+                        <el-radio-group v-model="initData.fee_type" >
+                            <el-radio label="region" disabled>{{ t('region') }}</el-radio>
+                            <el-radio label="distance" disabled>{{ t('distance') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item :label="t('feeSetting')" prop="distance" v-show="initData.fee_type == 'distance'">
+                        <div class="flex">
+                            <div class="w-[60px] mx-[5px]">
+                                <el-input v-model.number="initData.base_dist" disabled type="text" maxlength="6" @keyup="filterDigit($event)" />
+                            </div>
+                            {{ t('feeSettingTextOne') }}
+                            <div class="w-[60px] mx-[5px]">
+                                <el-input v-model.trim="initData.base_price" disabled type="text"  maxlength="8" @keyup="filterDigit($event)" />
+                            </div>
+                            {{ t('feeSettingTextTwo') }}
+                            <div class="w-[60px] mx-[5px]">
+                                <el-input v-model.number="initData.grad_dist" disabled type="text"  maxlength="6" @keyup="filterDigit($event)" />
+                            </div>
+                            {{ t('feeSettingTextThree') }}
+                            <div class="w-[60px] mx-[5px]">
+                                <el-input v-model.trim="initData.grad_price" disabled  type="text"  maxlength="8" @keyup="filterDigit($event)" />
+                            </div>
+                            {{ t('priceUnit') }}
+                        </div>
+                    </el-form-item>
+                    <el-form-item :label="t('weightFee')" prop="weight">
+                        <div class="flex">
+                            {{ t('weightFeeTextOne') }}
+                            <div class="w-[60px] mx-[5px]">
+                                <el-input v-model.trim="initData.weight_start" disabled type="text"  maxlength="6" @keyup="filterDigit($event)" />
+                            </div>
+                            {{ t('weightFeeTextTwo') }}
+                            <div class="w-[60px] mx-[5px]">
+                                <el-input v-model.trim="initData.weight_unit" disabled type="text"  maxlength="6" @keyup="filterDigit($event)" />
+                            </div>
+                            {{ t('weightFeeTextThree') }}
+                            <div class="w-[60px] mx-[5px]">
+                                <el-input v-model.trim="initData.weight_price" disabled type="text"  maxlength="8" @keyup="filterDigit($event)" />
+                            </div>
+                            {{ t('priceUnit') }}
+                        </div>
+                    </el-form-item>
+                </template>
+                <el-form-item :label="t('地址')" prop="address_area">
+                    <el-select v-model="formData.province_id" value-key="id" @change="handleFlash"  clearable class="w-[200px]"  ref="provinceRef" :disabled="formData.is_system === 1">
+                        <el-option :label="t('provincePlaceholder')" :value="0"/>
+                        <el-option v-for="(item, index) in areaList.province" :key="index" :label="item.name"  :value="item.id"/>
+                    </el-select>
+                    <el-select v-model="formData.city_id" value-key="id" @change="handleFlash" clearable class="w-[200px] ml-3" ref="cityRef" :disabled="formData.is_system === 1">
+                        <el-option :label="t('cityPlaceholder')" :value="0"/>
+                        <el-option v-for="(item, index) in areaList.city " :key="index" :label="item.name"  :value="item.id"/>
+                    </el-select>
+                    <el-select v-model="formData.district_id" value-key="id" @change="handleFlash" clearable class="w-[200px] ml-3"  ref="districtRef" :disabled="formData.is_system === 1">
+                        <el-option :label="t('districtPlaceholder')" :value="0"/>
+                        <el-option v-for="(item, index) in areaList.district " :key="index" :label="item.name"  :value="item.id"/>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item prop="address">
+                    <div>
+                        <el-input v-model.trim="formData.address" clearable :placeholder="t('addressPlaceholder')" @input="areaChange()" class="input-width" :disabled="formData.is_system === 1"/>
+                    </div>
+                </el-form-item>
+
+                <el-form-item prop="area" v-loading="mapLoading">
+                    <div class="relative w-full">
+                        <div id="container" class="w-full h-[520px]"></div>
+                        <div class="absolute bg-white w-[270px] h-[500px] top-[10px] left-[10px] region-list" v-if="formData.pick_up_type.indexOf('local_delivery') != -1">
+                            <el-scrollbar>
+                                <div class="p-[10px] region-item pr-[50px] relative" v-for="(item, index) in formData.area" :key="index" :class="{ '!border-primary': index == currArea }" @click="selectArea(index)">
+                                    <el-form label-width="80px" :model="item" :rules="formRules" class="page-form"
+                                        ref="areaFromRef">
+                                        <div class="pb-[18px]">
+                                            <el-form-item :label="t('areaName')" prop="area_name">
+                                                <el-input v-model.trim="formData.area[index].area_name" type="text" @click.stop=""/>
+                                            </el-form-item>
+                                        </div>
+                                        <div class="pb-[18px]">
+                                            <el-form-item :label="t('startPrice')" prop="start_price">
+                                                <el-input v-model.trim="formData.area[index].start_price"  maxlength="8" type="text"
+                                                    @keyup="filterDigit($event)" @click.stop="" />
+                                            </el-form-item>
+                                        </div>
+                                        <div class="pb-[10px]" v-show="initData.fee_type == 'region'">
+                                            <el-form-item :label="t('deliveryPrice')" prop="delivery_price">
+                                                <el-input v-model.trim="formData.area[index].delivery_price" type="text"
+                                                    @keyup="filterDigit($event)"  @click.stop=""/>
+                                            </el-form-item>
+                                        </div>
+                                        <el-form-item :label="t('areaType')">
+                                            <el-radio-group v-model="formData.area[index].area_type" @change="areaTypeChange(index)">
+                                                <el-radio label="radius" size="large" class="!mr-[10px]">{{ t('radius') }}</el-radio>
+                                                <el-radio label="custom" size="large" class="!mr-[0px]">{{ t('custom') }}</el-radio>
+                                            </el-radio-group>
+                                        </el-form-item>
+                                    </el-form>
+                                    <el-button type="primary" link class="absolute z-1 top-[10px] right-[10px]"
+                                        @click.stop="deleteArea(index)">{{ t('delete') }}</el-button>
+                                </div>
+                                <div class="p-[10px] text-center">
+                                    <el-button plain @click="addArea">{{ t('addDeliveryArea') }}</el-button>
+                                </div>
+                            </el-scrollbar>
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <div class="fixed-footer-wrap">
+            <div class="fixed-footer">
+                <el-button type="primary" @click="onSave(formRef)" :disabled="loading">{{ t('save') }}</el-button>
+                <el-button @click="back()">{{ t('cancel') }}</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, onMounted, onBeforeUnmount, watch } from 'vue'
+import { t } from '@/lang'
+import { ArrowLeft } from '@element-plus/icons-vue'
+import { useRoute, useRouter } from 'vue-router'
+import { guid, filterNumber, filterDigit, deepClone, debounce } from '@/utils/common'
+import { getMap, getAreaListByPid, getAreaByCode } from '@/app/api/sys'
+import { createCircle, deleteGeometry, createPolygon, selectGeometry, createMarker, latLngToAddress, addressToLatLng } from '@/utils/qqmap'
+import { getDeliveryStoreDetail, addDeliveryStore, editDeliveryStore, getStoreInit, getStorePickUpType } from '@/addon/shop/api/delivery'
+import { FormInstance, ElMessage } from 'element-plus'
+import Test from '@/utils/test'
+
+const route = useRoute()
+const router = useRouter()
+const loading = ref(true)
+const pageName = route.meta.title
+const formRef = ref<FormInstance>()
+const areaFromRef: any = ref<FormInstance[]>()
+const initialFormData = {
+    store_id: '',
+    pick_up_type: [],
+    store_name: '',
+    contact_name: '',
+    store_mobile: '',
+    status: 1,
+    province_id: 0,
+    city_id: 0,
+    district_id: 0,
+    address: '',
+    full_address: '',
+    latitude: 39.908626,
+    longitude: 116.397190,
+    trade_time: '',
+    time_is_open: 1,
+    time_week: ['1', '2', '3', '4', '5', '6', '0'],
+    area: [
+        {
+            area_name: '',
+            area_type: 'radius',
+            start_price: 0,
+            delivery_price: 0,
+            area_json: {
+                key: guid()
+            }
+        }
+    ],
+    trade_time_json: [
+        { start_time: '', end_time: '' } // 初始一个时间段
+    ],
+    time_interval: 30,
+    is_system: 0
+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+formData.store_id = route.query.store_id
+const pickUpType = ref([])
+const initData = reactive<any>({
+    fee_type: 'region',
+    base_dist: '',
+    base_price: '',
+    grad_dist: '',
+    grad_price: '',
+    weight_start: 0.000,
+    weight_unit: 0,
+    weight_price: 0
+})
+const flash = ref(false)
+const getStorePickUpTypeFn = () => {
+    getStorePickUpType().then(res => {
+        pickUpType.value = res.data
+    })
+}
+getStorePickUpTypeFn()
+
+const getDeliveryStoreDetailFn = () => {
+    getDeliveryStoreDetail(formData.store_id).then(({ data }) => {
+        loading.value = false
+        Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+            if (key == 'trade_time_json' && Array.isArray(data[key])) {
+                formData[key] = data[key].map((item: any) => ({
+                    start_time: timestampTransition(item.start_time),
+                    end_time: timestampTransition(item.end_time)
+                }))
+            }
+        })
+    }).catch(() => {
+        loading.value = false
+    })
+}
+if (route.query.store_id) {
+    getDeliveryStoreDetailFn()
+} else {
+    loading.value = false
+}
+
+const refreshAddress = (bool = false) => {
+    getDeliveryStoreDetail(formData.store_id).then(({ data }) => {
+        loading.value = false
+        Object.keys(formData).forEach((key: string) => {
+            const addressKeyArr = ['store_name', 'contact_name', 'store_mobile', 'trade_time', 'province_id', 'city_id', 'district_id', 'address', 'full_address', 'latitude', 'longitude']
+            if (addressKeyArr.includes(key)) {
+                if (data[key] != undefined) formData[key] = data[key]
+            }
+        })
+        if (bool) {
+            ElMessage({
+                message: t('refreshSuccess'),
+                type: 'success'
+            })
+        }
+    }).catch(() => {
+        loading.value = false
+    })
+}
+
+const week_list = ref({})
+const time_interval_list = ref({})
+const getStoreInitFn = () => {
+    getStoreInit().then(res => {
+        week_list.value = res.data.week_list
+        time_interval_list.value = res.data.time_interval_list
+        Object.keys(initData).forEach((key: string) => {
+            if (res.data.local_delivery_config[key] != undefined) initData[key] = res.data.local_delivery_config[key]
+        })
+    })
+}
+
+interface areaType{
+    province: any[],
+    city: any[],
+    district: any[]
+}
+const areaList = reactive<areaType>({
+    province: [],
+    city: [],
+    district: []
+})
+const provinceRef = ref()
+const cityRef = ref()
+const districtRef = ref()
+
+/**
+ * 获取省
+ */
+getAreaListByPid(0).then(res => {
+    areaList.province = res.data
+})
+
+let mapKey: string = ''
+onMounted(() => {
+    const mapScript = document.createElement('script')
+    getMap().then(res => {
+        mapKey = res.data.key
+        mapScript.type = 'text/javascript'
+        mapScript.src = 'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=' + res.data.key
+        document.body.appendChild(mapScript)
+    })
+    mapScript.onload = () => {
+        setTimeout(() => {
+            initMap()
+        }, 500)
+    }
+    getStoreInitFn()
+})
+
+/**
+ * 初始化地图
+ */
+let map: any
+let marker: any
+const mapLoading = ref(true)
+const initMap = () => {
+    const TMap = (window as any).TMap
+    const LatLng = TMap.LatLng
+    const center = new LatLng(formData.latitude, formData.longitude)
+
+    map = new TMap.Map('container', {
+        center,
+        zoom: 14
+    })
+
+    map.on('tilesloaded', () => {
+        mapLoading.value = false
+    })
+
+    marker = createMarker(map)
+
+    map.on('click', (evt: any) => {
+        map.setCenter(evt.latLng)
+        marker.updateGeometries({
+            id: 'center',
+            position: evt.latLng
+        })
+        latLngChange(evt.latLng.lat, evt.latLng.lng)
+    })
+
+    latLngChange(center.lat, center.lng)
+
+    if (formData.pick_up_type.indexOf('local_delivery') != -1) {
+        formData.area.forEach(item => {
+            item.area_type == 'radius' ? createCircle(map, item.area_json) : createPolygon(map, item.area_json)
+        })
+    }
+}
+
+const storeArea = reactive({
+    province_id: 0,
+    city_id: 0,
+    district_id: 0
+})
+
+const latLngChange = (lat: number, lng: number) => {
+    latLngToAddress({ mapKey, lat, lng }).then(({ message, result }) => {
+        if (message == 'query ok' || message == 'Success') {
+            formData.latitude = result.location.lat
+            formData.longitude = result.location.lng
+            formData.address = result.formatted_addresses && result.formatted_addresses.recommend ? result.formatted_addresses.recommend : ''
+
+            getAreaByCode(result.ad_info.adcode).then(({ data }) => {
+                storeArea.province_id = data.province ? data.province.id : 0
+                storeArea.city_id = data.city ? data.city.id : (data.district ? data.district.id : 0)
+                storeArea.district_id = data.city ? (data.district ? data.district.id : 0) : 0
+            })
+        } else {
+            console.error(message, result)
+        }
+    }).catch(() => {
+        // console.log(err)
+    })
+}
+
+/**
+ * 获取市
+ */
+watch(() => formData.province_id, (nval) => {
+    if (nval) {
+        getAreaListByPid(formData.province_id).then(res => {
+            areaList.city = res.data
+
+            const cityId = formData.city_id
+            if (cityId) {
+                let isExist = false
+                for (let i = 0; i < res.data.length; i++) {
+                    if (cityId == res.data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (isExist) {
+                    formData.city_id = cityId
+                    return
+                }
+            }
+            formData.city_id = 0
+            areaChange()
+        })
+    } else {
+        formData.city_id = 0
+    }
+})
+
+/**
+* 获取区
+ */
+watch(() => formData.city_id, (nval) => {
+    if (nval) {
+        getAreaListByPid(formData.city_id).then(res => {
+            areaList.district = res.data
+
+            const districtId = formData.district_id
+            if (districtId) {
+                let isExist = false
+                for (let i = 0; i < res.data.length; i++) {
+                    if (districtId == res.data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (isExist) {
+                    formData.district_id = districtId
+                    return
+                }
+            }
+            areaChange()
+            formData.district_id = 0
+        })
+    } else {
+        formData.district_id = 0
+    }
+})
+
+watch(() => formData.district_id, (nval) => {
+    if (nval) {
+        areaChange()
+    }
+})
+
+const handleFlash = () => {
+    flash.value = true
+}
+
+const areaChange = debounce(() => {
+    setTimeout(() => {
+        const province = areaList.province.map((item) => { if (item.id == formData.province_id) { return item.name } })
+        const city = areaList.city.map((item) => { if (item.id == formData.city_id) { return item.name } })
+        const district = areaList.district.map((item) => { if (item.id == formData.district_id) { return item.name } })
+
+        const address = [
+            formData.province_id ? (provinceRef.value.selectedLabel || province) : '',
+            formData.city_id ? (cityRef.value.selectedLabel || city) : '',
+            formData.district_id ? (districtRef.value.selectedLabel || district) : '',
+            formData.address
+        ]
+        addressToLatLng({ mapKey, address: address.join('') }).then(({ message, result }) => {
+            if (message == 'Success' || message == 'query ok') {
+                const latLng = new (window as any).TMap.LatLng(result.location.lat, result.location.lng)
+                map.setCenter(latLng)
+
+                marker.updateGeometries({
+                    id: 'center',
+                    position: latLng
+                })
+                formData.latitude = result.location.lat
+                formData.longitude = result.location.lng
+                if (formData.pick_up_type.indexOf('local_delivery') != -1 && flash.value) {
+                    formData.area.forEach(item => {
+                        // 先删除旧的图形
+                        deleteGeometry(item.area_json.key)
+                        // 重新创建图形
+                        item.area_json.center = {
+                            lat: result.location.lat,
+                            lng: result.location.lng
+                        }
+                        item.area_type == 'radius' ? createCircle(map, item.area_json) : createPolygon(map, item.area_json)
+                    })
+                }
+            } else {
+                console.error(message, result)
+            }
+        })
+    }, 500)
+}, 500)
+
+/**
+ * 地图点选获取市
+ */
+watch(() => storeArea.province_id, (nval) => {
+    if (nval) {
+        getAreaListByPid(storeArea.province_id).then(res => {
+            areaList.city = res.data
+            formData.province_id = storeArea.province_id
+            formData.city_id = storeArea.city_id
+        })
+    }
+})
+
+/**
+* 地图点选获取区
+ */
+watch(() => storeArea.city_id, (nval) => {
+    if (nval) {
+        getAreaListByPid(storeArea.city_id).then(res => {
+            areaList.district = res.data
+            formData.city_id = storeArea.city_id
+            formData.district_id = storeArea.district_id
+        })
+    }
+})
+
+/**
+ * 地图点选获取区
+ */
+watch(() => storeArea.district_id, (nval) => {
+    if (nval) {
+        formData.district_id = storeArea.district_id
+    }
+})
+
+// 正则表达式
+const regExp = {
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
+}
+
+// 表单验证规则
+const formRules = reactive({
+    store_name: [
+        { required: true, message: t('storeNamePlaceholder'), trigger: 'blur' }
+    ],
+    contact_name: [
+        { required: true, message: t('contactNamePlaceholder'), trigger: 'blur' }
+    ],
+    store_mobile: [
+        { required: true, message: t('storeMobilePlaceholder'), trigger: 'blur' }
+    ],
+    trade_time: [
+        { required: true, message: t('tradeTimePlaceholder'), trigger: 'blur' }
+    ],
+    time_week: [
+        { required: true, message: t('timeWeekRequire'), trigger: 'change' }
+    ],
+    distance: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (initData.fee_type == 'distance') {
+                    if (Test.require(formData.base_dist)) {
+                        callback(new Error(t('baseDistRequire')))
+                    } else if (Number(formData.base_dist) <= 0) {
+                        callback(new Error(t('起始公里数不能小于等于0')))
+                    }
+                    if (Test.require(formData.base_price)) {
+                        callback(new Error(t('basePriceRequire')))
+                    }
+                    if (Test.require(formData.grad_dist)) {
+                        callback(new Error(t('gradDistRequire')))
+                    } else if (Number(formData.grad_dist) <= 0) {
+                        callback(new Error(t('超出公里数不能小于等于0')))
+                    }
+                    if (Test.require(formData.grad_price)) {
+                        callback(new Error(t('gradPriceRequire')))
+                    }
+                    if (Number(formData.weight_start) <= 0) { // 重量不能小于等于0
+                        callback(new Error(t('商品重量不能小于等于0')))
+                    }
+                    if (Number(formData.weight_unit) <= 0) { // 超出重量不能小于等于0
+                        callback(new Error(t('商品超出重量不能小于等于0')))
+                    }
+                }
+                callback()
+            },
+            trigger: ['blur', 'change']
+        }
+    ],
+    weight: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (initData.fee_type == 'distance') {
+                    if (Number(formData.weight_start) <= 0) { // 重量不能小于等于0
+                        callback(new Error(t('商品重量不能小于等于0')))
+                    }
+                    if (Number(formData.weight_unit) <= 0) { // 超出重量不能小于等于0
+                        callback(new Error(t('商品超出重量不能小于等于0')))
+                    }
+                }
+                callback()
+            },
+            trigger: ['blur', 'change']
+        }
+    ],
+    area_name: [{ required: true, message: t('areaNameRequire'), trigger: 'blur' }],
+    start_price: [
+        { required: true, message: t('startPriceRequire'), trigger: 'blur' },
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (parseInt(value) < 0) {
+                    callback(new Error(t('startPriceMin')))
+                }
+                callback()
+            },
+            trigger: 'blur'
+        }
+    ],
+    delivery_price: [
+        { required: initData.fee_type == 'region', message: t('deliveryPriceRequire'), trigger: 'blur' },
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (parseInt(value) < 0) {
+                    callback(new Error(t('deliveryPriceMin')))
+                }
+                callback()
+            },
+            trigger: 'blur'
+        }
+    ],
+    area: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (Test.empty(formData.area)) {
+                    callback(new Error(t('areaPlaceholder')))
+                }
+                callback()
+            },
+            trigger: 'blur'
+        }
+    ],
+    trade_time_json: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (!value || value.length === 0) {
+                    return callback(new Error(t('tradeTimePlaceholderTwo')))
+                }
+                for (let i = 0; i < value.length; i++) {
+                    const timeRange = value[i]
+                    if (!timeRange.start_time || !timeRange.end_time) {
+                        return callback(new Error(t('tradeTimePlaceholderTwo')))
+                    }
+                    // 结束时间不能小于或等于开始时间
+                    if (timeRange.end_time <= timeRange.start_time) {
+                        return callback(new Error(t('tradeTimePlaceholderFour')))
+                    }
+                    // 确保后一个时间段的开始时间不能小于前一个时间段的结束时间
+                    if (i > 0 && value[i].start_time < value[i - 1].end_time) {
+                        return callback(new Error(t('tradeTimePlaceholderFive')))
+                    }
+                }
+                callback()
+            },
+            trigger: 'change',
+            required: true
+        }
+    ],
+    time_interval: [
+        { required: true, message: t('tradeTimePlaceholderThree'), trigger: 'change' }
+    ],
+
+    address_area: [
+        {
+            validator: (rule: any, value: any, callback: any) => {
+                if (!formData.province_id) {
+                    callback(new Error(t('provincePlaceholder')))
+                }
+                if (!formData.city_id) {
+                    callback(new Error(t('cityPlaceholder')))
+                }
+                if (areaList.district.length && !formData.district_id) {
+                    callback(new Error(t('districtPlaceholder')))
+                }
+                callback()
+            }
+        }
+    ],
+    address: [
+        { required: true, message: t('addressPlaceholder'), trigger: 'blur' }
+    ]
+})
+
+// 添加时间段
+const addTimeRange = () => {
+    formData.trade_time_json.push({ start_time: '', end_time: '' })
+}
+
+// 删除时间段
+const removeTimeRange = (index: number) => {
+    formData.trade_time_json.splice(index, 1)
+}
+
+const timeTransition = (time:any) => {
+    const arr = time.split(':')
+    const num = arr[0] * 60 * 60 + arr[1] * 60
+    return num
+}
+
+const timestampTransition = (timeStamp:any) => {
+    let hour = Math.floor(timeStamp / (60 * 60))
+    let minute = Math.floor(timeStamp / 60) - (hour * 60)
+    hour = hour < 10 ? ('0' + hour) : hour
+    minute = minute < 10 ? ('0' + minute) : minute
+
+    return hour + ':' + minute
+}
+
+const currArea = ref<number>(0)
+
+/**
+ * 添加配送区域
+ */
+const addArea = () => {
+    formData.area.push({
+        area_name: '',
+        area_type: 'radius',
+        start_price: 0,
+        delivery_price: 0,
+        area_json: {
+            key: guid()
+        }
+    })
+    const index = formData.area.length - 1
+    createCircle(map, formData.area[index].area_json)
+}
+
+/**
+ * 删除配送区域
+ */
+const deleteArea = (index: number) => {
+    const data = formData.area[index]
+    deleteGeometry(data.area_json.key)
+    formData.area.splice(index, 1)
+}
+
+const selectArea = (index: number) => {
+    currArea.value = index
+    const data = formData.area[index]
+    selectGeometry(data.area_json.key)
+}
+
+const areaTypeChange = (index: number) => {
+    const data = formData.area[index]
+    deleteGeometry(data.area_json.key)
+    data.area_type == 'radius' ? createCircle(map, data.area_json) : createPolygon(map, data.area_json)
+}
+
+onBeforeUnmount(() => {
+    map.destroy()
+})
+
+// 当配送类型发生改变时
+const changePickUpType = (val: any) => {
+    if (val.indexOf('local_delivery') == -1) {
+        formData.area.forEach((item: any) => {
+            deleteGeometry(item.area_json.key)
+        })
+    } else {
+        formData.area.forEach((item: any) => {
+            deleteGeometry(item.area_json.key)
+            item.area_type == 'radius' ? createCircle(map, item.area_json) : createPolygon(map, item.area_json)
+        })
+    }
+}
+
+const onSave = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    await formEl.validate(async (valid) => {
+        let areaValidate = true
+
+        for (let i = 0; i < areaFromRef.value?.length; i++) {
+            const ref = areaFromRef.value[i]
+            await ref.validate(async (valid) => {
+                areaValidate = valid
+            })
+            if (!areaValidate) break
+        }
+        if (!areaValidate) return
+
+        if (valid) {
+            loading.value = true
+            await formEl.validate(async (valid) => {
+                const param: any = deepClone(formData)
+                formData.province_name = formData.province_id ? provinceRef.value.selectedLabel : ''
+                formData.city_name = formData.city_id ? cityRef.value.selectedLabel : ''
+                formData.district_name = formData.district_id ? districtRef.value.selectedLabel : ''
+                const address = [
+                    param.province_id ? provinceRef.value.selectedLabel : '',
+                    param.city_id ? cityRef.value.selectedLabel : '',
+                    param.district_id ? districtRef.value.selectedLabel : '',
+                    param.address
+                ]
+                param.full_address = address.join('')
+                param.trade_time_json = param.trade_time_json.map((range: any) => ({
+                    start_time: range.start_time ? timeTransition(range.start_time) : null,
+                    end_time: range.end_time ? timeTransition(range.end_time) : null
+                }))
+                const api = formData.store_id ? editDeliveryStore : addDeliveryStore
+                api(param).then(() => {
+                    loading.value = false
+                    router.push({ path: '/shop/delivery_store' })
+                }).catch(() => {
+                    loading.value = false
+                })
+            })
+        }
+    })
+}
+const back = () => {
+    router.push({ path: '/shop/delivery_store' })
+}
+
+// 新窗口打开
+const newWindow = () => {
+    const url = router.resolve({
+        path: '/shop/setting'
+    })
+    window.open(url.href)
+}
+</script>
+
+<style lang="scss" scoped>
+.region-list {
+    border: 1px solid var(--el-border-color-lighter);
+    z-index: 3;
+
+    .region-item {
+        border: 1px solid transparent;
+        border-bottom-color: var(--el-border-color-lighter);
+    }
+}
+#container :deep(div){
+    z-index: 2 !important;
+}
+</style>
diff --git a/niucloud/addon/shop/admin/views/delivery_store/list.vue b/niucloud/addon/shop/admin/views/delivery_store/list.vue
new file mode 100644
index 000000000..56549f731
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/delivery_store/list.vue
@@ -0,0 +1,160 @@
+<template>
+    <div class="main-container">
+       <el-card class="box-card !border-none" shadow="never">
+            <div class="flex justify-between items-center">
+                <span class="right">{{ pageName }}</span>
+                <el-button type="primary" @click="addEvent">{{ t('添加提货点') }}</el-button>
+            </div>
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="deliveryStoreTable.searchParam" ref="searchFormRef">
+                    <el-form-item :label="t('提货点名称')" prop="store_name">
+                        <el-input v-model.trim="deliveryStoreTable.searchParam.store_name" :placeholder="t('请输入提货点名称')" />
+                    </el-form-item>
+                    <el-form-item :label="t('提货类型')" prop="pick_up_type">
+                        <el-select v-model="deliveryStoreTable.searchParam.pick_up_type" :placeholder="t('请选择提货类型')" clearable>
+                            <el-option v-for="(item,key) in pickUpType" :key="key" :label="item" :value="key" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="primary" @click="loadDeliveryStoreList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+            <div class="mt-[10px]">
+                <el-table :data="deliveryStoreTable.data" size="large" v-loading="deliveryStoreTable.loading">
+                    <template #empty>
+                        <span>{{ !deliveryStoreTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column :label="t('提货点编号')" min-width="200" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <el-tag size="small" v-if="row.is_system">{{ t('系统') }}</el-tag>
+                            <span class="ml-[8px]">{{row.store_no}}</span>
+                       </template>
+                    </el-table-column>
+                    <el-table-column prop="store_name" :label="t('提货点名称')" min-width="120" />
+                    <el-table-column prop="contact_name" :label="t('联系人姓名')" min-width="80" />
+                    <el-table-column prop="store_mobile" :label="t('联系人电话')" min-width="80" />
+                    <el-table-column prop="full_address" :label="t('提货地址')" min-width="120" />
+                    <el-table-column prop="trade_time" :label="t('营业时间')" min-width="120" />
+                    <el-table-column prop="pick_up_type_name" :label="t('提货类型')" min-width="120" />
+                    <el-table-column :label="t('开启状态')" min-width="120">
+                        <template #default="{ row }">
+                            <el-tag class="cursor-pointer" :type="row.status ? 'success' : 'danger'" @click="updateStatus(row)">{{ row.status  ? '开启' : '关闭' }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column :label="t('operation')" fixed="right" min-width="120" align="right">
+                        <template #default="{ row }">
+                            <el-button type="primary" link @click="deliverySetEvent(row)">配送服务商设置</el-button>
+                            <el-button type="primary" link @click="editEvent(row)">编辑</el-button>
+                            <el-button type="primary" link @click="deleteEvent(row)" v-if="row.is_system == 0">删除</el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="deliveryStoreTable.page" v-model:page-size="deliveryStoreTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="deliveryStoreTable.total"
+                        @size-change="loadDeliveryStoreList()" @current-change="loadDeliveryStoreList" />
+                </div>
+            </div>
+       </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { t } from '@/lang'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessageBox, FormInstance } from 'element-plus'
+import { getDeliveryStoreList, getStorePickUpType, deleteDeliveryStore, editDeliveryStoreStatus } from '@/addon/shop/api/delivery'
+
+const route = useRoute()
+const router = useRouter()
+const pageName = route.meta.title
+
+const deliveryStoreTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam: {
+        store_name: '',
+        pick_up_type: '',
+        create_time: ''
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+const pickUpType = ref([])
+
+const getStorePickUpTypeFn = () => {
+    getStorePickUpType().then(res => {
+        pickUpType.value = res.data
+    })
+}
+getStorePickUpTypeFn()
+/**
+ * 获取门店自提列表
+ */
+const loadDeliveryStoreList = (page: number = 1) => {
+    deliveryStoreTable.loading = true
+    deliveryStoreTable.page = page
+
+    getDeliveryStoreList({
+        page: deliveryStoreTable.page,
+        limit: deliveryStoreTable.limit,
+        ...deliveryStoreTable.searchParam
+    }).then((res: any) => {
+        deliveryStoreTable.loading = false
+        deliveryStoreTable.data = res.data.data
+        deliveryStoreTable.total = res.data.total
+    }).catch(() => {
+        deliveryStoreTable.loading = false
+    })
+}
+loadDeliveryStoreList()
+
+/**
+ * 添加门店
+ */
+const addEvent = () => {
+    router.push('/shop/delivery_store/edit')
+}
+// 配送设置
+const deliverySetEvent = (data: any) => {
+    router.push('/shop/delivery_store/delivery_set?id=' + data.store_id)
+}
+// 编辑
+const editEvent = (row: any) => {
+    router.push({ path: '/shop/delivery_store/edit', query: { store_id: row.store_id } })
+}
+// 删除
+const deleteEvent = (row: any) => {
+    ElMessageBox.confirm(t('确定要删除该门店吗'), t('warning'), {
+        confirmButtonText: t('confirm'),
+        cancelButtonText: t('cancel'),
+        type: 'warning'
+    }).then(() => {
+        deleteDeliveryStore(row.store_id).then(() => {
+            loadDeliveryStoreList()
+        })
+    }).catch(() => {})
+}
+// 更新状态
+const updateStatus = (row: any) => {
+    row.status = row.status ? 0 : 1
+    editDeliveryStoreStatus({
+        store_id: row.store_id,
+        status: row.status
+    }).then(() => {
+
+    })
+}
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadDeliveryStoreList()
+}
+</script>
\ No newline at end of file
diff --git a/niucloud/addon/shop/admin/views/diy/components/edit-goods-list.vue b/niucloud/addon/shop/admin/views/diy/components/edit-goods-list.vue
index e4169ef37..e51d79adb 100644
--- a/niucloud/addon/shop/admin/views/diy/components/edit-goods-list.vue
+++ b/niucloud/addon/shop/admin/views/diy/components/edit-goods-list.vue
@@ -124,6 +124,18 @@
             </el-form>
         </div>
 
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('图片展示模式') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('模式')">
+                    <el-radio-group v-model="diyStore.editComponent.mode">
+                        <el-radio label="aspectFill">{{ t('短边完整，长边裁剪') }}</el-radio>
+                        <el-radio label="aspectFit">{{ t('长边适配，等比缩放') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </div>
+
         <div class="edit-attr-item-wrap">
             <h3 class="mb-[10px]">{{ t("goodsShowContent") }}</h3>
             <el-form label-width="90px" class="px-[10px]">
diff --git a/niucloud/addon/shop/admin/views/diy/components/edit-many-goods-list.vue b/niucloud/addon/shop/admin/views/diy/components/edit-many-goods-list.vue
index 6cf3edad5..80785032b 100644
--- a/niucloud/addon/shop/admin/views/diy/components/edit-many-goods-list.vue
+++ b/niucloud/addon/shop/admin/views/diy/components/edit-many-goods-list.vue
@@ -32,6 +32,17 @@
                 </el-form-item>
             </el-form>
         </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('图片展示模式') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('模式')">
+                    <el-radio-group v-model="diyStore.editComponent.mode">
+                        <el-radio label="aspectFill">{{ t('短边完整，长边裁剪') }}</el-radio>
+                        <el-radio label="aspectFit">{{ t('长边适配，等比缩放') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </div>
         <div class="edit-attr-item-wrap">
             <h3 class="mb-[10px]">{{ t("manyGoodsListCategorySet") }}</h3>
             <el-form label-width="80px" class="px-[10px]">
diff --git a/niucloud/addon/shop/admin/views/diy/components/edit-shop-exchange-goods.vue b/niucloud/addon/shop/admin/views/diy/components/edit-shop-exchange-goods.vue
index 06b5cb4bf..5d6329af9 100644
--- a/niucloud/addon/shop/admin/views/diy/components/edit-shop-exchange-goods.vue
+++ b/niucloud/addon/shop/admin/views/diy/components/edit-shop-exchange-goods.vue
@@ -64,6 +64,17 @@
                 </el-form>
 
             </div>
+            <div class="edit-attr-item-wrap">
+                <h3 class="mb-[10px]">{{ t('图片展示模式') }}</h3>
+                <el-form label-width="80px" class="px-[10px]">
+                    <el-form-item :label="t('模式')">
+                        <el-radio-group v-model="diyStore.editComponent.mode">
+                            <el-radio label="aspectFill">{{ t('短边完整，长边裁剪') }}</el-radio>
+                            <el-radio label="aspectFit">{{ t('长边适配，等比缩放') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                </el-form>
+            </div>
         </div>
 
         <!-- 样式 -->
diff --git a/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-hot.vue b/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-hot.vue
new file mode 100644
index 000000000..b897267b5
--- /dev/null
+++ b/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-hot.vue
@@ -0,0 +1,197 @@
+<template>
+    <!-- 内容 -->
+    <div class="content-wrap" v-show="diyStore.editTab == 'content'">
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('标题内容') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('标题风格')">
+                    <el-radio-group v-model="diyStore.editComponent.titleStyle.way">
+                        <el-radio :value="'text'">{{ t('文字') }}</el-radio>
+                        <el-radio :value="'img'">{{ t('图片') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('标题')" v-show="diyStore.editComponent.titleStyle.way == 'text'">
+                    <el-input v-model.trim="diyStore.editComponent.titleStyle.text" :placeholder="t('请输入标题')" clearable maxlength="10" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('image')" v-show="diyStore.editComponent.titleStyle.way == 'img'">
+                    <upload-image v-model="diyStore.editComponent.titleStyle.imgUrl" :limit="1" />
+                </el-form-item>
+                <el-form-item :label="t('link')">
+                    <diy-link v-model="diyStore.editComponent.titleStyle.link" />
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('副标题内容') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('副标题')">
+                    <el-input v-model.trim="diyStore.editComponent.subTitleStyle.text" :placeholder="t('请输入副标题')" clearable maxlength="10" show-word-limit />
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('按钮内容') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('按钮名称')">
+                    <el-input v-model.trim="diyStore.editComponent.btnStyle.text" :placeholder="t('请输入按钮名称')" clearable maxlength="4" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('link')">
+                    <diy-link v-model="diyStore.editComponent.btnStyle.link" />
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('商品标签')">
+                    <el-input v-model.trim="diyStore.editComponent.goodsStyle.labelText" :placeholder="t('请输入名称')" clearable maxlength="4" show-word-limit />
+                </el-form-item>
+                <el-form-item :label="t('选择商品')">
+                    <el-radio-group v-model="diyStore.editComponent.goodsStyle.source" :title="t('选择商品')">
+                        <el-radio label="all">{{ t('全部') }}</el-radio>
+                        <el-radio label="custom">{{ t('手动选择') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('goodsNum')" v-if="diyStore.editComponent.goodsStyle.source == 'all'">
+                    <el-slider class="goods-list-slider" show-input v-model="diyStore.editComponent.goodsStyle.num" :min="1" max="20" size="small" />
+                </el-form-item>
+                <el-form-item :label="t('customGoods')" v-if="diyStore.editComponent.goodsStyle.source == 'custom'">
+                    <goods-select-popup ref="goodsSelectPopupRef" v-model="diyStore.editComponent.goodsStyle.goodsIds" :min="1" :max="99" />
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('图片展示模式') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('模式')">
+                    <el-radio-group v-model="diyStore.editComponent.mode">
+                        <el-radio label="aspectFill">{{ t('短边完整，长边裁剪') }}</el-radio>
+                        <el-radio label="aspectFit">{{ t('长边适配，等比缩放') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </div>
+    </div>
+
+    <!-- 样式 -->
+    <div class="style-wrap" v-show="diyStore.editTab == 'style'">
+
+        <div class="edit-attr-item-wrap" v-if="diyStore.editComponent.titleStyle.way == 'text'">
+            <h3 class="mb-[10px]">{{ t('标题样式') }}</h3>
+            <el-form label-width="100px" class="px-[10px]">
+                <el-form-item :label="t('textFontSize')">
+                    <el-slider v-model="diyStore.editComponent.titleStyle.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="20" />
+                </el-form-item>
+                <el-form-item :label="t('textFontWeight')">
+                    <el-radio-group v-model="diyStore.editComponent.titleStyle.fontWeight">
+                        <el-radio :value="'normal'">{{ t('fontWeightNormal') }}</el-radio>
+                        <el-radio :value="'bold'">{{ t('fontWeightBold') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="t('textColor')">
+                    <el-color-picker v-model="diyStore.editComponent.titleStyle.textColor" />
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('副标题样式') }}</h3>
+            <el-form label-width="100px" class="px-[10px]">
+                <el-form-item :label="t('textFontSize')">
+                    <el-slider v-model="diyStore.editComponent.subTitleStyle.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="12" :max="30" />
+                </el-form-item>
+                <el-form-item :label="t('textColor')">
+                    <el-color-picker v-model="diyStore.editComponent.subTitleStyle.textColor" />
+                </el-form-item>
+                <el-form-item :label="t('背景色')">
+                    <el-color-picker v-model="diyStore.editComponent.subTitleStyle.bgColor" />
+                </el-form-item>
+                <el-form-item :label="t('标题圆角')">
+                    <el-slider v-model="diyStore.editComponent.subTitleStyle.rounded" show-input size="small" class="ml-[10px] diy-nav-slider" :min="0" :max="30" />
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('按钮样式') }}</h3>
+            <el-form label-width="100px" class="px-[10px]">
+                <el-form-item :label="t('文字大小')">
+                    <el-slider v-model="diyStore.editComponent.btnStyle.fontSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="10" :max="15" />
+                </el-form-item>
+                <el-form-item :label="t('文字颜色')">
+                    <el-color-picker v-model="diyStore.editComponent.btnStyle.textColor" show-alpha :predefine="diyStore.predefineColors" />
+                </el-form-item>
+                <el-form-item :label="t('背景色')">
+                    <el-color-picker v-model="diyStore.editComponent.btnStyle.startBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                    <icon name="iconfont iconmap-connect" size="20px" class="block !text-gray-400 mx-[5px]" />
+                    <el-color-picker v-model="diyStore.editComponent.btnStyle.endBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                </el-form-item>
+                <el-form-item :label="t('渐变方式')">
+                    <el-radio-group v-model="diyStore.editComponent.btnStyle.gradientType">
+                        <el-radio :value="'linear'">{{ t('线性渐变') }}</el-radio>
+                        <el-radio :value="'radial'">{{ t('径向渐变') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </div>
+
+        
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('商品样式') }}</h3>
+            <el-form label-width="100px" class="px-[10px]">
+                <el-form-item :label="t('标签大小')">
+                    <el-slider v-model="diyStore.editComponent.goodsStyle.labelSize" show-input size="small" class="ml-[10px] diy-nav-slider" :min="10" :max="15" />
+                </el-form-item>
+                <el-form-item :label="t('标签文字色')">
+                    <el-color-picker v-model="diyStore.editComponent.goodsStyle.labelColor" show-alpha :predefine="diyStore.predefineColors" />
+                </el-form-item>
+                <el-form-item :label="t('标签背景色')">
+                    <el-color-picker v-model="diyStore.editComponent.goodsStyle.labelBgColor" show-alpha :predefine="diyStore.predefineColors" />
+                </el-form-item>
+                <el-form-item :label="t('背景色')">
+                    <el-color-picker v-model="diyStore.editComponent.goodsStyle.bgColor" show-alpha :predefine="diyStore.predefineColors" />
+                </el-form-item>
+                <el-form-item :label="t('商品圆角')">
+                    <el-slider v-model="diyStore.editComponent.goodsStyle.rounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+                </el-form-item>
+                <el-form-item :label="t('图片圆角')">
+                    <el-slider v-model="diyStore.editComponent.goodsStyle.imgRounded" show-input size="small" class="ml-[10px] diy-nav-slider" :max="50" />
+                </el-form-item>
+            </el-form>
+        </div>
+
+        <!-- 组件样式 -->
+        <slot name="style"></slot>
+    </div>
+
+</template>
+
+<script lang="ts" setup>
+import { t } from '@/lang'
+import useDiyStore from '@/stores/modules/diy'
+import { ref, reactive, onMounted } from 'vue'
+import goodsSelectPopup from '@/addon/shop/views/goods/components/goods-select-popup.vue'
+
+const diyStore: any = useDiyStore()
+diyStore.editComponent.ignore = [] // 忽略公共属性
+
+// 组件验证
+diyStore.editComponent.verify = (index: number) => {
+    const res = { code: true, message: '' }
+
+    if (diyStore.value[index].goodsStyle.source == 'custom' && !diyStore.value[index].goodsStyle.goodsIds.length) {
+        res.code = false
+        res.message = t('请选择商品')
+    }
+    return res
+}
+
+defineExpose({})
+
+</script>
+
+<style lang="scss">
+.goods-list-slider {
+    .el-slider__input {
+        width: 100px;
+    }
+}
+</style>
diff --git a/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-ranking.vue b/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-ranking.vue
index ffd34a845..de59bb36c 100644
--- a/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-ranking.vue
+++ b/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-ranking.vue
@@ -59,6 +59,17 @@
 
             </el-form>
         </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('图片展示模式') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('模式')">
+                    <el-radio-group v-model="diyStore.editComponent.mode">
+                        <el-radio label="aspectFill">{{ t('短边完整，长边裁剪') }}</el-radio>
+                        <el-radio label="aspectFit">{{ t('长边适配，等比缩放') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </div>
     </div>
 
     <!-- 样式 -->
diff --git a/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-recommend.vue b/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-recommend.vue
index 0ebd624f9..c403d4e00 100644
--- a/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-recommend.vue
+++ b/niucloud/addon/shop/admin/views/diy/components/edit-shop-goods-recommend.vue
@@ -15,6 +15,17 @@
                 </el-form-item>
             </el-form>
         </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('图片展示模式') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('模式')">
+                    <el-radio-group v-model="diyStore.editComponent.mode">
+                        <el-radio label="aspectFill">{{ t('短边完整，长边裁剪') }}</el-radio>
+                        <el-radio label="aspectFit">{{ t('长边适配，等比缩放') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </div>
 
         <div class="edit-attr-item-wrap">
             <el-form label-width="120px" class="px-[10px]">
diff --git a/niucloud/addon/shop/admin/views/diy/components/edit-shop-newcomer.vue b/niucloud/addon/shop/admin/views/diy/components/edit-shop-newcomer.vue
index 5643d8533..74bf5a562 100644
--- a/niucloud/addon/shop/admin/views/diy/components/edit-shop-newcomer.vue
+++ b/niucloud/addon/shop/admin/views/diy/components/edit-shop-newcomer.vue
@@ -32,6 +32,17 @@
 
             </el-dialog>
         </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('图片展示模式') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('模式')">
+                    <el-radio-group v-model="diyStore.editComponent.mode">
+                        <el-radio label="aspectFill">{{ t('短边完整，长边裁剪') }}</el-radio>
+                        <el-radio label="aspectFit">{{ t('长边适配，等比缩放') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </div>
 
         <div class="edit-attr-item-wrap">
             <h3 class="mb-[10px]">{{ t('titleContent') }}</h3>
diff --git a/niucloud/addon/shop/admin/views/diy/components/edit-single-recommend.vue b/niucloud/addon/shop/admin/views/diy/components/edit-single-recommend.vue
index 979854054..1f8ed5cdf 100644
--- a/niucloud/addon/shop/admin/views/diy/components/edit-single-recommend.vue
+++ b/niucloud/addon/shop/admin/views/diy/components/edit-single-recommend.vue
@@ -45,6 +45,17 @@
 
             </el-dialog>
         </div>
+        <div class="edit-attr-item-wrap">
+            <h3 class="mb-[10px]">{{ t('图片展示模式') }}</h3>
+            <el-form label-width="80px" class="px-[10px]">
+                <el-form-item :label="t('模式')">
+                    <el-radio-group v-model="diyStore.editComponent.mode">
+                        <el-radio label="aspectFill">{{ t('短边完整，长边裁剪') }}</el-radio>
+                        <el-radio label="aspectFit">{{ t('长边适配，等比缩放') }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
+        </div>
 
         <div class="edit-attr-item-wrap">
             <h3 class="mb-[10px]">{{ t("selectSource") }}</h3>
diff --git a/niucloud/addon/shop/admin/views/goods/list.vue b/niucloud/addon/shop/admin/views/goods/list.vue
index 49de2a2f6..bacc101a4 100644
--- a/niucloud/addon/shop/admin/views/goods/list.vue
+++ b/niucloud/addon/shop/admin/views/goods/list.vue
@@ -479,71 +479,7 @@ const previewEvent = (data: any) => {
 }
 
 const activeclick = (data: any) => {
-    if (data.list[0].join_type == 'impulse_buy') {
-        const routeUrl = router.resolve({
-            path: '/shop_impulse_buy/list',
-            query: {
-                active_id: data.list[0].join_id
-            }
-        })
-        window.open(routeUrl.href, '_blank')
-    } else if (data.list[0].join_type == 'discount') {
-        const routeUrl = router.resolve({
-            path: '/shop/marketing/discount/list',
-            query: {
-                active_id: data.list[0].join_id
-            }
-        })
-        window.open(routeUrl.href, '_blank')
-    } else if (data.list[0].join_type == 'gift_card') {
-        const routeUrl = router.resolve({
-            path: '/shop_giftcard/giftcard/list',
-            query: {
-                active_id: data.list[0].join_id
-            }
-        })
-        window.open(routeUrl.href, '_blank')
-    } else if (data.list[0].join_type == 'active_exchange') {
-        const routeUrl = router.resolve({
-            path: '/shop/marketing/exchange/goods_list',
-            query: {
-                active_id: data.list[0].join_id
-            }
-        })
-        window.open(routeUrl.href, '_blank')
-    } else if (data.list[0].join_type == 'active_newcomer_discount') {
-        const routeUrl = router.resolve({
-            path: '/shop/marketing/newcomer/config'
-            // query: {
-            //     active_id: data.list[0].join_id
-            // }
-        })
-        window.open(routeUrl.href, '_blank')
-    } else if (data.list[0].join_type == 'manjian') {
-        const routeUrl = router.resolve({
-            path: '/shop/marketing/manjian/list',
-            query: {
-                active_id: data.list[0].join_id
-            }
-        })
-        window.open(routeUrl.href, '_blank')
-    } else if (data.list[0].join_type == 'seckill') {
-        const routeUrl = router.resolve({
-            path: '/seckill/active/list',
-            // query: {
-            //     active_id: data.list[0].join_id
-            // }
-        })
-        window.open(routeUrl.href, '_blank')
-    }else if (data.list[0].join_type == 'pintuan') {
-        const routeUrl = router.resolve({
-            path: '/pintuan/active/list',
-            // query: {
-            //     active_id: data.list[0].join_id
-            // }
-        })
-        window.open(routeUrl.href, '_blank')
-    }
+    window.open(data.jump_url, '_blank')
 }
 
 // 监听排序
@@ -783,7 +719,7 @@ loadGoodsList(getTablePageStorage(goodsTable.searchParam).page)
  * 添加商品
  */
 const addEvent = () => {
-    router.push('/shop/goods/real_edit')
+    router.push('/shop/goods/real_add')
     // let url = router.resolve({
     //     path: '/shop/goods/real_edit',
     // });
@@ -865,6 +801,10 @@ const copyEvent = (data: any) => {
                 loadGoodsList(getTablePageStorage(goodsTable.searchParam).page)
             }
             repeat.value = false
+            ElMessage({
+                type: 'success',
+                message: '商品复制成功，可以在仓库中商品查询'
+            })
         }).catch(() => {
             repeat.value = false
         })
diff --git a/niucloud/addon/shop/admin/views/goods/public/js/useGoodsEdit.ts b/niucloud/addon/shop/admin/views/goods/public/js/useGoodsEdit.ts
index d286cef42..54cec5be6 100644
--- a/niucloud/addon/shop/admin/views/goods/public/js/useGoodsEdit.ts
+++ b/niucloud/addon/shop/admin/views/goods/public/js/useGoodsEdit.ts
@@ -3,7 +3,7 @@ import { t } from '@/lang'
 import { TabsPaneContext, ElMessage } from 'element-plus'
 import Sortable from 'sortablejs'
 import { range, cloneDeep } from 'lodash-es'
-import { debounce, deepClone } from '@/utils/common'
+import { debounce, deepClone, getImageDimensions } from '@/utils/common'
 import { useRoute, useRouter } from 'vue-router'
 import Test from '@/utils/test'
 import {
@@ -125,7 +125,9 @@ export function useGoodsEdit(params: any = {}) {
 
     // 切换商品类型
     const changeGoodsType = (data: any) => {
-        router.push(data.path)
+        // 添加商品是切换类型不应该是edit
+        let url = '/shop/goods/'+data.type + '_add'
+        router.push(url)
     }
 
     // 商品类型
@@ -1358,13 +1360,18 @@ export function useGoodsEdit(params: any = {}) {
 
     // 保存数据
     const save = (callback: any = null) => {
-        verify(() => {
+        verify(async() => {
 
             if (repeat.value) return
             repeat.value = true
 
             const api = formData.goods_id ? editApi : addApi
             const data = cloneDeep(formData)
+            const coverImage = data.goods_image.split(',')[0]
+
+            const info = await getImageDimensions(coverImage)
+            data.goods_image_width = info ? info.width : 800
+            data.goods_image_height = info ? info.height : 800
 
             if (data.spec_type == 'multi') {
                 data.stock = 0
diff --git a/niucloud/addon/shop/admin/views/index/index.vue b/niucloud/addon/shop/admin/views/index/index.vue
index 43638a4f5..da9fbd086 100644
--- a/niucloud/addon/shop/admin/views/index/index.vue
+++ b/niucloud/addon/shop/admin/views/index/index.vue
@@ -199,6 +199,7 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 import { t } from '@/lang'
+import { ElMessage, ElNotification } from 'element-plus'
 import {
     getShopCountList,
     getShopTodayCountList,
@@ -207,6 +208,7 @@ import {
     getShopOrderStat,
     getShopGoodsStat
 } from '@/addon/shop/api/shop'
+import { checkJobStatus } from '@/app/api/sys'
 import * as echarts from 'echarts'
 import { useRouter } from 'vue-router'
 
@@ -370,6 +372,27 @@ const nowTime = () => {
     time.value = year + '-' + month + '-' + day + ' ' + hh + ':' + mm + ':' + ss
 }
 nowTime()
+
+/**
+ * 校验消息队列
+ */
+let notification = null
+const checkJob = () => {
+    checkJobStatus().then(res => {
+        if (!res.data) {
+            notification = ElNotification({
+                title: '温馨提示',
+                dangerouslyUseHTMLString: true,
+                duration: 0,
+                position: 'bottom-right',
+                message: '您的【队列】运行异常，会导致商城订单相关任务无法正常使用，请尽快启动队列<br><a class="text-[var(--el-color-primary)]" href="https://doc.press.niucloud.com/php/saas-framework/use/other/scheduled-task-config.html" target="_blank">>>> 点击查看处理方法 <<<</a>',
+                type: 'warning'
+            })
+        }
+    }).catch(() => {
+    })
+}
+checkJob()
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/niucloud/addon/shop/admin/views/member/components/gift-coupon.vue b/niucloud/addon/shop/admin/views/member/components/gift-coupon.vue
index 1fd7195f5..194c23c3f 100644
--- a/niucloud/addon/shop/admin/views/member/components/gift-coupon.vue
+++ b/niucloud/addon/shop/admin/views/member/components/gift-coupon.vue
@@ -30,16 +30,13 @@
                         </el-table-column>
                         <el-table-column label="有效期" min-width="210">
                             <template #default="{ row }">
-                                <template v-if="row.receive_type == 1">
-                                    <span v-if="row.valid_type == 1">  领取之日起{{ row.length || '' }} 天内有效</span>
-                                    <span v-else> 使用截止时间至{{ row.valid_end_time || ''}} </span>
-                                </template>
-                                <span v-else>--</span>
+                                <span v-if="row.valid_type == 1">  领取之日起{{ row.length || '' }} 天内有效</span>
+                                <span v-else> 使用截止时间至{{ row.valid_end_time || ''}} </span>
                             </template>
                         </el-table-column>
                         <el-table-column label="赠券数" min-width="130">
                             <template #default="{ row }">
-                                <el-input-number
+                                <el-input-number v-if="row.limit_count"
                                     v-model="formData.coupon_list['id_' + row.id]"
                                     :min="1"
                                     :precision="0"
@@ -47,6 +44,14 @@
                                     controls-position="right"
                                     class="!w-[100px]"
                                 />
+                                <el-input-number v-else
+                                    v-model="formData.coupon_list['id_' + row.id]"
+                                    :min="1"
+                                    :max="999999"
+                                    :precision="0"
+                                    controls-position="right"
+                                    class="!w-[100px]"
+                                />
                             </template>
                         </el-table-column>
                         <el-table-column :label="t('operation')" align="right" fixed="right">
diff --git a/niucloud/addon/shop/admin/views/order/components/delivery-action.vue b/niucloud/addon/shop/admin/views/order/components/delivery-action.vue
index cafbe98cf..b693ae11d 100644
--- a/niucloud/addon/shop/admin/views/order/components/delivery-action.vue
+++ b/niucloud/addon/shop/admin/views/order/components/delivery-action.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-model="showDialog" :title="showType == 'add' ? t('delivery') : t('修改物流信息')" :width="showType =='add' ?'700px' :'1000px'" class="diy-dialog-wrap" :destroy-on-close="true" :close-on-click-modal="false">
+    <el-dialog v-model="showDialog" :title="showType == 'add' ? t('delivery') : t('修改物流信息')" :width="showType =='add' ? '700px' :'1000px'" class="diy-dialog-wrap" :destroy-on-close="true" :close-on-click-modal="false" @close="handleClose">
         <div v-loading="loading">
 
             <el-alert type="warning" :closable="false" class="!mb-[10px]" v-if="isTradeManaged">
@@ -35,15 +35,67 @@
                         </el-select>
                     </el-form-item>
                 </template>
+                <template v-if="formData.delivery_type == 'local_delivery'">
+                    <el-form-item :label="t('deliveryWay')">
+                        <el-radio-group v-model="formData.delivery_way" @change="deliveryWayChange">
+                            <el-radio label="store_delivery">{{ t('storeDeliveryWay') }}</el-radio>
+                            <el-radio label="third_party_delivery">{{ t('thirdPartyDeliveryWay') }}</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <div v-if="formData.delivery_way == 'store_delivery'">
+                        <el-form-item :label="t('deliveryStore')" prop="store_id">
+                            <el-select v-model="formData.store_id" :placeholder="t('deliveryStorePlaceholder')" clearable class="input-width">
+                                <el-option v-for="(item) in deliveryStoreData" :key="item.store_id" :label="item.store_name" :value="item.store_id" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="t('deliverName')" prop="local_deliver_id">
+                            <el-select v-model="formData.local_deliver_id" :placeholder="t('deliverNamePlaceholder')" clearable class="input-width" @change="deliverNameChange">
+                                <el-option v-for="(item) in deliverData" :key="item.deliver_id" :label="item.deliver_name" :value="item.deliver_id" />
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item :label="t('deliverMobile')" prop="deliver_mobile">
+                            <el-input v-model.trim="formData.deliver_mobile" clearable :disabled="true" :placeholder="t('deliverMobilePlaceholder')" class="input-width" maxlength="30" />
+                        </el-form-item>
+                    </div>
+                    <div v-if="formData.delivery_way == 'third_party_delivery'">
+                        <el-form-item :label="t('deliveryStore')" prop="store_id">
+                            <div>
+                                <el-select v-model="formData.store_id" :placeholder="t('deliveryStorePlaceholder')" clearable class="input-width" @change="deliveryStoreChange">
+                                    <el-option v-for="(item) in deliveryStoreData" :key="item.store_id" :label="item.store_name" :value="item.store_id" />
+                                </el-select>
+                                <span class="ml-[10px] cursor-pointer text-primary" @click="toAddress" v-if="curThirdDelivery?.open_status == 2">去开通</span>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('thirdDeliveryName')" prop="local_delivery_type">
+                            <div class="flex items-center">
+                                <el-select v-model="formData.local_delivery_type" :placeholder="t('thirdDeliveryNamePlaceholder')" clearable class="input-width" @change="thirdDeliveryChange">
+                                    <el-option v-for="(item,index) in thirdDeliveryData" :key="index" :label="item.name" :value="item.key" />
+                                </el-select>
+                                <div class="ml-[10px]">
+                                    <span class="cursor-pointer text-primary mr-[10px]" @click="getInUseLocalDeliveryListFn(formData.store_id)">{{ t('refresh') }}</span>
+                                    <span class="cursor-pointer text-primary" @click="toThirdDelivery">{{ t('去配置') }}</span>
+                                </div>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('goodsWeight')" prop="goods_weight">
+                            <el-input v-model.trim="formData.goods_weight" clearable placeholder="0.000" class="input-width" maxlength="6" @blur="thirdDeliveryChange">
+                                <template #append>kg</template>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item :label="t('配送费用')" >
+                           <div class="input-width">{{ deliveryFee }}元</div>
+                        </el-form-item>
+                    </div>
+                </template>
             </el-form>
-            <el-table :data="goodsDataArr" size="large" @selection-change="handleSelectionChange" max-height="400px">
+            <el-table :data="goodsDataArr" size="large" @selection-change="handleSelectionChange" ref="tableRef" max-height="400px">
                 <el-table-column type="selection" width="55" :selectable="selectable" />
                 <el-table-column prop="goods_name" :label="t('goodsName')" min-width="200" >
                     <template #default="{ row }">
                         <div class="flex cursor-pointer">
                             <div class="flex items-center min-w-[50px] mr-[10px]">
                                 <img class="w-[50px] h-[50px]" v-if="row.goods_image" :src="img(row.goods_image)" alt="">
-                                 <img class="w-[50px] h-[50px]" v-else src="" alt="">
+                                <img class="w-[50px] h-[50px]" v-else src="" alt="">
                             </div>
                             <div class="flex  flex-col items-start">
                                 <span class="multi-hidden text-[14px]">{{row.goods_name}}</span>
@@ -56,12 +108,22 @@
                 <el-table-column prop="num" :label="t('num')" min-width="80" />
                 <el-table-column prop="status_name" :label="t('refundStatusName')" min-width="80" />
                 <el-table-column prop="delivery_status_name" :label="t('deliveryStatusName')" min-width="80" />
-                <el-table-column prop="express_company_name" :label="t('物流公司')" min-width="80" v-if="showType == 'edit'">
+                 <el-table-column  :label="t('deliveryPlatform')" min-width="80" v-if="showType == 'edit' && formData.delivery_type == 'local_delivery'">
+                    <template #default="{ row }">
+                        <span>{{row.delivery_info?.delivery_service_name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="local_delivery_status_name" :label="t('deliveryStatus')" min-width="80" v-if="showType == 'edit' && formData.delivery_type == 'local_delivery'">
+                    <template #default="{ row }">
+                        <span>{{ row.delivery_info?.local_delivery_status_name }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="express_company_name" :label="t('物流公司')" min-width="80" v-if="showType == 'edit' && formData.delivery_type == 'express'">
                     <template #default="{ row }">
                         <span class="text-[#999]">{{ row.delivery_info?.express_company_name }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column prop="express_number" :label="t('物流单号')" min-width="80" v-if="showType == 'edit'">
+                <el-table-column prop="express_number" :label="t('物流单号')" min-width="80" v-if="showType == 'edit' && formData.delivery_type == 'express'">
                     <template #default="{ row }">
                         <span class="text-[#999]">{{ row.delivery_info?.express_number }}</span>
                     </template>
@@ -70,7 +132,7 @@
         </div>
         <template #footer>
             <span class="dialog-footer">
-                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button @click="handleClose">{{ t('cancel') }}</el-button>
                 <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{ t('confirm') }}</el-button>
             </span>
         </template>
@@ -78,21 +140,19 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, computed, nextTick } from 'vue'
 import { t } from '@/lang'
 import { img } from '@/utils/common'
 import { FormInstance, ElMessage } from 'element-plus'
-import { getCompanyList } from '@/addon/shop/api/delivery'
-import { getOrderDeliveryType, orderDelivery } from '@/addon/shop/api/order'
+import { getCompanyList, getShopDeliverList, getInUseLocalDeliveryList, getDeliveryStoreListAll } from '@/addon/shop/api/delivery'
+import { getOrderDeliveryType, orderDelivery, getSelectOrderGoodsWeight, getDeliveryFee } from '@/addon/shop/api/order'
 import { getIsTradeManaged } from '@/app/api/weapp'
 import { cloneDeep } from 'lodash-es'
-import {
-    getElectronicSheetConfig,
-    getElectronicSheetList,
-    printElectronicSheet
-} from '@/addon/shop/api/electronic_sheet'
-import { loadCLodop,getLodop } from '@/utils/lodop'
+import { getElectronicSheetConfig, getElectronicSheetList, printElectronicSheet } from '@/addon/shop/api/electronic_sheet'
+import { loadCLodop, getLodop } from '@/utils/lodop'
+import { useRouter } from 'vue-router'
 
+const router = useRouter()
 const showDialog = ref(false)
 const loading = ref(false)
 interface companyDataType{
@@ -139,6 +199,57 @@ const companyChange = (value: any) => {
     })
 }
 
+/**
+ * 配送员
+ */
+const deliverNameChange = (value: any) => {
+    if (value) {
+        deliverData.value.forEach((item: any) => {
+            if (item.deliver_id == value) {
+                formData.deliver_mobile = item.deliver_mobile
+            }
+        })
+    } else {
+        formData.deliver_mobile = ''
+        formData.local_deliver_id = ''
+    }
+}
+
+const deliverData = ref([])
+getShopDeliverList({}).then((res: any) => {
+    deliverData.value = res.data
+})
+
+/**
+ * 三方配送列表
+ */
+const thirdDeliveryData = ref([])
+const getInUseLocalDeliveryListFn = (value: any) => {
+    getInUseLocalDeliveryList({store_id: value}).then((res: any) => {
+        thirdDeliveryData.value = res.data
+    })
+}
+
+/**
+ * 获取提货点列表
+ */
+const deliveryStoreData = ref([])
+getDeliveryStoreListAll({
+    pick_up_type: 'local_delivery',
+}).then((res: any) => {
+    deliveryStoreData.value = res.data
+})
+
+const deliveryStoreChange = (value: any) => {
+    if (formData.delivery_way == 'third_party_delivery' && value) {
+        formData.local_delivery_type = ''
+        deliveryFee.value = 0
+        getInUseLocalDeliveryListFn(value)
+    } else {
+        thirdDeliveryData.value = []
+    }
+}
+
 /**
  * 表单数据
  */
@@ -147,17 +258,30 @@ const initialFormData = {
     order_id: 0,
     delivery_type: '',
     delivery_way: 'manual_write',
+    local_delivery_type: 'merchant',
+    goods_weight: 1,
+    local_deliver_id: '',
+    deliver_mobile: '',
     express_company_id: '',
     express_number: '',
     electronic_sheet_id: '',
     order_goods_ids: [],
-    delivery_ids: []
+    delivery_ids: [],
+    store_id: ''
 }
 
 const formData: Record<string, any> = reactive({ ...initialFormData })
 
 const formRef = ref<FormInstance>()
 
+// 正则表达式
+const regExp: any = {
+    required: /[\S]+/,
+    number: /^\d{0,10}$/,
+    digit: /^\d{0,10}(.?\d{0,2})$/,
+    special: /^\d{0,10}(.?\d{0,3})$/
+}
+
 // 表单验证规则
 const formRules = computed(() => {
     return {
@@ -172,6 +296,18 @@ const formRules = computed(() => {
         ],
         electronic_sheet_id: [
             { required: true, validator: electronicSheetIdPass, trigger: 'blur' }
+        ],
+        local_deliver_id: [
+            { required: true, validator: localDeliverIdPass, trigger: 'blur' }
+        ],
+        store_id: [
+            { required: true, validator: storeIdPass, trigger: 'blur' }
+        ],
+        local_delivery_type: [
+            { required: true, validator: thirdDeliveryTypePass, trigger: ['blur', 'change'] }
+        ],
+        goods_weight: [
+            { required: true, validator: goodsWeightPass, trigger: 'blur' }
         ]
     }
 })
@@ -200,8 +336,50 @@ const electronicSheetIdPass = (rule: any, value: any, callback: any) => {
     }
 }
 
+const localDeliverIdPass = (rule: any, value: any, callback: any) => {
+    if (formData.delivery_type == 'local_delivery' && formData.delivery_way == 'store_delivery' && value == '') {
+        callback(new Error(t('deliverNamePlaceholder')))
+    } else {
+        callback()
+    }
+}
+
+const storeIdPass = (rule: any, value: any, callback: any) => {
+    if (formData.delivery_type == 'local_delivery' && value == '') {
+        callback(new Error(t('deliveryStorePlaceholder')))
+    } else {
+        callback()
+    }
+}
+
+const thirdDeliveryTypePass = (rule: any, value: any, callback: any) => {
+    if (formData.delivery_type == 'local_delivery' && formData.delivery_way == 'third_party_delivery' && (value == '' || value == undefined)) {
+        callback(new Error(t('thirdDeliveryNamePlaceholder')))
+    } else {
+        callback()
+    }
+}
+
+const goodsWeightPass = (rule: any, value: any, callback: any) => {
+    if (formData.delivery_type == 'local_delivery' && formData.delivery_way == 'third_party_delivery' && value == '') {
+        callback(new Error(t('goodsWeightPlaceholder')))
+    } else if (isNaN(value) || !regExp.special.test(value)) {
+        callback(new Error(t('weightTips')))
+    } else if (value <= 0) {
+        callback(new Error(t('weightNotZeroTips')))
+    } else {
+        callback()
+    }
+}
+
 const selectable = (row:any, index:number) => {
-    if ((row.status == 2 || row.delivery_status != 'wait_delivery'  || row.status == 3 || row.is_gift == 1 )&& (showType.value =='add' || !showType.value)) {
+    if ((row.status == 2 || row.delivery_status != 'wait_delivery' || row.status == 3 || row.is_gift == 1) && (showType.value == 'add' || !showType.value)) {
+        return false
+    }
+    if (row.delivery_info && row.delivery_info.delivery_service == 'dada' && (row.delivery_info.local_delivery_status == '-2' || row.delivery_info.local_delivery_status == '-1' || row.delivery_info.local_delivery_status == '8')) {
+        return false
+    }
+    if (formData.delivery_type == 'local_delivery') {
         return false
     }
     return true
@@ -226,6 +404,20 @@ const deliveryChange = () => {
         })
     }
     goodsDataArr.value = cloneDeep(arr)
+    if (formData.delivery_type && formData.delivery_type == 'express') {
+        formData.delivery_way = 'manual_write'
+    } else if (formData.delivery_type && formData.delivery_type == 'local_delivery') {
+        formData.delivery_way = 'store_delivery'
+    }
+}
+
+const deliveryWayChange = () => {
+    curThirdDelivery.value = {}
+    if (formData.delivery_way && formData.delivery_way == 'store_delivery') {
+        formData.local_delivery_type = 'merchant'
+    } else {
+        formData.local_delivery_type = ''
+    }
 }
 
 const handleSelectionChange = (val:any) => {
@@ -233,11 +425,35 @@ const handleSelectionChange = (val:any) => {
     formData.delivery_ids = cloneDeep([])
     for (const v in val) {
         formData.order_goods_ids.push(val[v].order_goods_id)
-        if(showType.value == 'edit'){
+        if (showType.value == 'edit') {
             formData.delivery_ids.push(val[v].delivery_id)
         }
     }
+}
 
+const getSelectOrderGoodsWeightFn = () => {
+    getSelectOrderGoodsWeight({
+        order_goods_ids: formData.order_goods_ids
+    }).then((res: any) => {
+        formData.goods_weight = res.data
+    })
+}
+
+// 计算配送费用
+const deliveryFee = ref<any>(0)
+const getDeliveryFeeFn = () => {
+    getDeliveryFee(formData).then((res: any) => {
+        deliveryFee.value = res.data
+    })
+}
+const curThirdDelivery = ref<any>(null)
+const thirdDeliveryChange = (value: any) => {
+    if (formData.delivery_way == 'third_party_delivery' && value) {
+        curThirdDelivery.value = thirdDeliveryData.value?.find((item: any) => item.key == value)
+        getDeliveryFeeFn()
+    } else {
+        deliveryFee.value = 0
+    }
 }
 
 const emit = defineEmits(['complete'])
@@ -276,6 +492,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
     })
 }
 const showType = ref('')
+const tableRef = ref()
 const setFormData = async (row: any = null,type:any) => {
     loading.value = true
     showType.value = type
@@ -283,6 +500,9 @@ const setFormData = async (row: any = null,type:any) => {
         formData.order_id = row.order_id
         formData.delivery_type = ''
         formData.delivery_way = 'manual_write'
+        formData.local_delivery_type = 'merchant'
+        formData.store_id = row.take_store_id
+        formData.local_deliver_id = row.order_goods[0]?.delivery_info?.local_deliver_id
         goodsData.value = row.order_goods
         goodsDataArr.value = row.order_goods
         isHasVirtual.value = false
@@ -306,6 +526,25 @@ const setFormData = async (row: any = null,type:any) => {
         if (isHasVirtual.value) {
             Object.assign(deliveryType.value, { virtual: t('virtualDelivery') })
         }
+        if (formData.delivery_type == 'local_delivery') {
+            nextTick(() => {
+                if (tableRef.value) {
+                    if (row.status == 2) {
+                        goodsDataArr.value.forEach((item: any, index: any) => {
+                            tableRef.value.toggleRowSelection(item, true)
+                        })
+                    } else if (row.status == 3) {
+                        goodsDataArr.value.forEach((item: any, index: any) => {
+                            if (item.delivery_info.local_delivery_status == '-2' || item.delivery_info.local_delivery_status == '-1' || item.delivery_info.local_delivery_status == '8') {
+                                tableRef.value.toggleRowSelection(item, true)
+                            }
+                        })
+                    }
+                }
+                getSelectOrderGoodsWeightFn()
+                getInUseLocalDeliveryListFn(formData.store_id)
+            })
+        }
     }
     loading.value = false
 }
@@ -313,6 +552,10 @@ const setFormData = async (row: any = null,type:any) => {
 const initFormData = () => {
     formData.order_id = 0
     formData.delivery_type = ''
+    formData.delivery_way = 'manual_write'
+    formData.local_delivery_type = 'merchant'
+    formData.store_id = ''
+    formData.local_deliver_id = ''
     formData.express_company_id = ''
     formData.electronic_sheet_id = ''
     formData.express_number = ''
@@ -352,6 +595,28 @@ const printElectronicSheetFn = () => {
     })
 }
 
+const handleClose = () => {
+    showDialog.value = false
+    initFormData()
+}
+// 去开通
+const toThirdDelivery = () => {
+    const url = router.resolve({
+        path: '/shop/delivery/local_delivery_service'
+    })
+    window.open(url.href)
+}
+
+const toAddress = () => {
+    const url = router.resolve({
+        path: '/shop/delivery_store/delivery_set',
+        query: {
+            id: formData.store_id
+        }
+    })
+    window.open(url.href)
+}
+
 defineExpose({
     showDialog,
     setFormData
diff --git a/niucloud/addon/shop/admin/views/order/components/refund-detail.vue b/niucloud/addon/shop/admin/views/order/components/refund-detail.vue
index 37ca84441..4b20e649f 100644
--- a/niucloud/addon/shop/admin/views/order/components/refund-detail.vue
+++ b/niucloud/addon/shop/admin/views/order/components/refund-detail.vue
@@ -484,7 +484,7 @@ const deliveryRefuseEvent = () => {
 
 const transferEvent = () => {
     const routeUrl = router.resolve({
-        path: '/member/refund/detail',
+        path: '/finance/refund/detail',
         query: { refund_no: formData.value.refund_no }
     })
     window.open(routeUrl.href, '_blank')
diff --git a/niucloud/addon/shop/admin/views/order/list.vue b/niucloud/addon/shop/admin/views/order/list.vue
index e373d78b1..105fb84f4 100644
--- a/niucloud/addon/shop/admin/views/order/list.vue
+++ b/niucloud/addon/shop/admin/views/order/list.vue
@@ -153,8 +153,11 @@
                                         </template>
                                     </el-table-column>
                                     <el-table-column min-width="100">
-                                        <template #default>
-                                            <span class="text-[14px]">{{ item.delivery_type_name }}</span>
+                                        <template #default="{ row }">
+                                             <div>
+                                                <div class="text-[14px]">{{ item.delivery_type_name }}</div>
+                                                <div class="text-[14px] cursor-pointer text-primary" @click="toDelivery(item)">{{ row.delivery_info?.local_delivery_status_name }}</div>
+                                            </div>
                                         </template>
                                     </el-table-column>
                                     <el-table-column min-width="100">
@@ -677,6 +680,16 @@ const batchDeleteFn = () => {
         })
     })
 }
+
+const toDelivery = (data: any) => {
+    const url = router.resolve({
+        path: '/shop/delivery/local/record',
+        query: {
+            trade_no: data.order_no
+        }
+    })
+    window.open(url.href)
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/niucloud/addon/shop/app/adminapi/controller/delivery/Delivery.php b/niucloud/addon/shop/app/adminapi/controller/delivery/Delivery.php
index 9d587cac0..056e866f6 100644
--- a/niucloud/addon/shop/app/adminapi/controller/delivery/Delivery.php
+++ b/niucloud/addon/shop/app/adminapi/controller/delivery/Delivery.php
@@ -11,7 +11,7 @@
 
 namespace addon\shop\app\adminapi\controller\delivery;
 
-use addon\shop\app\service\admin\delivery\DeliverService;
+use addon\shop\app\dict\order\OrderDeliveryDict;
 use addon\shop\app\service\admin\delivery\DeliveryService;
 use core\base\BaseAdminController;
 
@@ -42,7 +42,7 @@ class Delivery extends BaseAdminController
     /**
      * 配送页信息
      * @description 获取配送页信息
-     * @return void
+     * @return \think\Response
      */
     public function getDelivery()
     {
@@ -52,7 +52,7 @@ class Delivery extends BaseAdminController
     /**
      * 配送页信息
      * @description 获取配送页信息配置
-     * @return void
+     * @return \think\Response
      */
     public function getDeliveryList()
     {
@@ -60,70 +60,11 @@ class Delivery extends BaseAdminController
     }
 
     /**
-     * 获取配送员列表
-     * @description 查看配送员列表
+     * 获取配送方式
      * @return \think\Response
      */
-    public function lists()
+    public function getDeliveryType()
     {
-        $data = $this->request->params([
-            [ "deliver_name", "" ],
-            [ "deliver_mobile", "" ]
-        ]);
-        return success(( new DeliverService() )->getPage($data));
-    }
-
-    /**
-     * 配送员详情
-     * @description 查看配送员详情
-     * @param int $id
-     * @return \think\Response
-     */
-    public function info(int $id)
-    {
-        return success(( new DeliverService() )->getInfo($id));
-    }
-
-    /**
-     * 添加配送员
-     * @description 添加配送员
-     * @return \think\Response
-     */
-    public function add()
-    {
-        $data = $this->request->params([
-            [ "deliver_name", "" ],
-            [ "deliver_mobile", "" ],
-        ]);
-        $id = ( new DeliverService() )->add($data);
-        return success('ADD_SUCCESS', [ 'id' => $id ]);
-    }
-
-    /**
-     * 配送员编辑
-     * @description 编辑配送员
-     * @param $id  自提门店id
-     * @return \think\Response
-     */
-    public function edit($id)
-    {
-        $data = $this->request->params([
-            [ "deliver_name", "" ],
-            [ "deliver_mobile", "" ],
-        ]);
-        ( new DeliverService() )->edit($id, $data);
-        return success('EDIT_SUCCESS');
-    }
-
-    /**
-     * 配送员删除
-     * @description 删除配送员
-     * @param $id
-     * @return \think\Response
-     */
-    public function del(int $id)
-    {
-        ( new DeliverService() )->del($id);
-        return success('DELETE_SUCCESS');
+        return success(OrderDeliveryDict::getType());
     }
 }
diff --git a/niucloud/addon/shop/app/adminapi/controller/delivery/ElectronicSheet.php b/niucloud/addon/shop/app/adminapi/controller/delivery/ElectronicSheet.php
index b4b5d4aa1..040829dd0 100644
--- a/niucloud/addon/shop/app/adminapi/controller/delivery/ElectronicSheet.php
+++ b/niucloud/addon/shop/app/adminapi/controller/delivery/ElectronicSheet.php
@@ -85,6 +85,12 @@ class ElectronicSheet extends BaseAdminController
             [ 'exp_type', 0 ],
             [ "print_style", "" ],
             [ "is_default", 0 ],
+//            [ "kd100_customer_name", "" ],
+//            [ "kd100_customer_pwd", "" ],
+//            [ "kd100_send_site", "" ],
+//            [ "kd100_send_staff", "" ],
+//            [ "kd100_month_code", "" ],
+//            [ "kd100_pay_type", 0 ],
         ]);
         $this->validate($data, 'addon\shop\app\validate\delivery\ElectronicSheet.add');
         $id = ( new ElectronicSheetService() )->add($data);
@@ -113,6 +119,12 @@ class ElectronicSheet extends BaseAdminController
             [ 'exp_type', 0 ],
             [ "print_style", "" ],
             [ "is_default", 0 ],
+//            [ "kd100_customer_name", "" ],
+//            [ "kd100_customer_pwd", "" ],
+//            [ "kd100_send_site", "" ],
+//            [ "kd100_send_staff", "" ],
+//            [ "kd100_month_code", "" ],
+//            [ "kd100_pay_type", 0 ],
         ]);
         $this->validate($data, 'addon\shop\app\validate\delivery\ElectronicSheet.edit');
         ( new ElectronicSheetService() )->edit($id, $data);
@@ -156,7 +168,9 @@ class ElectronicSheet extends BaseAdminController
             [ "kdniao_api_key", "" ],
             [ 'server_port1', '8000' ],
             [ 'server_port2', '18000' ],
-            [ 'https_port', '8443' ]
+            [ 'https_port', '8443' ],
+            [ "kd100_key", "" ],
+            [ "kd100_secret", "" ],
         ]);
         ( new ElectronicSheetService() )->setConfig($data);
         return success();
diff --git a/niucloud/addon/shop/app/adminapi/controller/delivery/Store.php b/niucloud/addon/shop/app/adminapi/controller/delivery/Store.php
deleted file mode 100644
index 2c22113f2..000000000
--- a/niucloud/addon/shop/app/adminapi/controller/delivery/Store.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | Niucloud-admin 企业快速开发的多应用管理平台
-// +----------------------------------------------------------------------
-// | 官方网址：https://www.niucloud.com
-// +----------------------------------------------------------------------
-// | niucloud团队 版权所有 开源版本可自由商用
-// +----------------------------------------------------------------------
-// | Author: Niucloud Team
-// +----------------------------------------------------------------------
-
-namespace addon\shop\app\adminapi\controller\delivery;
-
-use core\base\BaseAdminController;
-use addon\shop\app\service\admin\delivery\StoreService;
-
-
-/**
- * 自提门店控制器
- * Class Store
- * @package addon\shop\app\adminapi\controller\delivery
- */
-class Store extends BaseAdminController
-{
-    /**
-     * 获取展示用信息
-     * @description 获取添加/编辑展示用信息
-     * @param int $id
-     * @return \think\Response
-     */
-    public function init()
-    {
-        return success(( new StoreService() )->getInitInfo());
-    }
-
-    /**
-     * 获取自提门店列表
-     * @description 查看自提门店列表详情
-     * @return \think\Response
-     */
-    public function lists()
-    {
-        $data = $this->request->params([
-            [ "store_name", "" ],
-            [ "create_time", [ "", "" ] ]
-        ]);
-        return success(( new StoreService() )->getPage($data));
-    }
-
-    /**
-     * 自提门店详情
-     * @param int $id
-     * @return \think\Response
-     */
-    public function info(int $id)
-    {
-        return success(( new StoreService() )->getInfo($id));
-    }
-
-
-    /**
-     * 添加自提门店
-     * @description 添加自提门店
-     * @return \think\Response
-     */
-    public function add()
-    {
-        $data = $this->request->params([
-            [ "store_name", "" ],
-            [ "store_desc", "" ],
-            [ "store_logo", "" ],
-            [ "store_mobile", 0 ],
-            [ "province_name", "" ],
-            [ "city_name", "" ],
-            [ "district_name", "" ],
-            [ "address", "" ],
-            [ "full_address", "" ],
-            [ "longitude", "" ],
-            [ "latitude", "" ],
-            [ "trade_time", "" ],
-            [ "time_type", "" ],//类型
-            [ "time_week", [] ],//周数组
-            [ "time_interval", "" ],//间隔时间段 单位分钟
-            [ "trade_time_json", [] ],//营业时间
-        ]);
-        $this->validate($data, 'addon\shop\app\validate\delivery\Store.add');
-        $id = ( new StoreService() )->add($data);
-        return success('ADD_SUCCESS', [ 'id' => $id ]);
-    }
-
-    /**
-     * 自提门店编辑
-     * @description 编辑自提门店
-     * @param $id  自提门店id
-     * @return \think\Response
-     */
-    public function edit($id)
-    {
-        $data = $this->request->params([
-            [ "store_name", "" ],
-            [ "store_desc", "" ],
-            [ "store_logo", "" ],
-            [ "store_mobile", 0 ],
-            [ "address", "" ],
-            [ "full_address", "" ],
-            [ "longitude", "" ],
-            [ "latitude", "" ],
-            [ "trade_time", "" ],
-            [ "time_week", [] ],//周数组
-            [ "time_interval", "" ],//间隔时间段 单位分钟
-            [ "trade_time_json", "" ],//营业时间
-        ]);
-        $address = $this->request->params([
-            [ "province_name", "" ],
-            [ "city_name", "" ],
-            [ "district_name", "" ],
-        ]);
-        $this->validate($data, 'addon\shop\app\validate\delivery\Store.edit');
-        ( new StoreService() )->edit($id, $data, $address);
-        return success('EDIT_SUCCESS');
-    }
-
-    /**
-     * 自提门店删除
-     * @description 删除自提门店
-     * @param $id  自提门店id
-     * @return \think\Response
-     */
-    public function del(int $id)
-    {
-        ( new StoreService() )->del($id);
-        return success('DELETE_SUCCESS');
-    }
-
-    /**
-     * @description 查看自提门店列表-全部
-     * @return \think\Response
-     */
-    public function getList()
-    {
-        $data = $this->request->params([
-            [ "store_name", "" ],
-            [ "create_time", [ "", "" ] ]
-        ]);
-        return success(( new StoreService() )->getList($data));
-    }
-
-}
diff --git a/niucloud/addon/shop/app/adminapi/controller/delivery_store/DeliveryService.php b/niucloud/addon/shop/app/adminapi/controller/delivery_store/DeliveryService.php
new file mode 100644
index 000000000..4d4a627ea
--- /dev/null
+++ b/niucloud/addon/shop/app/adminapi/controller/delivery_store/DeliveryService.php
@@ -0,0 +1,63 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\adminapi\controller\delivery_store;
+
+use addon\shop\app\service\admin\delivery_store\DeliveryServiceService;
+use core\base\BaseAdminController;
+use think\Response;
+
+
+/**
+ * 配送服务商控制器
+ * Class DeliveryService
+ * @package addon\shop\app\adminapi\controller\delivery_store
+ */
+class DeliveryService extends BaseAdminController
+{
+
+    /**
+     * 获取配送服务商列表
+     */
+    public function getDeliveryServiceList($id)
+    {
+        return success((new DeliveryServiceService())->deliveryServiceList($id));
+    }
+
+    /**
+     * 配送门店开通配送服务
+     * @return Response
+     */
+    public function deliveryServiceOpen($id)
+    {
+        $data = $this->request->params([
+            ['delivery_type', ''],
+            ['business', ''],
+            ['extend_data', []]
+        ]);
+        (new DeliveryServiceService())->deliveryServiceOpen($id, $data);
+        return success('SUCCESS');
+    }
+
+    /**
+     * 配送门店品类修改
+     * @return Response
+     */
+    public function deliveryServiceEdit($id)
+    {
+        $data = $this->request->params([
+            ['delivery_type', ''],
+            ['business', '']
+        ]);
+        (new DeliveryServiceService())->deliveryServiceEdit($id, $data);
+        return success('SUCCESS');
+    }
+}
diff --git a/niucloud/addon/shop/app/adminapi/controller/delivery_store/DeliveryStore.php b/niucloud/addon/shop/app/adminapi/controller/delivery_store/DeliveryStore.php
new file mode 100644
index 000000000..f689153bf
--- /dev/null
+++ b/niucloud/addon/shop/app/adminapi/controller/delivery_store/DeliveryStore.php
@@ -0,0 +1,177 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\adminapi\controller\delivery_store;
+
+use addon\shop\app\service\admin\delivery_store\DeliveryStoreService;
+use app\upgrade\v158\Upgrade;
+use core\base\BaseAdminController;
+use think\Response;
+
+/**
+ * 提货点控制器
+ * Class DeliveryStore
+ * @package addon\shop\app\adminapi\controller\delivery_store
+ */
+class DeliveryStore extends BaseAdminController
+{
+    /**
+     * 获取展示用信息
+     * @description 获取添加/编辑展示用信息
+     * @return Response
+     */
+    public function init()
+    {
+        return success(( new DeliveryStoreService() )->getInitInfo());
+    }
+
+    /**
+     * 获取提货点列表
+     * @description 查看提货点列表详情
+     * @return \think\Response
+     */
+    public function lists()
+    {
+        $data = $this->request->params([
+            ['store_name', ''],
+            ['pick_up_type', ''],//提货类型
+            ['create_time', [] ]
+        ]);
+        return success(( new DeliveryStoreService() )->getPage($data));
+    }
+
+    /**
+     * 提货点详情
+     * @param int $id
+     * @return \think\Response
+     */
+    public function info(int $id)
+    {
+        return success(( new DeliveryStoreService() )->getInfo($id));
+    }
+
+
+    /**
+     * 添加提货点
+     * @description 添加提货点
+     * @return \think\Response
+     */
+    public function add()
+    {
+        $data = $this->request->params([
+            ['pick_up_type', ''],//提货类型
+            ['store_name', ''],//门店名称
+            ['store_logo', ''],//门店logo
+            ['contact_name', ''],
+            ['store_mobile', ''],
+            [ 'province_id',0 ],
+            [ 'city_id',0 ],
+            [ 'district_id',0 ],
+            ['address', ''],
+            ['full_address', ''],
+            ['longitude', ''],
+            ['latitude', ''],
+            ['trade_time', ''],
+            ['time_is_open', ''],
+            ['time_week', [] ],//周数组
+            ['time_interval', ''],//间隔时间段 单位分钟
+            ['trade_time_json', [] ],//营业时间
+            [ 'area', [] ],//配送区域
+            ['status', 0 ]
+        ]);
+        $this->validate($data, 'addon\shop\app\validate\delivery\Store.add');
+        $id = ( new DeliveryStoreService() )->add($data);
+        return success('ADD_SUCCESS', [ 'id' => $id ]);
+    }
+
+    /**
+     * 提货点编辑
+     * @description 编辑提货点
+     * @param int $id 提货点id
+     * @return \think\Response
+     */
+    public function edit(int $id)
+    {
+        $data = $this->request->params([
+            ['pick_up_type', ''],//提货类型
+            ['store_name', ''],//门店名称
+            ['store_logo', ''],//门店logo
+            ['contact_name', ''],
+            ['store_mobile', ''],
+            [ 'province_id',0 ],
+            [ 'city_id',0 ],
+            [ 'district_id',0 ],
+            ['address', ''],
+            ['full_address', ''],
+            ['longitude', ''],
+            ['latitude', ''],
+            ['trade_time', ''],
+            ['time_is_open', ''],
+            ['time_week', [] ],//周数组
+            ['time_interval', ''],//间隔时间段 单位分钟
+            ['trade_time_json', [] ],//营业时间
+            [ 'area', [] ],//配送区域
+            ['status', 0 ]
+        ]);
+        $this->validate($data, 'addon\shop\app\validate\delivery\Store.edit');
+        ( new DeliveryStoreService() )->edit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 提货点删除
+     * @description 删除提货点
+     * @param int $id 提货点id
+     * @return \think\Response
+     */
+    public function del(int $id)
+    {
+        ( new DeliveryStoreService() )->del($id);
+        return success('DELETE_SUCCESS');
+    }
+
+    /**
+     * @description 查看提货点列表-全部
+     * @return \think\Response
+     */
+    public function getList()
+    {
+        $data = $this->request->params([
+            ['keyword', ''],
+            ['pick_up_type', '' ]
+        ]);
+        return success(( new DeliveryStoreService() )->getList($data));
+    }
+
+    /**
+     * @description 提货点提货类型
+     * @return \think\Response
+     */
+    public function getPickUpType()
+    {
+        return success(( new DeliveryStoreService() )->getPickUpType());
+    }
+
+    /**
+     * 修改社区分类状态
+     * @return \think\Response
+     */
+    public function modifyStatus()
+    {
+        $data = $this->request->params([
+            [ 'store_id', '' ],
+            [ 'status', '' ],
+        ]);
+        ( new DeliveryStoreService() )->modifyStatus($data);
+        return success('SUCCESS');
+    }
+
+}
diff --git a/niucloud/addon/shop/app/adminapi/controller/goods/Goods.php b/niucloud/addon/shop/app/adminapi/controller/goods/Goods.php
index bdc543a55..958209a53 100644
--- a/niucloud/addon/shop/app/adminapi/controller/goods/Goods.php
+++ b/niucloud/addon/shop/app/adminapi/controller/goods/Goods.php
@@ -85,6 +85,8 @@ class Goods extends BaseAdminController
             ["sub_title", ""],
             ["goods_type", ""],
             ["goods_image", ""],
+            ["goods_image_width", ""],
+            ["goods_image_height", ""],
             ["goods_video", ""],
             ["goods_category", ''],
             ["brand_id", 0],
@@ -154,6 +156,8 @@ class Goods extends BaseAdminController
             ["sub_title", ""],
             ["goods_type", ""],
             ["goods_image", ""],
+            ["goods_image_width", ""],
+            ["goods_image_height", ""],
             ["goods_video", ""],
             ["goods_category", ''],
             ["brand_id", 0],
diff --git a/niucloud/addon/shop/app/adminapi/controller/goods/VirtualGoods.php b/niucloud/addon/shop/app/adminapi/controller/goods/VirtualGoods.php
index 0c75fb066..56552f567 100644
--- a/niucloud/addon/shop/app/adminapi/controller/goods/VirtualGoods.php
+++ b/niucloud/addon/shop/app/adminapi/controller/goods/VirtualGoods.php
@@ -47,6 +47,8 @@ class VirtualGoods extends BaseAdminController
             [ "sub_title", "" ],
             [ "goods_type", "" ],
             [ "goods_image", "" ],
+            ["goods_image_width", ""],
+            ["goods_image_height", ""],
             [ "goods_video", "" ],
             [ "goods_category", '' ],
             [ "brand_id", 0 ],
@@ -113,6 +115,8 @@ class VirtualGoods extends BaseAdminController
             [ "sub_title", "" ],
             [ "goods_type", "" ],
             [ "goods_image", "" ],
+            ["goods_image_width", ""],
+            ["goods_image_height", ""],
             [ "goods_video", "" ],
             [ "goods_category", '' ],
             [ "brand_id", 0 ],
diff --git a/niucloud/addon/shop/app/adminapi/controller/local_delivery/config/Config.php b/niucloud/addon/shop/app/adminapi/controller/local_delivery/config/Config.php
new file mode 100644
index 000000000..facc96a3b
--- /dev/null
+++ b/niucloud/addon/shop/app/adminapi/controller/local_delivery/config/Config.php
@@ -0,0 +1,49 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\adminapi\controller\local_delivery\config;
+
+use addon\shop\app\service\admin\local_delivery\config\ConfigService;
+use core\base\BaseAdminController;
+use think\Response;
+
+
+/**
+ * 配送配置
+ * Class Config
+ * @package addon\shop\app\adminapi\controller\local_delivery\config
+ */
+class Config extends BaseAdminController
+{
+    /**
+     * 设置配置
+     * @return Response
+     */
+    public function setConfig(): Response
+    {
+        $data = $this->request->params([
+            ['is_show_polyline',0],//是否显示配送轨迹
+            ['is_local_delivery_store_select',0],//是否开启门店选择
+        ]);
+        (new ConfigService())->setConfig($data);
+        return success('SUCCESS');
+
+    }
+
+    /**
+     * 获取配置
+     * @return Response
+     */
+    public function getConfig(): Response
+    {
+        return success((new ConfigService())->getConfig());
+    }
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/adminapi/controller/local_delivery/config/Local.php b/niucloud/addon/shop/app/adminapi/controller/local_delivery/config/Local.php
new file mode 100644
index 000000000..6f101e825
--- /dev/null
+++ b/niucloud/addon/shop/app/adminapi/controller/local_delivery/config/Local.php
@@ -0,0 +1,65 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\adminapi\controller\local_delivery\config;
+
+use addon\shop\app\service\admin\local_delivery\config\LocalService;
+use core\base\BaseAdminController;
+
+
+/**
+ * 同城配送
+ * @description 同城配送
+ * Class Store
+ * @package addon\shop\app\adminapi\controller\delivery
+ */
+class Local extends BaseAdminController
+{
+    /**
+     * @description 查看设置
+     * @return \think\Response
+     */
+    public function getLocal()
+    {
+        return success(data: (new LocalService())->getLocal());
+    }
+
+    /**
+     * @description 设置配置
+     * @return \think\Response
+     */
+    public function setLocal()
+    {
+        $data = $this->request->params([
+            ['fee_type', ''],
+            ['base_dist', 0],
+            ['base_price', 0],
+            ['grad_dist', 0],
+            ['grad_price', 0],
+            ['weight_start', 0],
+            ['weight_unit', 0],
+            ['weight_price', 0],
+
+            ['time_is_open', 0],
+            ['time_type', 0],
+            ['time_week', ''],
+            ['time_interval', 30],
+            ['advance_day', 0],
+            ['most_day', 7],
+            ['start_time', 0],
+            ['end_time', 0],
+            ['delivery_time', ''],
+
+            ['area_data', []],
+        ]);
+        return success(data: (new LocalService())->setLocal($data));
+    }
+}
diff --git a/niucloud/addon/shop/app/adminapi/controller/local_delivery/order/LocalDeliveryOrder.php b/niucloud/addon/shop/app/adminapi/controller/local_delivery/order/LocalDeliveryOrder.php
new file mode 100644
index 000000000..b89434c60
--- /dev/null
+++ b/niucloud/addon/shop/app/adminapi/controller/local_delivery/order/LocalDeliveryOrder.php
@@ -0,0 +1,120 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\adminapi\controller\local_delivery\order;
+
+use addon\shop\app\service\admin\local_delivery\order\LocalDeliveryOrderService;
+use core\base\BaseAdminController;
+use think\Response;
+
+
+/**
+ * 本地配送订单控制器
+ * Class LocalDeliveryOrder
+ * @package addon\shop\app\adminapi\controller\local_delivery\order
+ */
+class LocalDeliveryOrder extends BaseAdminController
+{
+    /**
+     * 本地配送订单分页列表
+     * @return Response
+     */
+    public function pages(): Response
+    {
+        $data = $this->request->params([
+            ['delivery_no', ''],
+            ['trade_no', ''],
+            ['status', ''],
+            ['create_time', []],
+        ]);
+        return success(( new LocalDeliveryOrderService() )->getPage($data));
+    }
+
+    /**
+     * 本地配送订单详情
+     * @param int $id
+     * @return Response
+     */
+    public function info(int $id): Response
+    {
+        return success(( new LocalDeliveryOrderService() )->getInfo($id));
+    }
+
+    /**
+     * 取消订单
+     * @param int $id
+     * @return Response
+     */
+    public function closeOrder(int $id): Response
+    {
+        $data = $this->request->params([
+            ['cancel_reason_id', ''],
+            ['cancel_reason', '']
+        ]);
+        $res = ( new LocalDeliveryOrderService() )->closeOrder($id, $data);
+        if ($res) {
+            return success('CANCEL_SUCCESS');
+        } else {
+            return fail('FAIL');
+        }
+    }
+
+     /**
+     * 完成订单
+     * @param int $id
+     * @return Response
+     */
+    public function finishOrder(int $id): Response
+    {
+        $res = ( new LocalDeliveryOrderService() )->finishOrder($id);
+        if ($res) {
+            return success('SUCCESS');
+        } else {
+            return fail('FAIL');
+        }
+    }
+
+    /**
+     * 同步订单信息
+     * @param int $id
+     * @return Response
+     */
+    public function syncOrder(int $id): Response
+    {
+        $res = ( new LocalDeliveryOrderService() )->syncOrder($id);
+        if ($res) {
+            return success('SUCCESS');
+        } else {
+            return fail('FAIL');
+        }
+    }
+
+    /**
+     * 订单取消原因
+     * @return Response
+     */
+    public function getCancelReasonList(): Response
+    {
+        $data = $this->request->params([
+            ['service', '']
+        ]);
+        return success(( new LocalDeliveryOrderService() )->getCancelReasonList($data['service']));
+    }
+
+    /**
+     * 获取订单状态列表
+     * @return Response
+     */
+    public function getOrderStatusList(): Response
+    {
+        return success((new LocalDeliveryOrderService())->getOrderStatusList());
+    }
+}
diff --git a/niucloud/addon/shop/app/adminapi/controller/local_delivery/service/LocalDeliveryService.php b/niucloud/addon/shop/app/adminapi/controller/local_delivery/service/LocalDeliveryService.php
new file mode 100644
index 000000000..bb44955a5
--- /dev/null
+++ b/niucloud/addon/shop/app/adminapi/controller/local_delivery/service/LocalDeliveryService.php
@@ -0,0 +1,79 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\adminapi\controller\local_delivery\service;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryDict;
+use addon\shop\app\service\admin\local_delivery\service\LocalDeliveryServiceService;
+use core\base\BaseAdminController;
+use core\exception\AdminException;
+use think\Response;
+
+
+/**
+ * 配送服务商
+ * Class LocalDeliveryService
+ * @package addon\shop\app\adminapi\controller\local_delivery\service
+ */
+class LocalDeliveryService extends BaseAdminController
+{
+    /**
+     * 获取配送服务商列表
+     */
+    public function lists()
+    {
+        $res = (new LocalDeliveryServiceService())->getList();
+        return success($res);
+    }
+
+    /**
+     * 设置配置
+     * @return Response
+     */
+    public function setConfig($delivery_type)
+    {
+        //参数获取
+        $delivery_type_list = LocalDeliveryDict::getType();
+        if (!array_key_exists($delivery_type, $delivery_type_list)) throw new AdminException('LOCAL_DELIVERY_TYPE_NOT_EXIST');
+        //数据验证
+        $data = [
+            ['is_use', 0]
+        ];
+        foreach ($delivery_type_list[$delivery_type]['params'] as $k_param => $v_param) {
+            $data[] = [$k_param, ''];
+        }
+        $request_data = $this->request->params($data);
+        (new LocalDeliveryServiceService())->setConfig($delivery_type, $request_data);
+        return success('SUCCESS');
+
+    }
+
+    /**
+     * 获取配置
+     * @return Response
+     */
+    public function getConfig($delivery_type)
+    {
+        return success((new LocalDeliveryServiceService())->getConfig($delivery_type,true));
+    }
+
+    /**
+     * 获取已启用配送服务商列表
+     * @return Response
+     */
+    public function getInUseList()
+    {
+        $data = $this->request->params([
+            ['store_id', 0],
+        ]);
+        return success((new LocalDeliveryServiceService())->getInUseList($data));
+    }
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/adminapi/controller/order/Order.php b/niucloud/addon/shop/app/adminapi/controller/order/Order.php
index 11c1258d9..2a4acc49f 100644
--- a/niucloud/addon/shop/app/adminapi/controller/order/Order.php
+++ b/niucloud/addon/shop/app/adminapi/controller/order/Order.php
@@ -122,6 +122,9 @@ class Order extends BaseAdminController
             ['electronic_sheet_id', 0], // 电子面单
             ['local_deliver_id', 0],//配送员
             ['remark', ''],//配送员
+            ['local_delivery_type', ''],
+            ['goods_weight', 0],
+            ['store_id', ''],//提货点id
         ]);
         return success("DELIVERY_SUCCESS", (new OrderDeliveryService())->delivery($data));
     }
@@ -324,6 +327,35 @@ class Order extends BaseAdminController
         return success(data: OrderBatchDeliveryDict::getStatus());
     }
 
+    /**
+     * 获取已选商品总重量
+     * @return \think\Response
+     */
+    public function getSelectOrderGoodsWeight()
+    {
+        $data = $this->request->params([
+            [ 'order_goods_ids', [] ], // 已选订单项id集合
+        ]);
+        return success(data:( new OrderService() )->getSelectOrderGoodsWeight($data));
+    }
+
+    /**
+     * 配送费用计算
+     */
+    public function getDeliveryFee()
+    {
+        $data = $this->request->params([
+            ['order_id', 0],
+            ['order_goods_ids', []],
+            ['delivery_type', ''],
+            ['delivery_way', ''],
+            ['local_delivery_type', ''],
+            ['goods_weight', 0],
+            ['store_id', 0],
+        ]);
+        return success(data:( new OrderDeliveryService() )->getDeliveryFee($data));
+    }
+
     /**
      * @description 删除订单
      * @return Response
diff --git a/niucloud/addon/shop/app/adminapi/controller/shop_delivery/deliver/Deliver.php b/niucloud/addon/shop/app/adminapi/controller/shop_delivery/deliver/Deliver.php
new file mode 100644
index 000000000..cb693f87e
--- /dev/null
+++ b/niucloud/addon/shop/app/adminapi/controller/shop_delivery/deliver/Deliver.php
@@ -0,0 +1,109 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\adminapi\controller\shop_delivery\deliver;
+
+use addon\shop\app\service\admin\shop_delivery\deliver\DeliverService;
+use core\base\BaseAdminController;
+use think\Response;
+
+
+/**
+ * 配送员
+ * @description 配送员
+ * Class Deliver
+ * @package addon\shop\app\adminapi\controller\shop_delivery\deliver
+ */
+class Deliver extends BaseAdminController
+{
+    /**
+     * 获取配送员分页列表
+     * @description 查看配送员列表
+     * @return \think\Response
+     */
+    public function pages()
+    {
+        $data = $this->request->params([
+            ['deliver_name', ''],
+            ['deliver_mobile', '']
+        ]);
+        return success(( new DeliverService() )->getPage($data));
+    }
+
+    /**
+     * 获取配送员列表
+     * @description 查看配送员列表
+     * @return \think\Response
+     */
+    public function lists()
+    {
+        $data = $this->request->params([
+            ['deliver_name', ''],
+            ['deliver_mobile', '']
+        ]);
+        return success(( new DeliverService() )->getList($data));
+    }
+
+    /**
+     * 配送员详情
+     * @description 查看配送员详情
+     * @param int $id
+     * @return \think\Response
+     */
+    public function info(int $id)
+    {
+        return success(( new DeliverService() )->getInfo($id));
+    }
+
+    /**
+     * 添加配送员
+     * @description 添加配送员
+     * @return \think\Response
+     */
+    public function add()
+    {
+        $data = $this->request->params([
+            ['deliver_name', ''],
+            ['deliver_mobile', ''],
+        ]);
+        $id = ( new DeliverService() )->add($data);
+        return success('ADD_SUCCESS', [ 'id' => $id ]);
+    }
+
+    /**
+     * 配送员编辑
+     * @description 编辑配送员
+     * @param int $id 自提门店id
+     * @return \think\Response
+     */
+    public function edit($id)
+    {
+        $data = $this->request->params([
+            ['deliver_name', ''],
+            ['deliver_mobile', ''],
+        ]);
+        ( new DeliverService() )->edit($id, $data);
+        return success('EDIT_SUCCESS');
+    }
+
+    /**
+     * 配送员删除
+     * @description 删除配送员
+     * @param int $id
+     * @return Response
+     */
+    public function del(int $id)
+    {
+        ( new DeliverService() )->del($id);
+        return success('DELETE_SUCCESS');
+    }
+
+}
diff --git a/niucloud/addon/shop/app/adminapi/controller/shop_delivery/order/ShopDeliveryOrder.php b/niucloud/addon/shop/app/adminapi/controller/shop_delivery/order/ShopDeliveryOrder.php
new file mode 100644
index 000000000..c7509186f
--- /dev/null
+++ b/niucloud/addon/shop/app/adminapi/controller/shop_delivery/order/ShopDeliveryOrder.php
@@ -0,0 +1,92 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\adminapi\controller\shop_delivery\order;
+
+use addon\shop\app\service\admin\shop_delivery\order\ShopDeliveryOrderService;
+use core\base\BaseAdminController;
+use think\Response;
+
+
+/**
+ * 商家配送订单控制器
+ * Class ShopDeliveryOrder
+ * @package addon\shop\app\adminapi\controller\shop_delivery\order
+ */
+class ShopDeliveryOrder extends BaseAdminController
+{
+    /**
+     * 商家配送订单分页列表
+     * @return Response
+     */
+    public function pages(): Response
+    {
+        $data = $this->request->params([
+            ['delivery_no', ''],
+            ['trade_no', ''],
+            ['status', ''],
+            ['create_time', []],
+        ]);
+        return success(( new ShopDeliveryOrderService() )->getPage($data));
+    }
+
+    /**
+     * 商家配送订单详情
+     * @param int $id
+     * @return Response
+     */
+    public function info(int $id): Response
+    {
+        return success(( new ShopDeliveryOrderService() )->getInfo($id));
+    }
+
+    /**
+     * 取消订单
+     * @param int $id
+     * @return Response
+     */
+    public function closeOrder(int $id): Response
+    {
+        $data = $this->request->params([
+            ['cancel_reason', '']
+        ]);
+        $res = ( new ShopDeliveryOrderService() )->closeOrder($id, $data);
+        if ($res) {
+            return success('CANCEL_SUCCESS');
+        } else {
+            return fail('FAIL');
+        }
+    }
+
+    /**
+     * 完成订单
+     * @param int $id
+     * @return Response
+     */
+    public function finishOrder(int $id): Response
+    {
+        $res = ( new ShopDeliveryOrderService() )->finishOrder($id);
+        if ($res) {
+            return success('SUCCESS');
+        } else {
+            return fail('FAIL');
+        }
+    }
+
+    /**
+     * 获取订单状态列表
+     * @return Response
+     */
+    public function getOrderStatusList(): Response
+    {
+        return success((new ShopDeliveryOrderService())->getOrderStatusList());
+    }
+}
diff --git a/niucloud/addon/shop/app/adminapi/route/route.php b/niucloud/addon/shop/app/adminapi/route/route.php
index df3278b38..a87d990b5 100644
--- a/niucloud/addon/shop/app/adminapi/route/route.php
+++ b/niucloud/addon/shop/app/adminapi/route/route.php
@@ -14,9 +14,6 @@ use app\adminapi\middleware\AdminCheckToken;
 use app\adminapi\middleware\AdminLog;
 use think\facade\Route;
 
-// 第三方配送
-Route::any('delivery/third/callback/:type/:order_no', 'addon\shop\app\adminapi\controller\delivery\Local@thirdDeliveryCallback');
-
 /**
  * 商城系统
  */
@@ -65,51 +62,135 @@ Route::group('shop', function () {
     //运费模版 删除
     Route::delete('shipping/template/:template_id', 'addon\shop\app\adminapi\controller\delivery\ShippingTemplate@del');
 
-    //自提门店列表（分页）
-    Route::get('delivery/store', 'addon\shop\app\adminapi\controller\delivery\Store@lists');
+    /************************************************** 提货点 *****************************************************/
+    //提货点列表（分页）
+    Route::get('delivery/store', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@lists');
 
-    Route::get('delivery/store/init', 'addon\shop\app\adminapi\controller\delivery\Store@init');
+    //提货点初始化数据
+    Route::get('delivery/store/init', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@init');
 
-    //自提门店列表（不分页）
-    Route::get('delivery/store/list', 'addon\shop\app\adminapi\controller\delivery\Store@getList');
+    //提货点列表（不分页）
+    Route::get('delivery/store/list', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@getList');
 
-    //自提门店详情
-    Route::get('delivery/store/:id', 'addon\shop\app\adminapi\controller\delivery\Store@info');
+    //提货点详情
+    Route::get('delivery/store/:id', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@info');
 
-    //添加自提门店
-    Route::post('delivery/store', 'addon\shop\app\adminapi\controller\delivery\Store@add');
+    //添加提货点
+    Route::post('delivery/store', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@add');
 
-    //编辑自提门店
-    Route::put('delivery/store/:id', 'addon\shop\app\adminapi\controller\delivery\Store@edit');
+    //编辑提货点
+    Route::put('delivery/store/:id', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@edit');
 
-    //删除自提门店
-    Route::delete('delivery/store/:id', 'addon\shop\app\adminapi\controller\delivery\Store@del');
+    //删除提货点
+    Route::delete('delivery/store/:id', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@del');
 
+    //提货点提货类型
+    Route::get('delivery/store/pick_up_type', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@getPickUpType');
+
+    //修改提货点状态
+    Route::put('delivery/store/modify_status', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryStore@modifyStatus');
+
+    /************************************************** 配送服务商 *****************************************************/
+    //获取配送服务商列表
+    Route::get('delivery_store/delivery_service_list/:id', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryService@getDeliveryServiceList');
+
+    //配送门店开通配送服务
+    Route::put('delivery_store/delivery_shop_open/:id', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryService@deliveryServiceOpen');
+
+    //配送门店品类修改
+    Route::put('delivery_store/delivery_shop_edit/:id', 'addon\shop\app\adminapi\controller\delivery_store\DeliveryService@deliveryServiceEdit');
+
+    /************************************************** 配送设置 *****************************************************/
     //物流配置
     Route::get('delivery/deliveryList', 'addon\shop\app\adminapi\controller\delivery\Delivery@getDeliveryList');
     Route::put('delivery/setConfig', 'addon\shop\app\adminapi\controller\delivery\Delivery@setDeliveryConfig');
 
-    //配送员列表
-    Route::get('delivery/staff', 'addon\shop\app\adminapi\controller\delivery\Delivery@lists');
+    //获取配送方式
+    Route::get('delivery/delivery_type', 'addon\shop\app\adminapi\controller\delivery\Delivery@getDeliveryType');
 
-    //配送员详情
-    Route::get('delivery/staff/:id', 'addon\shop\app\adminapi\controller\delivery\Delivery@info');
-
-    //添加配送员
-    Route::post('delivery/staff', 'addon\shop\app\adminapi\controller\delivery\Delivery@add');
-
-    //编辑配送员
-    Route::put('delivery/staff/:id', 'addon\shop\app\adminapi\controller\delivery\Delivery@edit');
-
-    //删除配送员
-    Route::delete('delivery/staff/:id', 'addon\shop\app\adminapi\controller\delivery\Delivery@del');
+    /************************************************** 同城配送 *******************************************************/
 
     // 获取同城配送设置
-    Route::get('local', 'addon\shop\app\adminapi\controller\delivery\Local@getLocal');
+    Route::get('local_delivery/config', 'addon\shop\app\adminapi\controller\local_delivery\config\Local@getLocal');
 
     // 设置同城配送
-    Route::put('local', 'addon\shop\app\adminapi\controller\delivery\Local@setLocal');
-    Route::get('third/init', 'addon\shop\app\adminapi\controller\delivery\Local@getThirdPartyInit');
+    Route::put('local_delivery/config', 'addon\shop\app\adminapi\controller\local_delivery\config\Local@setLocal');
+
+    // 获取同城配送基础配置
+    Route::get('local_delivery/base_config', 'addon\shop\app\adminapi\controller\local_delivery\config\Config@getConfig');
+
+    // 设置同城配送基础配置
+    Route::put('local_delivery/base_config', 'addon\shop\app\adminapi\controller\local_delivery\config\Config@setConfig');
+
+    //获取已启用配送服务商列表
+    Route::get('local_delivery/list', 'addon\shop\app\adminapi\controller\local_delivery\service\LocalDeliveryService@getInUseList');
+
+    //同城配送服务商列表
+    Route::get('local_delivery/service', 'addon\shop\app\adminapi\controller\local_delivery\service\LocalDeliveryService@lists');
+
+    //同城配送服务商配置
+    Route::get('local_delivery/service/:delivery_type', 'addon\shop\app\adminapi\controller\local_delivery\service\LocalDeliveryService@getConfig');
+
+    //同城配送服务商配置修改
+    Route::put('local_delivery/service/:delivery_type', 'addon\shop\app\adminapi\controller\local_delivery\service\LocalDeliveryService@setConfig');
+
+    // 同城配送订单
+    Route::get('local_delivery/order', 'addon\shop\app\adminapi\controller\local_delivery\order\LocalDeliveryOrder@pages');
+
+    // 同城配送订单详情
+    Route::get('local_delivery/order/:id', 'addon\shop\app\adminapi\controller\local_delivery\order\LocalDeliveryOrder@info');
+
+    // 同城配送订单同步
+    Route::put('local_delivery/order/sync/:id', 'addon\shop\app\adminapi\controller\local_delivery\order\LocalDeliveryOrder@syncOrder');
+
+    // 同城配送订单取消原因
+    Route::get('local_delivery/order/cancel_reason', 'addon\shop\app\adminapi\controller\local_delivery\order\LocalDeliveryOrder@getCancelReasonList');
+
+    // 同城配送订单取消
+    Route::put('local_delivery/order/cancel/:id', 'addon\shop\app\adminapi\controller\local_delivery\order\LocalDeliveryOrder@closeOrder');
+
+    // 同城配送订单完成
+    Route::put('local_delivery/order/finish/:id', 'addon\shop\app\adminapi\controller\local_delivery\order\LocalDeliveryOrder@finishOrder');
+
+    // 同城配送订单状态列表
+    Route::get('local_delivery/order/status', 'addon\shop\app\adminapi\controller\local_delivery\order\LocalDeliveryOrder@getOrderStatusList');
+
+    /************************************************** 商家配送 *******************************************************/
+
+    //配送员分页列表
+    Route::get('shop_delivery/staff', 'addon\shop\app\adminapi\controller\shop_delivery\deliver\Deliver@pages');
+
+    //配送员列表
+    Route::get('shop_delivery/staff/list', 'addon\shop\app\adminapi\controller\shop_delivery\deliver\Deliver@lists');
+
+    //配送员详情
+    Route::get('shop_delivery/staff/:id', 'addon\shop\app\adminapi\controller\shop_delivery\deliver\Deliver@info');
+
+    //添加配送员
+    Route::post('shop_delivery/staff', 'addon\shop\app\adminapi\controller\shop_delivery\deliver\Deliver@add');
+
+    //编辑配送员
+    Route::put('shop_delivery/staff/:id', 'addon\shop\app\adminapi\controller\shop_delivery\deliver\Deliver@edit');
+
+    //删除配送员
+    Route::delete('shop_delivery/staff/:id', 'addon\shop\app\adminapi\controller\shop_delivery\deliver\Deliver@del');
+
+    // 商家配送订单
+    Route::get('shop_delivery/order', 'addon\shop\app\adminapi\controller\shop_delivery\order\ShopDeliveryOrder@pages');
+
+    // 商家配送订单详情
+    Route::get('shop_delivery/order/:id', 'addon\shop\app\adminapi\controller\shop_delivery\order\ShopDeliveryOrder@info');
+
+    // 商家配送订单取消
+    Route::put('shop_delivery/order/cancel/:id', 'addon\shop\app\adminapi\controller\shop_delivery\order\ShopDeliveryOrder@closeOrder');
+
+    // 商家配送订单完成
+    Route::put('shop_delivery/order/finish/:id', 'addon\shop\app\adminapi\controller\shop_delivery\order\ShopDeliveryOrder@finishOrder');
+
+    // 商家配送订单状态列表
+    Route::get('shop_delivery/order/status', 'addon\shop\app\adminapi\controller\shop_delivery\order\ShopDeliveryOrder@getOrderStatusList');
+
+//    Route::get('third/init', 'addon\shop\app\adminapi\controller\delivery\Local@getThirdPartyInit');
 
     /************************************************** 接口管理 *******************************************************/
 
@@ -414,6 +495,12 @@ Route::group('shop', function () {
     //获取订单配送方式
     Route::get('order/delivery_type', 'addon\shop\app\adminapi\controller\order\Order@getDeliveryType');
 
+    //获取已选订单项总重量
+    Route::get('order/select/weight', 'addon\shop\app\adminapi\controller\order\Order@getSelectOrderGoodsWeight');
+
+    //同城配送费用计算
+    Route::get('order/delivery/fee', 'addon\shop\app\adminapi\controller\order\Order@getDeliveryFee');
+
     //商家留言
     Route::put('order/shop_remark', 'addon\shop\app\adminapi\controller\order\Order@setShopRemark');
 
diff --git a/niucloud/addon/shop/app/api/controller/delivery/Order.php b/niucloud/addon/shop/app/api/controller/delivery/Order.php
new file mode 100644
index 000000000..6f17868bc
--- /dev/null
+++ b/niucloud/addon/shop/app/api/controller/delivery/Order.php
@@ -0,0 +1,47 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\api\controller\delivery;
+
+use addon\shop\app\service\api\delivery\OrderService;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderNotifyService;
+use core\base\BaseApiController;
+use think\Response;
+
+class Order extends BaseApiController
+{
+    /**
+     * 订单状态回调
+     * @param $type
+     * @param $order_no
+     * @param $action
+     * @return Response
+     */
+    public function notify($type, $order_no, $action)
+    {
+        $params = $this->request->all();
+        $params['type'] = $type;
+        $params['order_no'] = $order_no;
+        return (new CoreLocalDeliveryOrderNotifyService())->notify($type, $order_no, $action, $params);
+    }
+
+    /**
+     * 获取配送轨迹
+     * @return Response
+     */
+    public function getTrackOfLocalDeliveryOrder()
+    {
+        $data = $this->request->params([
+            [ 'trade_no', '' ],
+        ]);
+        return success(( new OrderService() )->getTrackOfLocalDeliveryOrder($data));
+    }
+}
diff --git a/niucloud/addon/shop/app/api/controller/order/OrderCreate.php b/niucloud/addon/shop/app/api/controller/order/OrderCreate.php
index ed545a0be..5af21948f 100644
--- a/niucloud/addon/shop/app/api/controller/order/OrderCreate.php
+++ b/niucloud/addon/shop/app/api/controller/order/OrderCreate.php
@@ -49,6 +49,7 @@ class OrderCreate extends BaseApiController
 //            ['invoice', []],//发票
             ['extend_data', []],// 扩展数据
             ['impulse_buy_goods', []], // 顺买商品信息
+            ['position', []],//用户位置信息
         ]);
 
         return success('SUCCESS', ( new OrderCreateService() )->calculate($data));
diff --git a/niucloud/addon/shop/app/api/route/route.php b/niucloud/addon/shop/app/api/route/route.php
index dc69d0730..34bb9d44b 100644
--- a/niucloud/addon/shop/app/api/route/route.php
+++ b/niucloud/addon/shop/app/api/route/route.php
@@ -14,7 +14,8 @@ use app\api\middleware\ApiCheckToken;
 use app\api\middleware\ApiLog;
 use think\facade\Route;
 
-
+// 第三方配送
+Route::any('delivery/notify/:type/:order_no/:action', 'addon\shop\app\api\controller\delivery\Order@notify');
 /**
  * 商城系统
  */
@@ -204,6 +205,9 @@ Route::group('shop', function () {
     Route::get('order_create/store', 'addon\shop\app\api\controller\order\OrderCreate@getStore');
     Route::get('order_create/local', 'addon\shop\app\api\controller\order\OrderCreate@getLocalDeliveryConfig');
 
+    // 获取同城配送轨迹
+    Route::get('delivery/track_of_local', 'addon\shop\app\api\controller\delivery\Order@getTrackOfLocalDeliveryOrder');
+
     //获取订单确认数据
     Route::get('confirm', 'addon\shop\app\api\controller\order\OrderCreate@confirm');
 
diff --git a/niucloud/addon/shop/app/dict/delivery/ElectronicSheetDict.php b/niucloud/addon/shop/app/dict/delivery/ElectronicSheetDict.php
index ba9fd34f3..5620b3d42 100644
--- a/niucloud/addon/shop/app/dict/delivery/ElectronicSheetDict.php
+++ b/niucloud/addon/shop/app/dict/delivery/ElectronicSheetDict.php
@@ -14,6 +14,9 @@ namespace addon\shop\app\dict\delivery;
 class ElectronicSheetDict
 {
 
+
+
+
     /**
      * 获取邮费支付方式类型
      * @param $type
diff --git a/niucloud/addon/shop/app/dict/delivery_store/DeliveryStoreDict.php b/niucloud/addon/shop/app/dict/delivery_store/DeliveryStoreDict.php
new file mode 100644
index 000000000..ef9d540d9
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/delivery_store/DeliveryStoreDict.php
@@ -0,0 +1,44 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\delivery_store;
+
+/**
+ * 提货点枚举类
+ * Class LocalDeliveryDict
+ * @package app\dict\sys
+ */
+class DeliveryStoreDict
+{
+
+    //同城配送
+    const LOCAL_DELIVERY = 'local_delivery';
+    //门店自提
+    const STORE = 'store';
+
+    /**
+     * 获取提货类型
+     * @param string $type
+     * @return array|string
+     */
+    public static function getPickUpType($type = '')
+    {
+        $pick_up_type = [
+            self::LOCAL_DELIVERY => get_lang('dict_shop_delivery_store_pick_up_type.local_delivery'),
+            self::STORE => get_lang('dict_shop_delivery_store_pick_up_type.store'),
+        ];
+        if (!empty($type)) {
+            return $pick_up_type[$type] ?? '';
+        }
+        return $pick_up_type;
+    }
+
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/dict/diy/components.php b/niucloud/addon/shop/app/dict/diy/components.php
index e4f59acf7..8e2e95165 100644
--- a/niucloud/addon/shop/app/dict/diy/components.php
+++ b/niucloud/addon/shop/app/dict/diy/components.php
@@ -25,6 +25,7 @@ return [
                         "fontWeight" => 'normal',
                         "isShow" => true
                     ],
+                    "mode" => "aspectFill",
                     "priceStyle" => [
                         "color" => "#FF4142",
                         "control" => true,
@@ -126,6 +127,7 @@ return [
                 'value' => [
                     'style' => 'style-2',
                     'num' => 6,
+                    "mode" => "aspectFill",
                     "sortWay" => "default", // 排序方式，default：综合，sale_num：销量，price：价格
                     "headStyle" => "style-1",
                     "aroundRadius" => 25,
@@ -237,8 +239,8 @@ return [
                     "componentStartBgColor" => '', // 组件背景颜色（开始）
                     "componentEndBgColor" => '', // 组件背景颜色（结束）
                     "componentGradientAngle" => 'to bottom', // 渐变角度，上下（to bottom）、左右（to right）
-                    "topRounded" => 0, // 组件上圆角
-                    "bottomRounded" => 0, // 组件下圆角
+                    "topRounded" => 12, // 组件上圆角
+                    "bottomRounded" => 12, // 组件下圆角
                     "elementBgColor" => '', // 元素背景颜色
                     "topElementRounded" => 0,// 元素上圆角
                     "bottomElementRounded" => 0, // 元素下圆角
@@ -308,6 +310,7 @@ return [
                 'sort' => 10018,
                 'value' => [
                     'style' => 'style-2',
+                    "mode" => "aspectFill",
                     'source' => 'all',
                     'num' => 10,
                     'goods_category' => '',
@@ -365,6 +368,7 @@ return [
                     "priceStyle" => [
                         "mainColor" => "#333333",
                     ],
+                    "mode" => "aspectFill",
                     'source' => 'all',
                     "goods_ids" => [],
                     'list' => [
@@ -465,6 +469,7 @@ return [
                 'uses' => 0,
                 'sort' => 10019,
                 'value' => [
+                    "mode" => "aspectFill",
                     "titleStyle" => [
                         'title' => '风格1',
                         'value' => 'style-1'
@@ -553,6 +558,7 @@ return [
                 'uses' => 1,
                 'sort' => 10020,
                 'value' => [
+                    "mode" => "aspectFill",
                     "style" => [
                         'title' => '风格1',
                         'value' => 'style-1'
@@ -611,6 +617,7 @@ return [
                 'uses' => 0,
                 'sort' => 10021,
                 'value' => [
+                    "mode" => "aspectFill",
                     "list" => [
                         [
                             'bgUrl' => 'addon/shop/rank/rank_bg_01.jpg', // 榜单背景图
@@ -682,7 +689,81 @@ return [
                         "both" => 10 // 左右边距
                     ]
                 ]
-            ]
+            ],
+            'ShopGoodsHot' => [
+                'title' => '爆款商品',
+                'icon' => 'iconfont iconjifenshangpinpc',
+                'path' => 'edit-shop-goods-hot',
+                'support_page' => [],
+                'uses' => 0,
+                'sort' => 10022,
+                'value' => [
+                    "mode" => "aspectFill",
+                    'titleStyle' => [
+                        'text' => '大牌直降',
+                        'textColor' => '#FFFFFF',
+                        "fontWeight" => 'bold',
+                        "fontSize" => 18,
+                        'imgUrl' => '',
+                        'way' => 'text', // 展示方式，text：文本，img：图片
+                        "link" => [
+                            "name" => ""
+                        ]
+                    ],
+                    'subTitleStyle' => [
+                        'text' => '7月10日-29日',
+                        'textColor' => '#ffffff',
+                        'bgColor' => '#ff737a',
+                        "rounded" => 6,
+                        "fontSize" => 12
+                    ],
+                    'btnStyle' => [
+                        "text" => '立即抢购',
+                        'textColor' => '#ee695c',
+                        "startBgColor" => "",
+                        "endBgColor" => "",
+                        "gradientType" => "radial",
+                        "fontSize" => 12,
+                        "link" => [
+                            "name" => ""
+                        ]
+                    ],
+                    'goodsStyle' => [
+                        'bgColor' => '#ffffff',
+                        'labelText' => '大牌直降',
+                        'labelSize' => 10,
+                        'labelColor' => '#ffffff',
+                        'labelBgColor' => '#FF0000',
+                        "rounded" => 8,
+                        "imgRounded" => 7,
+                        'source' => 'all', // 商品来源方式
+                        'num' => 10,
+                        "goodsIds" => []
+                    ]
+                ],
+                // 组件属性
+                'template' => [
+                    "textColor" => "#303133", // 文字颜色
+                    'pageStartBgColor' => '#FF0000', // 底部背景颜色（开始）
+                    'pageEndBgColor' => '', // 底部背景颜色（结束）
+                    'pageGradientAngle' => 'to bottom', // 渐变角度，从上到下（to bottom）、从左到右（to right）
+                    'componentBgUrl' => '', // 组件背景图片
+                    'componentBgAlpha' => 2, // 组件背景图片的透明度，0~10
+                    "componentStartBgColor" => '', // 组件背景颜色（开始）
+                    "componentEndBgColor" => '', // 组件背景颜色（结束）
+                    "componentGradientAngle" => 'to bottom', // 渐变角度，上下（to bottom）、左右（to right）
+                    "topRounded" => 0, // 组件上圆角
+                    "bottomRounded" => 0, // 组件下圆角
+                    "elementBgColor" => '', // 元素背景颜色
+                    "topElementRounded" => 0,// 元素上圆角
+                    "bottomElementRounded" => 0, // 元素下圆角
+                    "margin" => [
+                        "top" => 12, // 上边距
+                        "bottom" => 12, // 下边距
+                        "both" => 10 // 左右边距
+                    ],
+                ]
+            ],
         ]
     ],
     'SHOP_GOODS_DETAIL_COMPONENT' => [
diff --git a/niucloud/addon/shop/app/dict/diy/pages.php b/niucloud/addon/shop/app/dict/diy/pages.php
index 9214729eb..593e3d37b 100644
--- a/niucloud/addon/shop/app/dict/diy/pages.php
+++ b/niucloud/addon/shop/app/dict/diy/pages.php
@@ -967,6 +967,7 @@ return [
                         "id" => "2ezdal8ps1og",
                         "componentName" => "ShopGoodsRecommend",
                         "componentTitle" => "商品推荐",
+                        "mode" => "aspectFill",
                         "ignore" => [],
                         "priceStyle" => [
                             "mainColor" => "#333333"
@@ -1441,6 +1442,7 @@ return [
                         "id" => "2hjc1q7f7q80",
                         "componentName" => "ShopNewcomer",
                         "componentTitle" => "新人专享",
+                        "mode" => "aspectFill",
                         "ignore" => [],
                         "style" => [
                             "title" => "风格1",
@@ -1496,6 +1498,7 @@ return [
                         "uses" => 0,
                         "id" => "2mxsu6pbqpu0",
                         "componentName" => "SingleRecommend",
+                        "mode" => "aspectFill",
                         "componentTitle" => "精选推荐",
                         "ignore" => [],
                         "titleStyle" => [
@@ -1631,6 +1634,7 @@ return [
                         "id" => "37adfqtqe080",
                         "componentName" => "ManyGoodsList",
                         "componentTitle" => "多商品组",
+                        "mode" => "aspectFill",
                         "ignore" => [
                             "componentBgUrl"
                         ],
@@ -2788,6 +2792,7 @@ return [
                         "id" => "17uao387qdds",
                         "componentName" => "GoodsList",
                         "componentTitle" => "商品列表",
+                        "mode" => "aspectFill",
                         "ignore" => [],
                         "style" => "style-3",
                         "source" => "all",
@@ -2939,6 +2944,7 @@ return [
                         "id" => "2u96wyrm79u0",
                         "componentName" => "GoodsList",
                         "componentTitle" => "商品列表",
+                        "mode" => "aspectFill",
                         "ignore" => [],
                         "style" => "style-1",
                         "source" => "all",
@@ -3059,6 +3065,7 @@ return [
                         "id" => "4y7mw7j2uko0",
                         "componentName" => "GoodsList",
                         "componentTitle" => "商品列表",
+                        "mode" => "aspectFill",
                         "ignore" => [],
                         "style" => "style-2",
                         "source" => "all",
@@ -3126,6 +3133,7 @@ return [
                         "id" => "65lv65b38ig0",
                         "componentName" => "ManyGoodsList",
                         "componentTitle" => "多商品组",
+                        "mode" => "aspectFill",
                         "ignore" => ['componentBgUrl'],
                         "style" => "style-2",
                         "num" => 6,
@@ -3767,6 +3775,7 @@ return [
                         "id" => "50pj7dmvbvo0",
                         "componentName" => "GoodsList",
                         "componentTitle" => "商品列表",
+                        "mode" => "aspectFill",
                         "ignore" => [],
                         'style' => 'style-1',
                         "source" => "all",
@@ -5182,6 +5191,7 @@ return [
                         "id" => "76wf7oom00o0",
                         "componentName" => "ShopExchangeGoods",
                         "componentTitle" => "积分商品",
+                        "mode" => "aspectFill",
                         "path" => "edit-shop-exchange-goods",
                         "uses" => 0,
                         "ignore" => [],
diff --git a/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryDict.php b/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryDict.php
new file mode 100644
index 000000000..a82f76077
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryDict.php
@@ -0,0 +1,56 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\local_delivery;
+
+/**
+ * 同城配送枚举类
+ * Class LocalDeliveryDict
+ * @package addon\shop\app\dict\local_delivery
+ */
+class LocalDeliveryDict
+{
+
+    //商家配送
+    const MERCHANT = 'merchant';
+
+    public static function getType($type = '')
+    {
+        $list = [
+            self::MERCHANT => [
+                'name' => '商家配送',
+                'key' => self::MERCHANT,
+                //配置参数
+                'params' => [],
+                'component' => '',
+                'business_list' => '',
+                'extend_data' => [],
+                //商家配送标识
+                'is_merchant' => 1
+            ],
+        ];
+
+        $extend = event('LocalDeliveryType');
+        $type_list = array_merge($list, ...$extend);
+        if ($type == '') return $type_list;
+        return $type_list[$type]['name'] ?? '';
+    }
+
+
+    //门店开通状态
+    const OPEN_PASS = 1;//通过
+    const OPEN_REFUND = 2;//未通过
+
+    //门店编辑状态
+    const EDIT_PASS = 1;//编辑审核通过
+    const EDIT_REFUND = 2;//编辑审核驳回
+
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryPreStatusDict.php b/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryPreStatusDict.php
new file mode 100644
index 000000000..46dd5bccc
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryPreStatusDict.php
@@ -0,0 +1,30 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\local_delivery;
+
+/**
+ * 配送订单操作前置状态枚举类
+ * Class LocalDeliveryDict
+ * @package app\dict\sys
+ */
+class LocalDeliveryPreStatusDict
+{
+
+    public static function getStatus(string $service = '')
+    {
+        $list = [];
+
+        $extend = array_filter(event('DeliveryOrderPreStatus', ['service' => $service]));
+        return array_merge($list, ...$extend);
+    }
+
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryStatusDict.php b/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryStatusDict.php
new file mode 100644
index 000000000..fc70ac803
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/local_delivery/LocalDeliveryStatusDict.php
@@ -0,0 +1,63 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\local_delivery;
+
+
+/**
+ *同城配送相关枚举类
+ */
+class LocalDeliveryStatusDict
+{
+
+    const WAIT_RELEASE = -100; // 预约待发布
+    // 订单状态常量定义
+    const ORDER_ACCEPTED = 0; // 商家已接单
+    const PENDING_ACCEPTANCE = 1;      // 待接单
+    const PENDING_PICKUP = 2;          // 待取货
+    const RIDER_ARRIVED = 3;         // 骑士到店
+    const IN_DELIVERY = 4;             // 配送中
+    const COMPLETED = 5;               // 已完成
+    const DISPATCH_ORDER = 6;          // 指派单（已追加待接单）
+    const RETURN_IN_PROGRESS = 7;      // 妥投异常之物品返回中
+    const RETURN_COMPLETED = 8;        // 妥投异常之物品返回完成
+    const RETURN_RIDER_ARRIVED = 9;    // 售后取件单送达门店
+    const CREATE_ORDER_FAILED = -1; // 创建运单失败
+    const CANCELED = -2;                // 已取消
+
+    /**
+     * 获取所有订单状态映射
+     * @return array|mixed|string
+     */
+    public static function getStatus(string $status = '')
+    {
+        $data = [
+            self::WAIT_RELEASE => get_lang('dict_shop_local_delivery_status.wait_release'), //预约待发布,
+            self::ORDER_ACCEPTED => get_lang('dict_shop_local_delivery_status.order_accepted'), //商家已接单,
+            self::PENDING_ACCEPTANCE => get_lang('dict_shop_local_delivery_status.pending_acceptance'), //待接单,
+            self::PENDING_PICKUP => get_lang('dict_shop_local_delivery_status.pending_pickup'), //待取货,
+            self::RIDER_ARRIVED => get_lang('dict_shop_local_delivery_status.rider_arrived'), //骑士到店,
+            self::IN_DELIVERY => get_lang('dict_shop_local_delivery_status.in_delivery'), //配送中,
+            self::COMPLETED => get_lang('dict_shop_local_delivery_status.completed'), //已完成,
+            self::DISPATCH_ORDER => get_lang('dict_shop_local_delivery_status.dispatch_order'), //指派单,
+            self::RETURN_IN_PROGRESS => get_lang('dict_shop_local_delivery_status.return_in_progress'), //妥投异常之物品返回中,
+            self::RETURN_COMPLETED => get_lang('dict_shop_local_delivery_status.return_completed'), //妥投异常之物品返回完成,
+            self::RETURN_RIDER_ARRIVED => get_lang('dict_shop_local_delivery_status.return_rider_arrived'), //售后取件单送达门店,
+            self::CREATE_ORDER_FAILED => get_lang('dict_shop_local_delivery_status.create_order_failed'), //创建运单失败,
+            self::CANCELED => get_lang('dict_shop_local_delivery_status.canceled'), //已取消,
+        ];
+        if ($status == '' && $status !== 0) {
+            return $data;
+        }
+        return $data[$status] ?? '';
+    }
+
+}
diff --git a/niucloud/addon/shop/app/dict/local_delivery/OrderCancelReasonDict.php b/niucloud/addon/shop/app/dict/local_delivery/OrderCancelReasonDict.php
new file mode 100644
index 000000000..a25b4bb13
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/local_delivery/OrderCancelReasonDict.php
@@ -0,0 +1,33 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\local_delivery;
+
+
+/**
+ *订单取消原因相关枚举类
+ */
+class OrderCancelReasonDict
+{
+    /**
+     * 获取订单取消原因枚举列表
+     * @return array|mixed|string
+     */
+    public static function getType($type = '', string $service = '')
+    {
+        $data = array_filter(event('OrderCancelReason', ['service' => $service]))[0];
+        if ($type == '') {
+            return $data;
+        }
+        return $data[$type] ?? '';
+    }
+
+}
diff --git a/niucloud/addon/shop/app/dict/local_delivery/OrderLogDict.php b/niucloud/addon/shop/app/dict/local_delivery/OrderLogDict.php
new file mode 100644
index 000000000..1fdf72f69
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/local_delivery/OrderLogDict.php
@@ -0,0 +1,121 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\local_delivery;
+
+
+/**
+ * 订单日志枚举类
+ */
+class OrderLogDict
+{
+
+    const STORE = 'store';
+    const RIDER = 'rider';
+    const MEMBER = 'member';
+    const SYSTEM = 'system';
+
+
+    /**
+     * 获取操作人类型
+     * @param string $type
+     * @return array|array[]|string
+     */
+    public static function getMainType(string $type = '')
+    {
+        $data = [
+            self::STORE => get_lang('dict_shop_local_delivery_order_log.store'),//商家
+            self::RIDER => get_lang('dict_shop_local_delivery_order_log.rider'),//骑手
+            self::MEMBER => get_lang('dict_shop_local_delivery_order_log.member'),//会员
+            self::SYSTEM => get_lang('dict_shop_local_delivery_order_log.system'),//系统
+        ];
+        if (!$type) {
+            return $data;
+        }
+        return $data[$type] ?? '';
+    }
+
+    const ORDER_ACCEPTED = 'order_accepted';//商家已接单
+    const ORDER_CALL = 'order_call';//商家呼叫配送
+    const DISPATCH_ORDER = 'dispatch_order';//商家指派骑手
+    const RIDER_ACCEPTED = 'rider_accepted';//骑手已接单
+    const RIDER_ARRIVED = 'rider_arrived';//骑手已到店
+    const RIDER_PICKED_UP = 'rider_picked_up';//骑手已取货
+    const ORDER_DELIVERED = 'order_delivered';//订单已送达
+    const ORDER_CANCELED = 'order_canceled';//订单已取消
+    const RETURN_APPLIED = 'return_applied';//物品返回申请
+    const RETURN_COMPLETED = 'return_completed';//物品返回完成
+
+    /**
+     * 获取操作
+     * @return array
+     */
+    public static function getOperate($status)
+    {
+        switch ($status) {
+            case LocalDeliveryStatusDict::ORDER_ACCEPTED:
+                return [
+                    'operate' => self::ORDER_ACCEPTED,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.order_accepted')
+                ];// 商家已接单
+            case LocalDeliveryStatusDict::PENDING_ACCEPTANCE:
+                return [
+                    'operate' => self::ORDER_CALL,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.order_call')
+                ];// 商家呼叫配送
+            case LocalDeliveryStatusDict::DISPATCH_ORDER:
+                return [
+                    'operate' => self::DISPATCH_ORDER,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.dispatch_order')
+                ];// 商家指派骑手
+            case LocalDeliveryStatusDict::PENDING_PICKUP:
+                return [
+                    'operate' => self::RIDER_ACCEPTED,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.rider_accepted')
+                ];// 骑手已接单
+            case LocalDeliveryStatusDict::RIDER_ARRIVED:
+                return [
+                    'operate' => self::RIDER_ARRIVED,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.rider_arrived')
+                ];// 骑手已到店
+            case LocalDeliveryStatusDict::IN_DELIVERY:
+                return [
+                    'operate' => self::RIDER_PICKED_UP,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.rider_picked_up')
+                ];// 骑手已取货
+            case LocalDeliveryStatusDict::COMPLETED:
+                return [
+                    'operate' => self::ORDER_DELIVERED,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.order_delivered')
+                ];// 订单已送达
+            case LocalDeliveryStatusDict::CANCELED:
+                return [
+                    'operate' => self::ORDER_CANCELED,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.order_canceled')
+                ];// 订单已取消
+            case LocalDeliveryStatusDict::RETURN_IN_PROGRESS:
+                return [
+                    'operate' => self::RETURN_APPLIED,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.return_applied')
+                ];// 物品返回申请
+            case LocalDeliveryStatusDict::RETURN_COMPLETED:
+                return [
+                    'operate' => self::RETURN_COMPLETED,
+                    'operate_desc' => get_lang('dict_shop_local_delivery_order_log.return_completed')
+                ];// 物品返回完成
+        }
+        return [
+            'operate' => '',
+            'operate_desc' => ''
+        ];
+    }
+
+}
diff --git a/niucloud/addon/shop/app/dict/local_delivery/dada/DadaDeliveryDict.php b/niucloud/addon/shop/app/dict/local_delivery/dada/DadaDeliveryDict.php
new file mode 100644
index 000000000..2d41269ee
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/local_delivery/dada/DadaDeliveryDict.php
@@ -0,0 +1,25 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\local_delivery\dada;
+
+/**
+ * 达达秒送枚举类
+ * Class DadaDeliveryDict
+ * @package addon\shop\app\dict\local_delivery\dada
+ */
+class DadaDeliveryDict
+{
+
+    //达达秒送
+    const DADA = 'dada';
+
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/dict/local_delivery/dada/DadaDeliveryStatusDict.php b/niucloud/addon/shop/app/dict/local_delivery/dada/DadaDeliveryStatusDict.php
new file mode 100644
index 000000000..a1a938e52
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/local_delivery/dada/DadaDeliveryStatusDict.php
@@ -0,0 +1,72 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\local_delivery\dada;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+
+/**
+ *同城三方配送相关枚举类
+ */
+class DadaDeliveryStatusDict
+{
+    // 订单状态常量定义
+
+    const WAIT_RELEASE = 0;      // 预约待发布
+    const PENDING_ACCEPTANCE = 1;      // 待接单
+    const PENDING_PICKUP = 2;          // 待取货
+    const RIDER_ARRIVED = 100;         // 骑士到店
+    const IN_DELIVERY = 3;             // 配送中
+    const COMPLETED = 4;               // 已完成
+    const DISPATCH_ORDER = 8;          // 指派单（已追加待接单）
+    const RETURN_IN_PROGRESS = 9;      // 妥投异常之物品返回中
+    const RETURN_COMPLETED = 10;        // 妥投异常之物品返回完成
+    const RETURN_RIDER_ARRIVED = 6;    // 售后取件单送达门店
+    const CREATE_ORDER_FAILED = 1000; // 创建运单失败
+    const CANCELED = 5;                // 已取消
+
+    /**
+     * 转换配送状态
+     * @param $status
+     * @return int
+     */
+    public static function convertStatus($status)
+    {
+        switch ($status) {
+            case self::WAIT_RELEASE:
+                return LocalDeliveryStatusDict::WAIT_RELEASE;// 待接单
+            case self::PENDING_ACCEPTANCE:
+                return LocalDeliveryStatusDict::PENDING_ACCEPTANCE;// 待接单
+            case self::PENDING_PICKUP:
+                return LocalDeliveryStatusDict::PENDING_PICKUP;// 待取货
+            case self::RIDER_ARRIVED:
+                return LocalDeliveryStatusDict::RIDER_ARRIVED;// 骑士到店
+            case self::IN_DELIVERY:
+                return LocalDeliveryStatusDict::IN_DELIVERY;// 配送中
+            case self::COMPLETED:
+                return LocalDeliveryStatusDict::COMPLETED;// 已完成
+            case self::CANCELED:
+                return LocalDeliveryStatusDict::CANCELED;// 已取消
+            case self::DISPATCH_ORDER:
+                return LocalDeliveryStatusDict::DISPATCH_ORDER;// 指派单（已追加待接单）
+            case self::RETURN_IN_PROGRESS:
+                return LocalDeliveryStatusDict::RETURN_IN_PROGRESS;// 妥投异常之物品返回中
+            case self::RETURN_COMPLETED:
+                return LocalDeliveryStatusDict::RETURN_COMPLETED;// 妥投异常之物品返回完成
+            case self::RETURN_RIDER_ARRIVED:
+                return LocalDeliveryStatusDict::RETURN_RIDER_ARRIVED;// 售后取件单送达门店
+            case self::CREATE_ORDER_FAILED:
+                return LocalDeliveryStatusDict::CREATE_ORDER_FAILED;// 创建运单失败
+        }
+        return 0;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/dict/local_delivery/dada/json/shop_catetory_dict.json b/niucloud/addon/shop/app/dict/local_delivery/dada/json/shop_catetory_dict.json
new file mode 100644
index 000000000..7eb79622c
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/local_delivery/dada/json/shop_catetory_dict.json
@@ -0,0 +1 @@
+{"1":"食品小吃","2":"饮料","3":"鲜花绿植","5":"其他","8":"文印票务","9":"便利店","13":"水果生鲜","19":"同城电商","20":"医药","21":"蛋糕","24":"酒品","25":"小商品市场","26":"服装","27":"汽修零配","28":"数码家电","29":"小龙虾/烧烤","31":"超市","51":"火锅","53":"个护美妆","55":"母婴","57":"家居家纺","59":"手机","61":"家装","63":"成人用品","65":"校园","66":"高端市场"}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/dict/member/account_change_type.php b/niucloud/addon/shop/app/dict/member/account_change_type.php
index 7ba3b8b7c..8fd971305 100644
--- a/niucloud/addon/shop/app/dict/member/account_change_type.php
+++ b/niucloud/addon/shop/app/dict/member/account_change_type.php
@@ -111,5 +111,24 @@ return [
             //是否累增
             'is_change_get' => 1,
         ]
+    ],
+    //成长值
+    MemberAccountTypeDict::GROWTH => [
+        'shop_buy_goods' => [
+            //名称
+            'name' => '购买产品',
+            //是否增加
+            'inc' => 1,
+            //是否减少
+            'dec' => 0,
+        ],
+        'shop_buy_order' => [
+            //名称
+            'name' => '完成下单',
+            //是否增加
+            'inc' => 1,
+            //是否减少
+            'dec' => 0,
+        ],
     ]
 ];
diff --git a/niucloud/addon/shop/app/dict/menu/admin.php b/niucloud/addon/shop/app/dict/menu/admin.php
index 5fa7e0802..c00909eca 100644
--- a/niucloud/addon/shop/app/dict/menu/admin.php
+++ b/niucloud/addon/shop/app/dict/menu/admin.php
@@ -557,7 +557,7 @@ return [
                         'menu_type' => '1',
                         'icon' => '',
                         'api_url' => 'shop/goods/virtual',
-                        'router_path' => 'shop/goods/virtual_edit',
+                        'router_path' => 'shop/goods/virtual_add',
                         'view_path' => 'goods/virtual_edit',
                         'methods' => 'post',
                         'sort' => '0',
@@ -737,7 +737,7 @@ return [
                         'menu_type' => '1',
                         'icon' => '',
                         'api_url' => 'shop/goods',
-                        'router_path' => 'shop/goods/real_edit',
+                        'router_path' => 'shop/goods/real_add',
                         'view_path' => 'goods/real_edit',
                         'methods' => 'post',
                         'sort' => '0',
@@ -1107,6 +1107,509 @@ return [
                             ],
                         ],
                     ],
+                    [
+                        'menu_name' => '添加评价',
+                        'menu_key' => 'shop_goods_evaluate_add',
+                        'menu_short_name' => '添加评价',
+                        'parent_select_key' => 'shop_goods_evaluate',
+                        'menu_type' => '1',
+                        'icon' => '',
+                        'api_url' => 'shop/goods/evaluate',
+                        'router_path' => 'shop/order/evaluate/add',
+                        'view_path' => 'goods/evaluate_edit',
+                        'methods' => 'get',
+                        'sort' => '0',
+                        'status' => '1',
+                        'is_show' => '0',
+                    ],
+                    [
+                        'menu_name' => '订单详情',
+                        'menu_key' => 'shop_order_detail',
+                        'menu_short_name' => '订单详情',
+                        'parent_select_key' => 'shop_order_list',
+                        'menu_type' => '1',
+                        'icon' => 'iconfont iconshangpinguanli',
+                        'api_url' => 'shop/order/detail/<id>',
+                        'router_path' => 'shop/order/detail',
+                        'view_path' => 'order/detail',
+                        'methods' => 'get',
+                        'sort' => '0',
+                        'status' => '1',
+                        'is_show' => '0',
+                    ],
+                    [
+                        'menu_name' => '售后详情',
+                        'menu_key' => 'shop_order_refund_detail',
+                        'menu_short_name' => '售后详情',
+                        'parent_select_key' => 'shop_order_refund',
+                        'menu_type' => '1',
+                        'icon' => 'iconfont iconshangpinguanli',
+                        'api_url' => '',
+                        'router_path' => 'shop/order/refund/detail',
+                        'view_path' => 'order/refund_detail',
+                        'methods' => 'get',
+                        'sort' => '0',
+                        'status' => '1',
+                        'is_show' => '0',
+                    ]
+                ],
+            ],
+            [
+                'menu_name' => '配送管理',
+                'menu_key' => 'shop_delivery_manage',
+                'menu_short_name' => '配送',
+                'menu_type' => '0',
+                'icon' => 'nc-iconfont nc-icon-a-peisongguanliPC30',
+                'api_url' => '',
+                'router_path' => '',
+                'view_path' => '',
+                'methods' => 'get',
+                'sort' => '80',
+                'status' => '1',
+                'is_show' => '1',
+                'children' => [
+                    [
+                        'menu_name' => '物流配送',
+                        'menu_key' => 'shop_logistics_manage',
+                        'menu_short_name' => '物流配送',
+                        'menu_type' => '0',
+                        'icon' => 'nc-iconfont nc-icon-a-wuliupeisongPC30',
+                        'api_url' => '',
+                        'router_path' => '',
+                        'view_path' => '',
+                        'methods' => '',
+                        'sort' => '100',
+                        'status' => '1',
+                        'is_show' => '1',
+                        'children' => [
+                            [
+                                'menu_name' => '物流公司',
+                                'menu_key' => 'shop_delivery_company',
+                                'menu_short_name' => '物流公司',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => 'shop/delivery/company',
+                                'router_path' => 'shop/delivery/company',
+                                'view_path' => 'delivery/company',
+                                'methods' => 'get',
+                                'sort' => '100',
+                                'status' => '1',
+                                'is_show' => '1',
+                                'children' => [
+                                    [
+                                        'menu_name' => '物流公司删除',
+                                        'menu_key' => 'shop_delivery_company_delete',
+                                        'menu_short_name' => '物流公司删除',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/delivery/company/<id>',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'delete',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                ],
+                            ],
+                            [
+                                'menu_name' => '添加物流公司',
+                                'menu_key' => 'shop_delivery_company_add',
+                                'menu_short_name' => '添加物流公司',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => 'shop/delivery/company',
+                                'router_path' => 'shop/delivery/company_add',
+                                'view_path' => 'delivery/company_edit',
+                                'methods' => 'post',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                            ],
+                            [
+                                'menu_name' => '编辑物流公司',
+                                'menu_key' => 'shop_delivery_company_edit',
+                                'menu_short_name' => '编辑物流公司',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => 'shop/delivery/company',
+                                'router_path' => 'shop/delivery/company_edit',
+                                'view_path' => 'delivery/company_edit',
+                                'methods' => 'put',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                            ],
+                            [
+                                'menu_name' => '运费模板',
+                                'menu_key' => 'shop_delivery_shipping_template',
+                                'menu_short_name' => '运费模板',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => 'shop/shipping/template',
+                                'router_path' => 'shop/shipping/template',
+                                'view_path' => 'delivery/template',
+                                'methods' => 'get',
+                                'sort' => '90',
+                                'status' => '1',
+                                'is_show' => '1',
+                                'children' => [
+                                    [
+                                        'menu_name' => '运费模板删除',
+                                        'menu_key' => 'shop_delivery_shipping_template_delete',
+                                        'menu_short_name' => '运费模板列表',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/shipping/template/<template_id>',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'delete',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                ],
+                            ],
+                            [
+                                'menu_name' => '运费模板添加/编辑',
+                                'menu_key' => 'shop_delivery_shipping_template_add_edit',
+                                'menu_short_name' => '运费模板添加/编辑',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => '',
+                                'router_path' => 'shop/shipping/template_edit',
+                                'view_path' => 'delivery/template_edit',
+                                'methods' => 'get',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                                'children' => [
+                                    [
+                                        'menu_name' => '运费模板添加',
+                                        'menu_key' => 'shop_delivery_shipping_template_add',
+                                        'menu_short_name' => '运费模板添加',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/shipping/template',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'post',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                    [
+                                        'menu_name' => '运费模板编辑',
+                                        'menu_key' => 'shop_delivery_shipping_template_edit',
+                                        'menu_short_name' => '运费模板编辑',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/shipping/template/<template_id>',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'put',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                ],
+                            ],
+                            [
+                                'menu_name' => '添加模板',
+                                'menu_key' => 'shop_delivery_electronic_sheet_add',
+                                'menu_short_name' => '添加电子面单模板',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => 'shop/electronic_sheet',
+                                'router_path' => 'shop/delivery/electronic_sheet_add',
+                                'view_path' => 'delivery/electronic_sheet_edit',
+                                'methods' => 'post',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                            ],
+                            [
+                                'menu_name' => '编辑模板',
+                                'menu_key' => 'shop_delivery_electronic_sheet_edit',
+                                'menu_short_name' => '编辑电子面单模板',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => 'shop/electronic_sheet/<id>',
+                                'router_path' => 'shop/delivery/electronic_sheet_edit',
+                                'view_path' => 'delivery/electronic_sheet_edit',
+                                'methods' => 'put',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                            ],
+                            [
+                                'menu_name' => '电子面单',
+                                'menu_key' => 'shop_delivery_electronic_sheet',
+                                'menu_short_name' => '电子面单',
+                                'menu_type' => '1',
+                                'icon' => 'iconfont icondiscount',
+                                'api_url' => '',
+                                'router_path' => 'shop/delivery/electronic_sheet',
+                                'view_path' => 'delivery/electronic_sheet',
+                                'methods' => 'get',
+                                'sort' => '80',
+                                'status' => '1',
+                                'is_show' => '1',
+                                'children' => [
+                                    [
+                                        'menu_name' => '删除电子面单模板',
+                                        'menu_key' => 'shop_delivery_electronic_sheet_del',
+                                        'menu_short_name' => '删除电子面单模板',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/electronic_sheet',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'delete',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                ],
+                            ],
+                            [
+                                'menu_name' => '电子面单设置',
+                                'menu_key' => 'shop_delivery_electronic_sheet_config',
+                                'menu_short_name' => '电子面单设置',
+                                'menu_type' => '1',
+                                'icon' => 'iconfont icondiscount',
+                                'api_url' => 'shop/electronic_sheet/config',
+                                'router_path' => 'shop/delivery/electronic_sheet/config',
+                                'view_path' => 'delivery/electronic_sheet_config',
+                                'methods' => 'get',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                            ],
+                            [
+                                'menu_name' => '物流跟踪',
+                                'menu_key' => 'shop_delivery_search',
+                                'menu_short_name' => '物流跟踪',
+                                'menu_type' => '1',
+                                'icon' => 'iconfont iconwuliugenzong',
+                                'api_url' => '',
+                                'router_path' => 'shop/delivery/search',
+                                'view_path' => 'delivery/search',
+                                'methods' => 'get',
+                                'sort' => '70',
+                                'status' => '1',
+                                'is_show' => '1',
+                                'children' => [
+                                    [
+                                        'menu_name' => '物流跟踪设置',
+                                        'menu_key' => 'shop_delivery_search_set',
+                                        'menu_short_name' => '物流跟踪设置',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/delivery/search',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'post',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                ],
+                            ]
+                        ]
+                    ],
+                    [
+                        'menu_name' => '同城配送',
+                        'menu_key' => 'shop_local_delivery_manage',
+                        'menu_short_name' => '同城配送',
+                        'menu_type' => '0',
+                        'icon' => 'nc-iconfont nc-icon-a-tongchengpeisongPC30',
+                        'api_url' => '',
+                        'router_path' => '',
+                        'view_path' => '',
+                        'methods' => '',
+                        'sort' => '90',
+                        'status' => '1',
+                        'is_show' => '1',
+                        'children' => [
+                            [
+                                'menu_name' => '配送设置',
+                                'menu_key' => 'shop_delivery_local_config',
+                                'menu_short_name' => '配送设置',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => '',
+                                'router_path' => 'shop/delivery/local',
+                                'view_path' => 'delivery/local',
+                                'methods' => 'get',
+                                'sort' => '100',
+                                'status' => '1',
+                                'is_show' => '1',
+                                'children' => [
+                                    [
+                                        'menu_name' => '保存设置',
+                                        'menu_key' => 'shop_delivery_local_config_set',
+                                        'menu_short_name' => '保存设置',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/local',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'put',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                ],
+                            ],
+                            [
+                                'menu_name' => '基础设置',
+                                'menu_key' => 'shop_delivery_local_base_config',
+                                'menu_short_name' => '基础设置',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => '',
+                                'router_path' => 'shop/delivery/local_config',
+                                'view_path' => 'delivery/local_config',
+                                'methods' => 'get',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                                'children' => [
+                                    [
+                                        'menu_name' => '保存设置',
+                                        'menu_key' => 'shop_delivery_local_config_set',
+                                        'menu_short_name' => '保存设置',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/local_delivery/base_config',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'put',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                ],
+                            ],
+                            [
+                                'menu_name' => '配送平台',
+                                'menu_key' => 'shop_local_delivery_service',
+                                'menu_short_name' => '配送平台',
+                                'menu_type' => '1',
+                                'icon' => 'iconfont iconpaisongshezhi',
+                                'api_url' => 'delivery/local_delivery_service',
+                                'router_path' => 'shop/delivery/local_delivery_service',
+                                'view_path' => 'delivery/local_delivery_service',
+                                'methods' => 'get',
+                                'sort' => '90',
+                                'status' => '1',
+                                'is_show' => '1',
+                            ],
+                            [
+                                'menu_name' => '配送记录',
+                                'menu_key' => 'shop_delivery_local_record',
+                                'menu_short_name' => '配送记录',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => '',
+                                'router_path' => 'shop/delivery/local/record',
+                                'view_path' => 'delivery/local_record',
+                                'methods' => 'get',
+                                'sort' => '80',
+                                'status' => '1',
+                                'is_show' => '1'
+                            ],
+                        ]
+                    ],
+                    [
+                        'menu_name' => '商家配送',
+                        'menu_key' => 'shop_delivery_merchant_manage',
+                        'menu_short_name' => '商家配送',
+                        'menu_type' => '0',
+                        'icon' => 'nc-iconfont nc-icon-a-shangjiapeisongPC30',
+                        'api_url' => '',
+                        'router_path' => '',
+                        'view_path' => '',
+                        'methods' => '',
+                        'sort' => '0',
+                        'status' => '1',
+                        'is_show' => '0',
+                        'children' => [
+                            [
+                                'menu_name' => '配送员',
+                                'menu_key' => 'shop_delivery_staff',
+                                'menu_short_name' => '配送员',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => '',
+                                'router_path' => 'shop/delivery/staff',
+                                'view_path' => 'delivery/staff',
+                                'methods' => '',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                                'children' => [
+                                    [
+                                        'menu_name' => '配送员添加',
+                                        'menu_key' => 'shop_delivery_staff_add',
+                                        'menu_short_name' => '配送员添加',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/delivery/staff',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'post',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                    [
+                                        'menu_name' => '配送员编辑',
+                                        'menu_key' => 'shop_delivery_staff_edit',
+                                        'menu_short_name' => '配送员编辑',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/delivery/staff/<id>',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'put',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                    [
+                                        'menu_name' => '配送员删除',
+                                        'menu_key' => 'shop_delivery_staff_delete',
+                                        'menu_short_name' => '配送员删除',
+                                        'menu_type' => '2',
+                                        'icon' => '',
+                                        'api_url' => 'shop/delivery/staff/<id>',
+                                        'router_path' => '',
+                                        'view_path' => '',
+                                        'methods' => 'delete',
+                                        'sort' => '0',
+                                        'status' => '1',
+                                        'is_show' => '0',
+                                    ],
+                                ],
+                            ],
+                            [
+                                'menu_name' => '配送记录',
+                                'menu_key' => 'shop_delivery_merchant_record',
+                                'menu_short_name' => '配送记录',
+                                'menu_type' => '1',
+                                'icon' => '',
+                                'api_url' => '',
+                                'router_path' => 'shop/delivery/merchant/record',
+                                'view_path' => 'delivery/merchant_record',
+                                'methods' => 'get',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '1'
+                            ],
+                        ]
+                    ],
                     [
                         'menu_name' => '商家地址库',
                         'menu_key' => 'shop_address',
@@ -1114,10 +1617,10 @@ return [
                         'menu_type' => '1',
                         'icon' => 'iconfont iconshangjiadizhiku',
                         'api_url' => '',
-                        'router_path' => 'shop/order/address',
+                        'router_path' => 'shop/address',
                         'view_path' => 'address/list',
                         'methods' => 'get',
-                        'sort' => '94',
+                        'sort' => '80',
                         'status' => '1',
                         'is_show' => '1',
                         'children' => [
@@ -1137,81 +1640,6 @@ return [
                             ],
                         ],
                     ],
-                    [
-                        'menu_name' => '配送设置',
-                        'menu_key' => 'shop_config_delivery',
-                        'menu_short_name' => '配送设置',
-                        'menu_type' => '1',
-                        'icon' => 'iconfont iconpaisongshezhi',
-                        'api_url' => '',
-                        'router_path' => 'shop/order/delivery',
-                        'view_path' => 'delivery/config',
-                        'methods' => '',
-                        'sort' => '93',
-                        'status' => '1',
-                        'is_show' => '1',
-                        'children' => [
-                            [
-                                'menu_name' => '配送设置编辑',
-                                'menu_key' => 'shop_config_delivery_set',
-                                'menu_short_name' => '配送设置编辑',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/delivery/setConfig',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'put',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                        ],
-                    ],
-                    [
-                        'menu_name' => '电子面单',
-                        'menu_key' => 'shop_delivery_electronic_sheet',
-                        'menu_short_name' => '电子面单',
-                        'menu_type' => '1',
-                        'icon' => 'iconfont icondiscount',
-                        'api_url' => '',
-                        'router_path' => 'shop/delivery/electronic_sheet',
-                        'view_path' => 'delivery/electronic_sheet',
-                        'methods' => 'get',
-                        'sort' => '92',
-                        'status' => '1',
-                        'is_show' => '1',
-                        'children' => [
-                            [
-                                'menu_name' => '删除电子面单模板',
-                                'menu_key' => 'shop_delivery_electronic_sheet_del',
-                                'menu_short_name' => '删除电子面单模板',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/electronic_sheet',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'delete',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                        ],
-                    ],
-                    [
-                        'menu_name' => '添加评价',
-                        'menu_key' => 'shop_goods_evaluate_add',
-                        'menu_short_name' => '添加评价',
-                        'parent_select_key' => 'shop_goods_evaluate',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => 'shop/goods/evaluate',
-                        'router_path' => 'shop/order/evaluate/add',
-                        'view_path' => 'goods/evaluate_edit',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                    ],
                     [
                         'menu_name' => '添加/编辑地址库',
                         'menu_key' => 'shop_address_add_edit',
@@ -1220,7 +1648,7 @@ return [
                         'menu_type' => '1',
                         'icon' => '',
                         'api_url' => '',
-                        'router_path' => 'shop/order/address/edit',
+                        'router_path' => 'shop/address/edit',
                         'view_path' => 'address/edit',
                         'methods' => 'get',
                         'sort' => '0',
@@ -1260,293 +1688,23 @@ return [
                         ],
                     ],
                     [
-                        'menu_name' => '物流公司',
-                        'menu_key' => 'shop_config_delivery_company',
-                        'menu_short_name' => '物流公司',
+                        'menu_name' => '提货点',
+                        'menu_key' => 'shop_delivery_store',
+                        'menu_short_name' => '提货点',
                         'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => 'shop/delivery/company',
-                        'router_path' => 'shop/order/delivery/company',
-                        'view_path' => 'delivery/company',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                        'children' => [
-                            [
-                                'menu_name' => '物流公司删除',
-                                'menu_key' => 'shop_config_delivery_company_delete',
-                                'menu_short_name' => '物流公司删除',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/delivery/company/<id>',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'delete',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                        ],
-                    ],
-                    [
-                        'menu_name' => '添加物流公司',
-                        'menu_key' => 'shop_config_delivery_company_add',
-                        'menu_short_name' => '添加物流公司',
-                        'parent_select_key' => 'shop_config_delivery_company',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => 'shop/delivery/company',
-                        'router_path' => 'shop/order/delivery/company_add',
-                        'view_path' => 'delivery/company_edit',
-                        'methods' => 'post',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                    ],
-                    [
-                        'menu_name' => '编辑物流公司',
-                        'menu_key' => 'shop_config_delivery_company_edit',
-                        'menu_short_name' => '编辑物流公司',
-                        'parent_select_key' => 'shop_config_delivery_company',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => 'shop/delivery/company',
-                        'router_path' => 'shop/order/delivery/company_edit',
-                        'view_path' => 'delivery/company_edit',
-                        'methods' => 'put',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                    ],
-                    [
-                        'menu_name' => '同城配送',
-                        'menu_key' => 'shop_config_delivery_local',
-                        'menu_short_name' => '同城配送',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => '',
-                        'router_path' => 'shop/order/delivery/local',
-                        'view_path' => 'delivery/local',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                        'children' => [
-                            [
-                                'menu_name' => '同城配送设置',
-                                'menu_key' => 'shop_config_delivery_local_set',
-                                'menu_short_name' => '同城配送设置',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/local',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'put',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                        ],
-                    ],
-                    [
-                        'menu_name' => '运费模版',
-                        'menu_key' => 'shop_config_delivery_shipping_template',
-                        'menu_short_name' => '运费模版',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => 'shop/shipping/template',
-                        'router_path' => 'shop/order/shipping/template',
-                        'view_path' => 'delivery/template',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                        'children' => [
-                            [
-                                'menu_name' => '运费模版删除',
-                                'menu_key' => 'shop_config_delivery_shipping_template_delete',
-                                'menu_short_name' => '运费模版列表',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/shipping/template/<template_id>',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'delete',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                        ],
-                    ],
-                    [
-                        'menu_name' => '运费模版添加/编辑',
-                        'menu_key' => 'shop_config_delivery_shipping_template_add_edit',
-                        'menu_short_name' => '运费模版添加/编辑',
-                        'parent_select_key' => 'shop_config_delivery_shipping_template',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => '',
-                        'router_path' => 'shop/order/shipping/template_edit',
-                        'view_path' => 'delivery/template_edit',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                        'children' => [
-                            [
-                                'menu_name' => '运费模版添加',
-                                'menu_key' => 'shop_config_delivery_shipping_template_add',
-                                'menu_short_name' => '运费模版添加',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/shipping/template',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'post',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                            [
-                                'menu_name' => '运费模版编辑',
-                                'menu_key' => 'shop_config_delivery_shipping_template_edit',
-                                'menu_short_name' => '运费模版编辑',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/shipping/template/<template_id>',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'put',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                        ],
-                    ],
-                    [
-                        'menu_name' => '配送员',
-                        'menu_key' => 'shop_config_delivery_staff',
-                        'menu_short_name' => '配送员',
-                        'parent_select_key' => 'shop_config_delivery',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => '',
-                        'router_path' => 'shop/order/delivery/staff',
-                        'view_path' => 'delivery/staff',
-                        'methods' => '',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                        'children' => [
-                            [
-                                'menu_name' => '配送员添加',
-                                'menu_key' => 'shop_config_delivery_staff_add',
-                                'menu_short_name' => '配送员添加',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/delivery/staff',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'post',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                            [
-                                'menu_name' => '配送员编辑',
-                                'menu_key' => 'shop_config_delivery_staff_edit',
-                                'menu_short_name' => '配送员编辑',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/delivery/staff/<id>',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'put',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                            [
-                                'menu_name' => '配送员删除',
-                                'menu_key' => 'shop_config_delivery_staff_delete',
-                                'menu_short_name' => '配送员删除',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/delivery/staff/<id>',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'delete',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                        ],
-                    ],
-                    [
-                        'menu_name' => '订单详情',
-                        'menu_key' => 'shop_order_detail',
-                        'menu_short_name' => '订单详情',
-                        'parent_select_key' => 'shop_order_list',
-                        'menu_type' => '1',
-                        'icon' => 'iconfont iconshangpinguanli',
-                        'api_url' => 'shop/order/detail/<id>',
-                        'router_path' => 'shop/order/detail',
-                        'view_path' => 'order/detail',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                    ],
-                    [
-                        'menu_name' => '物流跟踪',
-                        'menu_key' => 'shop_config_delivery_search',
-                        'menu_short_name' => '物流跟踪',
-                        'parent_select_key' => 'shop_config_delivery',
-                        'menu_type' => '1',
-                        'icon' => 'iconfont iconwuliugenzong',
-                        'api_url' => '',
-                        'router_path' => 'shop/order/delivery/search',
-                        'view_path' => 'delivery/search',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                        'children' => [
-                            [
-                                'menu_name' => '物流跟踪设置',
-                                'menu_key' => 'shop_config_delivery_search_set',
-                                'menu_short_name' => '物流跟踪设置',
-                                'menu_type' => '2',
-                                'icon' => '',
-                                'api_url' => 'shop/delivery/search',
-                                'router_path' => '',
-                                'view_path' => '',
-                                'methods' => 'post',
-                                'sort' => '0',
-                                'status' => '1',
-                                'is_show' => '0',
-                            ],
-                        ],
-                    ],
-                    [
-                        'menu_name' => '自提点',
-                        'menu_key' => 'shop_config_shop_delivery_store',
-                        'menu_short_name' => '自提点',
-                        'menu_type' => '1',
-                        'icon' => '',
+                        'icon' => 'nc-iconfont nc-icon-dingweiV6xx-1',
                         'api_url' => 'shop/delivery/store',
-                        'router_path' => 'shop/order/delivery/store',
-                        'view_path' => 'delivery/store',
+                        'router_path' => 'shop/delivery_store',
+                        'view_path' => 'delivery_store/list',
                         'methods' => 'get',
-                        'sort' => '0',
+                        'sort' => '70',
                         'status' => '1',
-                        'is_show' => '0',
+                        'is_show' => '1',
                         'children' => [
                             [
-                                'menu_name' => '自提点删除',
-                                'menu_key' => 'shop_config_delete_delivery_store',
-                                'menu_short_name' => '自提点删除',
+                                'menu_name' => '删除提货点',
+                                'menu_key' => 'shop_delivery_store_delete',
+                                'menu_short_name' => '删除提货点',
                                 'menu_type' => '2',
                                 'icon' => '',
                                 'api_url' => 'shop/delivery/store/<id>',
@@ -1555,29 +1713,42 @@ return [
                                 'methods' => 'delete',
                                 'sort' => '0',
                                 'status' => '1',
-                                'is_show' => '0',
+                                'is_show' => '1',
                             ],
                         ],
                     ],
                     [
-                        'menu_name' => '自提点添加/编辑',
-                        'menu_key' => 'shop_config_add_edit_delivery_store',
-                        'menu_short_name' => '自提点添加/编辑',
-                        'parent_select_key' => 'shop_config_shop_delivery_store',
+                        'menu_name' => '添加/编辑提货点',
+                        'menu_key' => 'shop_delivery_store_add_edit',
+                        'menu_short_name' => '添加/编辑提货点',
                         'menu_type' => '1',
                         'icon' => '',
                         'api_url' => '',
-                        'router_path' => 'shop/order/delivery/store/edit',
-                        'view_path' => 'delivery/store_edit',
-                        'methods' => 'post',
+                        'router_path' => 'shop/delivery_store/edit',
+                        'view_path' => 'delivery_store/edit',
+                        'methods' => 'get',
                         'sort' => '0',
                         'status' => '1',
                         'is_show' => '0',
                         'children' => [
                             [
-                                'menu_name' => '自提点添加',
-                                'menu_key' => 'shop_config_add_delivery_store',
-                                'menu_short_name' => '自提点添加',
+                                'menu_name' => '编辑提货点',
+                                'menu_key' => 'shop_delivery_store_edit',
+                                'menu_short_name' => '编辑提货点',
+                                'menu_type' => '2',
+                                'icon' => '',
+                                'api_url' => 'shop/delivery/store/<id>',
+                                'router_path' => '',
+                                'view_path' => '',
+                                'methods' => 'put',
+                                'sort' => '0',
+                                'status' => '1',
+                                'is_show' => '0',
+                            ],
+                            [
+                                'menu_name' => '添加提货点',
+                                'menu_key' => 'shop_delivery_store_add',
+                                'menu_short_name' => '添加提货点',
                                 'menu_type' => '2',
                                 'icon' => '',
                                 'api_url' => 'shop/delivery/store',
@@ -1588,13 +1759,44 @@ return [
                                 'status' => '1',
                                 'is_show' => '0',
                             ],
+                        ],
+                    ],
+                    [
+                        'menu_name' => '服务商配送设置',
+                        'menu_key' => 'shop_delivery_store_delivery_set',
+                        'menu_short_name' => '服务商配送设置',
+                        'menu_type' => '1',
+                        'icon' => 'nc-iconfont nc-icon-shangjiadizhiku',
+                        'api_url' => '',
+                        'router_path' => 'shop/delivery_store/delivery_set',
+                        'view_path' => 'delivery_store/delivery_set',
+                        'methods' => 'get',
+                        'sort' => '0',
+                        'status' => '1',
+                        'is_show' => '0',
+                        'children' => [],
+                    ],
+                    [
+                        'menu_name' => '配送设置',
+                        'menu_key' => 'shop_delivery_config',
+                        'menu_short_name' => '配送设置',
+                        'menu_type' => '1',
+                        'icon' => 'iconfont iconpaisongshezhi',
+                        'api_url' => '',
+                        'router_path' => 'shop/delivery/config',
+                        'view_path' => 'delivery/config',
+                        'methods' => '',
+                        'sort' => '60',
+                        'status' => '1',
+                        'is_show' => '1',
+                        'children' => [
                             [
-                                'menu_name' => '自提点编辑',
-                                'menu_key' => 'shop_config_edit_delivery_store',
-                                'menu_short_name' => '自提点编辑',
+                                'menu_name' => '配送设置编辑',
+                                'menu_key' => 'shop_delivery_config_set',
+                                'menu_short_name' => '配送设置编辑',
                                 'menu_type' => '2',
                                 'icon' => '',
-                                'api_url' => 'shop/delivery/store/<id>',
+                                'api_url' => 'shop/delivery/setConfig',
                                 'router_path' => '',
                                 'view_path' => '',
                                 'methods' => 'put',
@@ -1604,67 +1806,7 @@ return [
                             ],
                         ],
                     ],
-                    [
-                        'menu_name' => '售后详情',
-                        'menu_key' => 'shop_order_refund_detail',
-                        'menu_short_name' => '售后详情',
-                        'parent_select_key' => 'shop_order_refund',
-                        'menu_type' => '1',
-                        'icon' => 'iconfont iconshangpinguanli',
-                        'api_url' => '',
-                        'router_path' => 'shop/order/refund/detail',
-                        'view_path' => 'order/refund_detail',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                    ],
-                    [
-                        'menu_name' => '电子面单设置',
-                        'menu_key' => 'shop_delivery_electronic_sheet_config',
-                        'menu_short_name' => '电子面单设置',
-                        'parent_select_key' => 'shop_delivery_electronic_sheet',
-                        'menu_type' => '1',
-                        'icon' => 'iconfont icondiscount',
-                        'api_url' => 'shop/electronic_sheet/config',
-                        'router_path' => 'shop/delivery/electronic_sheet/config',
-                        'view_path' => 'delivery/electronic_sheet_config',
-                        'methods' => 'get',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                    ],
-                    [
-                        'menu_name' => '添加模板',
-                        'menu_key' => 'shop_delivery_electronic_sheet_add',
-                        'menu_short_name' => '添加电子面单模板',
-                        'parent_select_key' => 'shop_delivery_electronic_sheet',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => 'shop/electronic_sheet',
-                        'router_path' => 'shop/delivery/electronic_sheet_add',
-                        'view_path' => 'delivery/electronic_sheet_edit',
-                        'methods' => 'post',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                    ],
-                    [
-                        'menu_name' => '编辑模板',
-                        'menu_key' => 'shop_delivery_electronic_sheet_edit',
-                        'menu_short_name' => '编辑电子面单模板',
-                        'parent_select_key' => 'shop_delivery_electronic_sheet',
-                        'menu_type' => '1',
-                        'icon' => '',
-                        'api_url' => 'shop/electronic_sheet/<id>',
-                        'router_path' => 'shop/delivery/electronic_sheet_edit',
-                        'view_path' => 'delivery/electronic_sheet_edit',
-                        'methods' => 'put',
-                        'sort' => '0',
-                        'status' => '1',
-                        'is_show' => '0',
-                    ],
-                ],
+                ]
             ],
             [
                 'menu_name' => '数据统计',
@@ -1751,7 +1893,7 @@ return [
         'router_path' => 'shop/marketing/coupon/list',
         'view_path' => '',
         'methods' => '',
-        'sort' => '150',
+        'sort' => '100',
         'status' => '1',
         'is_show' => '1',
         'children' => [
@@ -1885,7 +2027,7 @@ return [
         'router_path' => 'shop/marketing/manjian/list',
         'view_path' => '',
         'methods' => '',
-        'sort' => '151',
+        'sort' => '99',
         'status' => '1',
         'is_show' => '1',
         'children' => [
@@ -1991,7 +2133,7 @@ return [
         'router_path' => 'shop/marketing/discount/list',
         'view_path' => 'marketing/discount/list',
         'methods' => 'get',
-        'sort' => '152',
+        'sort' => '98',
         'status' => '1',
         'is_show' => '1',
         'children' => [
@@ -2127,7 +2269,7 @@ return [
         'router_path' => 'shop/marketing/exchange/goods_list',
         'view_path' => '',
         'methods' => 'get',
-        'sort' => '153',
+        'sort' => '97',
         'status' => '1',
         'is_show' => '1',
         'children' => [
@@ -2247,7 +2389,7 @@ return [
         'router_path' => 'shop/marketing/newcomer/config',
         'view_path' => '',
         'methods' => 'get',
-        'sort' => '154',
+        'sort' => '96',
         'status' => '1',
         'is_show' => '1',
         'children' => [
@@ -2292,7 +2434,7 @@ return [
         'router_path' => 'shop/marketing/goods_rank/config',
         'view_path' => '',
         'methods' => 'get',
-        'sort' => '155',
+        'sort' => '50',
         'status' => '1',
         'is_show' => '1',
         'children' => [
diff --git a/niucloud/addon/shop/app/dict/shop_delivery/ShopDeliveryDict.php b/niucloud/addon/shop/app/dict/shop_delivery/ShopDeliveryDict.php
new file mode 100644
index 000000000..0cfb964c2
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/shop_delivery/ShopDeliveryDict.php
@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\shop_delivery;
+
+/**
+ * 商家配送配送枚举类
+ * Class LocalDeliveryDict
+ * @package app\dict\sys
+ */
+class ShopDeliveryDict
+{
+    //商家配送
+    const MERCHANT = 'merchant';
+
+    public static function getType()
+    {
+        $system = [
+            self::MERCHANT => [
+                'name' => '商家配送',
+                'key' => self::MERCHANT,
+                //配置参数
+                'params' => [],
+                'component' => '',
+                'business_list' => '',
+                'extend_data' => [],
+                //商家配送标识
+                'is_merchant' => 1
+            ],
+        ];
+        return $system;
+    }
+
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/dict/shop_delivery/ShopDeliveryStatusDict.php b/niucloud/addon/shop/app/dict/shop_delivery/ShopDeliveryStatusDict.php
new file mode 100644
index 000000000..6763f752a
--- /dev/null
+++ b/niucloud/addon/shop/app/dict/shop_delivery/ShopDeliveryStatusDict.php
@@ -0,0 +1,58 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\dict\shop_delivery;
+
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+
+/**
+ *同城三方配送相关枚举类
+ */
+class ShopDeliveryStatusDict
+{
+    // 订单状态常量定义
+    const IN_DELIVERY = 4;             // 配送中
+    const COMPLETED = 5;               // 已完成
+    const CANCELED = -2;                // 已取消
+
+    /**
+     * 获取商家配送订单状态映射
+     * @return array
+     */
+    public static function getStatus()
+    {
+        return [
+            self::IN_DELIVERY => get_lang('dict_shop_local_delivery_status.in_delivery'), //配送中,
+            self::COMPLETED => get_lang('dict_shop_local_delivery_status.completed'), //已完成,
+            self::CANCELED => get_lang('dict_shop_local_delivery_status.canceled'), //已取消,
+        ];
+    }
+
+
+    /**
+     * 转换配送状态
+     * @param $status
+     * @return int
+     */
+    public static function convertStatus($status)
+    {
+        switch ($status) {
+            case self::IN_DELIVERY:
+                return LocalDeliveryStatusDict::IN_DELIVERY;// 配送中
+            case self::COMPLETED:
+                return LocalDeliveryStatusDict::COMPLETED;//已完成
+            case self::CANCELED:
+                return LocalDeliveryStatusDict::CANCELED;//已取消
+        }
+        return 0;
+    }
+}
diff --git a/niucloud/addon/shop/app/event.php b/niucloud/addon/shop/app/event.php
index 1346f5aeb..db092d64a 100644
--- a/niucloud/addon/shop/app/event.php
+++ b/niucloud/addon/shop/app/event.php
@@ -188,6 +188,21 @@ return [
 
         //获取商品配送费用
         'ThirdAddonOrderDelivery' => ['addon\shop\app\listener\third_addon\order\OrderDeliveryServiceListener'],
+
+        /***************************************************** 同城配送 start *****************************************************/
+        //配送方式
+        'LocalDeliveryType' => ['addon\shop\app\listener\local_delivery\dada\local_delivery_type\LocalDeliveryTypeListener'],
+        //订单取消原因
+        'OrderCancelReason' => ['addon\shop\app\listener\local_delivery\dada\order\OrderCancelReasonListener'],
+        //配送订单操作前置状态
+        'DeliveryOrderPreStatus' => [
+            'addon\shop\app\listener\local_delivery\dada\order\OrderPreStatusListener',
+            'addon\shop\app\listener\shop_delivery\OrderPreStatusListener'
+        ],
+        //获取同城配送轨迹
+        'GetLocalDeliveryTrack' => ['addon\shop\app\listener\local_delivery\dada\order\GetLocalDeliveryTrack'],
+
+        /***************************************************** 同城配送 end *****************************************************/
     ],
     'subscribe' => [
     ],
diff --git a/niucloud/addon/shop/app/job/delivery/DeliveryShopEditJob.php b/niucloud/addon/shop/app/job/delivery/DeliveryShopEditJob.php
new file mode 100644
index 000000000..e04b917a9
--- /dev/null
+++ b/niucloud/addon/shop/app/job/delivery/DeliveryShopEditJob.php
@@ -0,0 +1,27 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\job\delivery;
+
+use addon\shop\app\service\core\delivery_store\CoreDeliveryServiceService;
+use core\base\BaseJob;
+
+/**
+ * 门店批量修改
+ */
+class DeliveryShopEditJob extends BaseJob
+{
+    public function doJob($id)
+    {
+        (new CoreDeliveryServiceService())->batchDeliveryShopEdit($id);
+        return true;
+    }
+}
diff --git a/niucloud/addon/shop/app/lang/zh-cn/api.php b/niucloud/addon/shop/app/lang/zh-cn/api.php
index 963660dcc..5622270f2 100644
--- a/niucloud/addon/shop/app/lang/zh-cn/api.php
+++ b/niucloud/addon/shop/app/lang/zh-cn/api.php
@@ -13,10 +13,7 @@ return [
     'SHOP_GOODS_LABEL_NAME_REPEAT'=>'标签名称重复',
     'SHOP_GOODS_LABEL_IN_USE'=>'该标签正在使用中',
     'NOT_SUPPORT_DELIVERY_TYPE' => '不支持选择的配送方式',
-    'NOT_SUPPORT_DELIVERY_ADDRESS' => '所选的收货地址不支持配送',
-    'NOT_SELECT_ADDRESS' => '需要先选择收货地址',
     'NOT_SELECT_STORE' => '请选择自提点',
-    'NOT_NEED_DELIVERY_START_PRICE' => '未达到起送费用',
     'EXIST_ORDER_NOT_DELETE_GOODS' => '存在未完成的订单，无法删除商品',
     'EXIST_ORDER_NOT_EDIT_GOODS' => '存在未完成的订单，无法编辑商品',
     'COUPON_STOCK_INSUFFICIENT' => '优惠券已领完',
@@ -29,6 +26,7 @@ return [
     'COUPON_RECEIVE_SUCCESS' => '领取成功',
     'MEMBER_ALREADY_COLLECT' => '已收藏，不可重复收藏',
     'CANCEL_COLLECT_SUCCESS' => '取消收藏成功',
+    'CANCEL_SUCCESS' => '取消成功',
 
     'SHOP_COUPON_IS_USED_OR_EXIST' => '优惠券不存在或已使用',
     'SHOP_COUPON_VALID_END_TIME_NOT_ALLOW_LT_START_TIME' => '优惠券的有效期结束时间不能小于当前时间',
@@ -50,7 +48,6 @@ return [
     'SHOP_VIRTUAL_ORDERS_EDIT_TAKER' => '虚拟商品订单不可以修改配送地址',
     'EXPRESS_FIELD_EMPTY' => '地址信息有误',
     'GOODS_NOT_DELIVERY_TYPE' => '当前商品不支持该配送方式',
-    'DELIVERY_TYPE_NOT_OPEN' => '商家未开启该配送方式',
 
     'SHOP_THE_ITEM_IS_BEING_REFUNDED_OR_HAS_BEEN_REFUNDED' => '当前商品项存在退款',
 
@@ -193,4 +190,36 @@ return [
     'DISCOUNT_IS_ENABLED_NOT_EMPTY' => 'is_enabled必传',
     /*********************************************  限时折扣end ****************************************************/
 
+    /************************************************************ 配送相关 *********************************************/
+    'DELIVERY_SUCCESS' => '发货成功',
+    'EXPRESS_COMPANY_NOT_EXIST' => '物流公司不存在',
+    'NOT_SUPPORT_DELIVERY_ADDRESS' => '所选的收货地址不支持配送',
+    'NOT_SELECT_ADDRESS' => '需要先选择收货地址',
+    'NOT_SELECT_PICK_UP_STORE' => '请选择提货点',
+    'NOT_SELECT_LOCAL_DELIVERY_STORE' => '请选择配送门店',
+    'NOT_NEED_DELIVERY_START_PRICE' => '未达到起送费用',
+    'LOCAL_DELIVERY_ORDER_EXIST' => '该订单已存在正在进行中的配送订单',
+    'ELECTRONIC_SHEET_API_EMPTY' => '未配置电子面单接口',
+    'ELECTRONIC_SHEET_TEMPLATE_FOUND' => '电子面单模板不存在',
+    'LOCAL_DELIVERY_TYPE_NOT_EXIST' => '配送服务商类型不存在',
+    'LOCAL_DELIVERY_OPEN_AT_LEAST_ONE_LOCAL_DELIVERY_STORE' => '同城配送已开启，至少需保留一个提货类型包含同城配送的提货点',
+    'STORE_OPEN_AT_LEAST_ONE_PICK_UP_STORE' => '门店自提已开启，至少需保留一个提货类型包含门店自提的提货点',
+    'LOCAL_DELIVERY_NOT_SET' => '同城配送未配置，请先完成配置',
+    'NOT_SET_LOCAL_DELIVERY_STORE' => '未配置配送门店',
+    'NOT_SET_PICK_UP_STORE' => '未配置提货点',
+    'DELIVERY_ORDER_NOT_EXIT' => '配送订单不存在',
+    'DELIVERY_SERVICE_NOT_SELECT' => '请选择配送平台',
+    'DELIVERY_STORE_NOT_EXIST' => '提货点不存在',
+    'DELIVERY_TYPE_NOT_OPEN' => '商家未开启该配送方式',
+    'GOODS_NOT_SUPPORT_LOCAL_DELIVERY' => '该商品不支持同城配送',
+    'GOODS_NOT_SUPPORT_EXPRESS' => '该商品不支持物流配送',
+    'GOODS_NOT_SUPPORT_STORE' => '该商品不支持门店自提',
+    'NOT_SUPPORT_DELIVERY_RANGE' => '不在配送范围内',
+    'SHOP_NOT_SET_LOCAL_DELIVERY_STORE' => '商家未设置配送门店',
+    'SHOP_NOT_SET_PICK_UP_STORE' => '商家未设置提货点',
+    'STORE_NOT_SET_DELIVERY_RANGE' => '该门店未设置配送范围',
+    'STORE_NOT_SUPPORT_LOCAL_DELIVERY' => '该门店不支持同城配送',
+    'STORE_NOT_SUPPORT_PICK_UP' => '该门店不支持门店自提',
+    'DELIVERY_WEAPP_SHIPPING_NOT_FOUND' => '小程序发货信息不存在',
+
 ];
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/lang/zh-cn/dict.php b/niucloud/addon/shop/app/lang/zh-cn/dict.php
index aea28362c..afdc0fc32 100644
--- a/niucloud/addon/shop/app/lang/zh-cn/dict.php
+++ b/niucloud/addon/shop/app/lang/zh-cn/dict.php
@@ -37,6 +37,54 @@ return [
         '90' => '90分钟',
         '120' => '2小时',
     ],
+    'dict_shop_delivery_store_pick_up_type' => [
+        'local_delivery' => '同城配送',
+        'store' => '门店自提',
+    ],
+    'dict_shop_local_delivery_status' => [
+        'wait_release' => '预约待发布',
+        'order_accepted' => '商家已接单',
+        'pending_acceptance' => '待接单',
+        'pending_pickup' => '待取货',
+        'rider_arrived' => '骑士到店',
+        'in_delivery' => '配送中',
+        'completed' => '已完成',
+        'dispatch_order' => '指派单',
+        'return_in_progress' => '妥投异常之物品返回中',
+        'return_completed' => '妥投异常之物品返回完成',
+        'return_rider_arrived' => '售后取件单送达门店',
+        'create_order_failed' => '创建运单失败',
+        'canceled' => '已取消',
+    ],
+    'dict_shop_local_delivery_order_log' => [
+        'store' => '商家',
+        'rider' => '骑手',
+        'member' => '会员',
+        'system' => '系统',
+
+        'order_accepted' => '商家已接单',
+        'order_call' => '商家呼叫配送',
+        'dispatch_order' => '商家指派骑手',
+        'rider_accepted' => '骑手已接单',
+        'rider_arrived' => '骑手已到店',
+        'rider_picked_up' => '骑手已取货',
+        'order_delivered' => '订单已送达',
+        'order_canceled' => '订单已取消',
+        'return_applied' => '物品返回申请',
+        'return_completed' => '物品返回完成',
+    ],
+    'dict_shop_local_delivery_order_cancel' => [
+        'no_rider' => '没有配送员接单',
+        'no_rider_pickup' => '配送员没来取货',
+        'rider_bad_attitude' => '配送员态度太差',
+        'customer_cancel' => '顾客取消订单',
+        'order_write_error' => '订单填写错误',
+        'rider_cancel' => '配送员让我取消此单',
+        'rider_unwill' => '配送员不愿上门取货',
+        'rider_unnecessary' => '我不需要配送了',
+        'rider_cannot_complete' => '配送员以各种理由表示无法完成订单',
+        'other_reason' => '其他',
+    ],
 
     'dict_shop_coupon' => [
         'user' => '手动领取',
diff --git a/niucloud/addon/shop/app/listener/local_delivery/dada/local_delivery_type/LocalDeliveryTypeListener.php b/niucloud/addon/shop/app/listener/local_delivery/dada/local_delivery_type/LocalDeliveryTypeListener.php
new file mode 100644
index 000000000..a3faa069f
--- /dev/null
+++ b/niucloud/addon/shop/app/listener/local_delivery/dada/local_delivery_type/LocalDeliveryTypeListener.php
@@ -0,0 +1,43 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\listener\local_delivery\dada\local_delivery_type;
+
+/**
+ * 配送服务商-达达秒送
+ * @package addon\shop\app\listener\local_delivery\dada\local_delivery_type
+ */
+class LocalDeliveryTypeListener
+{
+
+    public function handle($params)
+    {
+        return [
+            'dada' => [
+                'name' => '达达秒送',
+                'key' => 'dada',
+                //配置参数
+                'params' => [
+                    'app_key' => 'APP_KEY',
+                    'app_secret' => 'APP_SECRET',
+                    'source_id' => '商户SourceID',
+                    'shop_no' => '门店编号',
+                ],
+                'encrypt_params' => ['app_key', 'app_secret', 'source_id', 'shop_no'],
+                'component' => '/src/addon/shop/views/delivery/components/local-delivery-service-dada.vue',
+                'business_list' => json_decode(file_get_contents(root_path() . '/addon/shop/app/dict/local_delivery/dada/json/shop_catetory_dict.json'), true),
+                'extend_data' => [],
+                //商家配送标识
+                'is_merchant' => 0
+            ],
+        ];
+    }
+}
diff --git a/niucloud/addon/shop/app/listener/local_delivery/dada/order/GetLocalDeliveryTrack.php b/niucloud/addon/shop/app/listener/local_delivery/dada/order/GetLocalDeliveryTrack.php
new file mode 100644
index 000000000..2eb4726db
--- /dev/null
+++ b/niucloud/addon/shop/app/listener/local_delivery/dada/order/GetLocalDeliveryTrack.php
@@ -0,0 +1,155 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\listener\local_delivery\dada\order;
+
+use addon\shop\app\dict\local_delivery\dada\DadaDeliveryDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryService;
+use addon\shop\core\local_delivery\LocalDeliveryLoader;
+use app\model\member\Member;
+use core\exception\CommonException;
+
+/**
+ * 查询配送订单的起始点和终点
+ * Class GetLocalDeliveryTrack
+ * @package addon\shop\app\listener\local_delivery\dada\order
+ */
+class GetLocalDeliveryTrack
+{
+
+    public function handle($params)
+    {
+        $status = $params['status'];
+        $member_id = $params['member_id'];
+        $delivery_no = $params['delivery_no'];
+        $delivery_service = $params['delivery_service'];
+
+        if ($delivery_service == DadaDeliveryDict::DADA) {
+            $member_info = (new Member())->where([['member_id', '=', $member_id]])->findOrEmpty()->toArray();
+            if (empty($member_info)) throw new CommonException('MEMBER_NOT_EXIST');
+            $headimg = empty($member_info['headimg']) ? 'static/resource/images/default_headimg.png' : $member_info['headimg'];
+
+            if (in_array($status, [LocalDeliveryStatusDict::PENDING_PICKUP, LocalDeliveryStatusDict::IN_DELIVERY])) {
+                $config = (new CoreLocalDeliveryService())->getConfig($delivery_service);
+                $loader = new LocalDeliveryLoader($delivery_service, $config);
+                $data = [
+                    'delivery_no' => $delivery_no,
+                ];
+                $response_data = $loader->getTransporterPosition($data);
+            }
+
+            switch ($status) {
+                case LocalDeliveryStatusDict::ORDER_ACCEPTED:
+                case LocalDeliveryStatusDict::PENDING_ACCEPTANCE:
+                    return [
+                        [
+                            'points_type' => 'shop',
+                            'latitude' => $params['delivery_start_lat'],
+                            'longitude' => $params['delivery_start_lng'],
+                            'icon_path' => 'addon/shop/local_delivery/in_stock.png',
+                            'callout' => [
+                                'content' => '备货中',
+                            ],
+                        ],
+                        [
+                            'points_type' => 'member',
+                            'latitude' => $params['delivery_end_lat'],
+                            'longitude' => $params['delivery_end_lng'],
+                            'icon_path' => $headimg,
+                            'callout' => [
+                                'content' => '',
+                            ],
+                        ]
+                    ];
+                case LocalDeliveryStatusDict::PENDING_PICKUP:
+                    if (!empty($response_data['rider_latitude']) && !empty($response_data['rider_longitude'])) {
+                        return [
+                            [
+                                'points_type' => 'rider',
+                                'latitude' => $response_data['rider_latitude'],
+                                'longitude' => $response_data['rider_longitude'],
+                                'icon_path' => 'addon/shop/local_delivery/in_delivery.png',
+                                'callout' => [
+                                    'content' => '骑手正赶往商家',
+                                ],
+                            ],
+                            [
+                                'points_type' => 'shop',
+                                'latitude' => $params['delivery_start_lat'],
+                                'longitude' => $params['delivery_start_lng'],
+                                'icon_path' => 'addon/shop/local_delivery/in_stock.png',
+                                'callout' => [
+                                    'content' => '',
+                                ],
+                            ]
+                        ];
+                    } else {
+                        return [
+                            [
+                                'points_type' => 'shop',
+                                'latitude' => $params['delivery_start_lat'],
+                                'longitude' => $params['delivery_start_lng'],
+                                'icon_path' => 'addon/shop/local_delivery/in_stock.png',
+                                'callout' => [
+                                    'content' => '骑手正赶往商家',
+                                ],
+                            ]
+                        ];
+                    }
+                case LocalDeliveryStatusDict::RIDER_ARRIVED:
+                    return [
+                        [
+                            'points_type' => 'rider_arrived',
+                            'latitude' => $params['delivery_start_lat'],
+                            'longitude' => $params['delivery_start_lng'],
+                            'icon_path' => 'addon/shop/local_delivery/picking_up.png',
+                            'callout' => [
+                                'content' => '骑手到店取餐中',
+                            ],
+                        ],
+                        [
+                            'points_type' => 'member',
+                            'latitude' => $params['delivery_end_lat'],
+                            'longitude' => $params['delivery_end_lng'],
+                            'icon_path' => $headimg,
+                            'callout' => [
+                                'content' => '',
+                            ],
+                        ]
+                    ];
+                case LocalDeliveryStatusDict::IN_DELIVERY:
+                    return [
+                        [
+                            'points_type' => 'rider',
+                            'latitude' => $response_data['rider_latitude'] ?? $params['delivery_start_lat'],
+                            'longitude' => $response_data['rider_longitude'] ?? $params['delivery_start_lng'],
+                            'icon_path' => 'addon/shop/local_delivery/in_delivery.png',
+                            'callout' => [
+                                'content' => '骑手正在送餐',
+                            ],
+                        ],
+                        [
+                            'points_type' => 'member',
+                            'latitude' => $params['delivery_end_lat'],
+                            'longitude' => $params['delivery_end_lng'],
+                            'icon_path' => $headimg,
+                            'callout' => [
+                                'content' => '',
+                            ],
+                        ]
+                    ];
+                default:
+                    return [];
+            }
+        }
+    }
+}
diff --git a/niucloud/addon/shop/app/listener/local_delivery/dada/order/OrderCancelReasonListener.php b/niucloud/addon/shop/app/listener/local_delivery/dada/order/OrderCancelReasonListener.php
new file mode 100644
index 000000000..ea2d4e165
--- /dev/null
+++ b/niucloud/addon/shop/app/listener/local_delivery/dada/order/OrderCancelReasonListener.php
@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\listener\local_delivery\dada\order;
+
+
+use addon\shop\app\dict\local_delivery\dada\DadaDeliveryDict;
+
+/**
+ * 支付方式
+ * @package addon\mall\app\listener\diy
+ */
+class OrderCancelReasonListener
+{
+
+    public function handle($params)
+    {
+        // dada 订单取消原因
+        if (!empty($params['service']) && $params['service'] == DadaDeliveryDict::DADA) {
+            return [
+                1 => get_lang('dict_shop_local_delivery_order_cancel.no_rider'), //没有配送员接单,
+                2 => get_lang('dict_shop_local_delivery_order_cancel.no_rider_pickup'), //配送员没来取货,
+                3 => get_lang('dict_shop_local_delivery_order_cancel.rider_bad_attitude'), //配送员态度太差,
+                4 => get_lang('dict_shop_local_delivery_order_cancel.customer_cancel'), //顾客取消订单,
+                5 => get_lang('dict_shop_local_delivery_order_cancel.order_write_error'), //订单填写错误,
+                34 => get_lang('dict_shop_local_delivery_order_cancel.rider_cancel'), //配送员让我取消此单,
+                35 => get_lang('dict_shop_local_delivery_order_cancel.rider_unwill'), //配送员不愿上门取货,
+                36 => get_lang('dict_shop_local_delivery_order_cancel.rider_unnecessary'), //我不需要配送了,
+                37 => get_lang('dict_shop_local_delivery_order_cancel.rider_cannot_complete'), //配送员以各种理由表示无法完成订单,
+                10000 => get_lang('dict_shop_local_delivery_order_cancel.other_reason'), //其他,
+            ];
+        }
+    }
+}
diff --git a/niucloud/addon/shop/app/listener/local_delivery/dada/order/OrderPreStatusListener.php b/niucloud/addon/shop/app/listener/local_delivery/dada/order/OrderPreStatusListener.php
new file mode 100644
index 000000000..1ec4a9726
--- /dev/null
+++ b/niucloud/addon/shop/app/listener/local_delivery/dada/order/OrderPreStatusListener.php
@@ -0,0 +1,51 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\listener\local_delivery\dada\order;
+
+use addon\shop\app\dict\local_delivery\dada\DadaDeliveryDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+
+/**
+ * 配送订单操作前置状态
+ * @package addon\b2b2c_dada\app\listener\order
+ */
+class OrderPreStatusListener
+{
+
+    public function handle($params)
+    {
+        if (!empty($params['service']) && $params['service'] == DadaDeliveryDict::DADA) {
+            return [
+                'cancel' => [
+                    LocalDeliveryStatusDict::WAIT_RELEASE,
+                    LocalDeliveryStatusDict::PENDING_ACCEPTANCE,
+                    LocalDeliveryStatusDict::PENDING_PICKUP,
+                    LocalDeliveryStatusDict::RIDER_ARRIVED,
+                ], //取消订单
+                'sync' => [
+                    LocalDeliveryStatusDict::ORDER_ACCEPTED,
+                    LocalDeliveryStatusDict::PENDING_ACCEPTANCE,
+                    LocalDeliveryStatusDict::PENDING_PICKUP,
+                    LocalDeliveryStatusDict::RIDER_ARRIVED,
+                    LocalDeliveryStatusDict::IN_DELIVERY,
+                    LocalDeliveryStatusDict::COMPLETED,
+                    LocalDeliveryStatusDict::DISPATCH_ORDER,
+                    LocalDeliveryStatusDict::RETURN_IN_PROGRESS,
+                    LocalDeliveryStatusDict::RETURN_COMPLETED,
+                    LocalDeliveryStatusDict::RETURN_RIDER_ARRIVED,
+                    LocalDeliveryStatusDict::CREATE_ORDER_FAILED,
+                    LocalDeliveryStatusDict::CANCELED,
+                ], //同步订单
+            ];
+        }
+    }
+}
diff --git a/niucloud/addon/shop/app/listener/notice_template/OrderDelivery.php b/niucloud/addon/shop/app/listener/notice_template/OrderDelivery.php
index 9824b8856..653ec8f0f 100644
--- a/niucloud/addon/shop/app/listener/notice_template/OrderDelivery.php
+++ b/niucloud/addon/shop/app/listener/notice_template/OrderDelivery.php
@@ -18,19 +18,20 @@ class OrderDelivery extends BaseNoticeTemplate
         if ($this->key == $params['key']) {
             $order = (new CoreOrderService())->getInfo($params['data']['order_id']);
             if (!empty($order)) {
+                $order_data = $params['data'];
                 $wap_domain = get_wap_domain();
                 return $this->toReturn(
                     [
-                        '__wechat_page' => $wap_domain . '/addon/shop/pages/order/detail?order_id=' . $order['order_id'],//模板消息链接
-                        '__weapp_page' => 'addon/shop/pages/order/detail?order_id=' . $order['order_id'],//小程序链接
-                        'body' => str_sub($order['body']),
-                        'order_no' => $order['order_no'],
-                        'delivery_time' => $order['delivery_time'],
-                        'order_money' => $order['order_money'],
-                        'url' => $wap_domain . '/addon/shop/pages/order/detail?order_id=' . $order['order_id']
+                        '__wechat_page' => $wap_domain . '/addon/shop/pages/order/detail?order_id=' . $order_data['order_id'],//模板消息链接
+                        '__weapp_page' => 'addon/shop/pages/order/detail?order_id=' . $order_data['order_id'],//小程序链接
+                        'body' => str_sub($order_data['body']),
+                        'order_no' => $order_data['order_no'],
+                        'delivery_time' => $order_data['delivery_time'],
+                        'order_money' => $order_data['order_money'],
+                        'url' => $wap_domain . '/addon/shop/pages/order/detail?order_id=' . $order_data['order_id']
                     ],
                     [
-                        'member_id' => $order['member_id']
+                        'member_id' => $order_data['member_id']
                     ]
                 );
             }
diff --git a/niucloud/addon/shop/app/listener/order/AfterShopOrderClose.php b/niucloud/addon/shop/app/listener/order/AfterShopOrderClose.php
index 05f209dd9..849efa918 100644
--- a/niucloud/addon/shop/app/listener/order/AfterShopOrderClose.php
+++ b/niucloud/addon/shop/app/listener/order/AfterShopOrderClose.php
@@ -32,13 +32,17 @@ class AfterShopOrderClose
             $order_discount_where = array(
                 ['order_id', '=', $order_data['order_id']]
             );
+
             $order_discount = (new OrderDiscounts())->where($order_discount_where)->select();
+
             if (!$order_discount->isEmpty()) {
                 $recover_list = [];
                 foreach ($order_discount as $v) {
                     $item_discount_type = $v['discount_type'];
                     $recover_list[$item_discount_type][] = $v['discount_type_id'];
+
                 }
+
                 foreach ($recover_list as $item_discount_type => $discount_type_ids) {
                     switch ($item_discount_type) {
                         case 'coupon'://优惠券
@@ -52,6 +56,7 @@ class AfterShopOrderClose
                 ['is_gift', '=', 0],
             );
             $order_goods_data = (new OrderGoods())->where($order_goods_where)->select()->toArray();
+
             //返还商品库存
             $core_goods_stock_service = new CoreGoodsStockService();
             $inc_data = [];
diff --git a/niucloud/addon/shop/app/listener/order/AfterShopOrderDelivery.php b/niucloud/addon/shop/app/listener/order/AfterShopOrderDelivery.php
index 7e92aa1ed..46935a5f4 100644
--- a/niucloud/addon/shop/app/listener/order/AfterShopOrderDelivery.php
+++ b/niucloud/addon/shop/app/listener/order/AfterShopOrderDelivery.php
@@ -36,7 +36,7 @@ class AfterShopOrderDelivery
 
             //消息发送
             if ($order_data[ 'status' ] == OrderDict::WAIT_TAKE) {
-                ( new NoticeService() )->send('shop_order_delivery', [ 'order_id' => $order_data[ 'order_id' ] ]);
+                ( new NoticeService() )->send('shop_order_delivery', $order_data);
             }
 
             //写入定时收货任务
diff --git a/niucloud/addon/shop/app/listener/order/AfterShopOrderFinish.php b/niucloud/addon/shop/app/listener/order/AfterShopOrderFinish.php
index 7e051fdf6..8f08cb08c 100644
--- a/niucloud/addon/shop/app/listener/order/AfterShopOrderFinish.php
+++ b/niucloud/addon/shop/app/listener/order/AfterShopOrderFinish.php
@@ -53,8 +53,8 @@ class AfterShopOrderFinish
             }
 
             // 订单完成发放积分成长值
-            CoreMemberService::sendGrowth($order_data[ 'member_id' ], 'shop_buy_goods', $order_data);
-            CoreMemberService::sendGrowth($order_data[ 'member_id' ], 'shop_buy_order');
+            CoreMemberService::sendGrowth($order_data[ 'member_id' ], 'shop_buy_goods', array_merge($order_data, [ 'from_type' => 'shop_buy_goods', 'related_id' => $order_data[ 'order_id' ] ]));
+            CoreMemberService::sendGrowth($order_data[ 'member_id' ], 'shop_buy_order',['from_type'=>'shop_buy_order','related_id'=>$order_data[ 'order_id' ] ]);
             CoreMemberService::sendPoint($order_data[ 'member_id' ], 'shop_buy_goods', array_merge($order_data, [ 'from_type' => 'consume_reward', 'related_id' => $order_data[ 'order_id' ] ]));
 
             // 微信小程序 发送 确认收货提醒消息
diff --git a/niucloud/addon/shop/app/listener/order_export/ShopOrderExportDataListener.php b/niucloud/addon/shop/app/listener/order_export/ShopOrderExportDataListener.php
index 89b472075..90627d18b 100644
--- a/niucloud/addon/shop/app/listener/order_export/ShopOrderExportDataListener.php
+++ b/niucloud/addon/shop/app/listener/order_export/ShopOrderExportDataListener.php
@@ -14,7 +14,9 @@ namespace addon\shop\app\listener\order_export;
 use addon\shop\app\dict\order\InvoiceDict;
 use addon\shop\app\model\order\Order;
 use addon\shop\app\model\order\OrderGoods;
+use app\dict\pay\PayDict;
 use think\db\Query;
+use think\facade\Db;
 
 /**
  * 订单导出数据源查询
@@ -31,15 +33,35 @@ class ShopOrderExportDataListener
             $model = new Order();
             $orderGoodsModel = new OrderGoods();
             $pay_where = [];
-            if ($param[ 'where' ][ 'pay_type' ]) {
-                $pay_where[] = [ 'pay.type', '=', $param[ 'where' ][ 'pay_type' ] ];
+
+            if ($param[ 'where' ]['pay_type']) {
+                if ($param[ 'where' ]['pay_type'] == PayDict::FRIENDSPAY) {
+                    $pay_where = [
+                        ['pay.main_id', '<>', Db::raw("pay.from_main_id")],
+                        ['pay.from_main_id', '>', 0],
+                        ['pay.status', '=', PayDict::STATUS_FINISH]
+                    ];
+                } else {
+                    $pay_where[] = ['pay.type', '=', $param[ 'where' ]['pay_type']];
+                }
+            }
+            $member_where = [];
+            if ($param['where']['keyword'] != '') {
+                $member_where = [
+                    ['member.member_no|member.nickname|member.username|member.mobile', 'like', "%" . $param[ 'where' ]['keyword'] . "%"],
+                ];
             }
             //查询导出订单项数据
-            $order_ids = $model->where([ [ 'order.order_id', '>', 0 ] ])->withSearch([ 'search_type', 'order_from', 'join_status', 'create_time', 'join_pay_time' ], $param[ 'where' ])
+            $order_ids = $model->where([ [ 'order.order_id', '>', 0 ] ])
+                ->withSearch([ 'search_type', 'order_from', 'join_status', 'create_time', 'join_pay_time' ], $param[ 'where' ])
                 ->withJoin([
                     'pay' => function(Query $query) use ($pay_where) {
                         $query->where($pay_where);
-                    } ], 'left')
+                    },
+                    'member' => function (Query $query) use ($member_where) {
+                        $query->where($member_where);
+                    },
+                    ], 'left')
                 ->field('order_id')->order('order.create_time desc')->column('order_id');
 
             $order_goods_field = 'extend,order_goods_id,order_id,member_id,goods_id,sku_id,delivery_id,goods_name,sku_name,goods_image,sku_image,price,num,goods_money,is_enable_refund,goods_type,delivery_status,status';
@@ -56,7 +78,6 @@ class ShopOrderExportDataListener
                 $data = $search_model->select()->toArray();
             }
 
-            $is_first = true;
             $encountered = array();
             foreach ($data as $key => $val) {
 
diff --git a/niucloud/addon/shop/app/listener/order_export/ShopOrderGoodsExportDataListener.php b/niucloud/addon/shop/app/listener/order_export/ShopOrderGoodsExportDataListener.php
index 52b42371d..cb9981d06 100644
--- a/niucloud/addon/shop/app/listener/order_export/ShopOrderGoodsExportDataListener.php
+++ b/niucloud/addon/shop/app/listener/order_export/ShopOrderGoodsExportDataListener.php
@@ -13,7 +13,9 @@ namespace addon\shop\app\listener\order_export;
 
 use addon\shop\app\model\order\Order;
 use addon\shop\app\model\order\OrderGoods;
+use app\dict\pay\PayDict;
 use think\db\Query;
+use think\facade\Db;
 
 /**
  * 订单项导出数据源查询
@@ -31,16 +33,36 @@ class ShopOrderGoodsExportDataListener
             $orderGoodsModel = new OrderGoods();
             $order = 'order.create_time desc';
             $pay_where = [];
-            if($param['where'][ 'pay_type' ]){
-                $pay_where[] = ['pay.type', '=',  $param['where'][ 'pay_type' ] ];
+
+            if ($param[ 'where' ]['pay_type']) {
+                if ($param[ 'where' ]['pay_type'] == PayDict::FRIENDSPAY) {
+                    $pay_where = [
+                        ['pay.main_id', '<>', Db::raw("pay.from_main_id")],
+                        ['pay.from_main_id', '>', 0],
+                        ['pay.status', '=', PayDict::STATUS_FINISH]
+                    ];
+                } else {
+                    $pay_where[] = ['pay.type', '=', $param[ 'where' ]['pay_type']];
+                }
+            }
+            $member_where = [];
+            if ($param['where']['keyword'] != '') {
+                $member_where = [
+                    ['member.member_no|member.nickname|member.username|member.mobile', 'like', "%" . $param[ 'where' ]['keyword'] . "%"],
+                ];
             }
             //查询导出订单项数据
-            $order_ids = $model->where([[ 'order.order_id', '>', 0 ]])->withSearch([ 'search_type', 'order_from', 'join_status', 'create_time', 'join_pay_time' ], $param['where'])
+            $order_ids = $model->where([ [ 'order.order_id', '>', 0 ] ])
+                ->withSearch([ 'search_type', 'order_from', 'join_status', 'create_time', 'join_pay_time' ], $param[ 'where' ])
                 ->withJoin([
-                    'pay' => function(Query $query) use($pay_where){
+                    'pay' => function(Query $query) use ($pay_where) {
                         $query->where($pay_where);
-                    }], 'left')
-                ->field('order_id')->order($order)->column('order_id');
+                    },
+                    'member' => function (Query $query) use ($member_where) {
+                        $query->where($member_where);
+                    },
+                ], 'left')
+                ->field('order_id')->order('order.create_time desc')->column('order_id');
 
             $order_goods_field = 'order_goods_id,order_id,member_id,delivery_id,goods_name,sku_name,price,num,goods_money,discount_money,order_refund_no,order_goods_money,goods_type,delivery_status,status';
             $order_field = 'order_id,order_no,order_from,taker_name,taker_mobile,taker_full_address,create_time,pay_time,delivery_money,delivery_type,delivery_time,finish_time,member_remark,shop_remark,out_trade_no,status';
diff --git a/niucloud/addon/shop/app/listener/point_exchange/AfterShopOrderClose.php b/niucloud/addon/shop/app/listener/point_exchange/AfterShopOrderClose.php
index 925cc0548..c7f68b79d 100644
--- a/niucloud/addon/shop/app/listener/point_exchange/AfterShopOrderClose.php
+++ b/niucloud/addon/shop/app/listener/point_exchange/AfterShopOrderClose.php
@@ -60,8 +60,9 @@ class AfterShopOrderClose
                         'total_point_num' => Db::raw('total_point_num-' . $order_data['point']),
                         'total_price_num' => Db::raw('total_price_num-' . $v['goods_money']),
                         'total_order_num' => Db::raw('total_order_num-1'),
-                        'goods_id' => $v['goods_id'],
-                        'sku_id' => $v['sku_id'],
+                        'update_time'=>time(),
+//                        'goods_id' => $v['goods_id'],
+//                        'sku_id' => $v['sku_id'],
                         'id' => $order_data['relate_id'],
                     ];
 
diff --git a/niucloud/addon/shop/app/listener/point_exchange/AfterShopOrderCreate.php b/niucloud/addon/shop/app/listener/point_exchange/AfterShopOrderCreate.php
index 1803f7ce4..aa55c4937 100644
--- a/niucloud/addon/shop/app/listener/point_exchange/AfterShopOrderCreate.php
+++ b/niucloud/addon/shop/app/listener/point_exchange/AfterShopOrderCreate.php
@@ -58,8 +58,9 @@ class AfterShopOrderCreate
                         'total_point_num' => Db::raw('total_point_num+' . $order_data['point']),
                         'total_price_num' => Db::raw('total_price_num+' . $v['goods_money']),
                         'total_order_num' => Db::raw('total_order_num+1'),
-                        'goods_id' => $v['goods_id'],
-                        'sku_id' => $v['sku_id'],
+                        'update_time' => time(),
+//                        'goods_id' => $v['goods_id'],
+//                        'sku_id' => $v['sku_id'],
                         'id' => $order_data['relate_id'],
                     ];
                 }
diff --git a/niucloud/addon/shop/app/listener/poster/ShopPoster.php b/niucloud/addon/shop/app/listener/poster/ShopPoster.php
index 6c8f238ae..4b32048cd 100644
--- a/niucloud/addon/shop/app/listener/poster/ShopPoster.php
+++ b/niucloud/addon/shop/app/listener/poster/ShopPoster.php
@@ -114,7 +114,8 @@ class ShopPoster
                         ])->findOrEmpty()->toArray();
 
                         if (!empty($newcomer_goods_info) && $newcomer_goods_info[ 'active' ][ 'active_status' ] == ActiveDict::ACTIVE) {
-                            $url_data[] = [ 'key' => 'type', 'value' => 'newcomer_discount' ];
+//                            $url_data[] = [ 'key' => 'type', 'value' => 'newcomer_discount' ];
+                            $url_data[] = [ 'key' => 'type', 'value' => 'nd' ];
                             $newcomer_price = json_decode($newcomer_goods_info[ 'active_goods_value' ], true)[ 'newcomer_price' ];
                             if ($newcomer_price > 0) $show_price_data[] = $newcomer_price;
                         }
diff --git a/niucloud/addon/shop/app/listener/refund/AfterShopOrderRefundFinish.php b/niucloud/addon/shop/app/listener/refund/AfterShopOrderRefundFinish.php
index cda4f15b6..8856febef 100644
--- a/niucloud/addon/shop/app/listener/refund/AfterShopOrderRefundFinish.php
+++ b/niucloud/addon/shop/app/listener/refund/AfterShopOrderRefundFinish.php
@@ -35,7 +35,7 @@ class AfterShopOrderRefundFinish
             if ($order[ 'status' ] == OrderDict::WAIT_DELIVERY) {
                 //校验一下订单项是否全部发货
                 ( new CoreOrderDeliveryService() )->checkFinish(
-                    [ 'order_id' => $refund_data[ 'order_id' ]]
+                    [ 'order_id' => $refund_data[ 'order_id' ] ]
                 );
             }
             //校验一下是否全部退款
@@ -58,7 +58,8 @@ class AfterShopOrderRefundFinish
             'main_type' => $main_type,
             'main_id' => $main_id,
             'type' => OrderRefundDict::FINISH_ACTION,
-            'content' => ''
+            'content' => '',
+            'create_time'=>time()+1
         ]);
         //消息发送
 
diff --git a/niucloud/addon/shop/app/listener/refund_export/ShopOrderRefundExportDataListener.php b/niucloud/addon/shop/app/listener/refund_export/ShopOrderRefundExportDataListener.php
index 3b5129447..1e54abe65 100644
--- a/niucloud/addon/shop/app/listener/refund_export/ShopOrderRefundExportDataListener.php
+++ b/niucloud/addon/shop/app/listener/refund_export/ShopOrderRefundExportDataListener.php
@@ -47,7 +47,7 @@ class ShopOrderRefundExportDataListener
                 $data = $search_model->select()->toArray();
             }
             foreach ($data as $key => $val) {
-                $data[$key]['nickname'] = $val['member']['nickname'];
+                $data[$key]['nickname'] = $val['member']['nickname'] ?? "";
             }
             foreach ($data as $key => $val) {
                 $data[$key]['order_refund_no'] = $val['order_refund_no']."\t";
diff --git a/niucloud/addon/shop/app/listener/shop_delivery/OrderPreStatusListener.php b/niucloud/addon/shop/app/listener/shop_delivery/OrderPreStatusListener.php
new file mode 100644
index 000000000..17f3e8883
--- /dev/null
+++ b/niucloud/addon/shop/app/listener/shop_delivery/OrderPreStatusListener.php
@@ -0,0 +1,37 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\listener\shop_delivery;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryDict;
+
+/**
+ * 配送订单操作前置状态
+ * @package addon\shop\app\listener\shop_delivery
+ */
+class OrderPreStatusListener
+{
+
+    public function handle($params)
+    {
+        if (!empty($params['service']) && $params['service'] == ShopDeliveryDict::MERCHANT) {
+            return [
+                'finish' => [
+                    LocalDeliveryStatusDict::IN_DELIVERY
+                ], //完成订单
+                'cancel' => [
+                    LocalDeliveryStatusDict::IN_DELIVERY
+                ], //取消订单
+            ];
+        }
+    }
+}
diff --git a/niucloud/addon/shop/app/listener/third_addon/order/OrderAmountServiceListener.php b/niucloud/addon/shop/app/listener/third_addon/order/OrderAmountServiceListener.php
index dc6d556d9..52ab54f6c 100644
--- a/niucloud/addon/shop/app/listener/third_addon/order/OrderAmountServiceListener.php
+++ b/niucloud/addon/shop/app/listener/third_addon/order/OrderAmountServiceListener.php
@@ -31,11 +31,6 @@ class OrderAmountServiceListener
 //                        'name' => '配送费',
 //                        'key' => 'delivery_money',
 //                        'amount' => 20
-//                    ],
-//                    [
-//                        'name' => '服务费',
-//                        'key' => 'service_money',
-//                        'amount' => 10
 //                    ]
 //                ];
                 $this->getDeliveryMoney($data);
diff --git a/niucloud/addon/shop/app/model/cart/Cart.php b/niucloud/addon/shop/app/model/cart/Cart.php
index 80bcf326a..c41f780ed 100644
--- a/niucloud/addon/shop/app/model/cart/Cart.php
+++ b/niucloud/addon/shop/app/model/cart/Cart.php
@@ -154,10 +154,7 @@ class Cart extends BaseModel
     public function goods()
     {
         return $this->hasOne(Goods::class, 'goods_id', 'goods_id')
-            ->joinType('inner')
-            ->withTrashed()
-            ->withField('goods_id, goods_name, goods_type, sub_title, goods_cover, unit, stock, sale_num + virtual_sale_num as sale_num, status,delete_time')
-            ->append([ 'goods_type_name', 'goods_cover_thumb_small', 'goods_cover_thumb_mid' ]);
+            ->joinType('inner')->withTrashed();
     }
 
     /**
@@ -166,10 +163,7 @@ class Cart extends BaseModel
      */
     public function goodsSku()
     {
-        return $this->hasOne(GoodsSku::class, 'sku_id', 'sku_id')
-            ->joinType('inner')
-            ->withField('sku_id, sku_name, sku_image, sku_no, goods_id, sku_spec_format, price, market_price, sale_price, stock, weight, volume, is_default')
-            ->append([ 'sku_image_thumb_small', 'sku_image_thumb_mid', 'sku_image_thumb_big' ]);
+        return $this->hasOne(GoodsSku::class, 'sku_id', 'sku_id')->joinType('inner');
     }
 
     /**
diff --git a/niucloud/addon/shop/app/model/delivery/Store.php b/niucloud/addon/shop/app/model/delivery/Store.php
index ad97cc581..71a26ef64 100644
--- a/niucloud/addon/shop/app/model/delivery/Store.php
+++ b/niucloud/addon/shop/app/model/delivery/Store.php
@@ -11,6 +11,8 @@
 
 namespace addon\shop\app\model\delivery;
 
+use addon\shop\app\dict\delivery\DeliveryDict;
+use addon\shop\app\dict\delivery_store\DeliveryStoreDict;
 use core\base\BaseModel;
 use think\db\Query;
 
@@ -38,9 +40,22 @@ class Store extends BaseModel
         'create_time' => 'timestamp',
         'update_time' => 'timestamp',
     ];
-    protected $json = ['time_week','trade_time_json'];
+    protected $json = ['time_week','trade_time_json','area','support_delivery', 'extend_data'];
     protected $jsonAssoc = true;
 
+    /**
+     * 搜索器:关键字
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchKeywordAttr($query, $value, $data)
+    {
+        if ($value != '') {
+            $query->where('store_name|mobile|full_address', 'like', '%' . $value . '%');
+        }
+    }
+
     /**
      * 搜索器:自提门店门店名称
      * @param $value
@@ -53,6 +68,39 @@ class Store extends BaseModel
         }
     }
 
+    /**
+     * 搜索器:支持的提货类型
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchPickUpTypeAttr($query, $value, $data)
+    {
+        if (!empty($data['pick_up_type'])) {
+            switch ($data['pick_up_type']) {
+                case DeliveryDict::LOCAL_DELIVERY:
+                    $query->where('support_local_delivery', '=', 1);
+                    break;
+                case DeliveryDict::STORE:
+                    $query->where('support_store', '=', 1);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * 搜索器:提货点状态
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchStatusAttr($query, $value, $data)
+    {
+        if ($value != '') {
+            $query->where('status', $value);
+        }
+    }
+
     /**
      * 创建时间搜索器
      * @param $value
@@ -69,4 +117,22 @@ class Store extends BaseModel
             $query->where([ [ 'create_time', '<=', $end_time ] ]);
         }
     }
+
+    /**
+     * 提货类型
+     * @param $value
+     * @param $data
+     * @return array
+     */
+    public function getPickUpTypeNameAttr($value, $data)
+    {
+        $pick_up_type = [];
+        if (isset($data[ 'support_local_delivery' ]) && $data[ 'support_local_delivery' ] == 1) {
+            $pick_up_type[] = DeliveryStoreDict::getPickUpType(DeliveryDict::LOCAL_DELIVERY);
+        }
+        if (isset($data[ 'support_store' ]) && $data[ 'support_store' ] == 1) {
+            $pick_up_type[] = DeliveryStoreDict::getPickUpType(DeliveryDict::STORE);
+        }
+        return $pick_up_type;
+    }
 }
diff --git a/niucloud/addon/shop/app/model/goods/GoodsSku.php b/niucloud/addon/shop/app/model/goods/GoodsSku.php
index 3e191564c..5445bbbf4 100644
--- a/niucloud/addon/shop/app/model/goods/GoodsSku.php
+++ b/niucloud/addon/shop/app/model/goods/GoodsSku.php
@@ -260,6 +260,15 @@ class GoodsSku extends BaseModel
             ->append([ 'goods_type_name', 'goods_cover_thumb_small', 'goods_cover_thumb_mid', 'delivery_type_list', 'goods_image_thumb_small', 'goods_image_thumb_mid', 'goods_image_thumb_big' ]);
     }
 
+    /**
+     * 关联商品主表（自定义字段）
+     * @return \think\model\relation\HasOne
+     */
+    public function goodsSingle()
+    {
+        return $this->hasOne(Goods::class, 'goods_id', 'goods_id')->joinType('left');
+    }
+
     /**
      * 关联商品规格列表
      * @return \think\model\relation\HasMany
@@ -288,13 +297,4 @@ class GoodsSku extends BaseModel
             ->joinType('left');
     }
 
-    /**
-     * 关联商品主表（自定义字段）
-     * @return \think\model\relation\HasOne
-     */
-    public function goodsSingle()
-    {
-        return $this->hasOne(Goods::class, 'goods_id', 'goods_id')->joinType('left');
-    }
-
 }
diff --git a/niucloud/addon/shop/app/model/local_delivery/Local.php b/niucloud/addon/shop/app/model/local_delivery/Local.php
new file mode 100644
index 000000000..2fd08a57a
--- /dev/null
+++ b/niucloud/addon/shop/app/model/local_delivery/Local.php
@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\model\local_delivery;
+
+use core\base\BaseModel;
+
+
+/**
+ * 同城配送
+ * Class Local
+ * @package addon\shop\app\model\delivery
+ */
+class Local extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'local_id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'shop_delivery_local_delivery';
+
+    protected $type = [
+        'center' => 'json',
+        'area' => 'json',
+        'delivery_type' => 'json',
+        'delivery_time' => 'json'
+    ];
+}
diff --git a/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryOrder.php b/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryOrder.php
new file mode 100644
index 000000000..ec6126a20
--- /dev/null
+++ b/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryOrder.php
@@ -0,0 +1,161 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\model\local_delivery;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryPreStatusDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+//use addon\shop\app\dict\trade\TradeDict;
+use core\base\BaseModel;
+use think\model\relation\HasOne;
+
+
+/**
+ * 配送记录模型
+ * Class LocalDeliveryService
+ * @package app\model\delivery
+ */
+class LocalDeliveryOrder extends BaseModel
+{
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'shop_delivery_local_delivery_order';
+
+    //类型
+    protected $type = [
+        'finish_time' => 'timestamp',
+        'cancel_time' => 'timestamp'
+    ];
+
+    /**
+     * 搜索器:交易单号
+     * @param $query
+     * @param $value
+     */
+    public function searchTradeNoAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('trade_no', 'like', '%' . $value . '%');
+        }
+    }
+
+    /**
+     * 搜索器:交易类型
+     * @param $query
+     * @param $value
+     */
+    public function searchTradeTypeAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('trade_type', $value);
+        }
+    }
+
+    /**
+     * 搜索器:配送单号
+     * @param $query
+     * @param $value
+     */
+    public function searchDeliveryNoAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('delivery_no', 'like', '%' . $value . '%');
+        }
+    }
+
+    /**
+     * 搜索器:配送状态
+     * @param $query
+     * @param $value
+     */
+    public function searchStatusAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('status', $value);
+        }
+    }
+
+    /**
+     * 搜索器:创建时间
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchCreateTimeAttr($query, $value, $data)
+    {
+        $start_time = empty($value[0]) ? 0 : strtotime($value[0]);
+        $end_time = empty($value[1]) ? 0 : strtotime($value[1]);
+        if ($start_time > 0 && $end_time > 0) {
+            $query->whereBetweenTime('create_time', $start_time, $end_time);
+        } elseif ($start_time > 0 && $end_time == 0) {
+            $query->where([['create_time', '>=', $start_time]]);
+        } elseif ($start_time == 0 && $end_time > 0) {
+            $query->where([['create_time', '<=', $end_time]]);
+        }
+    }
+
+    /**
+     * 转化配送状态
+     */
+    public function getStatusNameAttr($value, $data)
+    {
+        if ($data['status'] == '') return '';
+        return LocalDeliveryStatusDict::getStatus($data['status']);
+    }
+
+    public function getPreStatusNameAttr($value, $data)
+    {
+        if (!empty($data['delivery_service'])) {
+            return LocalDeliveryPreStatusDict::getStatus($data['delivery_service']);
+        }
+        return '';
+    }
+
+    /**
+     * 转化配送服务商名称
+     */
+    public function getDeliveryServiceNameAttr($value, $data)
+    {
+        if (!empty($data['delivery_service'])) {
+            return LocalDeliveryDict::getType($data['delivery_service']);
+        }
+        return '';
+    }
+
+    /**
+     * 转化配送服务商名称
+     */
+//    public function getTradeTypeNameAttr($value, $data)
+//    {
+//        if (!empty($data['trade_type'])) {
+//            return TradeDict::getTradeType()[$data['trade_type']] ?? '';
+//        }
+//        return '';
+//    }
+
+    /**
+     * 日志
+     */
+    public function orderLog()
+    {
+        return $this->hasMany(LocalDeliveryOrderLog::class, 'order_id', 'id')->append(['main_type_name']);
+    }
+}
diff --git a/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryOrderLog.php b/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryOrderLog.php
new file mode 100644
index 000000000..a0b343315
--- /dev/null
+++ b/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryOrderLog.php
@@ -0,0 +1,58 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\model\local_delivery;
+
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use core\base\BaseModel;
+
+
+/**
+ * 配送订单日志模型
+ * Class LocalDeliveryOrderLog
+ * @package app\model\local_delivery
+ */
+class LocalDeliveryOrderLog extends BaseModel
+{
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'shop_delivery_local_delivery_order_log';
+
+    /**
+     * 来源渠道
+     * @param $value
+     * @param $data
+     * @return mixed|string|void
+     */
+    public function getMainTypeNameAttr($value, $data)
+    {
+        if (empty($data[ 'main_type' ]))
+            return '';
+        return OrderLogDict::getMainType() [ $data[ 'main_type' ] ] ?? '';
+    }
+
+    /**
+     * 同城配送订单
+     */
+    public function localDeliveryOrder()
+    {
+        return $this->hasOne(LocalDeliveryOrder::class, 'id', 'order_id');
+    }
+}
diff --git a/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryService.php b/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryService.php
new file mode 100644
index 000000000..d2c1eb8de
--- /dev/null
+++ b/niucloud/addon/shop/app/model/local_delivery/LocalDeliveryService.php
@@ -0,0 +1,53 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\model\local_delivery;
+
+use core\base\BaseModel;
+
+
+/**
+ * 同城配送服务商模型
+ * Class LocalDeliveryService
+ * @package addon\shop\app\model\local_delivery
+ */
+class LocalDeliveryService extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'shop_delivery_local_delivery_service';
+
+    // 设置json类型字段
+    protected $json = [ 'config' ];
+
+    // 设置JSON数据返回数组
+    protected $jsonAssoc = true;
+
+    /**
+     * 搜索器:三方配送名称
+     * @param $query
+     * @param $value
+     */
+    public function searchNameAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('name', 'like', '%' . $value . '%');
+        }
+    }
+}
diff --git a/niucloud/addon/shop/app/model/order/OrderDelivery.php b/niucloud/addon/shop/app/model/order/OrderDelivery.php
index 9cbf95031..ec6baf000 100644
--- a/niucloud/addon/shop/app/model/order/OrderDelivery.php
+++ b/niucloud/addon/shop/app/model/order/OrderDelivery.php
@@ -13,6 +13,7 @@ namespace addon\shop\app\model\order;
 
 use addon\shop\app\dict\delivery\DeliveryLocalDict;
 use addon\shop\app\model\delivery\Company;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
 use core\base\BaseModel;
 
 /**
@@ -56,4 +57,9 @@ class OrderDelivery extends BaseModel
     {
         return DeliveryLocalDict::getType($data['third_delivery'])['name']  ?? "";
     }
+
+    public function localDeliveryOrder()
+    {
+        return $this->hasOne(LocalDeliveryOrder::class, 'delivery_no', 'local_delivery_order_id')->append(['status_name','delivery_service_name'])->bind(['local_delivery_status' => 'status','local_delivery_status_name' => 'status_name','delivery_service','delivery_service_name','rider_name','rider_mobile']);
+    }
 }
diff --git a/niucloud/addon/shop/app/model/shop_delivery/Deliver.php b/niucloud/addon/shop/app/model/shop_delivery/Deliver.php
new file mode 100644
index 000000000..4c53bd6bd
--- /dev/null
+++ b/niucloud/addon/shop/app/model/shop_delivery/Deliver.php
@@ -0,0 +1,63 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\model\shop_delivery;
+
+use core\base\BaseModel;
+
+
+/**
+ * 配送员模型
+ * Class Deliver
+ * @package addon\shop\app\model\delivery
+ */
+class Deliver extends BaseModel
+{
+
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'deliver_id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'shop_delivery_deliver';
+
+
+    /**
+     * 搜索器:配送员名称
+     * @param $value
+     * @param $data
+     */
+    public function searchDeliverNameAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where("deliver_name", 'like', '%' . $value . '%');
+        }
+    }
+
+    /**
+     * 搜索器:配送员手机号
+     * @param $value
+     * @param $data
+     */
+    public function searchDeliverMobileAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where("deliver_mobile", 'like', '%' . $value . '%');
+
+        }
+    }
+}
diff --git a/niucloud/addon/shop/app/model/shop_delivery/ShopDeliveryOrder.php b/niucloud/addon/shop/app/model/shop_delivery/ShopDeliveryOrder.php
new file mode 100644
index 000000000..ca3b50013
--- /dev/null
+++ b/niucloud/addon/shop/app/model/shop_delivery/ShopDeliveryOrder.php
@@ -0,0 +1,146 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\model\shop_delivery;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryPreStatusDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryDict;
+use core\base\BaseModel;
+use think\model\relation\HasOne;
+
+
+/**
+ * 商家配送记录模型
+ * Class ShopDeliveryOrder
+ * @package addon\shop\app\model\shop_delivery
+ */
+class ShopDeliveryOrder extends BaseModel
+{
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'shop_delivery_shop_delivery_order';
+
+    //类型
+    protected $type = [
+        'finish_time' => 'timestamp',
+        'cancel_time' => 'timestamp'
+    ];
+
+    /**
+     * 搜索器:交易单号
+     * @param $query
+     * @param $value
+     */
+    public function searchTradeNoAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('trade_no', 'like', '%' . $value . '%');
+        }
+    }
+
+    /**
+     * 搜索器:交易类型
+     * @param $query
+     * @param $value
+     */
+    public function searchTradeTypeAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('trade_type', $value);
+        }
+    }
+
+    /**
+     * 搜索器:配送单号
+     * @param $query
+     * @param $value
+     */
+    public function searchDeliveryNoAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('delivery_no', 'like', '%' . $value . '%');
+        }
+    }
+
+    /**
+     * 搜索器:配送状态
+     * @param $query
+     * @param $value
+     */
+    public function searchStatusAttr($query, $value)
+    {
+        if ($value != '') {
+            $query->where('status', $value);
+        }
+    }
+
+    /**
+     * 搜索器:创建时间
+     * @param $query
+     * @param $value
+     * @param $data
+     */
+    public function searchCreateTimeAttr($query, $value, $data)
+    {
+        $start_time = empty($value[0]) ? 0 : strtotime($value[0]);
+        $end_time = empty($value[1]) ? 0 : strtotime($value[1]);
+        if ($start_time > 0 && $end_time > 0) {
+            $query->whereBetweenTime('create_time', $start_time, $end_time);
+        } elseif ($start_time > 0 && $end_time == 0) {
+            $query->where([['create_time', '>=', $start_time]]);
+        } elseif ($start_time == 0 && $end_time > 0) {
+            $query->where([['create_time', '<=', $end_time]]);
+        }
+    }
+
+    /**
+     * 转化配送状态
+     */
+    public function getStatusNameAttr($value, $data)
+    {
+        if (!empty($data['status'])) {
+            return LocalDeliveryStatusDict::getStatus($data['status']);
+        }
+        return '';
+    }
+
+    public function getPreStatusNameAttr($value, $data)
+    {
+        return LocalDeliveryPreStatusDict::getStatus(ShopDeliveryDict::MERCHANT);
+    }
+
+    /**
+     * 关联配送员
+     * @return HasOne
+     */
+    public function deliver()
+    {
+        return $this->hasOne(Deliver::class, 'deliver_id', 'deliver_id');
+    }
+
+    /**
+     * 日志
+     */
+    public function orderLog()
+    {
+        return $this->hasMany(ShopDeliveryOrderLog::class, 'order_id', 'id')->append(['main_type_name']);
+    }
+}
diff --git a/niucloud/addon/shop/app/model/shop_delivery/ShopDeliveryOrderLog.php b/niucloud/addon/shop/app/model/shop_delivery/ShopDeliveryOrderLog.php
new file mode 100644
index 000000000..958067644
--- /dev/null
+++ b/niucloud/addon/shop/app/model/shop_delivery/ShopDeliveryOrderLog.php
@@ -0,0 +1,58 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\model\shop_delivery;
+
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use core\base\BaseModel;
+
+
+/**
+ * 商家配送订单日志模型
+ * Class ShopDeliveryOrderLog
+ * @package app\model\shop_delivery
+ */
+class ShopDeliveryOrderLog extends BaseModel
+{
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'shop_delivery_shop_delivery_order_log';
+
+    /**
+     * 来源渠道
+     * @param $value
+     * @param $data
+     * @return mixed|string|void
+     */
+    public function getMainTypeNameAttr($value, $data)
+    {
+        if (empty($data[ 'main_type' ]))
+            return '';
+        return OrderLogDict::getMainType() [ $data[ 'main_type' ] ] ?? '';
+    }
+
+    /**
+     * 商家配送订单
+     */
+    public function shopDeliveryOrder()
+    {
+        return $this->hasOne(ShopDeliveryOrder::class, 'id', 'order_id');
+    }
+}
diff --git a/niucloud/addon/shop/app/service/admin/delivery/LocalService.php b/niucloud/addon/shop/app/service/admin/delivery/LocalService.php
deleted file mode 100644
index 5e94b37fc..000000000
--- a/niucloud/addon/shop/app/service/admin/delivery/LocalService.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | Niucloud-admin 企业快速开发的多应用管理平台
-// +----------------------------------------------------------------------
-// | 官方网址：https://www.niucloud.com
-// +----------------------------------------------------------------------
-// | niucloud团队 版权所有 开源版本可自由商用
-// +----------------------------------------------------------------------
-// | Author: Niucloud Team
-// +----------------------------------------------------------------------
-
-namespace addon\shop\app\service\admin\delivery;
-
-use addon\shop\app\dict\delivery\DeliveryLocalDict;
-use addon\shop\app\model\delivery\Local;
-use addon\shop\app\service\core\delivery\CoreLocalDeliveryService;
-use app\dict\common\CommonDict;
-use core\base\BaseAdminService;
-
-/**
- * 同城配送服务层
- * Class LocalService
- * @package addon\shop\app\service\admin\delivery
- */
-class LocalService extends BaseAdminService
-{
-    public $core_service;
-
-    public function __construct()
-    {
-        parent::__construct();
-        $this->core_service = new CoreLocalDeliveryService();
-
-    }
-
-    /**
-     * 设置同城配送
-     * @param array $data
-     * @return mixed
-     */
-    public function setLocal(array $data)
-    {
-        (new Local())->where([['local_id', '>', 0]])->delete();
-
-        $create_res = (new Local())->create([
-            'center' => $data['center'],
-            'fee_type' => $data['fee_type'],
-            'base_dist' => $data['base_dist'],
-            'base_price' => $data['base_price'],
-            'grad_dist' => $data['grad_dist'],
-            'grad_price' => $data['grad_price'],
-            'weight_start' => $data['weight_start'],
-            'weight_unit' => $data['weight_unit'],
-            'weight_price' => $data['weight_price'],
-            'delivery_type' => $data['delivery_type'],
-            'area' => $data['area'],
-
-            'time_is_open' => $data['time_is_open'],
-            'time_type' => $data['time_type'],
-            'time_week' => $data['time_week'],
-            'time_interval' => $data['time_interval'],
-            'advance_day' => $data['advance_day'],
-            'most_day' => $data['most_day'],
-            'start_time' => $data['start_time'],
-            'end_time' => $data['end_time'],
-            'delivery_time' => $data['delivery_time'],
-        ]);
-        if (in_array(DeliveryLocalDict::DELIVERY_TYPE_THIRD, $data['delivery_type'])) {
-            $this->setThirdPartyConfig($data['third_party_config']);
-        }
-        return $create_res->local_id;
-    }
-
-    /**
-     * 获取同城配送设置
-     * @return array
-     */
-    public function getLocal()
-    {
-        $info = (new Local())->where([['local_id', '>', 0]])->findOrEmpty()->toArray();
-        $config = $this->getThirdPartyConfig();
-        $type_config = DeliveryLocalDict::getType();
-        foreach ($type_config as $type => $value) {
-            foreach ($value['encrypt_params'] as $encrypt_param) {
-                $config[$type][$encrypt_param] = !empty( $config[$type][$encrypt_param] ) ? CommonDict::ENCRYPT_STR : '';
-            }
-        }
-        $info['third_party_config'] = $config;
-        return $info;
-    }
-
-    public function getThirdTypeConfig()
-    {
-        $config = DeliveryLocalDict::getType();
-        $return = [];
-        foreach ($config as $type => $item) {
-            $return[] = [
-                'type' => $type,
-                'name' => $item['name']
-            ];
-        }
-        return $return;
-    }
-
-    public function getThirdPartyConfig()
-    {
-        return $this->core_service->getConfig();
-    }
-
-    public function setThirdPartyConfig($data)
-    {
-        if (empty($data)) {
-            return true;
-        }
-        $config = $this->getThirdPartyConfig();
-        $config['default'] = $data['default'] ?? $config['default'];
-        unset($data['default']);
-        foreach ($data as $type => $item) {
-            foreach ($item as $column => $v) {
-                if (empty($v) || $v == CommonDict::ENCRYPT_STR) {
-                    $config[$type][$column] = $v ?? $config[$type][$column];
-                } else {
-                    $config[$type][$column] = $v;
-                }
-            }
-        }
-        return $this->core_service->setConfig($config);
-    }
-
-    public function thirdDeliveryCallback($params)
-    {
-        $this->core_service->thirdDeliveryCallback($params);
-    }
-}
diff --git a/niucloud/addon/shop/app/service/admin/delivery/StoreService.php b/niucloud/addon/shop/app/service/admin/delivery/StoreService.php
deleted file mode 100644
index 46a522073..000000000
--- a/niucloud/addon/shop/app/service/admin/delivery/StoreService.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | Niucloud-admin 企业快速开发的多应用管理平台
-// +----------------------------------------------------------------------
-// | 官方网址：https://www.niucloud.com
-// +----------------------------------------------------------------------
-// | niucloud团队 版权所有 开源版本可自由商用
-// +----------------------------------------------------------------------
-// | Author: Niucloud Team
-// +----------------------------------------------------------------------
-
-namespace addon\shop\app\service\admin\delivery;
-
-use addon\shop\app\dict\delivery\DeliveryDict;
-use addon\shop\app\model\delivery\Store;
-use app\service\admin\sys\AreaService;
-use app\service\core\sys\CoreAreaService;
-use core\base\BaseAdminService;
-
-
-/**
- * 自提门店服务层
- * Class StoreService
- * @package addon\shop\app\service\admin\delivery
- */
-class StoreService extends BaseAdminService
-{
-    public function __construct()
-    {
-        parent::__construct();
-        $this->model = new Store();
-    }
-
-    /**
-     * 获取自提门店列表
-     * @param array $where
-     * @return array
-     */
-    public function getPage(array $where = [])
-    {
-        $field = 'time_week,trade_time_json,time_interval,store_id,store_name,store_desc,store_logo,store_mobile,province_id,city_id,district_id,address,full_address,longitude,latitude,trade_time,create_time,update_time';
-        $order = 'create_time desc';
-
-        $search_model = $this->model->where([ [ 'store_id', '>', 0 ] ])->withSearch([ "store_name", "create_time" ], $where)->field($field)->order($order);
-        $list = $this->pageQuery($search_model);
-        return $list;
-    }
-
-    /**
-     * 获取自提门店信息
-     * @param int $id
-     * @return array
-     */
-    public function getInfo(int $id)
-    {
-        $field = 'time_week,trade_time_json,time_interval,store_id,store_name,store_desc,store_logo,store_mobile,province_id,city_id,district_id,address,full_address,longitude,latitude,trade_time,create_time,update_time';
-        $info = $this->model->field($field)->where([ [ 'store_id', '=', $id ] ])->findOrEmpty()->toArray();
-        $info[ 'province_name' ] = ( new AreaService() )->getAreaName($info[ 'province_id' ]);
-        $info[ 'city_name' ] = ( new AreaService() )->getAreaName($info[ 'city_id' ]);
-        $info[ 'district_name' ] = ( new AreaService() )->getAreaName($info[ 'district_id' ]);
-        if (empty($info[ 'time_interval' ])) $info[ 'time_interval' ] = DeliveryDict::TIME_INTERVAL_30;
-        return $info;
-    }
-
-    public function getInitInfo()
-    {
-        return [
-            'week_list' => DeliveryDict::getWeekList(),
-            'time_interval_list' => DeliveryDict::getTimeIntervalList()
-        ];
-    }
-
-    /**
-     * 添加自提门店
-     * @param array $data
-     * @return mixed
-     */
-    public function add(array $data)
-    {
-        $data[ 'create_time' ] = time();
-        $data[ 'update_time' ] = time();
-
-        $data[ 'province_id' ] = ( new AreaService() )->getAreaId($data[ 'province_name' ], 1);
-        $data[ 'city_id' ] = ( new AreaService() )->getAreaId($data[ 'city_name' ], 2);
-        $data[ 'district_id' ] = ( new AreaService() )->getAreaId($data[ 'district_name' ], 3);
-        if ($data[ 'full_address' ] == '') $data[ 'full_address' ] = ( new CoreAreaService() )->getFullAddress($data[ 'province_id' ], $data[ 'city_id' ], $data[ 'district_id' ], $data[ 'address' ], '');
-
-        $res = $this->model->create($data);
-        return $res->store_id;
-    }
-
-    /**
-     * 自提门店编辑
-     * @param int $id
-     * @param array $data
-     * @return bool
-     */
-    public function edit(int $id, array $data, $address)
-    {
-        $data[ 'update_time' ] = time();
-        $data[ 'province_id' ] = ( new AreaService() )->getAreaId($address[ 'province_name' ], 1);
-        $data[ 'city_id' ] = ( new AreaService() )->getAreaId($address[ 'city_name' ], 2);
-        $data[ 'district_id' ] = ( new AreaService() )->getAreaId($address[ 'district_name' ], 3);
-        if ($data[ 'full_address' ] == '') $data[ 'full_address' ] = ( new CoreAreaService() )->getFullAddress($data[ 'province_id' ], $data[ 'city_id' ], $data[ 'district_id' ], $data[ 'address' ], '');
-
-        $this->model->where([ [ 'store_id', '=', $id ] ])->update($data);
-        return true;
-    }
-
-    /**
-     * 删除自提门店
-     * @param int $id
-     * @return bool
-     */
-    public function del(int $id)
-    {
-        $res = $this->model->where([ [ 'store_id', '=', $id ] ])->delete();
-        return $res;
-    }
-
-    /**
-     * 获取自提门店列表
-     * @param array $where
-     * @return array
-     */
-    public function getList(array $where = [])
-    {
-        $field = 'store_id,store_name,store_desc,store_logo,store_mobile,province_id,city_id,district_id,address,full_address,longitude,latitude,trade_time,create_time,update_time';
-        $order = 'create_time desc';
-
-        $list = $this->model->where([ [ 'store_id', '>', 0 ] ])->withSearch([ "store_name", "create_time" ], $where)->field($field)->order($order)->select()->toArray();
-        return $list;
-    }
-
-}
diff --git a/niucloud/addon/shop/app/service/admin/delivery_store/DeliveryServiceService.php b/niucloud/addon/shop/app/service/admin/delivery_store/DeliveryServiceService.php
new file mode 100644
index 000000000..ba9ac1d29
--- /dev/null
+++ b/niucloud/addon/shop/app/service/admin/delivery_store/DeliveryServiceService.php
@@ -0,0 +1,55 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\admin\delivery_store;
+
+use addon\shop\app\service\core\delivery_store\CoreDeliveryServiceService;
+use core\base\BaseAdminService;
+
+/**
+ * 配送服务商服务层
+ * Class DeliveryServiceService
+ * @package addon\shop\app\service\admin\delivery_store
+ */
+class DeliveryServiceService extends BaseAdminService
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * 获取配送服务商列表
+     * @return array
+     */
+    public function deliveryServiceList(int $id)
+    {
+        return (new CoreDeliveryServiceService())->deliveryServiceList($id);
+    }
+
+    /**
+     * 配送门店开通配送服务
+     * @return true
+     */
+    public function deliveryServiceOpen(int $id, array $data)
+    {
+        return (new CoreDeliveryServiceService())->deliveryServiceOpen($id, $data);
+    }
+
+    /**
+     * 配送门店品类修改
+     * @return true
+     */
+    public function deliveryServiceEdit(int $id, array $data)
+    {
+        return (new CoreDeliveryServiceService())->deliveryServiceEdit($id, $data);
+    }
+}
diff --git a/niucloud/addon/shop/app/service/admin/delivery_store/DeliveryStoreService.php b/niucloud/addon/shop/app/service/admin/delivery_store/DeliveryStoreService.php
new file mode 100644
index 000000000..e528a802c
--- /dev/null
+++ b/niucloud/addon/shop/app/service/admin/delivery_store/DeliveryStoreService.php
@@ -0,0 +1,262 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\admin\delivery_store;
+
+use addon\shop\app\model\delivery\Store;
+use addon\shop\app\dict\delivery\DeliveryDict;
+use addon\shop\app\dict\delivery_store\DeliveryStoreDict;
+use addon\shop\app\job\delivery\DeliveryShopEditJob;
+use addon\shop\app\service\admin\local_delivery\config\LocalService;
+use addon\shop\app\service\core\delivery\CoreDeliveryService;
+use core\base\BaseAdminService;
+use core\exception\AdminException;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+/**
+ * 提货点服务层
+ * Class DeliveryStoreService
+ * @package app\service\admin\delivery_store
+ */
+class DeliveryStoreService extends BaseAdminService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new Store();
+    }
+
+    /**
+     * 获取提货点列表
+     * @param array $where
+     * @return array
+     * @throws DbException
+     */
+    public function getPage(array $where = [])
+    {
+        $field = 'store_id,store_no,store_name,store_logo,contact_name,store_mobile,province_id,city_id,district_id,address,full_address,longitude,latitude,trade_time,time_week,trade_time_json,time_interval,support_local_delivery,support_store,status,create_time';
+        $order = 'create_time desc';
+
+        $search_model = $this->model->where([ [ 'store_id', '>', 0 ] ])->withSearch(['store_name', 'pick_up_type', 'create_time'], $where)->field($field)->append([ 'pick_up_type_name' ])->order($order);
+        return $this->pageQuery($search_model);
+    }
+
+    /**
+     * 获取提货点信息
+     * @param int $id
+     * @return array
+     */
+    public function getInfo(int $id)
+    {
+        $field = 'store_id,store_no,store_name,store_logo,contact_name,store_mobile,province_id,city_id,district_id,address,full_address,longitude,latitude,trade_time,time_week,trade_time_json,time_interval,create_time,support_local_delivery,support_store,status,area,time_is_open';
+        $info = $this->model->field($field)->where([ [ 'store_id', '=', $id ] ])->append([ 'pick_up_type_name' ])->findOrEmpty()->toArray();
+        $pick_up_type = [];
+        if ($info[ 'support_local_delivery' ] == 1) {
+            $pick_up_type[] = DeliveryDict::LOCAL_DELIVERY;
+        }
+        if ($info[ 'support_store' ] == 1) {
+            $pick_up_type[] = DeliveryDict::STORE;
+        }
+        $info[ 'pick_up_type' ] = $pick_up_type;
+        if (empty($info[ 'time_interval' ])) $info[ 'time_interval' ] = DeliveryDict::TIME_INTERVAL_30;
+        return $info;
+    }
+
+    public function getInitInfo()
+    {
+        return [
+            'week_list' => DeliveryDict::getWeekList(),
+            'time_interval_list' => DeliveryDict::getTimeIntervalList(),
+            'local_delivery_config' => (new LocalService())->getLocal()
+        ];
+    }
+
+    /**
+     * 添加提货点
+     * @param array $data
+     * @return mixed
+     * @throws \Exception
+     */
+    public function add(array $data)
+    {
+        $data[ 'create_time' ] = time();
+        $data[ 'update_time' ] = time();
+
+        $store_no = create_no();//生成门店编号
+        $data[ 'store_no' ] = $store_no;
+        if (!empty($data['pick_up_type'])) {
+            if (in_array(DeliveryDict::LOCAL_DELIVERY, $data[ 'pick_up_type' ])) {
+                $data[ 'support_local_delivery' ] = 1;
+            } else {
+                $data[ 'support_local_delivery' ] = 0;
+            }
+            if (in_array(DeliveryDict::STORE, $data[ 'pick_up_type' ])) {
+                $data[ 'support_store' ] = 1;
+            } else {
+                $data[ 'support_store' ] = 0;
+            }
+        } else {
+            $data[ 'support_local_delivery' ] = 0;
+            $data[ 'support_store' ] = 0;
+        }
+        unset($data['pick_up_type']);
+        $res = $this->model->create($data);
+        return $res->store_id;
+    }
+
+    /**
+     * 提货点编辑
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function edit(int $id, array $data)
+    {
+        $data[ 'update_time' ] = time();
+        $check = $this->storeCheck($id);
+        $local_delivery_store_count = $check['local_delivery_store_count'];
+        $current_local_delivery_store_count = $check['current_local_delivery_store_count'];
+        $local_delivery_config = $check['local_delivery_config'];
+        $pick_up_store_count = $check['pick_up_store_count'];
+        $current_pick_up_store_count = $check['current_pick_up_store_count'];
+        $pick_up_config = $check['pick_up_config'];
+
+        if ($local_delivery_store_count == 1 && $current_local_delivery_store_count == 1 && !in_array(DeliveryDict::LOCAL_DELIVERY, $data[ 'pick_up_type' ]) && $local_delivery_config['status'] == 1) {
+            throw new AdminException('LOCAL_DELIVERY_OPEN_AT_LEAST_ONE_LOCAL_DELIVERY_STORE');//同城配送已开启，至少需保留一个同城配送门店
+        }
+        if ($pick_up_store_count == 1 && $current_pick_up_store_count == 1 && !in_array(DeliveryDict::STORE, $data[ 'pick_up_type' ]) && $pick_up_config['status'] == 1) {
+            throw new AdminException('STORE_OPEN_AT_LEAST_ONE_PICK_UP_STORE');//门店自提已开启，至少需保留一个自提门店
+        }
+        if (!empty($data['pick_up_type'])) {
+            if (in_array(DeliveryDict::LOCAL_DELIVERY, $data[ 'pick_up_type' ])) {
+                $data[ 'support_local_delivery' ] = 1;
+            } else {
+                $data[ 'support_local_delivery' ] = 0;
+            }
+            if (in_array(DeliveryDict::STORE, $data[ 'pick_up_type' ])) {
+                $data[ 'support_store' ] = 1;
+            } else {
+                $data[ 'support_store' ] = 0;
+            }
+        } else {
+            $data[ 'support_local_delivery' ] = 0;
+            $data[ 'support_store' ] = 0;
+        }
+        unset($data['pick_up_type']);
+        $this->model->where([ [ 'store_id', '=', $id ] ])->update($data);
+        //批量更新服务商门店信息
+        DeliveryShopEditJob::dispatch([ 'id' => $id ]);
+        return true;
+    }
+
+    /**
+     * 删除提货点
+     * @param int $id
+     * @return bool
+     */
+    public function del(int $id)
+    {
+        $check = $this->storeCheck($id);
+        $local_delivery_store_count = $check['local_delivery_store_count'];
+        $current_local_delivery_store_count = $check['current_local_delivery_store_count'];
+        $local_delivery_config = $check['local_delivery_config'];
+        $pick_up_store_count = $check['pick_up_store_count'];
+        $current_pick_up_store_count = $check['current_pick_up_store_count'];
+        $pick_up_config = $check['pick_up_config'];
+
+        if ($local_delivery_store_count == 1 && $current_local_delivery_store_count == 1 && $local_delivery_config['status'] == 1) {
+            throw new AdminException('LOCAL_DELIVERY_OPEN_AT_LEAST_ONE_LOCAL_DELIVERY_STORE');//同城配送已开启，至少需保留一个同城配送门店
+        }
+        if ($pick_up_store_count == 1 && $current_pick_up_store_count == 1 && $pick_up_config['status'] == 1) {
+            throw new AdminException('STORE_OPEN_AT_LEAST_ONE_PICK_UP_STORE');//门店自提已开启，至少需保留一个自提门店
+        }
+
+        $res = $this->model->where([ [ 'store_id', '=', $id ] ])->delete();
+        return $res;
+    }
+
+    /**
+     * 获取提货点列表
+     * @param array $where
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getList(array $where = [])
+    {
+        $field = 'store_id,store_name,contact_name,store_mobile,province_id,city_id,district_id,address,full_address,longitude,latitude,area,trade_time,create_time';
+        $order = 'create_time desc';
+        return $this->model->where([ [ 'status', '=', 1 ] ])->withSearch(['keyword', 'pick_up_type'], $where)->field($field)->order($order)->select()->toArray();
+    }
+
+     /**
+     * 获取提货点提货类型
+     * @return array
+     */
+    public function getPickUpType()
+    {
+        return DeliveryStoreDict::getPickUpType();
+    }
+
+     /**
+     * 修改提货点状态
+     * @param array $data
+     * @return bool
+     */
+    public function modifyStatus(array $data)
+    {
+        $this->model->where([ [ 'store_id', '=', $data[ 'store_id' ] ] ])->update([ 'status' => $data[ 'status' ] ]);
+        return true;
+    }
+
+    /**
+     * 提货点检测
+     * @param int $id
+     * @return array
+     * @throws DbException
+     */
+    public function storeCheck(int $id)
+    {
+        //同城配送门店检测
+        $local_delivery_store_count = $this->model->withSearch([ 'pick_up_type' ], [ 'pick_up_type' => DeliveryDict::LOCAL_DELIVERY ])->count();
+        $current_local_delivery_store_count = $this->model->where([ [ 'store_id', '=', $id ] ])->withSearch([ 'pick_up_type' ], [ 'pick_up_type' => DeliveryDict::LOCAL_DELIVERY ])->count();
+        $local_delivery_config = (new CoreDeliveryService())->getDeliveryConfig()['local_delivery'];
+
+        //自提门店检测
+        $pick_up_store_count = $this->model->withSearch([ 'pick_up_type' ], [ 'pick_up_type' => DeliveryDict::STORE ])->count();
+        $current_pick_up_store_count = $this->model->where([ [ 'store_id', '=', $id ] ])->withSearch([ 'pick_up_type' ], [ 'pick_up_type' => DeliveryDict::STORE ])->count();
+        $pick_up_config = (new CoreDeliveryService())->getDeliveryConfig()['store'];
+        return [
+            'local_delivery_store_count' => $local_delivery_store_count,
+            'current_local_delivery_store_count' => $current_local_delivery_store_count,
+            'local_delivery_config' => $local_delivery_config,
+            'pick_up_store_count' => $pick_up_store_count,
+            'current_pick_up_store_count' => $current_pick_up_store_count,
+            'pick_up_config' => $pick_up_config,
+        ];
+    }
+
+    /**
+     * 修改提货点配送区域
+     * @param int $id
+     * @param array $area_data
+     * @return bool
+     */
+    public function editArea(int $id, array $area_data)
+    {
+        $this->model->where([[ 'store_id', '=', $id ]])->update(['area' => $area_data]);
+        return true;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/admin/goods/GoodsService.php b/niucloud/addon/shop/app/service/admin/goods/GoodsService.php
index f3a7db17c..cdae305fd 100644
--- a/niucloud/addon/shop/app/service/admin/goods/GoodsService.php
+++ b/niucloud/addon/shop/app/service/admin/goods/GoodsService.php
@@ -254,6 +254,11 @@ class GoodsService extends BaseAdminService
                     }
                     if (isset($v[ 'short' ])) {
                         $active_tips[ $goods_id ][ $join_type ][ 'short' ] = $v[ 'short' ];
+                        if(($v['short']['is_need_params']??0) == 1){
+                            $active_tips[ $goods_id ][ $join_type ][ 'jump_url' ] = ($v[ 'short' ]['jump_url'] ?? '')."?active_id=".$join_active[0]['join_id'];
+                        }else{
+                            $active_tips[ $goods_id ][ $join_type ][ 'jump_url' ] = $v[ 'short' ]['jump_url'] ?? '';
+                        }
                         unset($v[ 'short' ]);
                         $active_tips[ $goods_id ][ $join_type ][ 'list' ][] = $v;
                         $active_tips[ $goods_id ][ $join_type ][ 'name' ] .= $v[ 'name' ] . PHP_EOL;
@@ -304,6 +309,8 @@ class GoodsService extends BaseAdminService
                 'goods_type' => $data[ 'goods_type' ],
                 'goods_cover' => $data[ 'goods_cover' ],
                 'goods_image' => $data[ 'goods_image' ],
+                'goods_image_width' => $data[ 'goods_image_width' ] ?? 0,
+                'goods_image_height' => $data[ 'goods_image_height' ] ?? 0,
                 'goods_video' => $data[ 'goods_video' ],
                 'goods_category' => array_map(function ($item) {
                     return (string) $item;
@@ -471,6 +478,8 @@ class GoodsService extends BaseAdminService
                 'goods_type' => $data[ 'goods_type' ],
                 'goods_cover' => $data[ 'goods_cover' ],
                 'goods_image' => $data[ 'goods_image' ],
+                'goods_image_width' => $data[ 'goods_image_width' ] ?? 0,
+                'goods_image_height' => $data[ 'goods_image_height' ] ?? 0,
                 'goods_video' => $data[ 'goods_video' ],
                 'goods_category' => array_map(function ($item) {
                     return (string) $item;
@@ -508,7 +517,7 @@ class GoodsService extends BaseAdminService
                 'update_time' => time()
             ];
 
-            $this->model->where([ [ 'goods_id', '=', $goods_id ]])->update($goods_data);
+            $this->model->where([ [ 'goods_id', '=', $goods_id ] ])->update($goods_data);
             $sku_data = [];
             if ($data[ 'spec_type' ] == 'single') {
                 if (!empty($data[ 'sku_no' ])) {
@@ -817,7 +826,7 @@ class GoodsService extends BaseAdminService
      */
     public function recycle($goods_ids)
     {
-        $res = $this->model->restore([ [ 'goods_id', 'in', $goods_ids ]]);
+        $res = $this->model->restore([ [ 'goods_id', 'in', $goods_ids ] ]);
         return $res;
     }
 
@@ -837,7 +846,7 @@ class GoodsService extends BaseAdminService
      */
     public function editSort($data)
     {
-        return $this->model->where([ [ 'goods_id', '=', $data[ 'goods_id' ] ]])->update([ 'sort' => $data[ 'sort' ] ]);
+        return $this->model->where([ [ 'goods_id', '=', $data[ 'goods_id' ] ] ])->update([ 'sort' => $data[ 'sort' ] ]);
     }
 
     /**
@@ -899,7 +908,7 @@ class GoodsService extends BaseAdminService
             // 查询商品信息
             $field = 'goods_name,sub_title,goods_type,goods_cover,goods_image,goods_video,goods_desc,brand_id,goods_category,label_ids,service_ids,unit,stock,virtual_sale_num,is_limit,limit_type,max_buy,min_buy,status,sort,delivery_type,is_free_shipping,fee_type,delivery_money,delivery_template_id,supplier_id,attr_ids,attr_format,virtual_auto_delivery,virtual_receive_type,virtual_verify_type,virtual_indate,poster_id,form_id';
 
-            $goods_data = $this->model->field($field)->where([ [ 'goods_id', '=', $goods_id ]])->findOrEmpty()->toArray();
+            $goods_data = $this->model->field($field)->where([ [ 'goods_id', '=', $goods_id ] ])->findOrEmpty()->toArray();
             if (empty($goods_data)) {
                 throw new AdminException('SHOP_GOODS_NOT_EXIST');
             }
@@ -982,7 +991,7 @@ class GoodsService extends BaseAdminService
      */
     public function getSelectPage(array $where = [])
     {
-        $field = ' goods_id, goods_name, goods_type, goods_cover,goods_image, stock,sub_title,goods_desc,is_gift';
+        $field = 'goods_id, goods_name, goods_type, goods_cover,goods_image, stock,sub_title,goods_desc,is_gift';
         $order = 'sort desc,create_time desc';
 
         $sku_where = [
@@ -1085,7 +1094,7 @@ class GoodsService extends BaseAdminService
      */
     public function getSelectSku(array $where = [])
     {
-        $field = ' goods_id, goods_name, goods_type, goods_cover, stock,is_gift';
+        $field = 'goods_id, goods_name, goods_type, goods_cover, stock,is_gift';
         $order = 'sort desc,create_time desc';
 
         $select_goods_list = [];// 已选商品列表
@@ -1170,7 +1179,7 @@ class GoodsService extends BaseAdminService
      */
     public function getBuyGoodsSelect(array $where = [])
     {
-        $field = ' goods_id, goods_name, goods_type, goods_cover,goods_image, stock,sub_title,goods_desc,is_limit,limit_type,max_buy,min_buy,member_discount';
+        $field = 'goods_id, goods_name, goods_type, goods_cover,goods_image, stock,sub_title,goods_desc,is_limit,limit_type,max_buy,min_buy,member_discount';
         $order = 'sort desc,create_time desc';
 
         $sku_where = [
@@ -1228,7 +1237,7 @@ class GoodsService extends BaseAdminService
                     $v[ 'member_price' ] = $this->getMemberPrice($member_info, $v[ 'goods' ][ 'member_discount' ], $v[ 'member_price' ], $v[ 'price' ]);
                 }
                 // 限购查询当前会员已购数量
-                $has_buy = ( new CoreGoodsLimitBuyService() )->getGoodsHasBuyNumber( $where[ 'member_id' ], $v[ 'goods_id' ]);
+                $has_buy = ( new CoreGoodsLimitBuyService() )->getGoodsHasBuyNumber($where[ 'member_id' ], $v[ 'goods_id' ]);
                 $v[ 'has_buy' ] = $has_buy;
                 // 满减活动
                 $manjian_info = ( new ManjianService() )->getManjianInfo([ 'goods_id' => $v[ 'goods_id' ], 'sku_id' => $v[ 'sku_id' ], 'member_id' => $where[ 'member_id' ] ]);
@@ -1250,7 +1259,7 @@ class GoodsService extends BaseAdminService
 
         $goods_sku_model = new GoodsSku();
 
-        $info = $goods_sku_model->where([  [ 'sku_id', '=', $data[ 'sku_id' ] ] ])
+        $info = $goods_sku_model->where([ [ 'sku_id', '=', $data[ 'sku_id' ] ] ])
             ->field($field)
             ->with([
                 // 商品主表
@@ -1260,7 +1269,7 @@ class GoodsService extends BaseAdminService
                 },
                 // 商品规格列表
                 'skuList' => function ($query) {
-                    $query->field(' sku_id, sku_name, sku_image, sku_no, goods_id, sku_spec_format, price, market_price, sale_price, stock, weight, volume, is_default,member_price');
+                    $query->field('sku_id, sku_name, sku_image, sku_no, goods_id, sku_spec_format, price, market_price, sale_price, stock, weight, volume, is_default,member_price');
                 },
                 // 商品规格项/规格值列表
                 'goodsSpec' => function ($query) {
@@ -1276,7 +1285,7 @@ class GoodsService extends BaseAdminService
 
             $this->getMemberPriceByList($member_info, $info[ 'goods' ][ 'member_discount' ], $info[ 'skuList' ]);
             // 限购查询当前会员已购数量
-            $has_buy = ( new CoreGoodsLimitBuyService() )->getGoodsHasBuyNumber( $data[ 'member_id' ], $info[ 'goods_id' ]);
+            $has_buy = ( new CoreGoodsLimitBuyService() )->getGoodsHasBuyNumber($data[ 'member_id' ], $info[ 'goods_id' ]);
             $info[ 'has_buy' ] = $has_buy;
             // 满减活动
             $manjian_info = ( new ManjianService() )->getManjianInfo([ 'goods_id' => $info[ 'goods_id' ], 'sku_id' => $info[ 'sku_id' ], 'member_id' => $data[ 'member_id' ] ]);
@@ -1708,7 +1717,7 @@ class GoodsService extends BaseAdminService
                     } else {
                         $query = GoodsSku::alias('goodsSku')
                             ->join(( new Goods() )->getTable() . ' goods', 'goods.goods_id = goodsSku.goods_id')
-                           ->whereIn('goods.goods_id', $goods_ids);
+                            ->whereIn('goods.goods_id', $goods_ids);
                     }
                     $query->update([
                         'goodsSku.stock' => Db::raw("goodsSku.stock + {$update_stock}"),
@@ -1814,8 +1823,7 @@ class GoodsService extends BaseAdminService
     {
         $goods_category = [];
 
-        $category_goods_list = ( new Goods() )->where([
-        ])->withSearch([ 'goods_category' ], [
+        $category_goods_list = ( new Goods() )->withSearch([ 'goods_category' ], [
             'goods_category' => $category_id
         ])->select()->toArray();
         if ($old_pid != 0 && $new_pid == 0) {
diff --git a/niucloud/addon/shop/app/service/admin/goods/VirtualGoodsService.php b/niucloud/addon/shop/app/service/admin/goods/VirtualGoodsService.php
index bab1a93f2..382caaaf8 100644
--- a/niucloud/addon/shop/app/service/admin/goods/VirtualGoodsService.php
+++ b/niucloud/addon/shop/app/service/admin/goods/VirtualGoodsService.php
@@ -214,6 +214,8 @@ class VirtualGoodsService extends BaseAdminService
                 'goods_type' => $data[ 'goods_type' ],
                 'goods_cover' => $data[ 'goods_cover' ],
                 'goods_image' => $data[ 'goods_image' ],
+                'goods_image_width' => $data[ 'goods_image_width' ],
+                'goods_image_height' => $data[ 'goods_image_height' ],
                 'goods_video' => $data[ 'goods_video' ],
                 'goods_category' => array_map(function ($item) {
                     return (string) $item;
@@ -375,6 +377,9 @@ class VirtualGoodsService extends BaseAdminService
                 'goods_type' => $data[ 'goods_type' ],
                 'goods_cover' => $data[ 'goods_cover' ],
                 'goods_image' => $data[ 'goods_image' ],
+                'goods_image_width' => $data[ 'goods_image_width' ],
+                'goods_image_height' => $data[ 'goods_image_height' ],
+
                 'goods_video' => $data[ 'goods_video' ],
                 'goods_category' => array_map(function ($item) {
                     return (string) $item;
diff --git a/niucloud/addon/shop/app/service/admin/local_delivery/config/ConfigService.php b/niucloud/addon/shop/app/service/admin/local_delivery/config/ConfigService.php
new file mode 100644
index 000000000..6937b553e
--- /dev/null
+++ b/niucloud/addon/shop/app/service/admin/local_delivery/config/ConfigService.php
@@ -0,0 +1,44 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\admin\local_delivery\config;
+
+use addon\shop\app\service\core\delivery\CoreConfigService;
+use app\model\sys\SysConfig;
+use core\base\BaseAdminService;
+use think\Model;
+
+/**
+ * 配送配置服务层
+ * Class ConfigService
+ * @package addon\shop\app\service\admin\local_delivery\config
+ */
+class ConfigService extends BaseAdminService
+{
+    /**
+     * 设置配送配置
+     * @param $data
+     * @return SysConfig|bool|Model
+     */
+    public function setConfig($data)
+    {
+        return (new CoreConfigService())->setLocalDeliveryConfig($data);
+    }
+
+    /**
+     * 获取配送配置
+     * @return array
+     */
+    public function getConfig()
+    {
+        return (new CoreConfigService())->getLocalDeliveryConfig();
+    }
+}
diff --git a/niucloud/addon/shop/app/service/admin/local_delivery/config/LocalService.php b/niucloud/addon/shop/app/service/admin/local_delivery/config/LocalService.php
new file mode 100644
index 000000000..77add8dc3
--- /dev/null
+++ b/niucloud/addon/shop/app/service/admin/local_delivery/config/LocalService.php
@@ -0,0 +1,80 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\admin\local_delivery\config;
+
+use addon\shop\app\model\local_delivery\Local;
+use addon\shop\app\service\admin\delivery_store\DeliveryStoreService;
+use core\base\BaseAdminService;
+
+/**
+ * 同城配送服务层
+ * Class LocalService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class LocalService extends BaseAdminService
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * 设置同城配送
+     * @param array $data
+     * @return mixed
+     */
+    public function setLocal(array $data)
+    {
+        (new Local())->where([['local_id', '>', 0]])->delete();
+
+        $create_res = (new Local())->create([
+            'fee_type' => $data['fee_type'],
+            'base_dist' => $data['base_dist'],
+            'base_price' => $data['base_price'],
+            'grad_dist' => $data['grad_dist'],
+            'grad_price' => $data['grad_price'],
+            'weight_start' => $data['weight_start'],
+            'weight_unit' => $data['weight_unit'],
+            'weight_price' => $data['weight_price'],
+
+            'time_is_open' => $data['time_is_open'],
+            'time_type' => $data['time_type'],
+            'time_week' => $data['time_week'],
+            'time_interval' => $data['time_interval'],
+            'advance_day' => 0,
+            'most_day' => 7,
+            'start_time' => $data['start_time'],
+            'end_time' => $data['end_time'],
+            'delivery_time' => $data['delivery_time'],
+            'area' => []
+        ]);
+
+        try {
+            if (!empty($data['area_data'])) {
+                foreach ($data['area_data'] as $store_id => $area) {
+                    (new DeliveryStoreService())->editArea($store_id, $area);
+                }
+            }
+        } catch (\Exception $e) {
+        }
+        return $create_res->local_id;
+    }
+
+    /**
+     * 获取同城配送设置
+     * @return array
+     */
+    public function getLocal($field = 'fee_type,base_dist,base_price,grad_dist,grad_price,weight_start,weight_unit,weight_price')
+    {
+        return (new Local())->where([['local_id', '>', 0]])->field($field)->findOrEmpty()->toArray();
+    }
+}
diff --git a/niucloud/addon/shop/app/service/admin/local_delivery/order/LocalDeliveryOrderService.php b/niucloud/addon/shop/app/service/admin/local_delivery/order/LocalDeliveryOrderService.php
new file mode 100644
index 000000000..a95dad41c
--- /dev/null
+++ b/niucloud/addon/shop/app/service/admin/local_delivery/order/LocalDeliveryOrderService.php
@@ -0,0 +1,118 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\admin\local_delivery\order;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\dict\local_delivery\OrderCancelReasonDict;
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use app\model\sys\SysUser;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderCloseService;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderFinishService;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderService;
+use core\base\BaseAdminService;
+use think\db\exception\DbException;
+
+/**
+ * 本地配送订单服务层
+ * Class LocalDeliveryOrderService
+ * @package app\service\admin\delivery\site
+ */
+class LocalDeliveryOrderService extends BaseAdminService
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrder();
+    }
+
+    /**
+     * 查询本地配送订单列表
+     * @param array $where
+     * @return array
+     * @throws DbException
+     */
+    public function getPage(array $where)
+    {
+        $field = 'id, delivery_service, delivery_no, trade_id, trade_no, trade_type, delivery_money, delivery_start, delivery_start_lng, delivery_start_lat, delivery_end, delivery_end_lng, delivery_end_lat, delivery_distance, status, create_time, remark, body';
+        $search_model = $this->model->where([ ['id', '>', 0] ])->withSearch([ 'delivery_no', 'trade_no', 'status', 'create_time' ], $where)->field($field)->order('create_time desc')->append([ 'delivery_service_name' , 'status_name', 'trade_type_name', 'pre_status_name' ]);
+        return $this->pageQuery($search_model);
+    }
+
+    /**
+     * 查询本地配送订单详情
+     * @return array
+     */
+    public function getInfo(int $id)
+    {
+        $field = 'id, delivery_service, delivery_no, out_delivery_no, trade_id, trade_no, trade_type, delivery_money, delivery_start, delivery_start_lng, delivery_start_lat, delivery_end, delivery_end_lng, delivery_end_lat, delivery_distance, status, create_time, finish_time, cancel_time, rider_name, rider_mobile, remark, body';
+        return $this->model->where([ [ 'id', '=', $id ] ])->field($field)->with(['orderLog'])->append([ 'delivery_service_name' , 'status_name', 'trade_type_name' ])->findOrEmpty()->toArray();
+    }
+
+    /**
+     * 取消订单
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function closeOrder(int $id, array $data)
+    {
+        $data['main_id'] = $this->uid;
+        $data['main_type'] = OrderLogDict::STORE;
+        $data['main_name'] = (new SysUser())->where('uid', $this->uid)->value('username') ?? '';
+        $data['id'] = $id;
+        return (new CoreLocalDeliveryOrderCloseService())->closeOrder($data);
+    }
+
+    /**
+     * 完成订单
+     * @param int $id
+     * @return bool
+     */
+    public function finishOrder(int $id)
+    {
+        $data['main_id'] = $this->uid;
+        $data['main_type'] = OrderLogDict::STORE;
+        $data['main_name'] = (new SysUser())->where('uid', $this->uid)->value('username') ?? '';
+        $data['id'] = $id;
+        return (new CoreLocalDeliveryOrderFinishService())->finishOrder($data);
+    }
+
+    /**
+     * 同步订单信息
+     * @param int $id
+     * @return bool
+     */
+    public function syncOrder(int $id)
+    {
+        return (new CoreLocalDeliveryOrderService())->syncOrder($id);
+    }
+
+    /**
+     * 订单取消原因
+     * @return array
+     */
+    public function getCancelReasonList(string $service)
+    {
+        return OrderCancelReasonDict::getType('', $service);
+    }
+
+    /**
+     * 获取订单状态列表
+     * @return array
+     */
+    public function getOrderStatusList()
+    {
+        return LocalDeliveryStatusDict::getStatus();
+    }
+}
diff --git a/niucloud/addon/shop/app/service/admin/local_delivery/service/LocalDeliveryServiceService.php b/niucloud/addon/shop/app/service/admin/local_delivery/service/LocalDeliveryServiceService.php
new file mode 100644
index 000000000..9614d92c7
--- /dev/null
+++ b/niucloud/addon/shop/app/service/admin/local_delivery/service/LocalDeliveryServiceService.php
@@ -0,0 +1,150 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\admin\local_delivery\service;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryDict;
+use addon\shop\app\model\delivery\Store;
+use addon\shop\app\model\local_delivery\LocalDeliveryService;
+use app\dict\common\CommonDict;
+use core\base\BaseAdminService;
+use core\exception\AdminException;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+/**
+ * 配送服务商服务层
+ * Class LocalDeliveryServiceService
+ * @package app\service\admin\local_delivery\site\service
+ */
+class LocalDeliveryServiceService extends BaseAdminService
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryService();
+    }
+
+    /**
+     * 获取配送服务商列表
+     */
+    public function getList()
+    {
+        $delivery_type_list = LocalDeliveryDict::getType();
+        $list = [];
+        foreach($delivery_type_list as $k => $v)
+        {
+            $info = $this->getConfig($k);
+            $data = [];
+            $data['delivery_type'] = $k;
+            $data['name'] = $v['name'];
+            $data['is_merchant'] = $v['is_merchant'];
+            $data['is_use'] = $info['is_use'];
+            foreach ($v['params'] as $k_param => $v_param)
+            {
+                $data['params'][$k_param] = [
+                    'name' => $v_param,
+                    'value' => $info ? $info['config'][$k_param] ?? '' : ''
+                ];
+            }
+            $data['component'] = $v['component'] ?? '';
+            $list[] = $data;
+        }
+        return $list;
+    }
+
+    /**
+     * 设置服务商配置
+     * @param $delivery_type
+     * @param $data
+     * @return true
+     */
+    public function setConfig($delivery_type, $data)
+    {
+        $delivery_type_list = LocalDeliveryDict::getType();
+        if(!array_key_exists($delivery_type, $delivery_type_list)) throw new AdminException('LOCAL_DELIVERY_TYPE_NOT_EXIST');
+        $db_config = $this->getConfig($delivery_type);
+        $config = [];
+        foreach ($delivery_type_list[$delivery_type]['params'] as $k_param => $v_param)
+        {
+            if ($data[$k_param]  == CommonDict::ENCRYPT_STR){
+                $config[$k_param] = $db_config['params'][$k_param]['value'];
+            }else{
+                $config[$k_param] = $data[$k_param] ?? '';
+            }
+
+        }
+        $third_delivery = $this->model->where([['key', '=', $delivery_type]])->findOrEmpty();
+        if ($third_delivery->isEmpty()) {
+            $this->model->create([
+                'key' => $delivery_type,
+                'name' => $delivery_type_list[$delivery_type]['name'],
+                'config' => $config,
+                'is_use' => $data['is_use'] ?? 0,
+            ]);
+        } else {
+            $third_delivery->save([
+                'config' => $config,
+                'is_use' => $data['is_use'] ?? 0,
+            ]);
+        }
+        return true;
+    }
+
+    /**
+     * 获取服务商配置
+     * @return array
+     */
+    public function getConfig($delivery_type,$is_encrypt = false)
+    {
+        $delivery_type_list = LocalDeliveryDict::getType();
+        if(!array_key_exists($delivery_type, $delivery_type_list)) throw new AdminException('LOCAL_DELIVERY_TYPE_NOT_EXIST');
+        $info = $this->model->where([['key', '=', $delivery_type]])->findOrEmpty()->toArray();
+        $data = [
+            'delivery_type' => $delivery_type,
+            'name' => $delivery_type_list[$delivery_type]['name'],
+            'is_merchant' => $delivery_type_list[$delivery_type]['is_merchant'],
+            'is_use' => $info ? $info['is_use'] : ($delivery_type_list[$delivery_type]['is_merchant'] ? 1 : 0)
+        ];
+        foreach ($delivery_type_list[$delivery_type]['params'] as $k_param => $v_param)
+        {
+            $data['params'][$k_param] = [
+                'name' => $v_param,
+                'value' => $info ? ($is_encrypt ? CommonDict::ENCRYPT_STR :$info['config'][$k_param]) ?? '' : ''
+            ];
+        }
+        return $data;
+    }
+
+    /**
+     * 获取已启用配送服务商列表
+     * @param array $data
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getInUseList(array $data)
+    {
+        $support_delivery_list = (new Store())->where([['store_id', '=', $data['store_id']], ['status', '=', 1]])->value('support_delivery') ?? [];
+        $list = $this->model->field('key,name')->where([['is_use', '=', 1]])->select()->toArray();
+        foreach ($list as &$v) {
+            if (in_array($v['key'], array_keys($support_delivery_list))) {
+                $v['open_status'] = $support_delivery_list[$v['key']]['open_status'];
+            } else {
+                $v['open_status'] = LocalDeliveryDict::OPEN_REFUND;
+            }
+        }
+        return $list;
+    }
+}
diff --git a/niucloud/addon/shop/app/service/admin/marketing/DiscountService.php b/niucloud/addon/shop/app/service/admin/marketing/DiscountService.php
index a457c336f..c21eb8ca1 100644
--- a/niucloud/addon/shop/app/service/admin/marketing/DiscountService.php
+++ b/niucloud/addon/shop/app/service/admin/marketing/DiscountService.php
@@ -64,10 +64,7 @@ class DiscountService extends BaseAdminService
      */
     public function getInfo(int $discount_id)
     {
-        $info = $this->model->field('discount_id,name,remark,start_time,end_time,status,create_time,order_money,order_num,member_num,success_num')
-            ->where([ [ 'discount_id', '=', $discount_id ]])
-            ->append([ 'status_name' ])
-            ->findOrEmpty()->toArray();
+        $info = $this->model->field('discount_id,name,remark,start_time,end_time,status,create_time,order_money,order_num,member_num,success_num')->where([ [ 'discount_id', '=', $discount_id ] ])->append([ 'status_name' ])->findOrEmpty()->toArray();
         return $info;
     }
 
@@ -81,7 +78,7 @@ class DiscountService extends BaseAdminService
         $info = $this->model->where([ [ 'discount_id', '=', $discount_id ] ])->append([ 'status_name' ])->findOrEmpty()->toArray();
         $active_goods = ( new DiscountGoods() )
             ->field('discount_goods_id,discount_id,goods_id,sku_id,type,rate,reduce_money,discount_price,is_enabled')
-            ->where([  [ 'discount_id', '=', $discount_id ] ])
+            ->where([ [ 'discount_id', '=', $discount_id ] ])
             ->withJoin([ 'goods'  => function($query){
                 $query->field('goods.goods_id,goods_name,goods_cover,goods_type');
             },'goodsSku' => function($query){
@@ -286,7 +283,7 @@ class DiscountService extends BaseAdminService
             $status = DiscountDict::END;
         }
 
-        $active_goods_data = $discount_goods_model->where([ [ 'discount_id', '=', $discount_id]])->select()->toArray();
+        $active_goods_data = $discount_goods_model->where([[ 'discount_id', '=', $discount_id]])->select()->toArray();
         $active_goods_ids = array_unique(array_column($active_goods_data,'goods_id'));
         $discount_goods = [];
         foreach ($goods_list as $k=>$v){
@@ -314,15 +311,15 @@ class DiscountService extends BaseAdminService
             $this->model->where([ [ 'discount_id', '=', $discount_id]])->update($data);
 
             foreach ($discount_goods as $v){
-                $discount_goods_info = $discount_goods_model->where([ [ 'discount_id', '=', $v['discount_id']], [ 'goods_id', '=', $v['goods_id']], [ 'sku_id', '=', $v['sku_id']]])->findOrEmpty();
+                $discount_goods_info = $discount_goods_model->where([[ 'discount_id', '=', $v['discount_id']], [ 'goods_id', '=', $v['goods_id']], [ 'sku_id', '=', $v['sku_id']]])->findOrEmpty();
                 if($discount_goods_info->isEmpty()){
                     $discount_goods_model->create($v);
                 }else{
-                    $discount_goods_model->where([ [ 'discount_id', '=', $v['discount_id']], [ 'goods_id', '=', $v['goods_id']], [ 'sku_id', '=', $v['sku_id']]])->update($v);
+                    $discount_goods_model->where([[ 'discount_id', '=', $v['discount_id']], [ 'goods_id', '=', $v['goods_id']], [ 'sku_id', '=', $v['sku_id']]])->update($v);
                 }
             }
 
-            $discount_goods_model->where([ [ 'goods_id', 'in', $delete_goods_ids], [ 'discount_id', '=', $discount_id]])->delete();
+            $discount_goods_model->where([[ 'goods_id', 'in', $delete_goods_ids], [ 'discount_id', '=', $discount_id]])->delete();
 
             if (!empty($data[ 'start_time' ]) && $data[ 'start_time' ] <= $time) {
                 $this->discountStartAfter($discount_id);
@@ -355,7 +352,7 @@ class DiscountService extends BaseAdminService
             ->where([ [ 'discount_goods.discount_goods_id', '>', 0 ] ])
             ->withJoin([
                 'discount' => function(Query $query) use ($data) {
-                    $query->where([  [ 'discount.status', 'in', [ DiscountDict::NOT_ACTIVE, DiscountDict::ACTIVE ] ] ])->where(function($query) use ($data) {
+                    $query->where([ [ 'discount.status', 'in', [ DiscountDict::NOT_ACTIVE, DiscountDict::ACTIVE ] ] ])->where(function($query) use ($data) {
                         $query->whereOr([ [ 'discount.start_time|discount.end_time', 'between', [ strtotime($data[ 'start_time' ]), strtotime($data[ 'end_time' ]) ] ],
                             [ [ 'discount.start_time', '<=', strtotime($data[ 'start_time' ]) ], [ 'discount.end_time', '>=', strtotime($data[ 'end_time' ]) ] ],
                             [ [ 'discount.start_time', '>=', strtotime($data[ 'start_time' ]) ], [ 'discount.end_time', '<=', strtotime($data[ 'end_time' ]) ] ] ]);
@@ -424,7 +421,7 @@ class DiscountService extends BaseAdminService
      */
     public function del(int $discount_id)
     {
-        $info = $this->model->where([  ['discount_id', '=', $discount_id] ])->findOrEmpty();
+        $info = $this->model->where([ ['discount_id', '=', $discount_id] ])->findOrEmpty();
         if ($info->isEmpty()) throw new AdminException('ACTIVE_NOT_FOUND');
         if ($info->status == DiscountDict::ACTIVE) throw new AdminException('ACTIVE_NOT_DELETE');
         $this->model->where([ [ 'discount_id', '=', $discount_id ] ])->delete();
@@ -439,7 +436,7 @@ class DiscountService extends BaseAdminService
      */
     public function batchDel($ids)
     {
-        $discount_list = $this->model->where([  [ 'discount_id', 'in', $ids ] ])->select()->toArray();
+        $discount_list = $this->model->where([ [ 'discount_id', 'in', $ids ] ])->select()->toArray();
         foreach ($discount_list as $value){
             if ($value[ 'status' ] == DiscountDict::ACTIVE) throw new AdminException('ACTIVE_NOT_DELETE');
         }
@@ -475,8 +472,8 @@ class DiscountService extends BaseAdminService
 
         Db::startTrans();
         try {
-            $this->model->where([  ['discount_id', 'in', $ids], ['status', '=', DiscountDict::ACTIVE] ])->update([ 'status' => DiscountDict::CLOSE ]);
-            $discount_goods_model->where([  ['discount_id', 'in', $ids]])->update([ 'status' => DiscountDict::CLOSE ]);
+            $this->model->where([ ['discount_id', 'in', $ids], ['status', '=', DiscountDict::ACTIVE] ])->update([ 'status' => DiscountDict::CLOSE ]);
+            $discount_goods_model->where([ ['discount_id', 'in', $ids]])->update([ 'status' => DiscountDict::CLOSE ]);
             $shop_goods_model->where([ [ 'goods_id', 'in', $discount_goods_ids ] ])->update([ 'is_discount' => 0 ]);
             $shop_goods_sku_model->where([ [ 'goods_id', 'in', $discount_goods_ids ] ])->update([ 'sale_price' => Db::raw('price') ]);
             Db::commit();
diff --git a/niucloud/addon/shop/app/service/admin/marketing/pointexchange/ExchangeService.php b/niucloud/addon/shop/app/service/admin/marketing/pointexchange/ExchangeService.php
index 3b443112a..6875574e7 100644
--- a/niucloud/addon/shop/app/service/admin/marketing/pointexchange/ExchangeService.php
+++ b/niucloud/addon/shop/app/service/admin/marketing/pointexchange/ExchangeService.php
@@ -49,7 +49,7 @@ class ExchangeService extends BaseAdminService
     {
         $field = 'total_exchange_num,stock,id,type,names,title,image,status,product_detail,point,price,limit_num,content,sort,total_point_num,total_price_num,total_order_num,total_member_num,update_time,create_time';
         $order = 'id desc';
-        $search_model = $this->model->where([ [ 'id', '>', 0 ] ])->withSearch([ 'names', 'status', 'create_time' ], $where)->append([ 'type_name', 'status_name', 'goods_cover_thumb_small' ])->field($field)->order($order);
+        $search_model = $this->model->where([ [ 'id', '>', 0 ] ])->withSearch([ 'names', 'status', 'create_time', 'active_id' ], $where)->append([ 'type_name', 'status_name', 'goods_cover_thumb_small' ])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
diff --git a/niucloud/addon/shop/app/service/admin/order/OrderDeliveryService.php b/niucloud/addon/shop/app/service/admin/order/OrderDeliveryService.php
index 1d17efb8c..d70facd29 100644
--- a/niucloud/addon/shop/app/service/admin/order/OrderDeliveryService.php
+++ b/niucloud/addon/shop/app/service/admin/order/OrderDeliveryService.php
@@ -16,7 +16,11 @@ use addon\shop\app\dict\order\OrderLogDict;
 use addon\shop\app\model\order\OrderDelivery;
 use addon\shop\app\service\core\order\CoreOrderDeliveryService;
 use addon\shop\app\service\core\order\CoreOrderService;
+use app\model\sys\SysUser;
 use core\base\BaseAdminService;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 /**
  *  订单配送服务层
@@ -38,6 +42,7 @@ class OrderDeliveryService extends BaseAdminService
     {
         $data[ 'main_type' ] = OrderLogDict::STORE;
         $data[ 'main_id' ] = $this->uid;
+        $data[ 'main_name' ] = (new SysUser())->where('uid', $this->uid)->value('username') ?? '';
         ( new CoreOrderDeliveryService() )->delivery($data);
         return true;
     }
@@ -86,4 +91,17 @@ class OrderDeliveryService extends BaseAdminService
         }
         return $info;
     }
+
+    /**
+     * 配送费用计算
+     * @param $data
+     * @return array|mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getDeliveryFee($data)
+    {
+        return ( new CoreOrderDeliveryService() )->getDeliveryFee($data);
+    }
 }
diff --git a/niucloud/addon/shop/app/service/admin/order/OrderService.php b/niucloud/addon/shop/app/service/admin/order/OrderService.php
index 43370d770..9e4b68bd5 100644
--- a/niucloud/addon/shop/app/service/admin/order/OrderService.php
+++ b/niucloud/addon/shop/app/service/admin/order/OrderService.php
@@ -16,17 +16,16 @@ use addon\shop\app\dict\order\OrderDeliveryDict;
 use addon\shop\app\dict\order\OrderDict;
 use addon\shop\app\dict\order\OrderGoodsDict;
 use addon\shop\app\dict\order\OrderLogDict;
-use addon\shop\app\model\delivery\Local;
 use addon\shop\app\model\delivery\Store;
+use addon\shop\app\model\goods\GoodsSku;
+use addon\shop\app\model\local_delivery\Local;
 use addon\shop\app\model\order\Order;
 use addon\shop\app\model\order\OrderDelivery;
 use addon\shop\app\model\order\OrderGoods;
 use addon\shop\app\model\order\OrderRefund;
-use addon\shop\app\model\ShopStat;
 use addon\shop\app\service\admin\delivery\DeliveryService;
 use addon\shop\app\service\core\CoreStatService;
-use addon\shop\app\service\core\delivery\CoreLocalDeliveryService;
-use addon\shop\app\service\core\delivery\third_delivery\ThirdDeliveryLoader;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryService;
 use addon\shop\app\service\core\goods\CoreGoodsStatService;
 use addon\shop\app\service\core\order\CoreOrderEventService;
 use addon\shop\app\service\core\order\CoreOrderPayService;
@@ -80,6 +79,7 @@ class OrderService extends BaseAdminService
                 $pay_where[] = ['pay.type', '=', $where['pay_type']];
             }
         }
+
         $member_where = [];
         if ($where['keyword'] != '') {
             $member_where = [
@@ -102,12 +102,12 @@ class OrderService extends BaseAdminService
             ->with([
                 'order_goods' => function ($query) {
                     $query->with(['delivery_info' => function ($query) {
-                        $query->field('*')->append(['express_company_name']);
+                        $query->field('*')->with(['localDeliveryOrder'])->append(['express_company_name']);
                     }])
                         ->field('extend,order_goods_id, order_id, member_id, goods_id, sku_id, goods_name, sku_name, goods_image, sku_image, price, num, goods_money, is_enable_refund, goods_type, delivery_status, status,discount_money,delivery_id,is_gift')
                         ->append(['delivery_status_name', 'status_name', 'goods_image_thumb_small', 'impulse_buy_info']);
                 }
-            ])->order($order)->append(['order_from_name', 'order_type_name', 'status_name', 'delivery_type_name','activity_type_name']);
+            ])->order($order)->append(['order_from_name', 'order_type_name', 'status_name', 'delivery_type_name']);
         $order_status_list = OrderDict::getStatus();
         $order_close_list = OrderDict::getCloseType();
         $list = $this->pageQuery($search_model, function ($item, $key) use ($order_status_list, $order_close_list) {
@@ -199,20 +199,14 @@ class OrderService extends BaseAdminService
         if ($info['delivery_type'] == DeliveryDict::EXPRESS || $info['delivery_type'] == DeliveryDict::LOCAL_DELIVERY) {
             $info['order_delivery'] = (new OrderDelivery())
                 ->where([['order_id', '=', $info['order_id']]])
-                ->field('id, order_id, name, delivery_type, sub_delivery_type,express_company_id, express_number, create_time,third_delivery')
+                ->field('id, order_id, name, delivery_type, sub_delivery_type,express_company_id, express_number, create_time,third_delivery,local_delivery_order_id')
                 ->append(['third_delivery_name'])
                 ->select()->toArray();
             if ($info['delivery_type'] == DeliveryDict::LOCAL_DELIVERY) {
-                $third_party_config = (new CoreLocalDeliveryService())->getConfig();
-                foreach ($info['order_delivery'] as $k => $item) {
-                    if (!empty($item['third_delivery'])) {
-                        $third_delivery = $item['third_delivery'];
-                        $loader = new ThirdDeliveryLoader($third_delivery, $third_party_config[$third_delivery]);
-                        //三方配送下单
-                        $info['order_delivery'][$k]['third_delivery_info'] = $loader->queryOrderInfo([
-                            'order_no' => $info['order_no']
-                        ]);
-                    }
+                if (!empty($info['order_delivery'])) {
+                    $local_delivery_order_id = $info['order_delivery'][0]['local_delivery_order_id'];
+                    $local_delivery_order_info = (new CoreLocalDeliveryService()) ->getLocalDeliveryOrderInfo($local_delivery_order_id);
+                    $info = array_merge($info, $local_delivery_order_info);
                 }
             }
         }
@@ -317,10 +311,10 @@ class OrderService extends BaseAdminService
             "refund_order" => 0, //退款中（订单项）
         ];
 
-        $data['wait_pay_order'] = $this->model->where([ ['status', '=', OrderDict::WAIT_PAY]])->count();
-        $data['wait_delivery_order'] = $this->model->where([ ['status', '=', OrderDict::WAIT_DELIVERY]])->count();
-        $data['wait_take_order'] = $this->model->where([ ['status', '=', OrderDict::WAIT_TAKE]])->count();
-        $data['refund_order'] = (new OrderGoods())->where([ ['status', '=', OrderGoodsDict::REFUNDING]])->count();
+        $data['wait_pay_order'] = $this->model->where([['status', '=', OrderDict::WAIT_PAY]])->count();
+        $data['wait_delivery_order'] = $this->model->where([['status', '=', OrderDict::WAIT_DELIVERY]])->count();
+        $data['wait_take_order'] = $this->model->where([['status', '=', OrderDict::WAIT_TAKE]])->count();
+        $data['refund_order'] = (new OrderGoods())->where([['status', '=', OrderGoodsDict::REFUNDING]])->count();
 
         return $data;
     }
@@ -404,7 +398,7 @@ class OrderService extends BaseAdminService
             //订单改价后操作
             CoreOrderEventService::orderEditPriceAfter($order_param);
             if ($order_money == 0) {
-                (new CoreOrderPayService())->pay([ 'trade_id' => $order_id, 'main_type' => OrderLogDict::SYSTEM, 'main_id' => $this->uid]);
+                (new CoreOrderPayService())->pay(['trade_id' => $order_id, 'main_type' => OrderLogDict::SYSTEM, 'main_id' => $this->uid]);
             }
             Db::commit();
             return true;
@@ -523,7 +517,7 @@ class OrderService extends BaseAdminService
      */
     public function checkLocationInArea($order, $data)
     {
-        $local = (new Local())->where([ [ 'local_id', '>', 0 ] ])->field('fee_type,base_dist,base_price,grad_dist,grad_price,weight_start,weight_unit,weight_price,delivery_type,area,center')->findOrEmpty();
+        $local = (new Local())->where([['local_id', '>', 0]])->field('fee_type,base_dist,base_price,grad_dist,grad_price,weight_start,weight_unit,weight_price,delivery_type,area,center')->findOrEmpty();
         if ($local->isEmpty()) {
             $order['error_code'] = -1;
             $order['error_msg'] = get_lang('NOT_CONFIGURED_LOCAL_DELIVERY');
@@ -573,6 +567,21 @@ class OrderService extends BaseAdminService
         return $order_from_list;
     }
 
+    /**
+     * 获取已选商品总重量
+     * @param $data
+     * @return float|int|mixed
+     */
+    public function getSelectOrderGoodsWeight($data)
+    {
+        $sku_ids = (new OrderGoods())->where([['order_goods_id', 'in', $data[ 'order_goods_ids' ]] ])->column('num', 'sku_id');
+        $weight = 0;
+        foreach ($sku_ids as $sku_id => $value) {
+            $weight += (new GoodsSku())->where([['sku_id', '=', $sku_id] ])->value('weight') ?? 0 * $value['num'];
+        }
+        return max($weight, 1);
+    }
+
     /**
      * 待确定删除逻辑之后再细化
      * @param $order_ids
@@ -584,7 +593,7 @@ class OrderService extends BaseAdminService
         if (empty($order_ids)) throw new AdminException('SHOP_ORDER_NOT_FOUND');
 
         $status_list = $this->model->field('order_id, status,order_no,create_time')->whereIn('order_id', $order_ids)->with(['orderGoods' => function ($query) {
-            $query->field(' order_id, goods_id');
+            $query->field('order_id, goods_id');
         }])->select()->toArray();
 
         $error_order_str = '';
@@ -615,7 +624,7 @@ class OrderService extends BaseAdminService
 
             //删除订单退款
             (new OrderRefund())::destroy(function ($query) use ($order_ids) {
-                $query->where([ [ 'order_id', 'in', $order_ids ]]);
+                $query->where([ [ 'order_id', 'in', $order_ids ] ]);
             });
 
             //删除统计
@@ -624,7 +633,7 @@ class OrderService extends BaseAdminService
                     foreach ($value['orderGoods'] as $v) {
                         CoreGoodsStatService::decStat(['goods_id' => $v['goods_id'], 'time' => $value['create_time'], 'sale_num' => 1]);
                     }
-                    CoreStatService::decStat([ 'time' => $value['create_time'], 'order_num' => 1]);
+                    CoreStatService::decStat(['time' => $value['create_time'], 'order_num' => 1]);
                 }
             }
 
diff --git a/niucloud/addon/shop/app/service/admin/delivery/DeliverService.php b/niucloud/addon/shop/app/service/admin/shop_delivery/deliver/DeliverService.php
similarity index 73%
rename from niucloud/addon/shop/app/service/admin/delivery/DeliverService.php
rename to niucloud/addon/shop/app/service/admin/shop_delivery/deliver/DeliverService.php
index 96e6a16c9..5049f92cd 100644
--- a/niucloud/addon/shop/app/service/admin/delivery/DeliverService.php
+++ b/niucloud/addon/shop/app/service/admin/shop_delivery/deliver/DeliverService.php
@@ -9,10 +9,13 @@
 // | Author: Niucloud Team
 // +----------------------------------------------------------------------
 
-namespace addon\shop\app\service\admin\delivery;
+namespace addon\shop\app\service\admin\shop_delivery\deliver;
 
-use addon\shop\app\model\delivery\Deliver;
+use addon\shop\app\model\shop_delivery\Deliver;
 use core\base\BaseAdminService;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
 
 
 /**
@@ -29,20 +32,36 @@ class DeliverService extends BaseAdminService
     }
 
     /**
-     * 获取配送员列表
+     * 获取配送员分页列表
      * @param array $where
      * @return array
+     * @throws DbException
      */
     public function getPage(array $where = [])
     {
         $field = 'deliver_id,deliver_name,deliver_mobile';
         $order = 'deliver_id desc';
 
-        $search_model = $this->model->where([['deliver_id', '>', 0] ])->withSearch(["deliver_name", "deliver_mobile"], $where)->field($field)->order($order);
+        $search_model = $this->model->where([['deliver_id', '>', 0] ])->withSearch(['deliver_name', 'deliver_mobile'], $where)->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
 
+    /**
+     * 获取配送员列表
+     * @param array $where
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getList(array $where = [])
+    {
+        $field = 'deliver_id,deliver_name,deliver_mobile';
+        $order = 'deliver_id desc';
+        return $this->model->where([['deliver_id', '>', 0]])->withSearch(['deliver_name', 'deliver_mobile'], $where)->field($field)->order($order)->select()->toArray();
+    }
+
     /**
      * 获取详情
      * @param int $id
diff --git a/niucloud/addon/shop/app/service/admin/shop_delivery/order/ShopDeliveryOrderService.php b/niucloud/addon/shop/app/service/admin/shop_delivery/order/ShopDeliveryOrderService.php
new file mode 100644
index 000000000..1797e2d83
--- /dev/null
+++ b/niucloud/addon/shop/app/service/admin/shop_delivery/order/ShopDeliveryOrderService.php
@@ -0,0 +1,97 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\admin\shop_delivery\order;
+
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryStatusDict;
+use addon\shop\app\model\shop_delivery\ShopDeliveryOrder;
+use app\model\sys\SysUser;
+use addon\shop\app\service\core\shop_delivery\CoreShopDeliveryOrderCloseService;
+use addon\shop\app\service\core\shop_delivery\CoreShopDeliveryOrderFinishService;
+use core\base\BaseAdminService;
+use think\db\exception\DbException;
+
+/**
+ * 商家配送订单服务层
+ * Class ShopDeliveryOrderService
+ * @package app\service\admin\delivery\site
+ */
+class ShopDeliveryOrderService extends BaseAdminService
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new ShopDeliveryOrder();
+    }
+
+    /**
+     * 查询商家配送订单列表
+     * @param array $where
+     * @return array
+     * @throws DbException
+     */
+    public function getPage(array $where)
+    {
+        $field = 'id, delivery_no, out_delivery_no, trade_id, trade_no, trade_type, delivery_money, delivery_start, delivery_start_lng, delivery_start_lat, delivery_end, delivery_end_lng, delivery_end_lat, delivery_distance, status, create_time, remark, body';
+        $search_model = $this->model->withSearch([ 'delivery_no', 'trade_no', 'status', 'create_time' ], $where)->field($field)->order('create_time desc')->append([ 'delivery_service_name' , 'status_name', 'trade_type_name', 'pre_status_name' ]);
+        return $this->pageQuery($search_model);
+    }
+
+    /**
+     * 查询商家配送订单详情
+     * @return array
+     */
+    public function getInfo(int $id)
+    {
+        $field = 'id, delivery_no, out_delivery_no, trade_id, trade_no, trade_type, delivery_money, delivery_start, delivery_start_lng, delivery_start_lat, delivery_end, delivery_end_lng, delivery_end_lat, delivery_distance, status, create_time, finish_time, cancel_time, deliver_id, remark, body';
+        return $this->model->where([ [ 'id', '=', $id ] ])->field($field)->with([ 'deliver', 'orderLog' ])->append([ 'delivery_service_name' , 'status_name', 'trade_type_name' ])->findOrEmpty()->toArray();
+    }
+
+    /**
+     * 取消订单
+     * @param int $id
+     * @param array $data
+     * @return bool
+     */
+    public function closeOrder(int $id, array $data)
+    {
+        $data['id'] = $id;
+        $data['main_id'] = $this->uid;
+        $data['main_type'] = OrderLogDict::STORE;
+        $data['main_name'] = (new SysUser())->where('uid', $this->uid)->value('username') ?? '';
+        return (new CoreShopDeliveryOrderCloseService())->closeOrder($data);
+    }
+
+    /**
+     * 完成订单
+     * @param int $id
+     * @return bool
+     */
+    public function finishOrder(int $id)
+    {
+        $data['id'] = $id;
+        $data['main_id'] = $this->uid;
+        $data['main_type'] = OrderLogDict::STORE;
+        $data['main_name'] = (new SysUser())->where('uid', $this->uid)->value('username') ?? '';
+        return (new CoreShopDeliveryOrderFinishService())->finishOrder($data);
+    }
+
+    /**
+     * 获取订单状态列表
+     * @return array
+     */
+    public function getOrderStatusList()
+    {
+        return ShopDeliveryStatusDict::getStatus();
+    }
+}
diff --git a/niucloud/addon/shop/app/service/api/delivery/OrderService.php b/niucloud/addon/shop/app/service/api/delivery/OrderService.php
new file mode 100644
index 000000000..aea04bc59
--- /dev/null
+++ b/niucloud/addon/shop/app/service/api/delivery/OrderService.php
@@ -0,0 +1,39 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\api\delivery;
+
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderService;
+use core\base\BaseApiService;
+
+/**
+ * 配送订单服务层
+ * Class OrderService
+ * @package addon\shop\app\service\api\delivery
+ */
+class OrderService extends BaseApiService
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+    }
+
+    /**
+     *  获取同城配送订单轨迹
+     * @param $data
+     * @return array|array[]
+     */
+    public function getTrackOfLocalDeliveryOrder($data){
+        $data['member_id'] = $this->member_id;
+        return (new CoreLocalDeliveryOrderService())->getTrackInfo($data);
+    }
+}
diff --git a/niucloud/addon/shop/app/service/api/goods/EvaluateService.php b/niucloud/addon/shop/app/service/api/goods/EvaluateService.php
index aaccddfc1..1385bcc10 100644
--- a/niucloud/addon/shop/app/service/api/goods/EvaluateService.php
+++ b/niucloud/addon/shop/app/service/api/goods/EvaluateService.php
@@ -125,7 +125,7 @@ class EvaluateService extends BaseApiService
     {
         $field = 'evaluate_id,order_id,order_goods_id,goods_id,member_id,member_name,member_head,content,images,is_anonymous,scores,is_audit,explain_first,create_time';
         $list = $this->model->field($field)->where([ [ 'order_id', '=', $order_id ] ])->with([
-            'order_goods' => function($query) {
+            'order_goods' => function ($query) {
                 $query->field('order_goods_id, goods_name, sku_name, goods_image, num, price')->append([ 'goods_image_thumb_mid' ]);
             }
         ])->append([ 'image_mid', 'image_big' ])->select()->toArray();
diff --git a/niucloud/addon/shop/app/service/api/goods/GoodsService.php b/niucloud/addon/shop/app/service/api/goods/GoodsService.php
index 2c9b19a66..ad992d68a 100644
--- a/niucloud/addon/shop/app/service/api/goods/GoodsService.php
+++ b/niucloud/addon/shop/app/service/api/goods/GoodsService.php
@@ -116,7 +116,7 @@ class GoodsService extends BaseApiService
         foreach ($list[ 'data' ] as $k => &$v) {
             if (!empty($v[ 'goodsSku' ])) {
                 $v[ 'goodsSku' ][ 'member_discount' ] = $v[ 'member_discount' ];
-                $list_show_price = $goods_active_price_service->getShowPrice($v[ 'goodsSku' ],$this->member_id);
+                $list_show_price = $goods_active_price_service->getShowPrice($v[ 'goodsSku' ], $this->member_id);
                 $v[ 'goodsSku' ][ 'show_price' ] = $list_show_price[ 'show_price' ];
                 $v[ 'goodsSku' ][ 'show_type' ] = $list_show_price[ 'show_type' ];
             }
@@ -185,7 +185,7 @@ class GoodsService extends BaseApiService
         $sku_id = $data[ 'sku_id' ];
         $goods_id = $data[ 'goods_id' ];
         if (!empty($goods_id)) {
-            $goods_info = ( new Goods() )->where([[ 'goods_id', '=', $goods_id ], [ 'delete_time', '=', 0 ] ])->count();
+            $goods_info = ( new Goods() )->where([ [ 'goods_id', '=', $goods_id ], [ 'delete_time', '=', 0 ] ])->count();
             if (empty($goods_info)) throw new CommonException('SHOP_GOODS_NOT_EXIST');//商品不存在
         }
 
@@ -206,7 +206,7 @@ class GoodsService extends BaseApiService
             ->field($field)
             ->with([
                 'goods' => function ($query) {
-                    $query->withField('goods_id, goods_name, goods_type, sub_title, goods_cover, goods_category, goods_image,goods_video,goods_desc,brand_id,label_ids,service_ids, unit, stock, sale_num + virtual_sale_num as sale_num, is_limit,limit_type,max_buy,min_buy,status,delivery_type,attr_ids,attr_format,member_discount,is_discount,poster_id,virtual_receive_type,is_gift,form_id,diy_detail_id')
+                    $query->withField('goods_id, goods_image_width,goods_image_height, goods_name,goods_type, sub_title, goods_cover, goods_category, goods_image,goods_video,goods_desc,brand_id,label_ids,service_ids, unit, stock, sale_num + virtual_sale_num as sale_num, is_limit,limit_type,max_buy,min_buy,status,delivery_type,attr_ids,attr_format,member_discount,is_discount,poster_id,virtual_receive_type,is_gift,form_id,diy_detail_id')
                         ->append([ 'goods_type_name', 'goods_cover_thumb_mid', 'delivery_type_list', 'goods_image_thumb_small', 'goods_image_thumb_mid', 'goods_image_thumb_big', 'goods_brand' ]);
                 },
                 // 商品规格列表
@@ -226,7 +226,7 @@ class GoodsService extends BaseApiService
             $goods_active_price_service = ( new CoreGoodsActivePriceService() );
             //获取展示信息（价格 标签）
             $info[ 'member_discount' ] = $info[ 'goods' ][ 'member_discount' ] ?? '';
-            $detail_show_price = $goods_active_price_service->getShowPrice($info,  $this->member_id);
+            $detail_show_price = $goods_active_price_service->getShowPrice($info, $this->member_id);
             $info[ 'show_price' ] = $detail_show_price[ 'show_price' ];
             $info[ 'show_type' ] = $detail_show_price[ 'show_type' ];
             //组装数据
@@ -234,7 +234,7 @@ class GoodsService extends BaseApiService
                 foreach ($info[ 'skuList' ] as &$value) {
                     $value[ 'type' ] = $data[ 'type' ] ?? '';
                     $value[ 'member_discount' ] = $info[ 'goods' ][ 'member_discount' ] ?? '';
-                    $list_show_price = $goods_active_price_service->getShowPrice($value,  $this->member_id);
+                    $list_show_price = $goods_active_price_service->getShowPrice($value, $this->member_id);
                     $value[ 'show_price' ] = $list_show_price[ 'show_price' ];
                     $value[ 'show_type' ] = $list_show_price[ 'show_type' ];
                 }
@@ -287,7 +287,7 @@ class GoodsService extends BaseApiService
             if (!empty($this->member_id)) {
                 $info[ 'goods' ][ 'is_collect' ] = $this->getGoodsIsCollect($info[ 'goods_id' ]);
                 // 限购查询当前会员已购数量
-                $has_buy = ( new CoreGoodsLimitBuyService() )->getGoodsHasBuyNumber( $this->member_id, $info[ 'goods' ][ 'goods_id' ]);
+                $has_buy = ( new CoreGoodsLimitBuyService() )->getGoodsHasBuyNumber($this->member_id, $info[ 'goods' ][ 'goods_id' ]);
                 $info[ 'goods' ][ 'has_buy' ] = $has_buy;
             } else {
                 $info[ 'goods' ][ 'has_buy' ] = 0;
@@ -305,7 +305,7 @@ class GoodsService extends BaseApiService
             $info[ 'evaluate_is_show' ] = $evaluate_config[ 'evaluate_is_show' ];
 
             // 商品统计-浏览次数
-            CoreGoodsStatService::addStat([  'goods_id' => $info[ 'goods' ][ 'goods_id' ], 'access_num' => 1 ]);
+            CoreGoodsStatService::addStat([ 'goods_id' => $info[ 'goods' ][ 'goods_id' ], 'access_num' => 1 ]);
             ( new CoreGoodsAccessNumService() )->inc([ 'goods_id' => $info[ 'goods' ][ 'goods_id' ], 'access_num' => 1 ]);
 
             // 种草秀数据查询
@@ -316,12 +316,7 @@ class GoodsService extends BaseApiService
 
             //获取商品主图第一张图片宽高
             $first_goods_image = explode(',',$info['goods']['goods_image'])[0] ?? '';
-            $info['goods']['image_size'] = ['width' => '', 'height' => ''];
-            if (!empty($first_goods_image)){
-                $goods_image_size = getimagesize(get_file_url($first_goods_image));
-                $info['goods']['image_size']['width'] =  $goods_image_size[0] ?? '';
-                $info['goods']['image_size']['height'] =  $goods_image_size[1] ?? '';
-            }
+            $info['goods']['image_size'] = ['width' => $info['goods']['goods_image_width'] ?? 800, 'height' => $info['goods']['goods_image_height'] ?? 800];
         }
 
         return $info;
@@ -380,7 +375,7 @@ class GoodsService extends BaseApiService
 
         $goods_sku_model = new GoodsSku();
 
-        $info = $goods_sku_model->where([  [ 'sku_id', '=', $sku_id ] ])
+        $info = $goods_sku_model->where([ [ 'sku_id', '=', $sku_id ] ])
             ->field($field)
             ->with([
                 // 商品主表
@@ -407,13 +402,13 @@ class GoodsService extends BaseApiService
             unset($info[ 'goodsSingle' ]);
             if (!empty($this->member_id)) {
                 // 限购查询当前会员已购数量
-                $has_buy = ( new CoreGoodsLimitBuyService() )->getGoodsHasBuyNumber( $this->member_id, $info[ 'goods_id' ]);
+                $has_buy = ( new CoreGoodsLimitBuyService() )->getGoodsHasBuyNumber($this->member_id, $info[ 'goods_id' ]);
                 $info[ 'has_buy' ] = $has_buy;
             }
             $goods_active_price_service = new CoreGoodsActivePriceService();
             //获取展示信息（价格 标签）
             $info[ 'member_discount' ] = $info[ 'goods' ][ 'member_discount' ] ?? '';
-            $detail_show_price = $goods_active_price_service->getShowPrice($info,  $this->member_id);
+            $detail_show_price = $goods_active_price_service->getShowPrice($info, $this->member_id);
             $info[ 'show_price' ] = $detail_show_price[ 'show_price' ];
             $info[ 'show_type' ] = $detail_show_price[ 'show_type' ];
             //组装数据
@@ -437,7 +432,7 @@ class GoodsService extends BaseApiService
      */
     public function getGoodsComponents(array $where = [])
     {
-        $field = 'goods_id,goods_name,sub_title,goods_type,goods_cover,unit,sale_num + goods.virtual_sale_num as sale_num,member_discount,label_ids,brand_id,is_limit,limit_type,max_buy,min_buy';
+        $field = 'goods_id,goods_name,sub_title,goods_type,goods_cover,unit,sale_num + goods.virtual_sale_num as sale_num,member_discount,label_ids,brand_id,is_limit,limit_type,max_buy,min_buy,virtual_receive_type';
 
         $sku_where = [
             [ 'goodsSku.is_default', '=', 1 ],
@@ -473,7 +468,7 @@ class GoodsService extends BaseApiService
         foreach ($list as $k => &$v) {
             if (!empty($v[ 'goodsSku' ])) {
                 $v[ 'goodsSku' ][ 'member_discount' ] = $v[ 'member_discount' ];
-                $list_show_price = $goods_active_price_service->getShowPrice($v[ 'goodsSku' ],  $this->member_id);
+                $list_show_price = $goods_active_price_service->getShowPrice($v[ 'goodsSku' ], $this->member_id);
                 $v[ 'goodsSku' ][ 'show_price' ] = $list_show_price[ 'show_price' ];
                 $v[ 'goodsSku' ][ 'show_type' ] = $list_show_price[ 'show_type' ];
             }
diff --git a/niucloud/addon/shop/app/service/api/goods/RankService.php b/niucloud/addon/shop/app/service/api/goods/RankService.php
index 688df5574..72395d63d 100644
--- a/niucloud/addon/shop/app/service/api/goods/RankService.php
+++ b/niucloud/addon/shop/app/service/api/goods/RankService.php
@@ -273,7 +273,7 @@ class RankService extends BaseApiService
                     $item[ 'goodsSku' ] = $this->getGoodsSku($item);
                     if (!empty($item[ 'goodsSku' ])) {
                         $item[ 'goodsSku' ][ 'member_discount' ] = $item[ 'member_discount' ];
-                        $show_price = $goods_active_price_service->getShowPrice($item[ 'goodsSku' ],$this->member_id);
+                        $show_price = $goods_active_price_service->getShowPrice($item[ 'goodsSku' ], $this->member_id);
                         $item[ 'goodsSku' ][ 'show_price' ] = $show_price[ 'show_price' ];
                         $item[ 'goodsSku' ][ 'show_type' ] = $show_price[ 'show_type' ];
                     }
diff --git a/niucloud/addon/shop/app/service/api/marketing/NewcomerService.php b/niucloud/addon/shop/app/service/api/marketing/NewcomerService.php
index 30cb00159..1c6051a9e 100644
--- a/niucloud/addon/shop/app/service/api/marketing/NewcomerService.php
+++ b/niucloud/addon/shop/app/service/api/marketing/NewcomerService.php
@@ -138,7 +138,7 @@ class NewcomerService extends BaseApiService
             ];
             $order = 'goods_sku.sale_num desc,goods_sku.stock desc';
 
-            $list = ( new GoodsSku() )->field($field)->withJoin([ 'goods' => [ 'goods_name' ] ])->where($sku_where)->limit($limit)->order($order)->select()->toArray();
+            $list = ( new GoodsSku() )->field($field)->withJoin([ 'goods' => [ 'goods_name','goods_cover' ] ])->where($sku_where)->limit($limit)->order($order)->select()->toArray();
             foreach ($list as &$item) {
                 $active_goods_value = json_decode($active_goods[ $item[ 'sku_id' ] ][ 'active_goods_value' ], true);
                 $item[ 'newcomer_price' ] = $active_goods_value[ 'newcomer_price' ] ?? 0;
diff --git a/niucloud/addon/shop/app/service/api/order/OrderCreateService.php b/niucloud/addon/shop/app/service/api/order/OrderCreateService.php
index 5a748be66..413696518 100644
--- a/niucloud/addon/shop/app/service/api/order/OrderCreateService.php
+++ b/niucloud/addon/shop/app/service/api/order/OrderCreateService.php
@@ -12,7 +12,7 @@
 namespace addon\shop\app\service\api\order;
 
 use addon\shop\app\dict\order\OrderLogDict;
-use addon\shop\app\model\delivery\Local;
+use addon\shop\app\model\local_delivery\Local;
 use addon\shop\app\model\order\Order;
 use addon\shop\app\service\core\delivery\CoreStoreService;
 use addon\shop\app\service\core\order\CoreOrderCreateService;
diff --git a/niucloud/addon/shop/app/service/api/order/OrderService.php b/niucloud/addon/shop/app/service/api/order/OrderService.php
index cb90d9944..10e488781 100644
--- a/niucloud/addon/shop/app/service/api/order/OrderService.php
+++ b/niucloud/addon/shop/app/service/api/order/OrderService.php
@@ -26,8 +26,7 @@ use addon\shop\app\model\manjian\ManjianGiveRecords;
 use addon\shop\app\model\order\Order;
 use addon\shop\app\model\order\OrderDelivery;
 use addon\shop\app\model\order\OrderRefund;
-use addon\shop\app\service\core\delivery\CoreLocalDeliveryService;
-use addon\shop\app\service\core\delivery\third_delivery\ThirdDeliveryLoader;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryService;
 use addon\shop\app\service\core\marketing\CoreManjianService;
 use addon\shop\app\service\core\order\CoreOrderCloseService;
 use addon\shop\app\service\core\order\CoreOrderConfigService;
@@ -202,21 +201,15 @@ class OrderService extends BaseApiService
             if ($info['delivery_type'] == DeliveryDict::EXPRESS || $info['delivery_type'] == DeliveryDict::LOCAL_DELIVERY) {
                 $info['order_delivery'] = (new OrderDelivery())
                     ->where([['order_id', '=', $info['order_id']]])
-                    ->field('id, order_id, name, delivery_type, sub_delivery_type,express_company_id, express_number, create_time,third_delivery')
-                    ->append(['third_delivery_name'])
+                    ->field('id, order_id, name, delivery_type, sub_delivery_type,express_company_id, express_number, create_time,local_delivery_order_id')
                     ->select()->toArray();
                 if ($info['delivery_type'] == DeliveryDict::LOCAL_DELIVERY) {
-                    $third_party_config = (new CoreLocalDeliveryService())->getConfig();
-                    foreach ($info['order_delivery'] as $k => $item) {
-                        if (!empty($item['third_delivery'])) {
-                            $third_delivery = $item['third_delivery'];
-                            $loader = new ThirdDeliveryLoader($third_delivery, $third_party_config[$third_delivery]);
-                            //三方配送下单
-                            $info['order_delivery'][$k]['third_delivery_info'] = $loader->queryOrderInfo(['order_no' => $info['order_no']]);
-                        }
+                    if (!empty($info['order_delivery'])) {
+                        $local_delivery_order_id = $info['order_delivery'][0]['local_delivery_order_id'];
+                        $local_delivery_order_info = (new CoreLocalDeliveryService()) ->getLocalDeliveryOrderInfo($local_delivery_order_id);
+                        $info = array_merge($info, $local_delivery_order_info);
                     }
                 }
-
             }
 
             if ($info['order_goods']) {
diff --git a/niucloud/addon/shop/app/service/core/delivery/CoreConfigService.php b/niucloud/addon/shop/app/service/core/delivery/CoreConfigService.php
index 264ccba3a..5dac208c5 100644
--- a/niucloud/addon/shop/app/service/core/delivery/CoreConfigService.php
+++ b/niucloud/addon/shop/app/service/core/delivery/CoreConfigService.php
@@ -28,7 +28,7 @@ class CoreConfigService extends BaseCoreService
      */
     public function setDeliverySearchConfig($data)
     {
-        return ( new ConfigService() )->setConfig( 'DELIVERY_INTERFACE', $data);
+        return ( new ConfigService() )->setConfig('DELIVERY_INTERFACE', $data);
     }
 
     /**
@@ -37,7 +37,7 @@ class CoreConfigService extends BaseCoreService
      */
     public function getDeliverySearchConfig()
     {
-        $info = ( new ConfigService() )->getConfig( 'DELIVERY_INTERFACE');
+        $info = ( new ConfigService() )->getConfig('DELIVERY_INTERFACE');
         if (empty($info)) {
             $info = [];
             $info[ 'value' ] = [
@@ -61,7 +61,7 @@ class CoreConfigService extends BaseCoreService
      */
     public function getDeliveryElectronSheeticConfig()
     {
-        $info = ( new ConfigService() )->getConfig( 'ELECTRONIC_SHEET_CONFIG');
+        $info = ( new ConfigService() )->getConfig('ELECTRONIC_SHEET_CONFIG');
         if (empty($info)) {
             $info = [];
             $info[ 'value' ] = [
@@ -75,4 +75,33 @@ class CoreConfigService extends BaseCoreService
         }
         return $info[ 'value' ];
     }
+
+    /**
+     * 设置同城配送配置
+     * @param $data
+     * @return SysConfig|bool|Model
+     */
+    public function setLocalDeliveryConfig($data)
+    {
+        return (new ConfigService())->setConfig('LOCAL_DELIVERY_CONFIG', $data);
+    }
+
+    /**
+     * 获取同城配送配置
+     * @return array
+     */
+    public function getLocalDeliveryConfig()
+    {
+        $value = (new ConfigService())->getConfigValue('LOCAL_DELIVERY_CONFIG');
+        if (empty($value)) {
+            $value = [
+                'is_show_polyline' => 0,
+                'is_local_delivery_store_select' => 0
+            ];
+        } else {
+            $value[ 'is_show_polyline' ] = intval($value[ 'is_show_polyline' ] ?? 0);
+            $value[ 'is_local_delivery_store_select' ] = intval($value[ 'is_local_delivery_store_select' ] ?? 0);
+        }
+        return $value;
+    }
 }
diff --git a/niucloud/addon/shop/app/service/core/delivery/CoreLocalDeliveryService.php b/niucloud/addon/shop/app/service/core/delivery/CoreLocalDeliveryService.php
deleted file mode 100644
index 3a15066d8..000000000
--- a/niucloud/addon/shop/app/service/core/delivery/CoreLocalDeliveryService.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | Niucloud-admin 企业快速开发的多应用管理平台
-// +----------------------------------------------------------------------
-// | 官方网址：https://www.niucloud.com
-// +----------------------------------------------------------------------
-// | niucloud团队 版权所有 开源版本可自由商用
-// +----------------------------------------------------------------------
-// | Author: Niucloud Team
-// +----------------------------------------------------------------------
-
-namespace addon\shop\app\service\core\delivery;
-
-use addon\shop\app\dict\delivery\DeliveryLocalDict;
-use addon\shop\app\dict\goods\GoodsDict;
-use addon\shop\app\dict\order\OrderDeliveryDict;
-use addon\shop\app\model\delivery\Local;
-use addon\shop\app\service\core\delivery\third_delivery\ThirdDeliveryLoader;
-use app\service\core\sys\CoreConfigService;
-use core\base\BaseCoreService;
-use Location\Coordinate;
-use Location\Distance\Vincenty;
-use Location\Polygon;
-
-/**
- * 同城配送服务层
- * Class CoreExpressService
- * @package addon\shop\app\service\admin\delivery
- */
-class CoreLocalDeliveryService extends BaseCoreService
-{
-    //系统配置文件
-    public $core_config_service;
-
-    public function __construct()
-    {
-        parent::__construct();
-        $this->core_config_service = new CoreConfigService();
-    }
-
-    /**
-     * 配置设置
-     * @param array $params
-     * @return array
-     */
-
-    public function setConfig( $data)
-    {
-        $this->core_config_service->setConfig( DeliveryLocalDict::SHOP_THIRD_PARTY_DELIVERY_CONFIG, $data);
-        return true;
-    }
-
-    public function getConfig()
-    {
-        $data = $this->core_config_service->getConfigValue( DeliveryLocalDict::SHOP_THIRD_PARTY_DELIVERY_CONFIG);
-        $config = DeliveryLocalDict::getType();
-        foreach ($config as $type => $item) {
-            if (!isset($data[$type])) {
-                $temp = [];
-                foreach ($item['column'] as $column) {
-                    $temp[$column] = '';
-                }
-                $data[$type] = $temp;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * 配送费用计算
-     * @param $order
-     * @return void
-     */
-    public static function calculate(&$order)
-    {
-        $address = $order->delivery['take_address'] ?? [];
-
-        if (empty($address)) {
-            $order->error[] = get_lang('NOT_SELECT_ADDRESS');
-            return;
-        }
-
-        $goods_money = 0; // 商品价格
-        $goods_weight = 0; // 商品重量
-
-        foreach ($order->goods_data as $k => &$v) {
-            $goods_type = $v['goods']['goods_type'];
-            if ($goods_type == GoodsDict::REAL) {
-                if (in_array(OrderDeliveryDict::LOCAL_DELIVERY, $v['goods']['delivery_type'])) {
-                    $goods_money += $v['goods_money'];
-                    $goods_weight += $v['weight'] * $v['num'];
-                } else {
-                    $v['not_support_delivery'] = 1;
-                    $order->error[] = get_lang('NOT_SUPPORT_DELIVERY_TYPE');
-                }
-            }
-        }
-        (new self())->feeCalculate($order, $goods_money, $goods_weight);
-    }
-
-    /**
-     * 运费计算
-     * @param $order
-     * @param float $goods_money
-     * @param float $goods_weight
-     * @return void
-     */
-    public function feeCalculate(&$order, float $goods_money, float $goods_weight)
-    {
-        $address = $order->delivery['take_address'] ?? [];
-        $local = (new Local())->where([['local_id', '>', 0]])->field('fee_type,base_dist,base_price,grad_dist,grad_price,weight_start,weight_unit,weight_price,delivery_type,area,center')->findOrEmpty();
-        if ($local->isEmpty()) {
-            $order->error[] = get_lang('NOT_CONFIGURED_LOCAL_DELIVERY');
-            return;
-        }
-        if (empty($address['lat']) || empty($address['lng'])) {
-            $order->error[] = get_lang('NOT_SUPPORT_DELIVERY_ADDRESS');
-            return;
-        }
-        // 收货地址
-        $address_point = new Coordinate($address['lat'], $address['lng']);
-        // 取货地址
-        $local_address_point = new Coordinate($local['center']['lat'], $local['center']['lng']);
-        $local = $local->toArray();
-//        $local['delivery_type'][0] = 'third'; //TODO调试使用   后续删除
-        // 判断所在区域
-        $located_in_area = null;
-        foreach ($local['area'] as $area) {
-            if ($area['area_type'] == 'radius') {
-                $center = new Coordinate($area['area_json']['center']['lat'], $area['area_json']['center']['lng']);
-                $distance = (new Vincenty())->getDistance($address_point, $center);
-                if ($distance <= $area['area_json']['radius']) {
-                    $located_in_area = $area;
-                    break;
-                }
-            } else {
-                $geofence = new Polygon();
-                $geofence->addPoints(array_map(function ($latlng) {
-                    return new Coordinate($latlng['lat'], $latlng['lng']);
-                }, $area['area_json']['paths']));
-                if ($geofence->contains($address_point)) {
-                    $located_in_area = $area;
-                    break;
-                }
-            }
-        }
-        if (!$located_in_area) {
-            $order->error[] = get_lang('NOT_SUPPORT_DELIVERY_ADDRESS');
-            return;
-        }
-
-        if (bccomp($goods_money, $located_in_area['start_price'], 2) == -1) {
-            $order->error[] = '差' . $located_in_area['start_price'] - $goods_money . '元起送';
-            return;
-        }
-        if ($local['delivery_type'][0] == DeliveryLocalDict::DELIVERY_TYPE_THIRD) {
-            //TODO::计算三方配送费用
-            $config = $this->getConfig();
-            $third_type = $config['default'];
-            $loader = new ThirdDeliveryLoader($third_type, $config[$third_type]);
-            $res = $loader->calculate($order);
-            // 按配送区域收费
-            $order->basic['delivery_money'] = $res['delivery_price'];
-            $order->basic['delivery_third'] = [
-                'name' => DeliveryLocalDict::getType($third_type)['name'],
-                'type' => $third_type,
-                'third_order_no' => $res['third_order_no'],
-            ];
-        } else {
-
-            if ($local['fee_type'] == 'distance') {
-                // 按距离收费
-                // 计算收货地址与取货地址的距离
-                $distance = round((new Vincenty())->getDistance($address_point, $local_address_point) / 1000, 2);
-                $order->basic['delivery_money'] = $local['base_price'];
-                if ($distance > $local['base_dist']) {
-                    $order->basic['delivery_money'] += round(ceil(($distance - $local['base_dist']) / $local['grad_dist']) * $local['grad_price'], 2);
-                }
-            } else {
-                // 按配送区域收费
-                $order->basic['delivery_money'] = $located_in_area['delivery_price'];
-            }
-
-            // 计算续重费用
-            if ($goods_weight > 0 && $goods_weight > $local['weight_start'] && $local['weight_unit'] > 0 && $local['weight_price'] > 0) {
-                $order->basic['delivery_money'] += round(ceil(($goods_weight - $local['weight_start']) / $local['weight_unit']) * $local['weight_price'], 2);
-            }
-        }
-    }
-
-    public function thirdDeliveryCallback(array $data)
-    {
-        $config = $this->getConfig();
-        $loader = new ThirdDeliveryLoader($data['type'], $config[$data['type']]);
-        $loader->callback($data);
-    }
-}
diff --git a/niucloud/addon/shop/app/service/core/delivery/CoreStoreService.php b/niucloud/addon/shop/app/service/core/delivery/CoreStoreService.php
index a1570cd89..4469dc9e4 100644
--- a/niucloud/addon/shop/app/service/core/delivery/CoreStoreService.php
+++ b/niucloud/addon/shop/app/service/core/delivery/CoreStoreService.php
@@ -80,7 +80,7 @@ class CoreStoreService extends BaseCoreService
      */
     public function getStoreList($latlng = [])
     {
-        $list = $this->model->where([ [ 'store_id', '>', 0 ] ])->field('store_id,time_week,time_interval,trade_time_json,store_name,store_logo,store_mobile,full_address,longitude,latitude,trade_time')->select()->toArray();
+        $list = $this->model->where([ [ 'support_store', '=', 1 ], [ 'status', '=', 1 ] ])->field('store_id,time_week,time_interval,trade_time_json,store_name,store_logo,store_mobile,full_address,longitude,latitude,trade_time')->select()->toArray();
         if (!empty($list) && !empty($latlng) && !empty($latlng[ 'lat' ]) && !empty($latlng[ 'lng' ])) {
             $location = new Coordinate($latlng[ 'lat' ], $latlng[ 'lng' ]);
             $list = array_map(function($item) use ($location) {
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/Dada.php b/niucloud/addon/shop/app/service/core/delivery/third_delivery/Dada.php
deleted file mode 100644
index af604f6b4..000000000
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/Dada.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | Niucloud-admin 企业快速开发的多应用管理平台
-// +----------------------------------------------------------------------
-// | 官方网址：https://www.niucloud.com
-// +----------------------------------------------------------------------
-// | niucloud团队 版权所有 开源版本可自由商用
-// +----------------------------------------------------------------------
-// | Author=>Niucloud Team
-// +----------------------------------------------------------------------
-namespace addon\shop\app\service\core\delivery\third_delivery;
-
-
-use addon\shop\app\service\core\delivery\third_delivery\sdk\Dada\OrderCancelRequest;
-use addon\shop\app\service\core\delivery\third_delivery\sdk\Dada\OrderCreateByFeeOrderNoRequest;
-use addon\shop\app\service\core\delivery\third_delivery\sdk\Dada\OrderCreateRequest;
-use addon\shop\app\service\core\delivery\third_delivery\sdk\Dada\OrderFeeRequest;
-use addon\shop\app\service\core\delivery\third_delivery\sdk\Dada\OrderInfoRequest;
-use addon\shop\app\service\core\delivery\third_delivery\sdk\Dada\OrderTransporterPositionH5Request;
-use addon\shop\app\service\core\delivery\third_delivery\sdk\Dada\OrderTransporterPositionRequest;
-use think\facade\Log;
-
-class Dada extends BaseThirdDelivery
-{
-    public $app_secret;//App_secret
-    public $app_key;//App_key
-    public $shop_id;//商户ID
-    public $shop_store_no;//门店编号
-    public $config;
-
-    public function initialize(array $config = [])
-    {
-        $this->app_secret = $config['app_secret'];
-        $this->app_key = $config['app_key'];
-        $this->shop_id = $config['shop_id'];
-        $this->shop_store_no = $config['shop_store_no'];
-        $this->config = $config;
-    }
-
-    /**
-     * ADMINAPI 发货使用
-     * @param $data
-     * @return array
-     */
-    public function createOrder($data)
-    {
-        $order_data = $data['order_data'];
-        $order_goods_data = $data['order_goods_data'];
-        $order_no = $order_data->order_no;
-//        return [//调试数据
-//            'delivery_price' => 100,//$res['fee'],
-//            'third_order_no' => $order_no,//$res['fee'],
-//        ];
-        $request = new OrderCreateRequest();
-        $product_list = [];
-        $weight = $num = 0;
-        foreach ($order_goods_data as $sku_info) {
-            $product_list[] = [
-                'count' => $sku_info['num'],
-                'sku_name' => $sku_info['goods_name'] . $sku_info['sku_name'],
-                'src_product_no' => $sku_info['sku_id'],
-                'unit' => $sku_info['goods']['unit'],
-            ];
-            $weight += $sku_info['sku']['weight'] * $sku_info['num'];
-            $num += $sku_info['num'];
-        }
-        // 创建请求对象并链式设置参数
-        $request = $request->setBaseParams($this->config)
-            ->setCallback($order_no)
-            ->setShopNo($this->shop_store_no)
-            ->setOriginId($order_no)
-            ->setReceiverName($order_data->taker_name)
-            ->setReceiverPhone($order_data->taker_phone)
-            ->setReceiverAddress($order_data->taker_address)
-            ->setReceiverLat($order_data->taker_latitude)
-            ->setReceiverLng($order_data->taker_longitude)
-            ->setCargoNum($num)
-            ->setCargoWeight(max($weight, 1))
-            ->setCargoPrice($order_data->order_money)
-            ->setProductList($product_list);
-        try {
-            $res = $request->sendRequest();
-            return [
-                'delivery_price' => $res['fee'],
-                'third_order_no' => $order_no,
-            ];
-
-        } catch (\Exception $e) {
-            Log::write('DADA' . $e->getMessage());
-            return [
-                'delivery_price' => 0,
-                'third_order_no' => $order_no,
-            ];
-
-        }
-
-    }
-
-    /**
-     * API使用
-     * @param $order_data
-     * @return array
-     */
-    public function calculate($order_data)
-    {
-        $order_no = $order_data->order_key;
-        $goods_data = $order_data->goods_data;
-        $member_address = $order_data->delivery['take_address'];
-        $request = new OrderFeeRequest();
-        $product_list = [];
-        $weight = 0;
-        foreach ($goods_data as $sku_id => $sku_info) {
-            $product_list[] = [
-                'count' => $sku_info['num'],
-                'sku_name' => $sku_info['goods']['goods_name'] . $sku_info['sku_name'],
-                'src_product_no' => $sku_id,
-                'unit' => $sku_info['goods']['unit'],
-            ];
-            $weight += $sku_info['weight'] * $sku_info['num'];
-        }
-        // 创建请求对象并链式设置参数
-        $request = $request->setBaseParams($this->config)
-            ->setShopNo($this->shop_store_no)
-            ->setOriginId($order_no)
-            ->setCargoPrice($order_data->basic['goods_money'])
-            ->setReceiverName($member_address['name'])
-            ->setReceiverPhone($member_address['mobile'])
-            ->setReceiverAddress($member_address['full_address'])
-            ->setReceiverLat($member_address['lat'])
-            ->setReceiverLng($member_address['lng'])
-            ->setCargoNum(count($goods_data))
-            ->setCargoWeight(max($weight, 1))
-            ->setCallback($order_no)
-            ->setProductList($product_list);
-        try {
-            $res = $request->sendRequest();
-            return [
-                'delivery_price' => $res['fee'],
-                'third_order_no' => $order_no,
-            ];
-        } catch (\Exception $exception) {
-            Log::write('DADA' . $exception->getMessage());
-            return [
-                'delivery_price' => 0,
-                'third_order_no' => $order_no,
-            ];
-        }
-    }
-
-    /**
-     *
-     * @param $delivery_third_order_no `计算运费接口返回的  配送方单号 queryFeeMoney.response.delivery_third_order_no`
-     * @return string[]
-     */
-    public function createOrderAfterCalculate($delivery_third_order_no)
-    {
-        return (new OrderCreateByFeeOrderNoRequest())->setDeliveryNo($delivery_third_order_no)->sendRequest();
-    }
-
-    /**
-     * @param $order_no `订单号`
-     * @return string[]
-     */
-    public function queryOrderInfo($data)
-    {
-//        return [//模拟返回的数据
-//            'order_no' => $data,
-//            'status' => 1,
-//            'status_name' => '待接单',
-//            'transporter_name' => '配送员1',
-//            'transporter_phone' => '15235353636',
-//            'transporter_lng' => '121.531522',
-//            'transporter_lat' => '31.252839',
-//            'accept_time' => '2025-06-22 12:00:00',
-//            'finish_time' => '2025-06-22 12:00:00',
-//            'order_finish_code' => '9527',
-//        ];
-        $order_no = $data['order_no'];
-        try {
-            $res = (new OrderInfoRequest())->setOrderId($order_no)->sendRequest();
-            return [
-                'order_no' => $res['orderId'],
-                'status' => $res['statusCode'],
-                'status_name' => $res['statusMsg'],
-                'transporter_name' => $res['transporterName'],
-                'transporter_phone' => $res['transporterPhone'],
-                'transporter_lng' => $res['transporterLng'],
-                'transporter_lat' => $res['transporterLat'],
-                'accept_time' => $res['acceptTime'],
-                'finish_time' => $res['finishTime'],
-                'order_finish_code' => $res['orderFinishCode'],
-            ];
-        } catch (\Exception $exception) {
-            Log::write('DADA' . $exception->getMessage());
-            return [//模拟返回的数据
-                'order_no' => $order_no,
-                'status' => 1,
-                'status_name' => '待接单',
-                'transporter_name' => '未知',
-                'transporter_phone' => '未知',
-                'transporter_lng' => '',
-                'transporter_lat' => '',
-                'accept_time' => '',
-                'finish_time' => '',
-                'order_finish_code' => '',
-            ];
-        }
-
-    }
-
-    /**
-     * @param $order_no `订单号`
-     * @param $cancel_reason_id `取消原因类型ID`
-     * @param $cancel_reason `取消原因`
-     * @return false|string[]
-     */
-    public function closeOrder($data)
-    {
-        try {
-            return (new OrderCancelRequest())
-                ->setOrderId($data['order_no'])
-                ->setCancelReasonId($data['cancel_reason_id'])
-                ->setCancelReason($data['cancel_reason'])
-                ->sendRequest();
-        } catch (\Exception $exception) {
-            Log::write('DADA' . $exception->getMessage());
-            return false;
-        }
-
-    }
-
-    public function GetTransporterPosition($data)
-    {
-        //调试数据
-//        return [
-//            'transporter_name' => '配送员1',
-//            'transporter_phone' => '15235353636',
-//            'transporter_lng' => '121.531522',
-//            'transporter_lat' => '31.252839',
-//        ];
-        try {
-            if ($data['is_h5']) {
-                $res = (new OrderTransporterPositionH5Request())
-                    ->setOrderId($data['order_no'])
-                    ->sendRequest();
-                $h5_url = $res['trackUrl'];
-            }
-            $res = (new OrderTransporterPositionRequest())
-                ->setOrderIds([$data['order_no']])
-                ->sendRequest();
-            return [
-                'transporter_name' => $res['transporterName'],
-                'transporter_phone' => $res['transporterPhone'],
-                'transporter_lng' => $res['transporterLng'],
-                'transporter_lat' => $res['transporterLat'],
-                'h5_url' => $h5_url ?? "",
-            ];
-        } catch (\Exception $exception) {
-            Log::write('DADA' . $exception->getMessage());
-            return [
-                'transporter_name' => '',
-                'transporter_phone' => '',
-                'transporter_lng' => '',
-                'transporter_lat' => '',
-            ];
-        }
-
-    }
-
-    public function callback($data)
-    {
-        $callback = [
-            'order_no' => '112233',//自主追加
-            "signature" => "2b3aa825562bcea9471fe860b3f8a8fa",
-            "client_id" => "1357061741749469184",
-            "order_id" => "Cu16538768403935339353",//订单号
-            "order_status" => 100,//订单状态(待接单＝1,待取货＝2,骑士到店=100,配送中＝3,已完成＝4,已取消＝5, 已追加待接单=8,妥投异常之物品返回中=9, 妥投异常之物品返回完成=10, 售后取件单送达门店=6, 创建达达运单失败=1000）
-            "cancel_reason" => "",
-            "cancel_from" => 0,
-            "dm_id" => 170900,
-            "dm_name" => "张三",
-            "dm_mobile" => "18500000000",
-            "update_time" => 1653876860,
-            "finish_code" => "1234"
-        ];
-        $status = $data['order_status'];//订单配送状态
-    }
-}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/service/core/delivery_store/CoreDeliveryServiceService.php b/niucloud/addon/shop/app/service/core/delivery_store/CoreDeliveryServiceService.php
new file mode 100644
index 000000000..122b38d4a
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/delivery_store/CoreDeliveryServiceService.php
@@ -0,0 +1,166 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\delivery_store;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryDict;
+use addon\shop\app\model\delivery\Store;
+use addon\shop\app\model\local_delivery\LocalDeliveryService;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryEventService;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryService;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+use think\facade\Log;
+
+/**
+ * 配送服务商服务层
+ * Class CoreDeliveryServiceService
+ * @package addon\shop\app\service\core\delivery_store
+ */
+class CoreDeliveryServiceService extends BaseCoreService
+{
+    protected $local_delivery_event;
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new Store();
+        $this->local_delivery_event = new CoreLocalDeliveryEventService();
+    }
+
+    /**
+     * 获取配送门店信息
+     * @param int $id
+     * @return array
+     */
+    public function getInfo(int $id)
+    {
+        return $this->model->where([ [ 'store_id', '=', $id ] ])->findOrEmpty()->toArray();
+    }
+
+    /**
+     * 获取配送服务商列表
+     * @return array
+     */
+    public function deliveryServiceList(int $id)
+    {
+        $info = $this->getInfo($id);
+        if (empty($info)) throw new CommonException('DELIVERY_STORE_NOT_EXIST');
+        $list = LocalDeliveryDict::getType();
+        $keys = (new LocalDeliveryService())->where([['key', 'in', array_keys($list)], ['is_use', '=', 1]])->column('key');
+        $support_delivery_array = $info['support_delivery'] ?? [];
+        foreach ($list as $k => &$v) {
+            if ($v['is_merchant']) {
+                $v['open_status'] = LocalDeliveryDict::OPEN_PASS;
+                $v['business'] = '';
+                $v['edit_status'] = '';
+                $v['reason'] = '';
+            } else {
+                if (in_array($k, $keys)) {
+                    $v['open_status'] = empty($support_delivery_array[$k]) ? '' : $support_delivery_array[$k]['open_status'];
+                    $v['business'] = empty($support_delivery_array[$k]) ? '' : $support_delivery_array[$k]['business'];
+                    $v['edit_status'] = empty($support_delivery_array[$k]) ? '' : $support_delivery_array[$k]['edit_status'];
+                    $v['reason'] = empty($support_delivery_array[$k]) ? '' : $support_delivery_array[$k]['reason'];
+                } else {
+                    unset($list[$k]);
+                }
+            }
+        }
+        return array_values($list);
+    }
+
+    /**
+     * 配送门店开通配送服务
+     * @param int $id
+     * @param array $data
+     * @return true
+     * @throws \Exception
+     */
+    public function deliveryServiceOpen(int $id, array $data)
+    {
+        $info = $this->getInfo($id);
+        if (empty($info)) throw new CommonException('DELIVERY_STORE_NOT_EXIST');
+        $delivery_type = $data['delivery_type'];
+        $config = (new CoreLocalDeliveryService())->getConfig($delivery_type);
+        $request_data = [
+            'delivery_type' => $delivery_type,
+            'business' => $data['business'],
+            'delivery_store' => $info,
+        ];
+        $response_data = $this->local_delivery_event->init(type: $delivery_type, config: $config)->addShop($request_data);
+        if (!empty($response_data)) {
+            $update_data['support_delivery'] = array_merge($info['support_delivery'] ?? [], $response_data['support_delivery']);
+            $update_data['extend_data'] = array_merge($info['extend_data'] ?? [], $data['extend_data']);
+            $this->model->where([ [ 'store_id', '=', $id ] ])->update($update_data);
+        }
+        return true;
+    }
+
+    /**
+     * 配送门店品类修改
+     * @param int $id
+     * @param array $data
+     * @return true
+     * @throws \Exception
+     */
+    public function deliveryServiceEdit(int $id, array $data)
+    {
+        $info = $this->getInfo($id);
+        if (empty($info)) throw new CommonException('DELIVERY_STORE_NOT_EXIST');
+        $delivery_type = $data['delivery_type'];
+        $config = (new CoreLocalDeliveryService())->getConfig($delivery_type);
+        $request_data = [
+            'delivery_type' => $delivery_type,
+            'business' => $data['business'],
+            'delivery_store' => $info,
+        ];
+        $response_data = $this->local_delivery_event->init(type: $delivery_type, config: $config)->editShop($request_data);
+        if (!empty($response_data)) {
+            $update_data['support_delivery'] = $response_data['support_delivery'];
+            $this->model->where([ [ 'store_id', '=', $id ] ])->update($update_data);
+        }
+        return true;
+    }
+
+    /**
+     * 配送门店信息批量修改
+     * @return true
+     */
+    public function batchDeliveryShopEdit(int $id)
+    {
+        try {
+            $info = $this->getInfo($id);
+            if (empty($info)) throw new CommonException('DELIVERY_STORE_NOT_EXIST');
+            $support_delivery_array = $info['support_delivery'];
+            $delivery_type_list = array_keys(LocalDeliveryDict::getType());
+            foreach ($delivery_type_list as $delivery_type) {
+                if ($delivery_type != LocalDeliveryDict::MERCHANT && !empty($support_delivery_array[$delivery_type]) && $support_delivery_array[$delivery_type]['open_status'] == LocalDeliveryDict::OPEN_PASS) {
+                    $config = (new CoreLocalDeliveryService())->getConfig($delivery_type);
+                    //三方配送更新门店
+                    $request_data = [
+                        'delivery_type' => $delivery_type,
+                        'business' => $support_delivery_array[$delivery_type]['business'],
+                        'delivery_store' => $info,
+                    ];
+                    $response_data = $this->local_delivery_event->init(type: $delivery_type, config: $config)->editShop($request_data);
+                    if (!empty($response_data)) {
+                        $support_delivery_array[$delivery_type]['edit_status'] = $response_data['support_delivery'][$delivery_type]['edit_status'];
+                        $support_delivery_array[$delivery_type]['reason'] = $response_data['support_delivery'][$delivery_type]['reason'];
+                    }
+                }
+            }
+            $update_data['support_delivery'] = $support_delivery_array;
+            $this->model->where([['store_id', '=', $id]])->update($update_data);
+        } catch (\Exception $e) {
+            Log::write('配送门店信息批量修改：'.$e->getMessage());
+        }
+        return true;
+    }
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryEventService.php b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryEventService.php
new file mode 100644
index 000000000..cb858e18c
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryEventService.php
@@ -0,0 +1,153 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery;
+
+use addon\shop\core\local_delivery\LocalDeliveryLoader;
+use core\base\BaseCoreService;
+use Exception;
+use Psr\Http\Message\ResponseInterface;
+use think\Response;
+
+/**
+ * 同城配送事件服务层
+ * Class CoreLocalDeliveryEventService
+ * @package addon\shop\app\service\core\local_delivery
+ */
+class CoreLocalDeliveryEventService extends BaseCoreService
+{
+    private $type = '';//配送类型
+    private $order_no = '';//配送单号
+    private $config = [];//本地配送配置
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+
+    /**
+     * 支付引擎外置触点初始化
+     * @param string $type
+     * @param string $order_no
+     * @param array $config
+     * @return $this
+     */
+    public function init(string $type = '', string $order_no = '', array $config = [])
+    {
+        $this->type = $type;
+        $this->order_no = $order_no;
+        $this->config = $config;
+        return $this;
+    }
+
+    /**
+     * 获取实例化应用
+     * @param string $action
+     * @return LocalDeliveryLoader
+     * @throws Exception
+     */
+    public function app(string $action = 'order')
+    {
+        $notify_url = (string)url("/api/delivery/notify/$this->type/$this->order_no/$action", [], '', true);//异步回调通知地址
+        $this->config['notify_url'] = $notify_url;
+        return new LocalDeliveryLoader($this->type, $this->config);
+    }
+
+    /**
+     * 直接下单
+     * @param array $params
+     * @return mixed
+     * @throws Exception
+     */
+    public function createOrder(array $params = [])
+    {
+        return $this->app()->createOrder($params);
+    }
+
+    /**
+     * 查询运费
+     * @param array $params
+     * @return mixed
+     * @throws Exception
+     */
+    public function calculate(array $params = [])
+    {
+        return $this->app()->calculate($params);
+    }
+
+    /**
+     * 取消订单
+     * @param array $params
+     * @return mixed
+     * @throws Exception
+     */
+    public function closeOrder(array $params = [])
+    {
+        return $this->app()->closeOrder($params);
+    }
+
+    /**
+     * 完成订单
+     * @param array $params
+     * @return mixed
+     * @throws Exception
+     */
+    public function finishOrder(array $params = [])
+    {
+        return $this->app()->finishOrder($params);
+    }
+
+    /**
+     * 查询订单
+     * @param array $params
+     * @return mixed
+     * @throws Exception
+     */
+    public function queryOrderInfo(array $params = [])
+    {
+        return $this->app()->queryOrderInfo($params);
+    }
+
+    /**
+     * 添加门店
+     * @param array $params
+     * @return mixed
+     * @throws Exception
+     */
+    public function addShop(array $params = [])
+    {
+        return $this->app()->addShop($params);
+    }
+
+    /**
+     * 编辑门店
+     * @param array $params
+     * @return mixed
+     * @throws Exception
+     */
+    public function editShop(array $params = [])
+    {
+        return $this->app()->editShop($params);
+    }
+
+    /**
+     * 支付异步通知
+     * @param string $action
+     * @param array $params
+     * @return ResponseInterface|Response
+     * @throws Exception
+     */
+    public function notify(string $action, array $params = [])
+    {
+        return $this->app()->notify($action, $params);
+    }
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderCloseService.php b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderCloseService.php
new file mode 100644
index 000000000..593db3e97
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderCloseService.php
@@ -0,0 +1,77 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery;
+
+use addon\shop\app\dict\local_delivery\OrderCancelReasonDict;
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreLocalDeliveryOrderCloseService extends BaseCoreService
+{
+    protected $local_delivery_event;
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrder();
+        $this->local_delivery_event = new CoreLocalDeliveryEventService();
+    }
+
+    /**
+     * 取消订单
+     * @param array $data
+     * @return bool
+     * @throws \Exception
+     */
+    public function closeOrder(array $data)
+    {
+        $delivery_order_condition = [];
+        $id = $data['id'] ?? 0;
+        if(empty($id)){
+            $trade_no =  $data['trade_no'];
+            $trade_type = $data['trade_type'];
+            $delivery_order_condition[] = ['trade_no', '=', $trade_no];
+            $delivery_order_condition[] =  ['trade_type', '=', $trade_type];
+        }else{
+            $delivery_order_condition[] = ['id', '=', $id];
+        }
+        $info = $this->model->where($delivery_order_condition)->findOrEmpty();
+        if ($info->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        $delivery_service = $info['delivery_service'];
+        $save_data = [
+            'remark' => $data['cancel_reason_id'] ? OrderCancelReasonDict::getType($data['cancel_reason_id'], $delivery_service) : $data['cancel_reason']
+        ];
+        $config = (new CoreLocalDeliveryService())->getConfig($delivery_service);
+        $request_data = [
+            'delivery_no' => $info['delivery_no'],
+            'cancel_reason_id' => $data['cancel_reason_id'],
+            'cancel_reason' => $data['cancel_reason'],
+            'main_id' => $data['main_id'] ?? 0,
+            'main_type' => $data['main_type'] ?? OrderLogDict::STORE,
+            'main_name' => $data['main_name'] ?? '',
+        ];
+        $response_data = $this->local_delivery_event->init(type: $delivery_service, config: $config)->closeOrder($request_data);
+        if (empty($response_data)) {
+            return false;
+        }
+        $save_data = array_merge($save_data, $response_data);
+        $info->save($save_data);
+        return true;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderCreateService.php b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderCreateService.php
new file mode 100644
index 000000000..2bd507393
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderCreateService.php
@@ -0,0 +1,189 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\model\delivery\Store;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreLocalDeliveryOrderCreateService extends BaseCoreService
+{
+    protected $local_delivery_event;
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrder();
+        $this->local_delivery_event = new CoreLocalDeliveryEventService();
+    }
+
+    /**
+     * 订单创建
+     * @param $data
+     * @return true
+     * @throws \Exception
+     */
+    public function create($data)
+    {
+        $order_data = $data['order_data'];
+        $order_goods_data = $data['order_goods_data'];
+        $local_delivery_no = $data['local_delivery_no'];
+        $param = $data['param'];
+        $delivery_service = $param['local_delivery_type'];
+        $store_id = empty($param['store_id']) ? $order_data['take_store_id'] : $param['store_id'];//提货点id
+
+        $config = $this->checkDeliveryService($store_id, $delivery_service);
+
+        $delivery_order_data = [
+            'store_id' => $store_id,
+            'delivery_service' => $delivery_service,
+            'delivery_no' => $local_delivery_no,
+            'status' => LocalDeliveryStatusDict::ORDER_ACCEPTED,
+            'trade_id' => $order_data['order_id'],
+            'trade_no' => $data['trade_no'],
+            'delivery_end' => $order_data['taker_full_address'],
+            'delivery_end_province_id' => $order_data['taker_province'],
+            'delivery_end_city_id' => $order_data['taker_city'],
+            'delivery_end_district_id' => $order_data['taker_district'],
+            'delivery_end_lng' => $order_data['taker_longitude'],
+            'delivery_end_lat' => $order_data['taker_latitude'],
+            'body' => $order_data['body'] ?? ''
+        ];
+        $order_id = $this->createOrder($delivery_order_data);
+
+        if (!empty($order_id)) {
+            //第三方配送下单
+            $request_data = [
+                'order_data' => $order_data,
+                'trade_no' => $data['trade_no'],
+                'order_goods_data' => $order_goods_data,
+                'delivery_no' => $local_delivery_no,
+                'param' => $param,
+                'deliver_id' => $param['local_deliver_id'],
+                'body' =>  $order_data['body'] ?? ''
+            ];
+            $response_data = (new CoreLocalDeliveryEventService())->init($delivery_service, $local_delivery_no, $config)->createOrder($request_data);
+            if (empty($response_data)) {
+                throw new CommonException('呼叫配送失败');
+            }
+            $this->model->where([['id', '=', $order_id]])->update($response_data);
+        }
+
+        return true;
+    }
+
+    /**
+     * 创建配送订单
+     * @param $params
+     * @return mixed
+     */
+    public function createOrder($params)
+    {
+        $store = (new Store())->where([['store_id', '=', $params['store_id']]])->findOrEmpty()->toArray();
+        $data = [
+            'delivery_service' => $params['delivery_service'],
+            'delivery_no' => $params['delivery_no'],
+            'out_delivery_no' => $params['out_delivery_no'] ?? '',
+            'delivery_money' => $params['delivery_money'] ?? 0,
+            'delivery_distance' => $params['delivery_distance'] ?? 0,
+            'status' => $params['status'],
+            'out_status' => $params['out_status'] ?? '',
+            'rider_name' => $params['rider_name'] ?? '',
+            'rider_mobile' => $params['rider_mobile'] ?? '',
+            'trade_id' => $params['trade_id'] ?? 0,
+            'trade_no' => $params['trade_no'],
+            'delivery_start' => $store['full_address'] ?? '',
+            'delivery_start_province_id' => $store['province_id'] ?? '',
+            'delivery_start_city_id' => $store['city_id'] ?? '',
+            'delivery_start_district_id' => $store['district_id'] ?? '',
+            'delivery_start_lng' => $store['longitude'] ?? '',
+            'delivery_start_lat' => $store['latitude'] ?? '',
+            'delivery_end' => $params['delivery_end'],
+            'delivery_end_province_id' => $params['delivery_end_province_id'] ?? '',
+            'delivery_end_city_id' => $params['delivery_end_city_id'] ?? '',
+            'delivery_end_district_id' => $params['delivery_end_district_id'] ?? '',
+            'delivery_end_lng' => $params['delivery_end_lng'] ?? '',
+            'delivery_end_lat' => $params['delivery_end_lat'] ?? '',
+            'remark' => $params['remark'] ?? '',
+            'body' => $params['body'] ?? '',
+            'create_time' => time()
+        ];
+        //添加配送订单记录
+        $res = $this->model->create($data);
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate($res['status']);
+        (new CoreLocalDeliveryOrderLogService())->addLog([
+            'order_id' => $res['id'],
+            'main_id' => '',
+            'main_type' => OrderLogDict::STORE,
+            'main_name' => '',
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => $res['status'],
+            'remark' => $operate['operate_desc']
+        ]);
+        return $res->id;
+    }
+
+    /**
+     * 配送费用计算
+     * @param $data
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getDeliveryFee($data)
+    {
+        $order_data = $data['order_data'];
+        $store_id = empty($data['store_id']) ? $order_data['take_store_id'] : $data['store_id'];//提货点id
+        $order_goods_data = $data['order_goods_data'];
+        if (empty($data['local_delivery_type'])) throw new CommonException('DELIVERY_SERVICE_NOT_SELECT');
+        $delivery_service = $data['local_delivery_type'];
+
+        $config = $this->checkDeliveryService($store_id, $delivery_service);
+        $delivery_no = create_no();//创建本地配送单号
+        $request_data = [
+            'order_data' => $order_data,
+            'order_goods_data' => $order_goods_data,
+            'param' => $data,
+            'delivery_no' => $delivery_no,
+        ];
+        $response_data = $this->local_delivery_event->init($delivery_service, $delivery_no, $config)->calculate($request_data);
+        return $response_data['delivery_money'] ?? 0;
+    }
+
+    public function checkDeliveryService($store_id, $delivery_service)
+    {
+        $config = [];
+        $store = (new Store())->field('store_no,support_delivery')->where([['store_id', '=', $store_id]])->findOrEmpty()->toArray();
+        if (empty($store)) throw new CommonException('DELIVERY_STORE_NOT_EXIST');
+        if ($delivery_service != LocalDeliveryDict::MERCHANT) {
+            $config = (new CoreLocalDeliveryService())->getConfig($delivery_service);
+            if (empty($store['support_delivery']) || empty($store['support_delivery'][$delivery_service]) || $store['support_delivery'][$delivery_service]['open_status'] != LocalDeliveryDict::OPEN_PASS) {
+                throw new CommonException('配送门店未开通'.LocalDeliveryDict::getType($delivery_service));
+            }
+            if (isset($config['is_use']) && $config['is_use'] != 1) {
+                throw new CommonException(LocalDeliveryDict::getType($delivery_service).'未启用');
+            }
+        }
+        $config['store_no'] = $store['store_no'];
+        return $config;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderFinishService.php b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderFinishService.php
new file mode 100644
index 000000000..c0576ea28
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderFinishService.php
@@ -0,0 +1,74 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery;
+
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+
+/**
+ * 同城配送服务层
+ * Class CoreLocalDeliveryOrderFinishService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreLocalDeliveryOrderFinishService extends BaseCoreService
+{
+    protected $local_delivery_event;
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrder();
+        $this->local_delivery_event = new CoreLocalDeliveryEventService();
+    }
+
+    /**
+     * 完成订单
+     * @param array $data
+     * @return bool
+     * @throws \Exception
+     */
+    public function finishOrder(array $data)
+    {
+        $delivery_order_condition = [];
+        $id = $data['id'] ?? 0;
+        if(empty($id)){
+            $trade_no =  $data['trade_no'];
+            $trade_type = $data['trade_type'];
+            $delivery_order_condition[] = ['trade_no', '=', $trade_no];
+            $delivery_order_condition[] =  ['trade_type', '=', $trade_type];
+        }else{
+            $delivery_order_condition[] = ['id', '=', $id];
+        }
+        $info = $this->model->where($delivery_order_condition)->findOrEmpty();
+        if ($info->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        $delivery_service = $info['delivery_service'];
+        $save_data = [
+            'finish_time' => time(),
+        ];
+        $config = (new CoreLocalDeliveryService())->getConfig($delivery_service);
+        $request_data = [
+            'delivery_no' => $info['delivery_no'],
+            'main_id' => $data['main_id'] ?? 0,
+            'main_type' => $data['main_type'] ?? OrderLogDict::STORE,
+            'main_name' => $data['main_name'] ?? '',
+        ];
+        $response_data = $this->local_delivery_event->init(type: $delivery_service, config: $config)->finishOrder($request_data);
+        if (empty($response_data)) {
+            return false;
+        }
+        $save_data = array_merge($save_data, $response_data);
+        $info->save($save_data);
+        return true;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderLogService.php b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderLogService.php
new file mode 100644
index 000000000..1451a414a
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderLogService.php
@@ -0,0 +1,51 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery;
+
+use addon\shop\app\model\local_delivery\LocalDeliveryOrderLog;
+use core\base\BaseCoreService;
+
+/**
+ * 同城配送订单日志服务层
+ * Class CoreLocalDeliveryOrderLogService
+ * @package addon\shop\app\service\core\local_delivery
+ */
+class CoreLocalDeliveryOrderLogService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrderLog();
+    }
+
+    /**
+     * 添加配送订单日志
+     * @param $params
+     * @return LocalDeliveryOrderLog|\think\Model
+     */
+    public function addLog($params)
+    {
+        $data = [
+            'order_id' => $params['order_id'],
+            'main_id' => $params['main_id'] ?? 0,
+            'main_type' => $params['main_type'],
+            'main_name' => $params['main_name'] ?? '',
+            'operate' => $params['operate'],
+            'operate_desc' => $params['operate_desc'],
+            'status' => $params['status'],
+            'remark' => $params['remark'] ?? '',
+        ];
+//        dd($data);
+        return $this->model->create($data);
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderNotifyService.php b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderNotifyService.php
new file mode 100644
index 000000000..36a4cad6d
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderNotifyService.php
@@ -0,0 +1,45 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery;
+
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+use think\facade\Log;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreLocalDeliveryOrderNotifyService extends BaseCoreService
+{
+    protected $local_delivery_event;
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrder();
+        $this->local_delivery_event = new CoreLocalDeliveryEventService();
+    }
+
+    public function notify($type, $delivery_no, $action, $params = [])
+    {
+        Log::write('同城配送订单状态回调参数：' . json_encode($params));
+        try {
+            return $this->local_delivery_event->init($type, $delivery_no)->notify($action, $params);
+        } catch ( CommonException $e ) {
+            Log::write('同城配送订单状态回调失败：'.json_encode(func_get_args()) .$e->getMessage(), 'error');
+            return false;
+        }
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderService.php b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderService.php
new file mode 100644
index 000000000..895cd9e1c
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryOrderService.php
@@ -0,0 +1,202 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use addon\shop\app\service\core\delivery\CoreConfigService;
+use app\service\core\map\CoreMapService;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+use think\db\exception\DbException;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreLocalDeliveryOrderService extends BaseCoreService
+{
+    protected $local_delivery_event;
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrder();
+        $this->local_delivery_event = new CoreLocalDeliveryEventService();
+    }
+
+    /**
+     * 同步订单信息
+     * @param int $id
+     * @return bool
+     * @throws \Exception
+     */
+    public function syncOrder(int $id)
+    {
+        $info = $this->model->where([['id', '=', $id]])->findOrEmpty();
+        if ($info->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        $delivery_service = $info['delivery_service'];
+        $config = (new CoreLocalDeliveryService())->getConfig($delivery_service);
+        $request_data = [
+            'delivery_no' => $info['delivery_no']
+        ];
+        $save_data = $this->local_delivery_event->init(type: $delivery_service, config: $config)->queryOrderInfo($request_data);
+        if (empty($save_data)) {
+            return false;
+        }
+        return $info->save($save_data);
+    }
+
+    /**
+     * 检查当前交易下是否有在进行中的配送订单
+     * @param $data
+     * @return bool
+     */
+    public function getUnderwayDeliveryOrder($data){
+        $order = $this->model->where([
+            ['trade_no', '=', $data['trade_no']],
+            ['status', '<>', LocalDeliveryStatusDict::CANCELED]
+        ])->findOrEmpty();
+        if ($order->isEmpty()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 获取配送轨迹
+     * @param $param
+     * @return array|array[]
+     */
+    public function getTrackInfo($param){
+        $local_delivery_order_model = new LocalDeliveryOrder();
+        $local_delivery_order = $local_delivery_order_model->where([['trade_no', '=', $param['trade_no']]])->order('create_time desc')->findOrEmpty();
+//        //查询配送订单的起始点
+        $local_delivery_order['member_id'] = $param['member_id'];
+        $points = array_filter(event('GetLocalDeliveryTrack', $local_delivery_order))[0] ?? [];
+        if(empty($points)) return [];
+        $data = [
+            'points' => $points,
+        ];
+        //增加
+//        $config = new CoreConfigService();
+//        $config_value = $config->getDeliveryConfig();
+//        $is_show_polyline = $config_value['is_show_polyline'] ?? false;
+        //todo 增加配送轨迹是否开启配置
+        $is_show_polyline = true;
+        if(count($data['points']) > 1){
+            $center = $this->calculateCenter($data['points']);
+            $driving =  $data['driving'] ?? [];
+            if($is_show_polyline){
+                $from_point = $data['points'][0] ?? [];
+                $to_point = $data['points'][1] ?? [];
+                try {
+                    $driving = (new CoreMapService())->getPolyline([
+                        'from' => $from_point['latitude'] . ',' . $from_point['longitude'],
+                        'to' => $to_point['latitude'] . ',' . $to_point['longitude']]
+                    );
+                } catch (DbException $e) {
+                }
+            }
+
+        }else{
+            $center = [
+                'latitude' => $data['points'][0]['latitude'],
+                'longitude' => $data['points'][0]['longitude'],
+            ];
+        }
+        $data['center'] = $center;
+        $data['driving'] = $driving ?? [];
+        $data['local_delivery_order'] = $local_delivery_order;
+        $data['step'] = [
+            [
+                'desc' => '已接单',
+                'logo' => ''
+            ],
+            [
+                'desc' => '召唤骑手取货',
+                'logo' => ''
+            ],
+            [
+                'desc' => '骑手配送中',
+                'logo' => ''
+            ],
+            [
+                'desc' => '配送完成',
+                'logo' => ''
+            ],
+        ];
+        $data['expected_finish_time'] = $this->getExpectedFinishTime($data);
+        //{"step":[{"desc":"已接单","logo":""},{"desc":"召唤骑手取货","logo":""},{"desc":"骑手配送中","logo":""},{"desc":"配送完成","logo":""}],"center":{"latitude":0,"longitude":0},"points":[{"name":"","latitude":0,"longitude":0,"avayar":"","logo":"","tab":{"content":"骑手:王大锤 | 工号:1214564646546464"}},{"name":"","latitude":0,"longitude":0,"avayar":"","logo":"","tab":{"content":""}}],"driving":{}}
+        return $data;
+    }
+
+    /**
+     * 计算预计送达时间
+     * @param $data
+     * @return string
+     */
+    function getExpectedFinishTime($data)
+    {
+        $local_delivery_order = $data['local_delivery_order'];
+        $points = $data['points'];
+        $current_time = time();
+        $rider_speed = 25; // 骑手速度，单位：公里/小时
+        $expected_finish_time = $current_time;
+
+        switch ($local_delivery_order['status']){
+            case LocalDeliveryStatusDict::ORDER_ACCEPTED:
+            case LocalDeliveryStatusDict::PENDING_ACCEPTANCE:
+                $distance = get_map_distance($local_delivery_order['delivery_start_lat'], $local_delivery_order['delivery_start_lng'], $local_delivery_order['delivery_end_lat'], $local_delivery_order['delivery_end_lng']);
+                $expected_finish_time += ($distance / $rider_speed) * 3600 + 600;
+                break;
+            case LocalDeliveryStatusDict::PENDING_PICKUP:
+                if(count($data['points']) > 1) {
+                    $distance1 = get_map_distance($points[0]['latitude'], $points[0]['longitude'], $points[1]['latitude'], $points[1]['longitude']);
+                } else {
+                    $distance1 = 0;
+                }
+                $distance2 = get_map_distance($local_delivery_order['delivery_start_lat'], $local_delivery_order['delivery_start_lng'], $local_delivery_order['delivery_end_lat'], $local_delivery_order['delivery_end_lng']);
+                $expected_finish_time += ($distance1 + $distance2) / $rider_speed * 3600;
+                break;
+            case LocalDeliveryStatusDict::RIDER_ARRIVED:
+                $distance1 = get_map_distance($points[0]['latitude'], $points[0]['longitude'], $points[1]['latitude'], $points[1]['longitude']);
+                $distance2 = get_map_distance($local_delivery_order['delivery_start_lat'], $local_delivery_order['delivery_start_lng'], $local_delivery_order['delivery_end_lat'], $local_delivery_order['delivery_end_lng']);
+                $expected_finish_time += ($distance1 + $distance2) / $rider_speed * 3600;
+                break;
+            case LocalDeliveryStatusDict::IN_DELIVERY:
+                $distance = get_map_distance($points[0]['latitude'], $points[0]['longitude'], $points[1]['latitude'], $points[1]['longitude']);
+                $expected_finish_time += ($distance / $rider_speed) * 3600;
+                break;
+        }
+        return date('H:i', $expected_finish_time);
+    }
+
+    /**
+     * 计算中心点
+     * @param $points
+     * @return float[]|int[]
+     */
+    function calculateCenter($points) {
+        $sumX = 0;
+        $sumY = 0;
+        $count = count($points); // 获取点的数量
+        foreach ($points as $point) {
+            $sumX += $point['latitude'];
+            $sumY += $point['longitude'];
+        }
+        $xCenter = $sumX / $count;
+        $yCenter = $sumY / $count;
+        return ['latitude' => $xCenter, 'longitude' => $yCenter];
+    }
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryService.php b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryService.php
new file mode 100644
index 000000000..7e0fea0bf
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/CoreLocalDeliveryService.php
@@ -0,0 +1,217 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery;
+
+use addon\shop\app\dict\order\OrderDeliveryDict;
+use addon\shop\app\dict\goods\GoodsDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\model\delivery\Store;
+use addon\shop\app\model\local_delivery\Local;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrderLog;
+use addon\shop\app\model\local_delivery\LocalDeliveryService;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+use Location\Coordinate;
+use Location\Distance\Vincenty;
+use Location\Polygon;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreLocalDeliveryService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function getConfig(string $delivery_service)
+    {
+        $config = [];
+        if ($delivery_service == LocalDeliveryDict::MERCHANT) return $config;
+        $service_data = (new LocalDeliveryService())->where([['key', '=', $delivery_service]])->findOrEmpty()->toArray();
+        if (empty($service_data) || empty($service_data['config'])) {
+            throw new CommonException(LocalDeliveryDict::getType($delivery_service).'未配置');
+        }
+        $config = $service_data['config'];
+        $config['is_use'] = $service_data['is_use'];
+        return $config;
+    }
+
+    /**
+     * 配送费用计算
+     * @param $order
+     * @return void
+     */
+    public static function calculate(&$order)
+    {
+        $address = $order->delivery[ 'take_address' ] ?? [];
+        $take_store = $order->delivery['take_store'] ?? [];
+
+        if (empty($address)) {
+            $order->error[] = get_lang('NOT_SELECT_ADDRESS');
+            return;
+        }
+
+        if (empty($take_store)) {
+            $order->error[] = get_lang('NOT_SELECT_LOCAL_DELIVERY_STORE');
+            $order->delivery['error'] = empty($order->delivery['error']) ? get_lang('NOT_SELECT_LOCAL_DELIVERY_STORE') : $order->delivery['error'];
+            return;
+        }
+
+        $goods_money = 0; // 商品价格
+        $goods_weight = 0; // 商品重量
+
+        foreach ($order->goods_data as $k => &$v) {
+            $goods_type = $v[ 'goods' ][ 'goods_type' ];
+            if ($goods_type == GoodsDict::REAL) {
+                if (in_array(OrderDeliveryDict::LOCAL_DELIVERY, $v[ 'goods' ][ 'delivery_type' ])) {
+                    $goods_money += $v[ 'goods_money' ];
+                    $goods_weight += $v[ 'weight' ] * $v[ 'num' ];
+                } else {
+                    $v[ 'not_support_delivery' ] = 1;
+                    $order->error[] = '“'.$v['goods']['goods_name'].'”'.get_lang('NOT_SUPPORT_DELIVERY_TYPE');//“'.$v['goods']['goods_name'].'”不支持选择的配送方式
+                    $order->goods_data[$v[ 'sku_id' ]]['error'] = get_lang('GOODS_NOT_SUPPORT_LOCAL_DELIVERY');//该商品不支持同城配送
+                }
+            }
+        }
+        ( new self() )->feeCalculate($order, $goods_money, $goods_weight);
+    }
+
+    /**
+     * 运费计算
+     * @param $order
+     * @param float $goods_money
+     * @param float $goods_weight
+     * @return void
+     */
+    public function feeCalculate(&$order, float $goods_money, float $goods_weight)
+    {
+        $address = $order->delivery[ 'take_address' ] ?? [];
+        $take_store = $order->delivery['take_store'] ?? [];
+        $local = ( new Local() )->where([ [ 'local_id', '>', 0 ] ])->field('fee_type,base_dist,base_price,grad_dist,grad_price,weight_start,weight_unit,weight_price,delivery_type,area,center')->findOrEmpty();
+        if ($local->isEmpty()) {
+            $order->error[] = get_lang('NOT_CONFIGURED_LOCAL_DELIVERY');
+            $order->delivery['error'] = empty($order->delivery['error']) ? get_lang('NOT_CONFIGURED_LOCAL_DELIVERY') : $order->delivery['error'];
+            return;
+        }
+        if (empty($address[ 'lat' ]) || empty($address[ 'lng' ])) {
+            $order->error[] = get_lang('NOT_SUPPORT_DELIVERY_ADDRESS');
+            $order->delivery['error'] = empty($order->delivery['error']) ? get_lang('NOT_SUPPORT_DELIVERY_ADDRESS') : $order->delivery['error'];
+            return;
+        }
+        if (empty($take_store[ 'store_id' ])) {
+            $order->error[] = get_lang('NOT_SELECT_LOCAL_DELIVERY_STORE');
+            $order->delivery['error'] = empty($order->delivery['error']) ? get_lang('NOT_SELECT_LOCAL_DELIVERY_STORE') : $order->delivery['error'];
+            return;
+        }
+        $store = ( new Store() )->where([['store_id', '=', $take_store[ 'store_id' ] ] ])->field('area,latitude,longitude')->findOrEmpty()->toArray();
+        if (empty($store)) {
+            $order->error[] = get_lang('DELIVERY_STORE_NOT_EXIST');
+            $order->delivery['error'] = empty($order->delivery['error']) ? get_lang('DELIVERY_STORE_NOT_EXIST') : $order->delivery['error'];
+            return;
+        }
+
+        // 收货地址
+        $address_point = new Coordinate($address[ 'lat' ], $address[ 'lng' ]);
+        // 取货地址
+        $local_address_point = new Coordinate($store[ 'latitude' ], $store[ 'longitude' ]);
+        $local = $local->toArray();
+
+        if (empty($store[ 'area' ])) {
+            $order->error[] = get_lang('STORE_NOT_SET_DELIVERY_RANGE');
+            $order->delivery['error'] = empty($order->delivery['error']) ? get_lang('STORE_NOT_SET_DELIVERY_RANGE') : $order->delivery['error'];
+            return;
+        }
+        // 判断所在区域
+        $located_in_area = null;
+        foreach ($store[ 'area' ] as $area) {
+            if (empty($area[ 'area_json' ])) {
+                continue;
+            }
+            if ($area[ 'area_type' ] == 'radius') {
+                $center = new Coordinate($area[ 'area_json' ][ 'center' ][ 'lat' ], $area[ 'area_json' ][ 'center' ][ 'lng' ]);
+                $distance = ( new Vincenty() )->getDistance($address_point, $center);
+                if ($distance <= $area[ 'area_json' ][ 'radius' ]) {
+                    $located_in_area = $area;
+                    break;
+                }
+            } else {
+                $geofence = new Polygon();
+                $geofence->addPoints(array_map(function ($latlng) {
+                    return new Coordinate($latlng[ 'lat' ], $latlng[ 'lng' ]);
+                }, $area[ 'area_json' ][ 'paths' ]));
+                if ($geofence->contains($address_point)) {
+                    $located_in_area = $area;
+                    break;
+                }
+            }
+        }
+        if (!$located_in_area) {
+            $order->error[] = get_lang('NOT_SUPPORT_DELIVERY_RANGE');
+            $order->delivery['error'] = empty($order->delivery['error']) ? get_lang('NOT_SUPPORT_DELIVERY_RANGE') : $order->delivery['error'];
+            return;
+        }
+
+        if (bccomp($goods_money, $located_in_area[ 'start_price' ], 2) == -1) {
+            $order->error[] = '差' . $located_in_area[ 'start_price' ] - $goods_money . '元起送';
+            $order->delivery['error'] = empty($order->delivery['error']) ? ('差' . $located_in_area[ 'start_price' ] - $goods_money . '元起送') : $order->delivery['error'];
+            return;
+        }
+
+        if ($local[ 'fee_type' ] == 'distance') {
+            // 按距离收费
+            // 计算收货地址与取货地址的距离
+            $distance = round(( new Vincenty() )->getDistance($address_point, $local_address_point) / 1000, 2);
+            $order->basic[ 'delivery_money' ] = $local[ 'base_price' ];
+            if ($distance > $local[ 'base_dist' ] && $local[ 'grad_dist' ] > 0) {
+                $order->basic[ 'delivery_money' ] += round(ceil(( $distance - $local[ 'base_dist' ] ) / $local[ 'grad_dist' ]) * $local[ 'grad_price' ], 2);
+            }
+        } else {
+            // 按配送区域收费
+            $order->basic[ 'delivery_money' ] = $located_in_area[ 'delivery_price' ];
+        }
+
+        // 计算续重费用
+        if ($goods_weight > 0 && $goods_weight > $local[ 'weight_start' ] && $local[ 'weight_unit' ] > 0 && $local[ 'weight_price' ] > 0) {
+            $order->basic[ 'delivery_money' ] += round(ceil(( $goods_weight - $local[ 'weight_start' ] ) / $local[ 'weight_unit' ]) * $local[ 'weight_price' ], 2);
+        }
+    }
+
+    public function getLocalDeliveryOrderInfo($local_delivery_order_id)
+    {
+        $data = [
+            'show_local_delivery_info' => false,
+        ];
+        $local_delivery_order_info = (new LocalDeliveryOrder())->where([['delivery_no', '=', $local_delivery_order_id]])->append(['status_name'])->findOrEmpty()->toArray();
+        if (!empty($local_delivery_order_info)) {
+            $data['local_delivery_status_name'] = $local_delivery_order_info['status_name'] ?? '';
+            if ($local_delivery_order_info['delivery_service'] != LocalDeliveryDict::MERCHANT && in_array($local_delivery_order_info['status'], [ LocalDeliveryStatusDict::ORDER_ACCEPTED,
+                LocalDeliveryStatusDict::PENDING_ACCEPTANCE,
+                LocalDeliveryStatusDict::PENDING_PICKUP,
+                LocalDeliveryStatusDict::RIDER_ARRIVED,
+                LocalDeliveryStatusDict::IN_DELIVERY ])) {
+                $data['show_local_delivery_info'] = true;
+            }
+            $data['local_delivery_order_log'] = (new LocalDeliveryOrderLog())
+                ->withJoin('localDeliveryOrder')
+                ->where([['delivery_no', '=', $local_delivery_order_id]])
+                ->append(['main_type_name'])->select()->toArray();
+        }
+        return $data;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/dada/CoreOrderEventService.php b/niucloud/addon/shop/app/service/core/local_delivery/dada/CoreOrderEventService.php
new file mode 100644
index 000000000..0a3f65c7d
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/dada/CoreOrderEventService.php
@@ -0,0 +1,441 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery\dada;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderLogService;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreOrderEventService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrder();
+    }
+
+
+    public function create(){
+
+    }
+
+    /**
+     * 商家呼叫配送
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function orderCall($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::PENDING_ACCEPTANCE) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::PENDING_ACCEPTANCE,
+            'out_status' => $notify_data['order_status'],
+            'out_delivery_no' => $notify_data['client_id'],
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        //todo 消息发送
+//        (new NoticeService())->send('');
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::PENDING_ACCEPTANCE);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => 0,
+            'main_name' => '',
+            'main_type' => OrderLogDict::STORE,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::PENDING_ACCEPTANCE,
+            'remark' => $operate['operate_desc'],
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    /**
+     * 商家指派骑手
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function dispatchOrder($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::DISPATCH_ORDER) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::DISPATCH_ORDER,
+            'out_status' => $notify_data['order_status'],
+            'out_delivery_no' => $notify_data['client_id'],
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        //todo 消息发送
+//        (new NoticeService())->send('');
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::DISPATCH_ORDER);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => 0,
+            'main_name' => '',
+            'main_type' => OrderLogDict::STORE,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::DISPATCH_ORDER,
+            'remark' => $operate['operate_desc'],
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    /**
+     * 骑手已接单
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function riderAccepted($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::PENDING_PICKUP) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::PENDING_PICKUP,
+            'out_status' => $notify_data['order_status'],
+            'rider_name' => $notify_data['dm_name'] ?? '',
+            'rider_mobile' => $notify_data['dm_mobile'] ?? '',
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        //todo 消息发送
+//        (new NoticeService())->send('');
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::PENDING_PICKUP);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['dm_id'] ?? 0,
+            'main_name' => $notify_data['dm_name'] ?? '',
+            'main_type' => OrderLogDict::RIDER,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::PENDING_PICKUP,
+            'remark' => $operate['operate_desc'].'，骑手'.($notify_data['dm_name'] ?? ''),
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    /**
+     * 骑手已到店
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function riderArrived($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::RIDER_ARRIVED) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::RIDER_ARRIVED,
+            'out_status' => $notify_data['order_status'],
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        //todo 消息发送
+//        (new NoticeService())->send('');
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::RIDER_ARRIVED);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['dm_id'] ?? 0,
+            'main_name' => $notify_data['dm_name'] ?? '',
+            'main_type' => OrderLogDict::RIDER,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::RIDER_ARRIVED,
+            'remark' => $operate['operate_desc'].'，骑手'.($notify_data['dm_name'] ?? ''),
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    /**
+     * 骑手已取货
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function riderPickedUp($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::IN_DELIVERY) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::IN_DELIVERY,
+            'out_status' => $notify_data['order_status'],
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        //todo 消息发送
+//        (new NoticeService())->send('');
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::IN_DELIVERY);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['dm_id'] ?? 0,
+            'main_name' => $notify_data['dm_name'] ?? '',
+            'main_type' => OrderLogDict::RIDER,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::IN_DELIVERY,
+            'remark' => $operate['operate_desc'].'，骑手'.($notify_data['dm_name'] ?? ''),
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    /**
+     * 物品返回中
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function returnApplied($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::RETURN_IN_PROGRESS) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::RETURN_IN_PROGRESS,
+            'out_status' => $notify_data['order_status'],
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        //todo 消息发送
+//        (new NoticeService())->send('');
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::RETURN_IN_PROGRESS);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['dm_id'] ?? 0,
+            'main_name' => $notify_data['dm_name'] ?? '',
+            'main_type' => OrderLogDict::RIDER,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::RETURN_IN_PROGRESS,
+            'remark' => $operate['operate_desc'].'，骑手'.($notify_data['dm_name'] ?? ''),
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    /**
+     * 物品返回完成
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function returnCompleted($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::RETURN_COMPLETED) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::RETURN_COMPLETED,
+            'out_status' => $notify_data['order_status'],
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        //todo 消息发送
+//        (new NoticeService())->send('');
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::RETURN_COMPLETED);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['dm_id'] ?? 0,
+            'main_name' => $notify_data['dm_name'] ?? '',
+            'main_type' => OrderLogDict::RIDER,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::RETURN_COMPLETED,
+            'remark' => $operate['operate_desc'],
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    public function cancel($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::CANCELED) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::CANCELED,
+            'out_status' => $notify_data['order_status'],
+            'cancel_time' =>  time()
+        ];
+        if (!empty($notify_data['cancel_reason'])) {
+            $data['remark'] = $notify_data['cancel_reason'];
+        }
+        $delivery_order_data = $local_delivery_order->toArray();
+        $delivery_order_data['event'] = 'cancel';
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        event('LocalDeliveryEvent', $delivery_order_data);
+
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::CANCELED);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => 0,
+            'main_name' => '',
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::CANCELED,
+            'remark' => $operate['operate_desc'],
+        ];
+        if ($notify_data['cancel_from'] == 1) {
+            $log_data['main_id'] = $notify_data['dm_id'] ?? 0;
+            $log_data['main_name'] = $notify_data['dm_name'] ?? '';
+            $log_data['main_type'] = OrderLogDict::RIDER;
+            $log_data['remark'] = $operate['operate_desc'].'，骑手'.($notify_data['dm_name'] ?? '');
+        } elseif ($notify_data['cancel_from'] == 2) {
+            $log_data['main_type'] = OrderLogDict::STORE;
+        } elseif ($notify_data['cancel_from'] == 3) {
+            $log_data['main_type'] = OrderLogDict::SYSTEM;
+        } else {
+            $log_data['main_type'] = OrderLogDict::SYSTEM;
+        }
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    public function finish($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::COMPLETED) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::COMPLETED,
+            'out_status' => $notify_data['order_status'],
+            'finish_time' => time()
+        ];
+        $delivery_order_data = $local_delivery_order->toArray();
+        $delivery_order_data['event'] = 'finish';
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        event('LocalDeliveryEvent', $delivery_order_data);
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::COMPLETED);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['dm_id'] ?? 0,
+            'main_name' => $notify_data['dm_name'] ?? '',
+            'main_type' => OrderLogDict::RIDER,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::COMPLETED,
+            'remark' => $operate['operate_desc'],
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    /**
+     * 创建达达运单失败
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function createOrderFailed($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::CREATE_ORDER_FAILED) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::CREATE_ORDER_FAILED,
+            'out_status' => $notify_data['order_status'],
+        ];
+        $delivery_order_data = $local_delivery_order->toArray();
+        $delivery_order_data['event'] = 'createOrderFailed';
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        event('LocalDeliveryEvent', $delivery_order_data);
+        return true;
+    }
+
+    /**
+     * 售后取件单送达门店
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function returnRiderArrived($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::RETURN_RIDER_ARRIVED) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::RETURN_RIDER_ARRIVED,
+            'out_status' => $notify_data['order_status'],
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        return true;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/local_delivery/dada/CoreOrderMessageService.php b/niucloud/addon/shop/app/service/core/local_delivery/dada/CoreOrderMessageService.php
new file mode 100644
index 000000000..88200c1e3
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/local_delivery/dada/CoreOrderMessageService.php
@@ -0,0 +1,107 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\local_delivery\dada;
+
+use addon\shop\app\dict\local_delivery\dada\DadaDeliveryStatusDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreOrderMessageService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * 订单状态回调
+     * @param array $data
+     * @return void
+     */
+    public function orderNotify(array $data)
+    {
+        // 回调数据签名校验
+        $signature = $this->signature([ $data['client_id'], $data['order_id'], $data['update_time'] ]);
+        if ($signature != $data['signature']) {
+            throw new CommonException('DADA_ORDER_NOTIFY_SIGN_ERROR');
+        }
+        // 同城配送订单号
+        $delivery_no = $data['order_id'];
+        // 同城配送订单状态转换
+        $status = DadaDeliveryStatusDict::convertStatus($data['order_status']);
+
+        $core_order_event_service = new CoreOrderEventService();
+        switch ($status) {
+            case LocalDeliveryStatusDict::PENDING_ACCEPTANCE:
+                $core_order_event_service->orderCall(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::DISPATCH_ORDER:
+                $core_order_event_service->dispatchOrder(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::PENDING_PICKUP:
+                $core_order_event_service->riderAccepted(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::RIDER_ARRIVED:
+                $core_order_event_service->riderArrived(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::IN_DELIVERY:
+                $core_order_event_service->riderPickedUp(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::COMPLETED:
+                $core_order_event_service->finish(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::RETURN_IN_PROGRESS:
+                $core_order_event_service->returnApplied(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::RETURN_COMPLETED:
+                $core_order_event_service->returnCompleted(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::CANCELED:
+                $core_order_event_service->cancel(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::RETURN_RIDER_ARRIVED:
+                $core_order_event_service->returnRiderArrived(['notify_data' => $data],  $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::CREATE_ORDER_FAILED:
+                $core_order_event_service->createOrderFailed(['notify_data' => $data],  $delivery_no);
+                break;
+            default:
+                break;
+        }
+    }
+
+    /**
+     * 回调数据签名校验
+     * @param array $data
+     * @return string
+     */
+    public function signature(array $data)
+    {
+        // 对client_id, order_id, update_time的值进行字符串升序排列
+        usort($data, function($a, $b) {
+            return strcmp($a, $b);
+        });
+
+        // 属性值拼接拼接字符串
+        $signStr = implode('', $data);
+
+        // MD5加密
+        return md5($signStr);
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/marketing/CoreManjianService.php b/niucloud/addon/shop/app/service/core/marketing/CoreManjianService.php
index c472a2adf..973851055 100644
--- a/niucloud/addon/shop/app/service/core/marketing/CoreManjianService.php
+++ b/niucloud/addon/shop/app/service/core/marketing/CoreManjianService.php
@@ -807,8 +807,9 @@ class CoreManjianService extends BaseCoreService
                     if (!empty($value['goods_json'])) {
                         foreach ($value['goods_json'] as $goods) {
                             if (!empty($gift) && !empty($gift['goods'])) {
-                                if ($goods['num'] > $gift['goods']['num']) {
-                                    $goods['num'] -= $gift['goods']['num'];
+                                $gift_goods = array_column($gift['goods'], null, 'sku_id');
+                                if ($goods['num'] > $gift_goods[$goods['sku_id']]['num']) {
+                                    $goods['num'] -= $gift_goods[$goods['sku_id']]['num'];
                                     $refund_gift_list[$value['manjian_id']]['goods'][] = $goods;
                                 }
                             }
diff --git a/niucloud/addon/shop/app/service/core/order/CoreOrderCreateService.php b/niucloud/addon/shop/app/service/core/order/CoreOrderCreateService.php
index 55d149b6c..774d18cab 100644
--- a/niucloud/addon/shop/app/service/core/order/CoreOrderCreateService.php
+++ b/niucloud/addon/shop/app/service/core/order/CoreOrderCreateService.php
@@ -12,6 +12,7 @@
 namespace addon\shop\app\service\core\order;
 
 use addon\shop\app\dict\active\ActiveDict;
+use addon\shop\app\dict\delivery\DeliveryDict;
 use addon\shop\app\dict\order\OrderDict;
 use addon\shop\app\dict\order\OrderGoodsDict;
 use addon\shop\app\model\cart\Cart;
@@ -52,7 +53,6 @@ class CoreOrderCreateService extends BaseCoreService
     {
         //参数赋值
         $this->setParam($data);
-
         $member_info = ( new CoreMemberService() )->getInfoByMemberId($data[ 'member_id' ], 'status');
 
         if (empty($member_info)) throw new CommonException('SHOP_ORDER_BUYER_NOT_FOUND');//无效的账号
@@ -62,6 +62,7 @@ class CoreOrderCreateService extends BaseCoreService
         //获取订单缓存缓存
         $this->getOrderCache($order_key);
 
+
         $this->goods_data = array_merge($this->goods_data, $this->gift_goods);
         $this->form_data = $this->param[ 'form_data' ] ?? []; // 万能表单数据
         //校验错误
@@ -69,6 +70,7 @@ class CoreOrderCreateService extends BaseCoreService
         //普通订单校验库存
         $this->checkStock($this->goods_data);
         $local_delivery_type = $data[ 'delivery' ]['local_delivery_type'] ?? '';
+        $delivery_type = $this->delivery[ 'delivery_type' ] ?? '';
         $order_data = [
             //订单整体
             'order_type' => OrderDict::TYPE,
@@ -83,10 +85,10 @@ class CoreOrderCreateService extends BaseCoreService
 //            'invoice_id' => $order_array['invoice_id'] ?? 0,
 
             //收发货相关
-            'delivery_type' => $this->delivery[ 'delivery_type' ] ?? '',
+            'delivery_type' => $delivery_type,
             'taker_name' => $data[ 'delivery' ][ 'taker_name' ] ?? $this->delivery[ 'take_address' ][ 'name' ] ?? '',
             'taker_mobile' => $data[ 'delivery' ][ 'taker_mobile' ] ?? $this->delivery[ 'take_address' ][ 'mobile' ] ?? '',
-            'buyer_ask_delivery_time' =>$local_delivery_type == 'now' ? "" :  $data[ 'delivery' ][ 'buyer_ask_delivery_time' ] ?? '', // 购买者期望的时间
+            'buyer_ask_delivery_time' => ($local_delivery_type == 'now' && $delivery_type == DeliveryDict::LOCAL_DELIVERY) ? "" :  $data[ 'delivery' ][ 'buyer_ask_delivery_time' ] ?? '', // 购买者期望的时间
             'taker_province' => $this->delivery[ 'take_address' ][ 'province_id' ] ?? 0,
             'taker_city' => $this->delivery[ 'take_address' ][ 'city_id' ] ?? 0,
             'taker_district' => $this->delivery[ 'take_address' ][ 'district_id' ] ?? 0,
@@ -205,6 +207,7 @@ class CoreOrderCreateService extends BaseCoreService
 
         //查询商品信息
         $this->getGoodsData();
+        ///$this->createGoodsData();
         //配送相关信息
         $this->getDelivery();
 
@@ -222,6 +225,7 @@ class CoreOrderCreateService extends BaseCoreService
         return true;
     }
 
+
     /**
      * 商品相关数据
      * @return array
@@ -236,7 +240,7 @@ class CoreOrderCreateService extends BaseCoreService
         if (!empty($cart_ids)) {
             $this->cart_ids = $cart_ids;
             //查询购物车
-            $cart = ( new Cart() )->where([ [ 'id', 'in', $cart_ids ] ])->field('goods_id, sku_id, num, market_type, market_type_id')->select();
+            $cart = ( new Cart() )->where([ [ 'id', 'in', $cart_ids ] ])->field('goods_id, sku_id, num')->select();
             if ($cart->isEmpty()) throw new CommonException('SHOP_ORDER_CARTS_EXPIRE');//无效的数据
             if ($cart->count() != count($cart_ids)) throw new CommonException('SHOP_ORDER_CARTS_EXPIRE');//无效的商品
             $sku_data = $cart->toArray();
@@ -280,13 +284,13 @@ class CoreOrderCreateService extends BaseCoreService
             //todo 需仔细看看
             $sku_info[ 'show_type' ] = 'original_price';
             $sku_info[ 'active_id' ] = '';
-            $sku_info[ 'member_price' ] = $this->getMemberPrice($sku_info);
-          //  $sku_info[ 'price' ] = $sku_info[ 'member_price' ];
             $goods_active_price_service = (new CoreGoodsActivePriceService());
             $show_price_data = $goods_active_price_service->getActivePrice($sku_info, $this->member_id);
             $sku_info[ 'show_type' ] = $show_price_data[ 'show_type' ];
             $sku_info[ 'price' ] = $show_price_data[ 'show_price' ];
             $sku_info[ 'active_id' ] = $show_price_data[ 'discount_id' ] ?? '';
+            $sku_info[ 'member_price' ] = $this->getMemberPrice($sku_info);
+
 
 
             //默认金额填充
@@ -338,7 +342,9 @@ class CoreOrderCreateService extends BaseCoreService
                 if (!empty($temp)) {
                     // 更新 SKU 信息
                     $sku_info = $temp[ 'sku_info' ];
+                    //todo 需仔细看看
                     $sku_info['relate_id'] = $temp[ 'relate_id' ];
+                    //todo 需仔细看看
                     if (!empty($this->extend_data)) {
                         // 更新扩展数据中的关联 ID 和活动类型
                         $this->extend_data[ 'relate_id' ] = $temp[ 'relate_id' ] ?? 0;
diff --git a/niucloud/addon/shop/app/service/core/order/CoreOrderCreateTrait.php b/niucloud/addon/shop/app/service/core/order/CoreOrderCreateTrait.php
index f33198931..21090d161 100644
--- a/niucloud/addon/shop/app/service/core/order/CoreOrderCreateTrait.php
+++ b/niucloud/addon/shop/app/service/core/order/CoreOrderCreateTrait.php
@@ -14,17 +14,20 @@ namespace addon\shop\app\service\core\order;
 
 use addon\shop\app\dict\active\ActiveDict;
 use addon\shop\app\dict\coupon\CouponDict;
+use addon\shop\app\dict\delivery\DeliveryDict;
 use addon\shop\app\dict\goods\GoodsDict;
 use addon\shop\app\dict\order\OrderDeliveryDict;
 use addon\shop\app\dict\order\OrderDiscountDict;
 use addon\shop\app\dict\order\OrderLogDict;
+use addon\shop\app\model\delivery\Store;
 use addon\shop\app\model\goods\GoodsSku;
 use addon\shop\app\model\order\Order;
 use addon\shop\app\model\order\OrderGoods;
 use addon\shop\app\service\core\coupon\CoreCouponMemberService;
+use addon\shop\app\service\core\delivery\CoreConfigService;
 use addon\shop\app\service\core\delivery\CoreDeliveryService;
 use addon\shop\app\service\core\delivery\CoreExpressService;
-use addon\shop\app\service\core\delivery\CoreLocalDeliveryService;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryService;
 use addon\shop\app\service\core\delivery\CoreStoreService;
 use addon\shop\app\service\core\goods\CoreGoodsLimitBuyService;
 use addon\shop\app\service\core\marketing\CoreManjianService;
@@ -33,6 +36,8 @@ use app\service\core\diy_form\CoreDiyFormRecordsService;
 use app\service\core\member\CoreMemberAddressService;
 use core\exception\CommonException;
 use Exception;
+use Location\Coordinate;
+use Location\Distance\Vincenty;
 use think\facade\Cache;
 use think\facade\Db;
 
@@ -71,6 +76,7 @@ trait CoreOrderCreateTrait
 
     public $order_key;
     public $error = [];
+    public $join_manjian = true;
 
     public function createOrder(array $data)
     {
@@ -109,7 +115,7 @@ trait CoreOrderCreateTrait
             $order_data[ 'order_id' ] = $this->order_id;
 
             // 订单创建后事件
-            CoreOrderEventService::orderCreate(['order_id' => $this->order_id, 'order_data' => $order_data, 'order_goods_data' => $order_goods_data, 'cart_ids' => $this->cart_ids, 'basic' => get_object_vars($this), 'main_type' => $main_type, 'main_id' => $main_id, 'time' => time() ]);
+            CoreOrderEventService::orderCreate([ 'order_id' => $this->order_id, 'order_data' => $order_data, 'order_goods_data' => $order_goods_data, 'cart_ids' => $this->cart_ids, 'basic' => get_object_vars($this), 'main_type' => $main_type, 'main_id' => $main_id, 'time' => time() ]);
 
             Db::commit();
 
@@ -122,7 +128,7 @@ trait CoreOrderCreateTrait
 
             // 订单金额为0的话,要直接支付
             if ($order_data[ 'order_money' ] == 0) {
-                ( new CoreOrderPayService() )->pay(['trade_id' => $this->order_id, 'main_type' => $main_type, 'main_id' => $main_id ]);
+                ( new CoreOrderPayService() )->pay([ 'trade_id' => $this->order_id, 'main_type' => $main_type, 'main_id' => $main_id ]);
             }
 
             return [
@@ -132,7 +138,7 @@ trait CoreOrderCreateTrait
 
         } catch (Exception $e) {
             Db::rollback();
-            throw new CommonException($e->getMessage().$e->getFile().$e->getLine());
+            throw new CommonException($e->getMessage());
         }
     }
 
@@ -217,6 +223,8 @@ trait CoreOrderCreateTrait
                 case 'invoice':
                     $config = ( new CoreOrderConfigService() )->invoice() ?? [];
                     break;
+                case 'local_delivery':
+                    $config = (new CoreConfigService())->getLocalDeliveryConfig() ?? [];
             }
             $this->config[ $key ] = $config;
         }
@@ -419,7 +427,9 @@ trait CoreOrderCreateTrait
         //查询积分优惠
 //        $this->getPoint();
         //满减送优惠计算
+        if($this->join_manjian){
             $this->calculateManjian();
+        }
         //查询可用优惠券
         $this->calculateCoupon();
     }
@@ -636,6 +646,7 @@ trait CoreOrderCreateTrait
 //            $delivery_type_list = array_column($delivery_type_list, null, 'key');
             $this->delivery[ 'delivery_type_list' ] = $delivery_type_list;
         }
+        $this->config('local_delivery');
         return true;
     }
 
@@ -674,7 +685,8 @@ trait CoreOrderCreateTrait
 
             //选中收货地址
             $this->selectTakeAddress();
-
+            //选择配送/自提门店
+            $this->selectTakeStore($delivery_type);
             switch ($delivery_type) {
                 case OrderDeliveryDict::EXPRESS://物流
                     CoreExpressService::calculate($this);
@@ -732,6 +744,71 @@ trait CoreOrderCreateTrait
         return true;
     }
 
+    /**
+     * 选中配送/自提门店
+     * @param $delivery_type
+     * @return true
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function selectTakeStore($delivery_type)
+    {
+        $delivery = $this->param[ 'delivery' ] ?? [];
+        $position = $this->param[ 'position' ] ?? [];
+        $this->delivery['take_store'] = [];
+        if (in_array($delivery_type, [DeliveryDict::LOCAL_DELIVERY, DeliveryDict::STORE])) {
+            $store_list = (new Store())->where([['status', '=', 1]])->withSearch(['pick_up_type'], ['pick_up_type' => $delivery_type])->select()->toArray();
+            if (empty($store_list)) {
+                if ($delivery_type == DeliveryDict::LOCAL_DELIVERY) {
+                    $this->delivery['error'] = empty($this->delivery['error']) ? get_lang('SHOP_NOT_SET_LOCAL_DELIVERY_STORE') : $this->delivery['error'];
+                } else {
+                    $this->delivery['error'] = empty($this->delivery['error']) ? get_lang('SHOP_NOT_SET_PICK_UP_STORE') : $this->delivery['error'];
+                }
+            }
+            if (!empty($store_list) && !empty($position) && !empty($position[ 'latitude' ]) && !empty($position[ 'longitude' ])) {
+                $location = new Coordinate($position[ 'latitude' ], $position[ 'longitude' ]);
+                $store_list = array_map(function($item) use ($location) {
+                    $distance = ( new Vincenty() )->getDistance($location, new Coordinate((float) $item[ 'latitude' ], (float) $item[ 'longitude' ]));
+                    $item[ 'distance' ] = round($distance/1000, 3);
+                    return $item;
+                }, $store_list);
+                array_multisort(array_column($store_list, 'distance'), SORT_ASC, $store_list);
+            }
+            $this->delivery['take_store_list'] = $store_list;
+            if (empty($delivery['take_store_id'])) {
+                if (!empty($store_list)) {
+                    $this->delivery['take_store'] = $store_list[0] ?? [];
+                }
+            } else {
+                $store_column_list = array_column($store_list, null, 'store_id');
+                $store = (new Store())->where([['store_id', '=', $delivery['take_store_id']]])->findOrEmpty()->toArray();
+                if (empty($store)) {
+                    $this->delivery['error'] = empty($this->delivery['error']) ? get_lang('DELIVERY_STORE_NOT_EXIST') : $this->delivery['error'];
+                } else {
+                    switch ($delivery_type) {
+                        case DeliveryDict::LOCAL_DELIVERY://同城配送
+                            if (!$store[ 'support_local_delivery' ]) {
+                                $this->delivery['error'] = empty($this->delivery['error']) ? get_lang('STORE_NOT_SUPPORT_LOCAL_DELIVERY') : $this->delivery['error'];
+                            }
+                            break;
+                        case DeliveryDict::STORE://门店自提
+                            if (!$store[ 'support_store' ]) {
+                                $this->delivery['error'] = empty($this->delivery['error']) ? get_lang('STORE_NOT_SUPPORT_PICK_UP') : $this->delivery['error'];
+                            }
+                            break;
+                    }
+                }
+                $store['distance'] = $store_column_list[$delivery['take_store_id']]['distance'] ?? 0;
+                $this->delivery['take_store'] = $store;
+            }
+        }
+        if (!empty($this->delivery['error'])) {
+            $this->setError($this->delivery['error']);
+        }
+        return true;
+    }
+
     /**
      * 检测限购
      * @return bool
@@ -910,7 +987,7 @@ trait CoreOrderCreateTrait
             $goods_form = $this->form_data[ 'goods' ] ?? [];
             if (!empty($goods_form)) {
                 $order_goods_model = new OrderGoods();
-                $order_goods_list = $data = $order_goods_model->where([  [ 'order_id', '=', $order_id ] ])
+                $order_goods_list = $data = $order_goods_model->where([ [ 'order_id', '=', $order_id ] ])
                     ->field('order_goods_id,sku_id')->select()->toArray();
                 foreach ($goods_form as $k => $v) {
                     foreach ($order_goods_list as $ck => $cv) {
diff --git a/niucloud/addon/shop/app/service/core/order/CoreOrderDeliveryService.php b/niucloud/addon/shop/app/service/core/order/CoreOrderDeliveryService.php
index b2de1b6a3..c27a8ae2c 100644
--- a/niucloud/addon/shop/app/service/core/order/CoreOrderDeliveryService.php
+++ b/niucloud/addon/shop/app/service/core/order/CoreOrderDeliveryService.php
@@ -11,20 +11,18 @@
 
 namespace addon\shop\app\service\core\order;
 
-use addon\shop\app\dict\delivery\DeliveryLocalDict;
 use addon\shop\app\dict\goods\GoodsDict;
 use addon\shop\app\dict\order\OrderDeliveryDict;
 use addon\shop\app\dict\order\OrderDict;
 use addon\shop\app\dict\order\OrderGoodsDict;
-use addon\shop\app\model\delivery\Local;
 use addon\shop\app\model\goods\Goods;
 use addon\shop\app\model\order\Order;
 use addon\shop\app\model\order\OrderDelivery;
 use addon\shop\app\model\order\OrderGoods;
 use addon\shop\app\model\shop_address\ShopAddress;
 use addon\shop\app\service\core\delivery\CoreElectronicSheetService;
-use addon\shop\app\service\core\delivery\CoreLocalDeliveryService;
-use addon\shop\app\service\core\delivery\third_delivery\ThirdDeliveryLoader;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderCreateService;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderService;
 use app\dict\pay\PayDict;
 use app\model\member\Member;
 use app\model\pay\Pay;
@@ -325,15 +323,12 @@ class CoreOrderDeliveryService extends BaseCoreService
         $order_goods_data = $data['order_goods_data'];
         $param = $data['param'];
         $delivery_type = $param['delivery_type'];
-        $local = (new Local())->where([['local_id', '>', 0 ]])->field('fee_type,base_dist,base_price,grad_dist,grad_price,weight_start,weight_unit,weight_price,delivery_type,area,center')->findOrEmpty()->toArray();
-        //若使用的是第三方配送
-        if (in_array(DeliveryLocalDict::DELIVERY_TYPE_THIRD, $local['delivery_type'])) {
-            $third_party_config = (new CoreLocalDeliveryService())->getConfig();
-            $third_delivery = $third_party_config['default'] ?? '';
-            $loader = new ThirdDeliveryLoader($third_delivery, $third_party_config[$third_delivery]);
-            //三方配送下单
-            $loader->createOrder($data);
-        }
+        //检查当前交易下是否有在进行中的配送订单
+        $check = (new CoreLocalDeliveryOrderService())->getUnderwayDeliveryOrder([
+            'trade_no' => $order_data['order_no'],
+        ]);
+        if (!$check) throw new CommonException('LOCAL_DELIVERY_ORDER_EXIST');//该订单已存在正在进行中的配送订单
+        $local_delivery_no = create_no();
         $insert_data = array(
             'delivery_ids' => $param['delivery_ids'] ?? [],
             'order_id' => $order_data['order_id'],
@@ -341,7 +336,7 @@ class CoreOrderDeliveryService extends BaseCoreService
             'sub_delivery_type' => $delivery_type,
             'local_deliver_id' => $param['local_deliver_id'],
             'remark' => $param['remark'],
-            'third_delivery' => $third_delivery ?? "",
+            'local_delivery_order_id' => $local_delivery_no
         );
         $delivery_id = $this->package($insert_data);
         $delivery_ids = $param['delivery_ids'];
@@ -351,6 +346,14 @@ class CoreOrderDeliveryService extends BaseCoreService
                 'delivery_id' => $delivery_id
             ]);
         }
+        //同城配送订单创建
+        (new CoreLocalDeliveryOrderCreateService())->create([
+            'order_data' => $order_data,
+            'trade_no' => $order_data['order_no'],
+            'order_goods_data' => $order_goods_data,
+            'local_delivery_no' => $local_delivery_no,
+            'param' => $param,
+        ]);
         return true;
     }
 
@@ -472,6 +475,39 @@ class CoreOrderDeliveryService extends BaseCoreService
         return true;
     }
 
+    /**
+     * 配送费用计算
+     * @param $data
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getDeliveryFee($data)
+    {
+        if ($data['delivery_type'] == 'local_delivery' && $data['delivery_way'] == 'third_party_delivery') {
+            $order_id = $data['order_id'];
+            $order_goods_ids = $data['order_goods_ids'];//订单项id
+            //查询订单
+            $order_data = $this->model->where([['order_id', '=', $order_id]])->findOrEmpty();
+            if ($order_data->isEmpty()) throw new CommonException('MALL_ORDER_NOT_FOUND');//订单不存在
+            $order_goods_where = [
+                ['order_id', '=', $order_id],
+                ['order_goods_id', 'in', $order_goods_ids],
+                ['status', '=', OrderGoodsDict::NORMAL]
+            ];
+            $order_goods_data = (new OrderGoods())->with(['sku' => function ($q) {
+                $q->field('sku_id,weight');
+            }, 'goods' => function ($q) {
+                $q->field('goods_id,unit');
+            }])->where($order_goods_where)->select();
+            $data['order_data'] = $order_data;
+            $data['order_goods_data'] = $order_goods_data;
+            return (new CoreLocalDeliveryOrderCreateService())->getDeliveryFee($data);
+        }
+        return 0;
+    }
+
     /**
      * 微信小程序 发货信息录入接口
      * @param $params
@@ -532,7 +568,7 @@ class CoreOrderDeliveryService extends BaseCoreService
             }
 
             // 设置消息跳转路径设置接口
-            $result_jump_path = $weapp_delivery_service->setMsgJumpPath( 'shop_order');
+            $result_jump_path = $weapp_delivery_service->setMsgJumpPath('shop_order');
             if ($result_jump_path['errcode'] != 0) {
                 return '设置消息跳转路径设置接口，报错：' . $result_jump_path["errmsg"];
             }
@@ -662,7 +698,7 @@ class CoreOrderDeliveryService extends BaseCoreService
                 $is_all_delivered = true;
             }
 
-            $member_info = (new Member())->where([ ['member_id', '=', $order_data['member_id']]])->field('weapp_openid')->findOrEmpty()->toArray();
+            $member_info = (new Member())->where([['member_id', '=', $order_data['member_id']]])->field('weapp_openid')->findOrEmpty()->toArray();
 
             $data = [
                 'out_trade_no' => $order_data['out_trade_no'],
@@ -674,7 +710,7 @@ class CoreOrderDeliveryService extends BaseCoreService
                 'is_all_delivered' => $is_all_delivered
             ];
 
-            $weapp_delivery_service->uploadShippingInfo( $data);
+            $weapp_delivery_service->uploadShippingInfo($data);
         } catch (\Exception $e) {
             Log::write('商城订单发货失败' . $e->getMessage() . $e->getFile() . $e->getLine());
         }
diff --git a/niucloud/addon/shop/app/service/core/pointexchange/CoreOrderCreateService.php b/niucloud/addon/shop/app/service/core/pointexchange/CoreOrderCreateService.php
index 93118f317..05906492e 100644
--- a/niucloud/addon/shop/app/service/core/pointexchange/CoreOrderCreateService.php
+++ b/niucloud/addon/shop/app/service/core/pointexchange/CoreOrderCreateService.php
@@ -71,8 +71,8 @@ class CoreOrderCreateService extends BaseCoreService
             'has_goods_types' => $this->basic[ 'has_goods_types' ],//包含的商品形式
             //收发货相关
             'delivery_type' => $this->delivery[ 'delivery_type' ] ?? '',
-            'taker_name' => $this->delivery[ 'take_address' ][ 'name' ] ?? $data['delivery'][ 'taker_name' ] ?? '',
-            'taker_mobile' => $this->delivery[ 'take_address' ][ 'mobile' ] ?? $data['delivery'][ 'taker_mobile' ] ?? '',
+            'taker_name' => $this->delivery[ 'take_address' ][ 'name' ] ??  $data[ 'delivery' ]['taker_name']??'',
+            'taker_mobile' => $this->delivery[ 'take_address' ][ 'mobile' ] ?? $data[ 'delivery' ]['taker_mobile']?? '',
             'taker_province' => $this->delivery[ 'take_address' ][ 'province_id' ] ?? 0,
             'taker_city' => $this->delivery[ 'take_address' ][ 'city_id' ] ?? 0,
             'taker_district' => $this->delivery[ 'take_address' ][ 'district_id' ] ?? 0,
diff --git a/niucloud/addon/shop/app/service/core/refund/CoreRefundService.php b/niucloud/addon/shop/app/service/core/refund/CoreRefundService.php
index 46a738c01..1b3b56cc1 100644
--- a/niucloud/addon/shop/app/service/core/refund/CoreRefundService.php
+++ b/niucloud/addon/shop/app/service/core/refund/CoreRefundService.php
@@ -142,7 +142,7 @@ class CoreRefundService extends BaseCoreService
                 ['order_id', '=', $order_refund_data['order_id']]
             ])->findOrEmpty();
             if ($order->isEmpty()) throw new CommonException('SHOP_ORDER_NOT_FOUND');
-            $refund_no = $core_refund_service->create( $order['out_trade_no'], $order_refund_data['money'], get_lang('SHOP_ORDER_BUYER_APPLY_REFUND'), OrderDict::TYPE, $order_refund_data['order_refund_no']);
+            $refund_no = $core_refund_service->create($order['out_trade_no'], $order_refund_data['money'], get_lang('SHOP_ORDER_BUYER_APPLY_REFUND'), OrderDict::TYPE, $order_refund_data['order_refund_no']);
             $this->model->where(
                 [
                     ['order_refund_no', '=', $order_refund_data['order_refund_no']]
@@ -153,7 +153,7 @@ class CoreRefundService extends BaseCoreService
                     'status' => OrderRefundDict::STORE_REFUND_TRANSFERING
                 ]
             );
-            $core_refund_service->refund( $refund_no, '', RefundDict::BACK, $main_type, $main_id);
+            $core_refund_service->refund($refund_no, '', RefundDict::BACK, $main_type, $main_id);
         }
         //状态改变
         return true;
diff --git a/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderCloseService.php b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderCloseService.php
new file mode 100644
index 000000000..4d953323a
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderCloseService.php
@@ -0,0 +1,87 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\shop_delivery;
+
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryStatusDict;
+use addon\shop\app\model\shop_delivery\ShopDeliveryOrder;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderNotifyService;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+
+/**
+ * 同城配送服务层
+ * Class CoreShopDeliveryOrderService
+ * @package app\service\core\delivery
+ */
+class CoreShopDeliveryOrderCloseService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new ShopDeliveryOrder();
+    }
+
+    /**
+     * 取消订单
+     * @param array $data
+     * @return bool
+     */
+    public function closeOrder(array $data)
+    {
+        $id = $data['id'] ?? 0;
+        $out_delivery_no = $data['out_delivery_no'] ?? '';
+        if (empty($id) && empty($out_delivery_no)) {
+            throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        }
+        $condition = [];
+        if (!empty($id)) {
+            $condition[] = ['id', '=', $id];
+        } else {
+            $condition[] = ['out_delivery_no', '=', $out_delivery_no];
+        }
+        $info = $this->model->where($condition)->findOrEmpty();
+        if ($info->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        $res = $info->save([
+            'status' => ShopDeliveryStatusDict::CANCELED,
+            'cancel_time' => time(),
+            'remark' => $data['cancel_reason'] ?? '',
+        ]);
+        if ($res) {
+            // 订单状态回调
+            $notify_data = [
+                'status' => ShopDeliveryStatusDict::CANCELED,
+                'cancel_time' => time(),
+                'out_delivery_no' => $data['out_delivery_no'] ?? $info['out_delivery_no'],
+                'cancel_reason' => $data['cancel_reason'] ?? '',
+                'main_id' => $data['main_id'] ?? 0,
+                'main_type' => $data['main_type'] ?? '',
+                'main_name' => $data['main_name'] ?? '',
+            ];
+            (new CoreLocalDeliveryOrderNotifyService())->notify(ShopDeliveryDict::MERCHANT, $info['out_delivery_no'], 'order', $notify_data);
+            //添加配送订单日志
+            $operate = OrderLogDict::getOperate(ShopDeliveryStatusDict::convertStatus(ShopDeliveryStatusDict::CANCELED));
+            (new CoreShopDeliveryOrderLogService())->addLog([
+                'order_id' => $info['id'],
+                'main_id' => $data['main_id'] ?? 0,
+                'main_type' => OrderLogDict::STORE,
+                'main_name' => $data['main_name'] ?? '',
+                'operate' => $operate['operate'],
+                'operate_desc' => $operate['operate_desc'],
+                'status' => ShopDeliveryStatusDict::CANCELED,
+                'remark' => $operate['operate_desc'],
+            ]);
+        }
+        return $res;
+    }
+}
diff --git a/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderCreateService.php b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderCreateService.php
new file mode 100644
index 000000000..a02605f44
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderCreateService.php
@@ -0,0 +1,117 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\shop_delivery;
+
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryStatusDict;
+use addon\shop\app\model\delivery\Store;
+use addon\shop\app\model\shop_delivery\Deliver;
+use addon\shop\app\model\shop_delivery\ShopDeliveryOrder;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderNotifyService;
+use core\base\BaseCoreService;
+use Location\Coordinate;
+use Location\Distance\Vincenty;
+
+/**
+ * 同城配送服务层
+ * Class CoreShopDeliveryOrderService
+ * @package app\service\core\delivery
+ */
+class CoreShopDeliveryOrderCreateService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new ShopDeliveryOrder();
+    }
+
+    /**
+     * 创建配送订单
+     * @param $params
+     * @return array
+     * @throws \Exception
+     */
+    public function createOrder($params)
+    {
+        $order_data = $params['order_data'];
+        $deliver = (new Deliver())->field('deliver_name,deliver_mobile')->where([['deliver_id', '=', $params['deliver_id']]])->findOrEmpty()->toArray();
+        $delivery_store = (new Store())->where([['store_id', '=', $order_data['take_store_id']]])->findOrEmpty()->toArray();
+        // 收货地址
+        $receiver_address_point = new Coordinate($order_data[ 'taker_latitude' ], $order_data[ 'taker_longitude' ]);
+        // 取货地址
+        $local_address_point = new Coordinate($delivery_store[ 'latitude' ], $delivery_store[ 'longitude' ]);
+        // 计算收货地址与取货地址的距离
+        $distance = round(( new Vincenty() )->getDistance($receiver_address_point, $local_address_point) / 1000, 2);
+
+        $delivery_no = create_no();//创建商家配送单号
+        $data = [
+            'delivery_no' => $delivery_no,
+            'out_delivery_no' => $params['delivery_no'],
+            'trade_id' => $order_data['order_id'],
+            'trade_no' => $params['trade_no'],
+            'delivery_money' => $order_data['delivery_money'],
+            'delivery_start' => $delivery_store['full_address'],
+            'delivery_start_province_id' => $delivery_store['province_id'] ?? 0,
+            'delivery_start_city_id' => $delivery_store['city_id'] ?? 0,
+            'delivery_start_district_id' => $delivery_store['district_id'] ?? 0,
+            'delivery_start_lng' => $delivery_store['longitude'] ?? '',
+            'delivery_start_lat' => $delivery_store['latitude'] ?? '',
+            'delivery_end' => $order_data['taker_full_address'],
+            'delivery_end_province_id' => $order_data['taker_province'] ?? 0,
+            'delivery_end_city_id' => $order_data['taker_city'] ?? 0,
+            'delivery_end_district_id' => $order_data['taker_district'] ?? 0,
+            'delivery_end_lng' => $order_data['taker_longitude'] ?? '',
+            'delivery_end_lat' => $order_data['taker_latitude'] ?? '',
+            'delivery_distance' => $distance,
+            'deliver_id' => $params['deliver_id'],
+            'deliver_name' => $deliver['deliver_name'],
+            'deliver_mobile' => $deliver['deliver_mobile'],
+            'status' => ShopDeliveryStatusDict::IN_DELIVERY,//配送中
+            'remark' => $params['remark'] ?? '',
+            'body' => $params['body'] ?? ''
+        ];
+        //添加配送订单记录
+        $res = $this->model->create($data);
+        if ($res->id) {
+            $res = $res->toArray();
+            // 商家订单状态回调
+            (new CoreLocalDeliveryOrderNotifyService())->notify(ShopDeliveryDict::MERCHANT, $res['out_delivery_no'], 'order', [
+                'main_id' => $res['deliver_id'],
+                'main_name' => $res['deliver_name'],
+                'delivery_no' => $res['delivery_no'],
+                'out_delivery_no' => $res['out_delivery_no'],
+                'status' => ShopDeliveryStatusDict::IN_DELIVERY
+            ]);
+            //添加配送订单日志
+            $operate = OrderLogDict::getOperate(ShopDeliveryStatusDict::convertStatus($res['status']));
+            (new CoreShopDeliveryOrderLogService())->addLog([
+                'order_id' => $res['id'],
+                'main_id' => $res['deliver_id'],
+                'main_type' => OrderLogDict::RIDER,
+                'main_name' => $res['deliver_name'],
+                'operate' => $operate['operate'],
+                'operate_desc' => $operate['operate_desc'],
+                'status' => ShopDeliveryStatusDict::IN_DELIVERY,
+                'remark' => $operate['operate_desc'].'，骑手'.$res['deliver_name']
+            ]);
+            return [
+                'out_delivery_no' => $res['delivery_no'],//商家配送的配送单号就是同城配送的三方配送单号
+                'delivery_money' => $res['delivery_money'],
+                'delivery_distance' => $res['delivery_distance'],
+                'rider_name' => $res['deliver_name'],
+                'rider_mobile' => $res['deliver_mobile'],
+            ];
+        }
+        return [];
+    }
+}
diff --git a/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderEventService.php b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderEventService.php
new file mode 100644
index 000000000..be52378c0
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderEventService.php
@@ -0,0 +1,147 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\shop_delivery;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\model\local_delivery\LocalDeliveryOrder;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderLogService;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreShopDeliveryOrderEventService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new LocalDeliveryOrder();
+    }
+
+
+    public function create(){
+
+    }
+
+    /**
+     * 骑手已取货
+     * @param $param
+     * @param $delivery_no
+     * @return true
+     */
+    public function riderPickedUp($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::IN_DELIVERY) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::IN_DELIVERY,
+            'out_status' => $notify_data['status'],
+        ];
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        //todo 消息发送
+//        (new NoticeService())->send('', []);
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::IN_DELIVERY);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['main_id'] ?? 0,
+            'main_name' => $notify_data['main_name'] ?? '',
+            'main_type' => OrderLogDict::RIDER,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::IN_DELIVERY,
+            'remark' => $operate['operate_desc'].'，骑手'.($notify_data['main_name'] ?? ''),
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    public function cancel($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::CANCELED) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::CANCELED,
+            'out_status' => $notify_data['status'],
+            'remark' => $notify_data['cancel_reason'] ?? '',
+            'cancel_time' => time()
+        ];
+        $delivery_order_data = $local_delivery_order->toArray();
+        $delivery_order_data['event'] = 'cancel';
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        event('LocalDeliveryEvent', $delivery_order_data);
+
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::CANCELED);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['main_id'] ?? 0,
+            'main_name' => $notify_data['main_name'] ?? '',
+            'main_type' => OrderLogDict::SYSTEM,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => $notify_data['status'],
+            'remark' => $operate['operate_desc'],
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+    public function finish($param, $delivery_no){
+        $local_delivery_order = $this->model->where([['delivery_no', '=', $delivery_no]])->findOrEmpty();
+        if ($local_delivery_order->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        if ($local_delivery_order->status == LocalDeliveryStatusDict::COMPLETED) {
+            return true;
+        }
+
+        $notify_data = $param['notify_data'];
+
+        $data = [
+            'status' => LocalDeliveryStatusDict::COMPLETED,
+            'out_status' => $notify_data['status'],
+            'finish_time' => time()
+        ];
+        $delivery_order_data = $local_delivery_order->toArray();
+        $delivery_order_data['event'] = 'finish';
+        $this->model->where([['delivery_no', '=', $delivery_no]])->update($data);
+        event('LocalDeliveryEvent', $delivery_order_data);
+        //添加配送订单日志
+        $operate = OrderLogDict::getOperate(LocalDeliveryStatusDict::COMPLETED);
+        $log_data = [
+            'order_id' => $local_delivery_order->id,
+            'main_id' => $notify_data['main_id'] ?? 0,
+            'main_name' => $notify_data['main_name'] ?? '',
+            'main_type' => OrderLogDict::SYSTEM,
+            'operate' => $operate['operate'],
+            'operate_desc' => $operate['operate_desc'],
+            'status' => LocalDeliveryStatusDict::COMPLETED,
+            'remark' => $operate['operate_desc'],
+        ];
+        (new CoreLocalDeliveryOrderLogService())->addLog($log_data);
+        return true;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderFinishService.php b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderFinishService.php
new file mode 100644
index 000000000..e6d3ca5a3
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderFinishService.php
@@ -0,0 +1,85 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\shop_delivery;
+
+use addon\shop\app\dict\local_delivery\OrderLogDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryStatusDict;
+use addon\shop\app\model\shop_delivery\ShopDeliveryOrder;
+use addon\shop\app\service\core\local_delivery\CoreLocalDeliveryOrderNotifyService;
+use core\base\BaseCoreService;
+use core\exception\CommonException;
+
+/**
+ * 同城配送服务层
+ * Class CoreShopDeliveryOrderService
+ * @package app\service\core\delivery
+ */
+class CoreShopDeliveryOrderFinishService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new ShopDeliveryOrder();
+    }
+
+    /**
+     * 完成订单
+     * @param array $data
+     * @return bool
+     */
+    public function finishOrder(array $data)
+    {
+        $id = $data['id'] ?? 0;
+        $out_delivery_no = $data['out_delivery_no'] ?? '';
+        if (empty($id) && empty($out_delivery_no)) {
+            throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        }
+        $condition = [];
+        if (!empty($id)) {
+            $condition[] = ['id', '=', $id];
+        } else {
+            $condition[] = ['out_delivery_no', '=', $out_delivery_no];
+        }
+        $info = $this->model->where($condition)->findOrEmpty();
+        if ($info->isEmpty()) throw new CommonException('DELIVERY_ORDER_NOT_EXIT');
+        $res = $info->save([
+            'status' => ShopDeliveryStatusDict::COMPLETED,
+            'finish_time' => time()
+        ]);
+        if ($res) {
+            // 订单状态回调
+            $notify_data = [
+                'status' => ShopDeliveryStatusDict::COMPLETED,
+                'finish_time' => time(),
+                'out_delivery_no' => $data['out_delivery_no'] ?? $info['out_delivery_no'],
+                'main_id' => $data['main_id'] ?? 0,
+                'main_type' => $data['main_type'] ?? '',
+                'main_name' => $data['main_name'] ?? '',
+            ];
+            (new CoreLocalDeliveryOrderNotifyService())->notify(ShopDeliveryDict::MERCHANT, $info['out_delivery_no'], 'order', $notify_data);
+            //添加配送订单日志
+            $operate = OrderLogDict::getOperate(ShopDeliveryStatusDict::convertStatus(ShopDeliveryStatusDict::COMPLETED));
+            (new CoreShopDeliveryOrderLogService())->addLog([
+                'order_id' => $info['id'],
+                'main_id' => $data['main_id'] ?? 0,
+                'main_type' => OrderLogDict::STORE,
+                'main_name' => $data['main_name'] ?? '',
+                'operate' => $operate['operate'],
+                'operate_desc' => $operate['operate_desc'],
+                'status' => ShopDeliveryStatusDict::COMPLETED,
+                'remark' => $operate['operate_desc'],
+            ]);
+        }
+        return $res;
+    }
+}
diff --git a/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderLogService.php b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderLogService.php
new file mode 100644
index 000000000..0e7b50ad5
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderLogService.php
@@ -0,0 +1,51 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\shop_delivery;
+
+use addon\shop\app\model\shop_delivery\ShopDeliveryOrderLog;
+use core\base\BaseCoreService;
+
+/**
+ * 同城配送订单日志服务层
+ * Class CoreShopDeliveryOrderLogService
+ * @package addon\shop\app\service\core\shop_delivery
+ */
+class CoreShopDeliveryOrderLogService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new ShopDeliveryOrderLog();
+    }
+
+    /**
+     * 添加配送订单日志
+     * @param $params
+     * @return ShopDeliveryOrderLog|\think\Model
+     */
+    public function addLog($params)
+    {
+        $data = [
+            'order_id' => $params['order_id'],
+            'main_id' => $params['main_id'] ?? 0,
+            'main_type' => $params['main_type'],
+            'main_name' => $params['main_name'] ?? '',
+            'operate' => $params['operate'],
+            'operate_desc' => $params['operate_desc'],
+            'status' => $params['status'],
+            'remark' => $params['remark'] ?? '',
+        ];
+//        dd($data);
+        return $this->model->create($data);
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderMessageService.php b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderMessageService.php
new file mode 100644
index 000000000..50a5b6047
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderMessageService.php
@@ -0,0 +1,58 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\shop_delivery;
+
+use addon\shop\app\dict\local_delivery\LocalDeliveryStatusDict;
+use addon\shop\app\dict\shop_delivery\ShopDeliveryStatusDict;
+use core\base\BaseCoreService;
+
+/**
+ * 同城配送服务层
+ * Class CoreExpressService
+ * @package addon\shop\app\service\admin\delivery
+ */
+class CoreShopDeliveryOrderMessageService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * 订单状态回调
+     * @param array $data
+     * @return void
+     */
+    public function orderNotify(array $data)
+    {
+        // 同城配送订单号
+        $delivery_no = $data['out_delivery_no'];
+        // 同城配送订单状态转换
+        $status = ShopDeliveryStatusDict::convertStatus($data['status']);
+
+        $core_order_event_service = new CoreShopDeliveryOrderEventService();
+        switch ($status) {
+            case LocalDeliveryStatusDict::IN_DELIVERY:
+                $core_order_event_service->riderPickedUp(['notify_data' => $data], $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::CANCELED:
+                $core_order_event_service->cancel(['notify_data' => $data], $delivery_no);
+                break;
+            case LocalDeliveryStatusDict::COMPLETED:
+                $core_order_event_service->finish(['notify_data' => $data], $delivery_no);
+                break;
+            default:
+                break;
+        }
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderService.php b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderService.php
new file mode 100644
index 000000000..29341ea30
--- /dev/null
+++ b/niucloud/addon/shop/app/service/core/shop_delivery/CoreShopDeliveryOrderService.php
@@ -0,0 +1,35 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\shop\app\service\core\shop_delivery;
+
+use addon\shop\app\model\shop_delivery\ShopDeliveryOrder;
+use core\base\BaseCoreService;
+
+/**
+ * 同城配送服务层
+ * Class CoreShopDeliveryOrderService
+ * @package addon\shop\app\service\core\shop_delivery
+ */
+class CoreShopDeliveryOrderService extends BaseCoreService
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $this->model = new ShopDeliveryOrder();
+    }
+
+    public function getOrderInfo($data)
+    {
+        return $this->model->where($data)->findOrEmpty()->toArray();
+    }
+
+}
diff --git a/niucloud/addon/shop/app/service/core/third_addon/order/CoreCreateOrderService.php b/niucloud/addon/shop/app/service/core/third_addon/order/CoreCreateOrderService.php
index 984d7dee6..90b4672ea 100644
--- a/niucloud/addon/shop/app/service/core/third_addon/order/CoreCreateOrderService.php
+++ b/niucloud/addon/shop/app/service/core/third_addon/order/CoreCreateOrderService.php
@@ -70,7 +70,7 @@ class CoreCreateOrderService extends BaseCoreService
                 $sku_id = $sku_info['source_sku_id'] ?? 0;
                 $relate_order_id = $relate_order_info['id'] ?? 0;
 
-                list($check_res, $reason) = $this->checkGoods( $goods_id, $sku_id, $relate_order_info['num']);
+                list($check_res, $reason) = $this->checkGoods($goods_id, $sku_id, $relate_order_info['num']);
                 if (!$check_res) {
                     $failed_orders[] = "第{$order_index}个订单（ID: {$relate_order_id}）" . $reason;
                     $return_order_list[$relate_order_id] = [
@@ -175,7 +175,7 @@ class CoreCreateOrderService extends BaseCoreService
                     'num' => $relate_order_info['num'] ?? 0,
                     'goods_money' => ($relate_order_info['goods_money'] ?? 0),
                     'goods_type' => $goods_type,
-                    'order_goods_money' => $goods_single_money,
+                    'order_goods_money' => ($relate_order_info['goods_money'] ?? 0),
                     'order_id' => $shop_order_id,
                     'discount_money' => 0,
                     'status' => OrderGoodsDict::NORMAL,
@@ -268,7 +268,7 @@ class CoreCreateOrderService extends BaseCoreService
                 $sku_id = $sku_info['source_sku_id'] ?? 0;
                 $relate_order_id = $relate_order_info['id'] ?? 0;
 
-                list($check_res, $reason) = $this->checkGoods( $goods_id, $sku_id, $relate_order_info['num']);
+                list($check_res, $reason) = $this->checkGoods($goods_id, $sku_id, $relate_order_info['num']);
                 if (!$check_res) {
                     $failed_orders[] = "第{$order_index}个订单（ID: {$relate_order_id}）" . $reason;
                     $return_order_list[$relate_order_id] = [
diff --git a/niucloud/addon/shop/app/service/core/third_addon/order/CoreSeckillOrderCreateService.php b/niucloud/addon/shop/app/service/core/third_addon/order/CoreSeckillOrderCreateService.php
index b5ab7d276..599c3a849 100644
--- a/niucloud/addon/shop/app/service/core/third_addon/order/CoreSeckillOrderCreateService.php
+++ b/niucloud/addon/shop/app/service/core/third_addon/order/CoreSeckillOrderCreateService.php
@@ -225,7 +225,7 @@ class CoreSeckillOrderCreateService extends BaseCoreService
     public function checkMember($data): void
     {
         $this->delivery['take_address'] = $data['take_address'] ?? [];
-        $member_info = (new CoreMemberService())->getInfoByMemberId( $data['member_id'], 'status');
+        $member_info = (new CoreMemberService())->getInfoByMemberId($data['member_id'], 'status');
         if (empty($member_info)) throw new CommonException(get_lang('SHOP_ORDER_BUYER_NOT_FOUND'));//无效的账号
         if ($member_info['status'] == MemberDict::OFF) throw new CommonException(get_lang('SHOP_ORDER_BUYER_LOCKED'));//账号被锁定
     }
diff --git a/niucloud/addon/shop/app/upgrade/v650/Upgrade.php b/niucloud/addon/shop/app/upgrade/v650/Upgrade.php
new file mode 100644
index 000000000..0fa2ead8b
--- /dev/null
+++ b/niucloud/addon/shop/app/upgrade/v650/Upgrade.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace addon\shop\app\upgrade\v650;
+
+use addon\shop\app\model\delivery\Store;
+
+class Upgrade
+{
+
+    public function handle()
+    {
+        $this->handleStoreData();
+    }
+
+    /**
+     * 处理门店数据
+     * @return true
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function handleStoreData()
+    {
+        $store_list = (new Store())->where([['store_no', '=', '']])->select()->toArray();
+
+        foreach ($store_list as $store) {
+            $store_id = $store['store_id'];
+            (new Store())->where('store_id', $store_id)->update([
+                'store_no' => create_no('', $store['store_id']),
+            ]);
+        }
+        return true;
+    }
+
+}
diff --git a/niucloud/addon/shop/app/upgrade/v650/upgrade.sql b/niucloud/addon/shop/app/upgrade/v650/upgrade.sql
new file mode 100644
index 000000000..7bea9450e
--- /dev/null
+++ b/niucloud/addon/shop/app/upgrade/v650/upgrade.sql
@@ -0,0 +1,176 @@
+ALTER TABLE `shop_store`
+    ADD COLUMN `store_no` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '门店编号' AFTER store_id;
+
+ALTER TABLE `shop_store`
+    ADD COLUMN `contact_name` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '联系人' AFTER store_mobile;
+
+ALTER TABLE `shop_store`
+    ADD COLUMN `support_delivery` TEXT DEFAULT NULL COMMENT '支持的配送服务商';
+
+ALTER TABLE `shop_store`
+    ADD COLUMN `extend_data` TEXT DEFAULT NULL COMMENT '配送服务商扩展数据';
+
+ALTER TABLE `shop_store`
+    ADD COLUMN `time_is_open` TINYINT NOT NULL DEFAULT 0 COMMENT '配送时间设置 0 关闭1 开启';
+
+ALTER TABLE `shop_store`
+    ADD COLUMN `support_local_delivery` TINYINT NOT NULL DEFAULT 0 COMMENT '支持同城配送';
+
+ALTER TABLE `shop_store`
+    ADD COLUMN `support_store` TINYINT NOT NULL DEFAULT 0 COMMENT '支持门店自提';
+
+ALTER TABLE `shop_store`
+    ADD COLUMN `status` TINYINT NOT NULL DEFAULT 0 COMMENT '开启状态（1开启，0关闭）';
+
+ALTER TABLE `shop_store`
+    ADD COLUMN `area` LONGTEXT DEFAULT NULL COMMENT '配送区域';
+
+ALTER TABLE `shop_order_delivery`
+    ADD COLUMN `local_delivery_order_id` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '同城配送单号';
+
+ALTER TABLE `shop_goods_evaluate`
+    CHANGE COLUMN `member_name` `member_name` VARCHAR (255) NOT NULL DEFAULT '' COMMENT '会员名称';
+
+ALTER TABLE `shop_goods`
+    ADD COLUMN `goods_image_width` INT NOT NULL DEFAULT 800 COMMENT '商品详情首图宽' AFTER `goods_image`;
+ALTER TABLE `shop_goods`
+    ADD COLUMN `goods_image_height` INT NOT NULL DEFAULT 800 COMMENT '商品详情首图高' AFTER `goods_image_width`;
+
+
+ALTER TABLE `shop_delivery_company`
+    COMMENT = '物流公司表';
+
+
+DROP TABLE IF EXISTS `shop_delivery_shop_delivery_order_log`;
+CREATE TABLE `shop_delivery_shop_delivery_order_log`
+(
+    `id`           INT          NOT NULL AUTO_INCREMENT,
+    `order_id`     INT          NOT NULL DEFAULT 0 COMMENT '订单id',
+    `main_id`      INT          NOT NULL DEFAULT 0 COMMENT '操作人id',
+    `main_type`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作人类型',
+    `main_name`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作人名称',
+    `operate`      VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作类型',
+    `operate_desc` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '操作描述',
+    `status`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作后配送状态',
+    `create_time`  INT          NOT NULL DEFAULT 0 COMMENT '配送时间',
+    `remark`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '商家配送服务订单操作表';
+
+DROP TABLE IF EXISTS `shop_delivery_shop_delivery_order`;
+CREATE TABLE `shop_delivery_shop_delivery_order`
+(
+    `id`                         INT            NOT NULL AUTO_INCREMENT,
+    `delivery_no`                VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送单号',
+    `out_delivery_no`            VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '三方配送单号',
+    `trade_type`                 VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '交易类型，mall商城 supply供货商',
+    `trade_no`                   VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '交易单号',
+    `trade_id`                   INT            NOT NULL DEFAULT 0 COMMENT '交易id',
+    `delivery_money`             DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '配送费用',
+    `delivery_start`             VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点（发货点）',
+    `delivery_start_province_id` INT            NOT NULL DEFAULT 0 COMMENT '配送起点省',
+    `delivery_start_city_id`     INT            NOT NULL DEFAULT 0 COMMENT '配送起点市',
+    `delivery_start_district_id` INT            NOT NULL DEFAULT 0 COMMENT '配送起点区',
+    `delivery_start_lng`         VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点经度',
+    `delivery_start_lat`         VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点纬度',
+    `delivery_end`               VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点（收货点）',
+    `delivery_end_province_id`   INT            NOT NULL DEFAULT 0 COMMENT '配送终点省',
+    `delivery_end_city_id`       INT            NOT NULL DEFAULT 0 COMMENT '配送终点市',
+    `delivery_end_district_id`   INT            NOT NULL DEFAULT 0 COMMENT '配送终点区',
+    `delivery_end_lng`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点经度',
+    `delivery_end_lat`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点纬度',
+    `delivery_distance`          DECIMAL(10, 4) NOT NULL DEFAULT 0.0000 COMMENT '配送距离',
+    `deliver_id`                 INT            NOT NULL DEFAULT 0 COMMENT '配送员id',
+    `deliver_name`               VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送员姓名',
+    `deliver_mobile`             VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送员手机号',
+    `status`                     VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送状态',
+    `create_time`                INT            NOT NULL DEFAULT 0 COMMENT '配送时间',
+    `finish_time`                INT            NOT NULL DEFAULT 0 COMMENT '送达时间',
+    `cancel_time`                INT            NOT NULL DEFAULT 0 COMMENT '取消时间',
+    `remark`                     VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '备注',
+    `body`                       VARCHAR(1000)  NOT NULL DEFAULT '' COMMENT '商品信息',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '商家配送服务订单表';
+
+DROP TABLE IF EXISTS `shop_delivery_local_delivery_service`;
+CREATE TABLE `shop_delivery_local_delivery_service`
+(
+    `id`          INT          NOT NULL AUTO_INCREMENT,
+    `key`         VARCHAR(255) NOT NULL DEFAULT '' COMMENT '三方配送key',
+    `name`        VARCHAR(255) NOT NULL DEFAULT '' COMMENT '三方配送名称',
+    `config`      TEXT                  DEFAULT NULL COMMENT '三方配送接入参数',
+    `is_merchant` TINYINT      NOT NULL DEFAULT 0 COMMENT '是否商家自配送',
+    `is_use`      TINYINT      NOT NULL DEFAULT 0 COMMENT '是否启用（0否，1是）',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '同城配送服务商表';
+
+
+DROP TABLE IF EXISTS `shop_delivery_local_delivery_order_log`;
+CREATE TABLE `shop_delivery_local_delivery_order_log`
+(
+    `id`           INT          NOT NULL AUTO_INCREMENT,
+    `order_id`     INT          NOT NULL DEFAULT 0 COMMENT '订单id',
+    `main_id`      INT          NOT NULL DEFAULT 0 COMMENT '操作人id',
+    `main_type`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作人类型',
+    `main_name`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作人名称',
+    `operate`      VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作类型',
+    `operate_desc` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '操作描述',
+    `status`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作后配送状态',
+    `create_time`  INT          NOT NULL DEFAULT 0 COMMENT '配送时间',
+    `remark`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '同城配送服务订单操作表';
+
+
+DROP TABLE IF EXISTS `shop_delivery_local_delivery_order`;
+CREATE TABLE `shop_delivery_local_delivery_order`
+(
+    `id`                         INT            NOT NULL AUTO_INCREMENT,
+    `delivery_service`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送方标识',
+    `delivery_no`                VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送单号',
+    `out_delivery_no`            VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '三方配送单号',
+    `trade_type`                 VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '交易类型，mall商城',
+    `trade_no`                   VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '交易单号',
+    `trade_id`                   INT            NOT NULL DEFAULT 0 COMMENT '交易id',
+    `delivery_money`             DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '配送费用',
+    `delivery_start`             VARCHAR(1000)  NOT NULL DEFAULT '' COMMENT '配送起点（发货点）',
+    `delivery_start_province_id` INT            NOT NULL DEFAULT 0 COMMENT '配送起点省',
+    `delivery_start_city_id`     INT            NOT NULL DEFAULT 0 COMMENT '配送起点市',
+    `delivery_start_district_id` INT            NOT NULL DEFAULT 0 COMMENT '配送起点区',
+    `delivery_start_lng`         VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点经度',
+    `delivery_start_lat`         VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点纬度',
+    `delivery_end`               VARCHAR(1000)  NOT NULL DEFAULT '' COMMENT '配送终点（收货点）',
+    `delivery_end_province_id`   INT            NOT NULL DEFAULT 0 COMMENT '配送终点省',
+    `delivery_end_city_id`       INT            NOT NULL DEFAULT 0 COMMENT '配送终点市',
+    `delivery_end_district_id`   INT            NOT NULL DEFAULT 0 COMMENT '配送终点区',
+    `delivery_end_lng`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点经度',
+    `delivery_end_lat`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点纬度',
+    `delivery_distance`          DECIMAL(10, 4) NOT NULL DEFAULT 0.0000 COMMENT '配送距离',
+    `status`                     VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送状态',
+    `out_status`                 VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '三方配送状态',
+    `create_time`                INT            NOT NULL DEFAULT 0 COMMENT '配送时间',
+    `finish_time`                INT            NOT NULL DEFAULT 0 COMMENT '送达时间',
+    `cancel_time`                INT            NOT NULL DEFAULT 0 COMMENT '取消时间',
+    `rider_name`                 VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '骑手姓名',
+    `rider_mobile`               VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '骑手电话',
+    `deduct_money`               DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '违约金',
+    `remark`                     VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '备注',
+    `body`                       VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送产品信息',
+    `actual_money`               DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '实际消费费用(订单取消或完成后实际定义)',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '同城配送服务订单表';
diff --git a/niucloud/addon/shop/config/local_delivery.php b/niucloud/addon/shop/config/local_delivery.php
new file mode 100644
index 000000000..ad1fba65e
--- /dev/null
+++ b/niucloud/addon/shop/config/local_delivery.php
@@ -0,0 +1,27 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+use core\dict\DictLoader;
+
+$system = [
+    //默认驱动
+    'default' => 'merchant',
+    'drivers' => [
+        //商家自配送
+        'merchant' => [],
+        //达达
+        'dada' => [
+            'driver' => 'addon\shop\core\local_delivery\Dada',  //反射类的名字
+        ]
+    ]
+];
+$system['drivers'] = (new DictLoader("Config"))->load(['data' => $system['drivers'], 'name' => 'local_delivery']);
+return $system;
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/BaseThirdDelivery.php b/niucloud/addon/shop/core/local_delivery/BaseLocalDelivery.php
similarity index 56%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/BaseThirdDelivery.php
rename to niucloud/addon/shop/core/local_delivery/BaseLocalDelivery.php
index 504cabb6b..e315282a8 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/BaseThirdDelivery.php
+++ b/niucloud/addon/shop/core/local_delivery/BaseLocalDelivery.php
@@ -9,28 +9,42 @@
 // | Author: Niucloud Team
 // +----------------------------------------------------------------------
 
-namespace addon\shop\app\service\core\delivery\third_delivery;
+namespace addon\shop\core\local_delivery;
 
 use core\loader\Storage;
 
 /**
- * Class BaseDelivery
- * @package
+ * Class BaseLocalDelivery
+ * @package addon\shop\app\service\core\local_delivery\local_delivery
  */
-abstract class BaseThirdDelivery extends Storage
+abstract class BaseLocalDelivery extends Storage
 {
     /**
      * 初始化
      * @param array $config
      * @return void
      */
-    protected function initialize(array $config = []){
+    protected function initialize(array $config = [])
+    {
 
     }
+
     abstract function createOrder($data);
-    abstract function calculate($order_data);
+    abstract function reCreateOrder($data);
+    abstract function calculate($data);
     abstract function createOrderAfterCalculate($delivery_third_order_no);
     abstract function queryOrderInfo($data);
     abstract function closeOrder($data);
-    abstract function callback($data);
-}
\ No newline at end of file
+    abstract function finishOrder($data);
+    abstract function getTransporterPosition($data);
+    abstract function addShop($data);
+    abstract function editShop($data);
+    /**
+     * 回调通知
+     * @param string $action
+     * @param callable $params
+     * @return mixed
+     */
+    abstract function notify(string $action, array $params);
+
+}
diff --git a/niucloud/addon/shop/core/local_delivery/Dada.php b/niucloud/addon/shop/core/local_delivery/Dada.php
new file mode 100644
index 000000000..9d260d678
--- /dev/null
+++ b/niucloud/addon/shop/core/local_delivery/Dada.php
@@ -0,0 +1,507 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author=>Niucloud Team
+// +----------------------------------------------------------------------
+namespace addon\shop\core\local_delivery;
+
+use addon\shop\app\dict\local_delivery\dada\DadaDeliveryStatusDict;
+use addon\shop\app\dict\local_delivery\LocalDeliveryDict;
+use addon\shop\app\service\core\local_delivery\dada\CoreOrderMessageService;
+use addon\shop\core\local_delivery\sdk\dada\OrderCancelRequest;
+use addon\shop\core\local_delivery\sdk\dada\OrderCreateByFeeOrderNoRequest;
+use addon\shop\core\local_delivery\sdk\dada\OrderCreateRequest;
+use addon\shop\core\local_delivery\sdk\dada\OrderFeeRequest;
+use addon\shop\core\local_delivery\sdk\dada\OrderInfoRequest;
+use addon\shop\core\local_delivery\sdk\dada\OrderTransporterPositionH5Request;
+use addon\shop\core\local_delivery\sdk\dada\OrderTransporterPositionRequest;
+use addon\shop\core\local_delivery\sdk\dada\ShopAddRequest;
+use addon\shop\core\local_delivery\sdk\dada\ShopEditRequest;
+use think\facade\Log;
+
+class Dada extends BaseLocalDelivery
+{
+    public $app_secret;//App_secret
+    public $app_key;//App_key
+    public $source_id;//商户ID
+    public $shop_no;//门店编号
+    public $config;
+    public $callback;//回调地址
+
+    public function initialize(array $config = [])
+    {
+        $this->app_secret = $config['app_secret'] ?? '';
+        $this->app_key = $config['app_key'] ?? '';
+        $this->source_id = $config['source_id'] ?? '';
+        $this->shop_no = $config['store_no'] ?? '';
+        $this->callback = $config['notify_url'] ?? '';
+        $this->config = $config;
+    }
+
+    /**
+     * ADMINAPI 发货使用
+     * @param $data
+     * @return array
+     * @throws \Exception
+     */
+    public function createOrder($data)
+    {
+        $order_data = $data['order_data'];
+        $order_goods_data = $data['order_goods_data'];
+        $param = $data['param'];
+        $delivery_no = $data['delivery_no'];
+
+        $request = new OrderCreateRequest();
+        $product_list = [];
+//        $weight = $num = 0;
+        $weight = max($param['goods_weight'], 1);
+        $num = 0;
+        foreach ($order_goods_data as $sku_info) {
+            $product_list[] = [
+                'count' => $sku_info['num'],
+                'sku_name' => $sku_info['goods_name'] . $sku_info['sku_name'],
+                'src_product_no' => $sku_info['sku_id'],
+                'unit' => $sku_info['goods']['unit'],
+            ];
+//            $weight += $sku_info['sku']['weight'] * $sku_info['num'];
+            $num += $sku_info['num'];
+        }
+        // 创建请求对象并链式设置参数
+        $request->setBaseParams($this->config)
+            ->setCallback($this->callback)
+            ->setShopNo($this->shop_no)
+            ->setOriginId($delivery_no)
+            ->setReceiverName($order_data->taker_name)
+            ->setReceiverPhone($order_data->taker_mobile)
+            ->setReceiverAddress($order_data->taker_address)
+            ->setReceiverLat($order_data->taker_latitude)
+            ->setReceiverLng($order_data->taker_longitude)
+            ->setCargoNum($num)
+            ->setCargoWeight($weight)
+            ->setCargoPrice($order_data->order_money)
+            ->setProductList($product_list);
+        if (!empty($order_data['buyer_ask_delivery_time'])) {
+            //2025-06-16 08:21~09:21
+            $buyer_ask_delivery_time_array = explode(' ', $order_data['buyer_ask_delivery_time']);
+            $buyer_ask_delivery_time_date = $buyer_ask_delivery_time_array[0];
+            $buyer_ask_delivery_time_hour = $buyer_ask_delivery_time_array[1];
+            $buyer_ask_delivery_time_hour_array = explode('~',$buyer_ask_delivery_time_hour);
+            $expect_finish_time_limit = strtotime($buyer_ask_delivery_time_date . ' ' . $buyer_ask_delivery_time_hour_array[1]);
+            $request->setIsExpectFinishOrder(1)->setExpectFinishTimeLimit($expect_finish_time_limit);
+        }
+        try {
+            $res = $request->sendRequest();
+            Log::write('达达接口请求：' . json_encode($res));
+            $result = $res['result'] ?? [];
+            if (empty($result)) {
+                return [];
+            }
+            return [
+                'delivery_money' => $result['fee'] ?? 0,
+                'delivery_distance' => ($result['distance'] ?? 0) / 1000,//转km
+            ];
+        } catch (\Exception $e) {
+            Log::write('达达接口请求异常：' . $e->getMessage());
+            throw new \Exception($e->getMessage());
+
+        }
+
+    }
+
+    /**
+     * ADMINAPI 重新下单
+     * @param $data
+     * @return array
+     * @throws \Exception
+     */
+    public function reCreateOrder($data)
+    {
+        $order_data = $data['order_data'];
+        $order_goods_data = $data['order_goods_data'];
+        $param = $data['param'];
+        $delivery_no = $data['delivery_no'];
+//        return [//调试数据
+//            'delivery_price' => 100,//$res['fee'],
+//            'third_order_no' => $order_no,//$res['fee'],
+//        ];
+        $request = new OrderCreateRequest();
+        $product_list = [];
+//        $weight = $num = 0;
+        $weight = max($param['goods_weight'], 1);
+        $num = 0;
+        foreach ($order_goods_data as $sku_info) {
+            $product_list[] = [
+                'count' => $sku_info['num'],
+                'sku_name' => $sku_info['goods_name'] . $sku_info['sku_name'],
+                'src_product_no' => $sku_info['sku_id'],
+                'unit' => $sku_info['goods']['unit'],
+            ];
+//            $weight += $sku_info['sku']['weight'] * $sku_info['num'];
+            $num += $sku_info['num'];
+        }
+        // 创建请求对象并链式设置参数
+        $request = $request->setBaseParams($this->config)
+            ->setCallback($this->callback)
+            ->setShopNo($this->shop_no)
+            ->setOriginId($delivery_no)
+            ->setReceiverName($order_data->taker_name)
+            ->setReceiverPhone($order_data->taker_mobile)
+            ->setReceiverAddress($order_data->taker_address)
+            ->setReceiverLat($order_data->taker_latitude)
+            ->setReceiverLng($order_data->taker_longitude)
+            ->setCargoNum($num)
+            ->setCargoWeight($weight)
+            ->setCargoPrice($order_data->order_money)
+            ->setProductList($product_list);
+        if (!empty($order_data['buyer_ask_delivery_time'])) {
+            //2025-06-16 08:21~09:21
+            $buyer_ask_delivery_time_array = explode(' ', $order_data['buyer_ask_delivery_time']);
+            $buyer_ask_delivery_time_date = $buyer_ask_delivery_time_array[0];
+            $buyer_ask_delivery_time_hour = $buyer_ask_delivery_time_array[1];
+            $buyer_ask_delivery_time_hour_array = explode('~',$buyer_ask_delivery_time_hour);
+            $expect_finish_time_limit = strtotime($buyer_ask_delivery_time_date . ' ' . $buyer_ask_delivery_time_hour_array[1]);
+            $request->setIsExpectFinishOrder(1)
+                ->setExpectFinishTimeLimit($expect_finish_time_limit);
+        }
+        try {
+            $res = $request->sendRequest();
+            return $res['result'] ?? [];
+        } catch (\Exception $e) {
+            Log::write('达达接口请求异常：' . $e->getMessage());
+            throw new \Exception($e->getMessage());
+
+        }
+
+    }
+
+    /**
+     * API使用
+     * @param $data
+     * @return array
+     * @throws \Exception
+     */
+    public function calculate($data)
+    {
+        $order_data = $data['order_data'];
+        $order_goods_data = $data['order_goods_data'];
+        $param = $data['param'];
+        $delivery_no = $data['delivery_no'];
+        $request = new OrderFeeRequest();
+        $product_list = [];
+        $weight = max($param['goods_weight'] ?? 0, 1);
+        $num = 0;
+        foreach ($order_goods_data as $sku_info) {
+            $product_list[] = [
+                'count' => $sku_info['num'],
+                'sku_name' => $sku_info['goods_name'] . $sku_info['sku_name'],
+                'src_product_no' => $sku_info['sku_id'],
+                'unit' => $sku_info['goods']['unit'],
+            ];
+//            $weight += $sku_info['weight'] * $sku_info['num'];
+            $num += $sku_info['num'];
+        }
+        // 创建请求对象并链式设置参数
+        $request = $request->setBaseParams($this->config)
+            ->setCallback($this->callback)
+            ->setShopNo($this->shop_no)
+            ->setOriginId($delivery_no)
+            ->setCargoPrice($order_data->order_money)
+            ->setReceiverName($order_data->taker_name)
+            ->setReceiverPhone($order_data->taker_mobile)
+            ->setReceiverAddress($order_data->taker_address)
+            ->setReceiverLat($order_data->taker_latitude)
+            ->setReceiverLng($order_data->taker_longitude)
+            ->setCargoNum($num)
+            ->setCargoWeight($weight)
+            ->setProductList($product_list);
+        try {
+            $res = $request->sendRequest();
+            $result = $res['result'] ?? [];
+            return [
+                'delivery_money' => $result['fee'] ?? 0,
+            ];
+        } catch (\Exception $e) {
+            Log::write('达达接口请求异常：' . $e->getMessage());
+            throw new \Exception($e->getMessage());
+        }
+    }
+
+    /**
+     *
+     * @param $delivery_third_order_no `计算运费接口返回的  配送方单号 queryFeeMoney.response.delivery_third_order_no`
+     * @return string[]
+     * @throws \Exception
+     */
+    public function createOrderAfterCalculate($delivery_third_order_no)
+    {
+        try {
+            $res = (new OrderCreateByFeeOrderNoRequest())
+                ->setBaseParams($this->config)
+                ->setDeliveryNo($delivery_third_order_no)
+                ->sendRequest();
+            return $res['result'] ?? [];
+        } catch (\Exception $e) {
+            Log::write('达达接口请求异常：' . $e->getMessage());
+            throw new \Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * @param $order_no `订单号`
+     * @return string[]
+     */
+    public function queryOrderInfo($data)
+    {
+        try {
+            $res = (new OrderInfoRequest())
+                ->setBaseParams($this->config)
+                ->setOrderId($data['delivery_no'])
+                ->sendRequest();
+            $result = $res['result'] ?? [];
+            if (empty($result)) {
+                return [];
+            }
+            $status = DadaDeliveryStatusDict::convertStatus($result['statusCode']);
+            return [
+                'status' => $status,
+                'out_status' => $result['statusCode'],
+                'rider_name' => $result['transporterName'],
+                'rider_mobile' => $result['transporterPhone'],
+                'delivery_money' => $result['actualFee'],
+                'delivery_distance' => ($result['distance'] ?? 0) / 1000,//转km
+                'create_time' => !empty($result['createTime']) && is_string($result['createTime']) ? strtotime($result['createTime']) : 0,
+                'finish_time' => !empty($result['finishTime']) && is_string($result['finishTime']) ? strtotime($result['finishTime']) : 0,
+                'cancel_time' => !empty($result['cancelTime']) && is_string($result['cancelTime']) ? strtotime($result['cancelTime']) : 0,
+                'deduct_money' => $result['deductFee'] ?? 0,
+            ];
+        } catch (\Exception $e) {
+            Log::write('达达接口请求异常：' . $e->getMessage());
+            return [];
+        }
+
+    }
+
+    /**
+     * @param array $data
+     * @return int[]
+     * @throws \Exception
+     */
+    public function closeOrder($data)
+    {
+        try {
+            $res = (new OrderCancelRequest())
+                ->setBaseParams($this->config)
+                ->setOrderId($data['delivery_no'])
+                ->setCancelReasonId($data['cancel_reason_id'])
+                ->setCancelReason($data['cancel_reason'])
+                ->sendRequest();
+            $result = $res['result'] ?? [];
+            return [
+                'deduct_money' => $result['deductFee'] ?? 0,
+            ];
+        } catch (\Exception $e) {
+            Log::write('达达接口请求异常：' . $e->getMessage());
+            throw new \Exception($e->getMessage());
+        }
+
+    }
+
+    /**
+     * 完成订单
+     * @param $data
+     * @return void
+     */
+    public function finishOrder($data)
+    {
+
+    }
+
+    public function getTransporterPosition($data)
+    {
+        try {
+            if (!empty($data['is_h5'])) {
+                $res = (new OrderTransporterPositionH5Request())
+                    ->setBaseParams($this->config)
+                    ->setOrderId($data['delivery_no'])
+                    ->sendRequest();
+                return $res['result'] ?? [];
+            } else {
+                $res = (new OrderTransporterPositionRequest())
+                    ->setBaseParams($this->config)
+                    ->setOrderIds([$data['delivery_no']])
+                    ->sendRequest();
+                $result = $res['result'] ?? [];
+                if (empty($result)) {
+                    return [];
+                }
+                return [
+                    'rider_latitude' => $result[0]['transporterLat'] ?? '',
+                    'rider_longitude' => $result[0]['transporterLng'] ?? '',
+                    'rider_name' => $result[0]['transporterName'] ?? '',
+                    'rider_mobile' => $result[0]['transporterPhone'] ?? '',
+                ];
+            }
+        } catch (\Exception $e) {
+            Log::write('达达接口请求异常：' . $e->getMessage());
+            throw new \Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * 添加门店
+     * @param $data
+     * @return array[]
+     * @throws \Exception
+     */
+    public function addShop($data)
+    {
+        $delivery_type = $data['delivery_type'];
+        $delivery_store = $data['delivery_store'];
+        try {
+            $res = (new ShopAddRequest())
+                ->setBaseParams($this->config)
+                ->setStationName($delivery_store['store_name'])
+                ->setBusiness($data['business'])
+                ->setStationAddress($delivery_store['full_address'])
+                ->setLng($delivery_store['longitude'])
+                ->setLat($delivery_store['latitude'])
+                ->setContactName($delivery_store['contact_name'])
+                ->setPhone($delivery_store['store_mobile'])
+                ->setOriginShopId($delivery_store['store_no'])
+                ->sendRequest();
+            $result = $res['result'] ?? [];
+            $support_delivery_array = [];
+            if (!empty($result)) {
+                if (!empty($result['successList'])) {
+                    $support_delivery_array[$delivery_type] = [
+                        'delivery_type' => $delivery_type,
+                        'business' => $data['business'],
+                        'store_no' => $result['successList'][0]['originShopId'],
+                        'open_status' => LocalDeliveryDict::OPEN_PASS,
+                        'edit_status' => '',
+                        'reason' => ''
+                    ];
+                }
+                if (!empty($result['failedList'])) {
+                    $support_delivery_array[$delivery_type] = [
+                        'delivery_type' => $delivery_type,
+                        'business' => '',
+                        'store_no' => '',
+                        'open_status' => LocalDeliveryDict::OPEN_REFUND,
+                        'edit_status' => '',
+                        'reason' => $result['failedList'][0]['msg']
+                    ];
+                }
+            }
+            return [
+                'support_delivery' => $support_delivery_array,
+            ];
+        } catch (\Exception $e) {
+            Log::write('达达接口请求异常：' . $e->getMessage());
+            throw new \Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * 更新门店
+     * @param $data
+     * @return array[]
+     */
+    public function editShop($data)
+    {
+        $delivery_type = $data['delivery_type'];
+        $delivery_store = $data['delivery_store'];
+        $support_delivery_array = $delivery_store['support_delivery'];
+        if (!empty($support_delivery_array[$delivery_type])) {
+            try {
+                $request = (new ShopEditRequest())
+                    ->setBaseParams($this->config)
+                    ->setOriginShopId($delivery_store['store_no']);
+
+                if (!empty($delivery_store['store_name'])) {
+                    $request->setStationName($delivery_store['store_name']);
+                }
+                if (!empty($data['business'])) {
+                    $request->setBusiness($data['business']);
+                }
+                if (!empty($delivery_store['full_address'])) {
+                    $request->setStationAddress($delivery_store['full_address']);
+                }
+                if (!empty($delivery_store['longitude'])) {
+                    $request->setLng($delivery_store['longitude']);
+                }
+                if (!empty($delivery_store['latitude'])) {
+                    $request->setLat($delivery_store['latitude']);
+                }
+                if (!empty($delivery_store['contact_name'])) {
+                    $request->setContactName($delivery_store['contact_name']);
+                }
+                if (!empty($delivery_store['store_mobile'])) {
+                    $request->setPhone($delivery_store['store_mobile']);
+                }
+                $res = $request->sendRequest();
+                if ($res['code'] == 0) {
+                    $support_delivery_array[$delivery_type]['edit_status'] = LocalDeliveryDict::EDIT_PASS;
+                    $support_delivery_array[$delivery_type]['business'] = $data['business'];
+                    $support_delivery_array[$delivery_type]['reason'] = '';
+                }
+            } catch (\Exception $e) {
+                Log::write('达达接口请求异常：' . $e->getMessage());
+                $support_delivery_array[$delivery_type]['edit_status'] = LocalDeliveryDict::EDIT_REFUND;
+                $support_delivery_array[$delivery_type]['reason'] = $e->getMessage();
+            }
+        }
+        return [
+            'support_delivery' => $support_delivery_array,
+        ];
+    }
+
+    /**
+     * 达达订单状态通知异步回调
+     * @param string $action
+     * @param array $params
+     * @return \think\Response
+     */
+    function notify(string $action, array $params = [])
+    {
+        try {
+            Log::write('达达订单状态通知回调：' . json_encode($params));
+            switch ($action) {
+                case 'order'://订单状态通知
+                    (new CoreOrderMessageService())->orderNotify($params);
+                    break;
+                //                    case 'store'://商户//todo
+                //                        break;
+                //                    case 'recharge'://充值//todo
+                //                        break;
+            }
+            return $this->success();
+        } catch (\Exception $e) {
+            Log::write('达达订单状态通知回调异常：' . $e->getMessage());
+            return $this->fail($e->getMessage());
+        }
+    }
+
+    public function success($message = '')
+    {
+        $response = [
+            'code' => 200,
+            'message' => $message ?: '成功',
+        ];
+        return response($response, 200, [], 'json');
+    }
+
+    public function fail($message = '')
+    {
+        $response = [
+            'code' => 400,
+            'message' => $message ?: '失败',
+        ];
+        return response($response, 400, [], 'json');
+    }
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/ThirdDeliveryLoader.php b/niucloud/addon/shop/core/local_delivery/LocalDeliveryLoader.php
similarity index 72%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/ThirdDeliveryLoader.php
rename to niucloud/addon/shop/core/local_delivery/LocalDeliveryLoader.php
index bcf6ad0e9..81288acfc 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/ThirdDeliveryLoader.php
+++ b/niucloud/addon/shop/core/local_delivery/LocalDeliveryLoader.php
@@ -9,25 +9,24 @@
 // | Author: Niucloud Team
 // +----------------------------------------------------------------------
 
-namespace addon\shop\app\service\core\delivery\third_delivery;
+namespace addon\shop\core\local_delivery;
 
 use core\loader\Loader;
 
-
 /**
- *
+ * Class LocalDeliveryLoader
+ * @package core\printer
  */
-class ThirdDeliveryLoader extends Loader
+class LocalDeliveryLoader extends Loader
 {
 
-
     /**
      * 空间名
      * @var string
      */
-    protected $namespace = '\\addon\\shop\\app\\service\\core\\delivery\\third_delivery\\';
+    protected $namespace = '\\addon\\shop\\core\\local_delivery\\';
 
-    protected $config_name = 'third_delivery';
+    protected $config_name = 'local_delivery';
 
     /**
      * 默认驱动
@@ -35,8 +34,6 @@ class ThirdDeliveryLoader extends Loader
      */
     protected function getDefault()
     {
-        return config('third_delivery.default');
+        return config('local_delivery.default');
     }
-
-
 }
\ No newline at end of file
diff --git a/niucloud/addon/shop/core/local_delivery/Merchant.php b/niucloud/addon/shop/core/local_delivery/Merchant.php
new file mode 100644
index 000000000..5344e634d
--- /dev/null
+++ b/niucloud/addon/shop/core/local_delivery/Merchant.php
@@ -0,0 +1,178 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author=>Niucloud Team
+// +----------------------------------------------------------------------
+namespace addon\shop\core\local_delivery;
+
+use addon\shop\app\service\core\shop_delivery\CoreShopDeliveryOrderCloseService;
+use addon\shop\app\service\core\shop_delivery\CoreShopDeliveryOrderCreateService;
+use addon\shop\app\service\core\shop_delivery\CoreShopDeliveryOrderFinishService;
+use addon\shop\app\service\core\shop_delivery\CoreShopDeliveryOrderMessageService;
+use addon\shop\app\service\core\shop_delivery\CoreShopDeliveryOrderService;
+use think\facade\Log;
+
+class Merchant extends BaseLocalDelivery
+{
+
+    public function initialize(array $config = [])
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * ADMINAPI 发货使用
+     * @param $data
+     * @return array
+     */
+    public function createOrder($data)
+    {
+        return (new CoreShopDeliveryOrderCreateService())->createOrder($data);
+    }
+
+    /**
+     * ADMINAPI 重新下单
+     * @param $data
+     * @return array
+     */
+    public function reCreateOrder($data)
+    {
+
+    }
+
+    /**
+     * API使用
+     * @param $data
+     * @return array
+     */
+    public function calculate($data)
+    {
+
+    }
+
+    /**
+     *
+     * @param $delivery_third_order_no
+     * @return string[]
+     */
+    public function createOrderAfterCalculate($delivery_third_order_no)
+    {
+
+    }
+
+    /**
+     * @param $order_no `订单号`
+     * @return string[]
+     */
+    public function queryOrderInfo($data)
+    {
+
+    }
+
+    /**
+     * @param $order_no `订单号`
+     * @param $cancel_reason_id `取消原因类型ID`
+     * @param $cancel_reason `取消原因`
+     * @return false|string[]
+     */
+    public function closeOrder($data)
+    {
+        $param = [
+            'out_delivery_no' => $data['delivery_no'],
+            'cancel_reason' => $data['cancel_reason'],
+            'main_id' => $data['main_id'] ?? 0,
+            'main_type' => $data['main_type'] ?? '',
+            'main_name' => $data['main_name'] ?? '',
+        ];
+        $res = (new CoreShopDeliveryOrderCloseService())->closeOrder($param);
+        if ($res) {
+            return ['cancel_time' => time()];
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * 完成订单
+     * @param $data
+     * @return false|string[]
+     */
+    public function finishOrder($data)
+    {
+        $param = [
+            'out_delivery_no' => $data['delivery_no'],
+            'main_id' => $data['main_id'] ?? 0,
+            'main_type' => $data['main_type'] ?? '',
+            'main_name' => $data['main_name'] ?? '',
+        ];
+        $res = (new CoreShopDeliveryOrderFinishService())->finishOrder($param);
+        if ($res) {
+            return ['finish_time' => time()];
+        } else {
+            return [];
+        }
+    }
+
+    public function getTransporterPosition($data)
+    {
+        $param = [
+            'out_delivery_no' => $data['delivery_no']
+        ];
+        $res = (new CoreShopDeliveryOrderService())->getOrderInfo($param);
+        if ($res) {
+            return [
+                'rider_latitude' => $res['delivery_start_lat'] ?? '',
+                'rider_longitude' => $res['delivery_start_lng'] ?? '',
+                'rider_name' => $res['deliver_name'] ?? '',
+                'rider_mobile' => $res['deliver_mobile'] ?? '',
+            ];
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * 添加门店
+     * @param $data
+     * @return false|mixed
+     */
+    public function addShop($data)
+    {
+
+    }
+
+    /**
+     * 更新门店
+     * @param $data
+     * @return false|mixed
+     */
+    public function editShop($data)
+    {
+
+    }
+
+    function notify(string $action, array $params)
+    {
+        try {
+            Log::write('商家配送订单状态通知回调：' . json_encode($params));
+            switch ($action) {
+                case 'order'://订单状态通知
+                    (new CoreShopDeliveryOrderMessageService())->orderNotify($params);
+                    break;
+                //                    case 'store'://商户//todo
+                //                        break;
+                //                    case 'recharge'://充值//todo
+                //                        break;
+            }
+            return true;
+        } catch (\Exception $e) {
+            Log::write('商家配送订单状态通知回调异常：' . $e->getMessage());
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/BaseRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/BaseRequest.php
similarity index 58%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/BaseRequest.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/BaseRequest.php
index 40835a6d8..cca439a4f 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/BaseRequest.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/BaseRequest.php
@@ -1,19 +1,18 @@
 <?php
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
-use addon\shop\app\dict\delivery\DeliveryLocalDict;
-use app\service\core\http\HttpHelper;
+use core\util\http\HttpClient;
+use think\facade\Log;
 
 class BaseRequest
 {
-    protected $test_domain = 'https://newopen.qa.imdada.cn';
+    protected $test_domain = 'https://newopen.imdada.cn';
     protected $domain = 'https://newopen.imdada.cn';
-    protected $app_secret = 'c0984f3aece2b32e7f28d07d4a413cd6';
-    protected $app_key = 'dada48ca0d46ea5f745';
-    protected $shop_id = '844132245';
-    protected $shop_store_no = '76f7a09af586492e';
-    protected $callback = 'delivery/third/callback/%s/%s/%s';
+    protected $app_secret = '';
+    protected $app_key = '';
+    protected $source_id = '';
+    protected $callback = null;
 
     // 设置App Secret
     public function setAppSecret(string $app_secret): self
@@ -40,33 +39,21 @@ class BaseRequest
     }
 
     // 设置商户ID
-    public function setShopId(string $shop_id): self
+    public function setSourceId(string $source_id): self
     {
-        $this->shop_id = $shop_id;
+        $this->source_id = $source_id;
         return $this;
     }
 
-    public function getShopId(): string
+    public function getSourceId(): string
     {
-        return $this->shop_id;
-    }
-
-    // 设置门店编号
-    public function setShopStoreNo(string $shop_store_no): self
-    {
-        $this->shop_store_no = $shop_store_no;
-        return $this;
-    }
-
-    public function getShopStoreNo(): string
-    {
-        return $this->shop_store_no;
+        return $this->source_id;
     }
 
     // 回调地址
-    public function setCallback($order_no)
+    public function setCallback(string $callback): self
     {
-        $this->callback = sprintf($this->callback,DeliveryLocalDict::DADA,$order_no);
+        $this->callback = $callback;
         return $this;
     }
 
@@ -80,8 +67,7 @@ class BaseRequest
     {
         return [
             'app_key' => $this->app_key,
-            'shop_id' => $this->shop_id,
-            'shop_store_no' => $this->shop_store_no,
+            'source_id' => $this->source_id,
             'app_secret' => $this->app_secret,
         ];
     }
@@ -90,8 +76,7 @@ class BaseRequest
     public function setBaseParams($config)
     {
         $this->app_key = $config['app_key'];
-        $this->shop_id = $config['shop_id'];
-        $this->shop_store_no = $config['shop_store_no'];
+        $this->source_id = $config['source_id'];
         $this->app_secret = $config['app_secret'];
         return $this;
     }
@@ -106,15 +91,15 @@ class BaseRequest
     protected function generateParams($body)
     {
         $data = [
-            "source_id" => $this->shop_id,
-            "app_key" => $this->app_key,
-            "timestamp" => time(),
-            "format" => "json",
-            "v" => "1.0",
-            "body" => empty($body) ? "" : json_encode($body),
+            'source_id' => $this->source_id,
+            'app_key' => $this->app_key,
+            'timestamp' => time(),
+            'format' => 'json',
+            'v' => '1.0',
+            'body' => empty($body) ? '' : json_encode($body),
         ];
 
-        $data["signature"] = $this->signature($data);
+        $data['signature'] = $this->signature($data);
         return $data;
     }
 
@@ -145,6 +130,7 @@ class BaseRequest
 
     protected function request($body, $method_url)
     {
+        Log::write('dada：请求参数：' . json_encode($body));
         $product_type = env('product_type');
         if ($product_type != 'product') {
             $domain = $this->test_domain;
@@ -152,10 +138,13 @@ class BaseRequest
             $domain = $this->domain;
         }
         $request_data = $this->generateParams($body);
-        $res = (new HttpHelper())->httpRequest('POST', $domain . $method_url, $request_data);
+        $res = (new HttpClient())->httpPost($domain . $method_url, $request_data, [
+            'verify' => false
+        ]);
+        Log::write('dada：响应参数：' . json_encode($res));
         if ($res['code'] != 0) {
-            throw new \Exception('DD' . $res['code'] . ":" . $res['msg']);
+            throw new \Exception($res['msg']);
         }
-        return $res['result'];
+        return $res;
     }
 }
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/ConfigRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/ConfigRequest.php
similarity index 76%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/ConfigRequest.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/ConfigRequest.php
index a6044b8c6..0d44e6e39 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/ConfigRequest.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/ConfigRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
 class ConfigRequest extends BaseRequest
 {
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCancelRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCancelRequest.php
similarity index 81%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCancelRequest.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCancelRequest.php
index 3c04668ce..4dabd7547 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCancelRequest.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCancelRequest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
-
-use app\service\core\http\HttpHelper;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
 class OrderCancelRequest extends BaseRequest
 {
@@ -61,10 +59,13 @@ class OrderCancelRequest extends BaseRequest
     private function validate()
     {
         if (empty($this->order_id)) {
-            throw new \Exception('订单ID不能为空');
+            throw new \Exception('订单编号不能为空');
         }
-        if (empty($this->cancel_reason_id ==1 )) {
-            throw new \Exception('订单ID不能为空');
+        if (empty($this->cancel_reason_id)) {
+            throw new \Exception('取消原因ID不能为空');
+        }
+        if ($this->cancel_reason_id == 10000 && empty($this->cancel_reason)) {
+            throw new \Exception('取消原因不能为空');
         }
     }
 
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCreateByFeeOrderNoRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCreateByFeeOrderNoRequest.php
similarity index 93%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCreateByFeeOrderNoRequest.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCreateByFeeOrderNoRequest.php
index 1052f04db..40d48ea0b 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCreateByFeeOrderNoRequest.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCreateByFeeOrderNoRequest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
-
-use app\service\core\http\HttpHelper;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
 class OrderCreateByFeeOrderNoRequest extends BaseRequest
 {
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCreateRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCreateRequest.php
similarity index 89%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCreateRequest.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCreateRequest.php
index ceb67c17b..c7d3efe02 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderCreateRequest.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderCreateRequest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
-
-use app\service\core\http\HttpHelper;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
 class OrderCreateRequest extends BaseRequest
 {
@@ -16,7 +14,9 @@ class OrderCreateRequest extends BaseRequest
     private $is_finish_code_needed = 0;
     private $is_prepay = 0;
     private $is_use_insurance = 0;
-    private $is_expect_finish_order = 0;
+    private $delay_publish_time = null;
+    private $is_expect_finish_order = null;
+    private $expect_finish_time_limit = null;
     private $origin_id;
     private $pick_up_pos;
     private $product_list;
@@ -142,6 +142,19 @@ class OrderCreateRequest extends BaseRequest
         return $this->is_use_insurance;
     } // 是否保价
 
+    // 预约发单时间
+    public function setDelayPublishTime($delay_publish_time)
+    {
+        $this->delay_publish_time = $delay_publish_time;
+        return $this;
+    }
+
+    public function getDelayPublishTime()
+    {
+        return $this->delay_publish_time;
+    }
+
+    // 是否根据期望送达时间预约发单
     public function setIsExpectFinishOrder($is_expect_finish_order)
     {
         $this->is_expect_finish_order = $is_expect_finish_order;
@@ -153,6 +166,18 @@ class OrderCreateRequest extends BaseRequest
         return $this->is_expect_finish_order;
     }
 
+    // 期望送达时间
+    public function setExpectFinishTimeLimit($expect_finish_time_limit)
+    {
+        $this->expect_finish_time_limit = $expect_finish_time_limit;
+        return $this;
+    }
+
+    public function getExpectFinishTimeLimit()
+    {
+        return $this->expect_finish_time_limit;
+    }
+
     // 订单ID
     public function setOriginId($origin_id)
     {
@@ -364,6 +389,9 @@ class OrderCreateRequest extends BaseRequest
             'info' => $this->info,
             'invoice_title' => $this->invoice_title,
             'is_finish_code_needed' => $this->is_finish_code_needed ? 1 : 0,
+            'delay_publish_time' => $this->delay_publish_time,
+            'is_expect_finish_order' => $this->is_expect_finish_order ? 1 : 0,
+            'expect_finish_time_limit' => $this->expect_finish_time_limit,
             'is_prepay' => $this->is_prepay ? 1 : 0,
             'is_use_insurance' => $this->is_use_insurance ? 1 : 0,
             'origin_id' => $this->origin_id,
@@ -420,12 +448,16 @@ class OrderCreateRequest extends BaseRequest
         if (empty($this->receiver_phone)) {
             throw new \Exception('收货人手机号不能为空');
         }
+        if (!empty($this->is_expect_finish_order) && empty($this->expect_finish_time_limit)) {
+            throw new \Exception('期望送达时间不能为空');
+        }
     }
 
     public function sendRequest()
     {
         $this->validate();
         $body = $this->toArray();
+//        dd($body);
         foreach ($body as $key => $value) {
             if (is_null($value)) {
                 unset($body[$key]);
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderFeeRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderFeeRequest.php
similarity index 98%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderFeeRequest.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/OrderFeeRequest.php
index 1e67ab984..0dc41d65d 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderFeeRequest.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderFeeRequest.php
@@ -9,9 +9,7 @@
 // | Author: Niucloud Team
 // +----------------------------------------------------------------------
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
-
-use app\service\core\http\HttpHelper;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
 class OrderFeeRequest extends BaseRequest
 {
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderInfoRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderInfoRequest.php
similarity index 90%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderInfoRequest.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/OrderInfoRequest.php
index f0e52f1a3..c231a643f 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderInfoRequest.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderInfoRequest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
-
-use app\service\core\http\HttpHelper;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
 class OrderInfoRequest extends BaseRequest
 {
diff --git a/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderReCreateRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderReCreateRequest.php
new file mode 100644
index 000000000..70c2433ef
--- /dev/null
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderReCreateRequest.php
@@ -0,0 +1,472 @@
+<?php
+
+namespace addon\shop\core\local_delivery\sdk\dada;
+
+/**
+ * 重新下单
+ * Class OrderReCreateRequest
+ * @package core\sdk\dada
+ */
+class OrderReCreateRequest extends BaseRequest
+{
+    private $request_url = '/api/order/reAddOrder';
+    private $cargo_num;
+    private $cargo_price;
+    private $cargo_type;
+    private $cargo_weight;
+    private $info;
+    private $invoice_title;
+    private $is_finish_code_needed = 0;
+    private $is_prepay = 0;
+    private $is_use_insurance = 0;
+    private $delay_publish_time = 0;
+    private $is_expect_finish_order = 0;
+    private $expect_finish_time_limit = 0;
+    private $origin_id;
+    private $pick_up_pos;
+    private $product_list;
+    private $receiver_address;
+    private $receiver_lat;
+    private $receiver_lng;
+    private $receiver_name;
+    private $receiver_phone;
+    private $shop_no;
+    private $tips;
+    private $business_type;
+    private $supplier_address;
+    private $supplier_lat;
+    private $supplier_lng;
+    private $supplier_name;
+    private $supplier_phone;
+
+    // 货物数量
+    public function setCargoNum($cargo_num)
+    {
+        $this->cargo_num = $cargo_num;
+        return $this;
+    }
+
+    public function getCargoNum()
+    {
+        return $this->cargo_num;
+    }
+
+    // 货物价格
+    public function setCargoPrice($cargo_price)
+    {
+        $this->cargo_price = $cargo_price;
+        return $this;
+    }
+
+    public function getCargoPrice()
+    {
+        return $this->cargo_price;
+    }
+
+    // 货物类型
+    public function setCargoType($cargo_type)
+    {
+        $this->cargo_type = $cargo_type;
+        return $this;
+    }
+
+    public function getCargoType()
+    {
+        return $this->cargo_type;
+    }
+
+    // 货物重量
+    public function setCargoWeight($cargo_weight)
+    {
+        $this->cargo_weight = $cargo_weight;
+        return $this;
+    }
+
+    public function getCargoWeight()
+    {
+        return $this->cargo_weight;
+    }
+
+    // 备注信息
+    public function setInfo($info)
+    {
+        $this->info = $info;
+        return $this;
+    }
+
+    public function getInfo()
+    {
+        return $this->info;
+    }
+
+    // 发票抬头
+    public function setInvoiceTitle($invoice_title)
+    {
+        $this->invoice_title = $invoice_title;
+        return $this;
+    }
+
+    public function getInvoiceTitle()
+    {
+        return $this->invoice_title;
+    }
+
+    // 是否需要收货码
+    public function setIsFinishCodeNeeded($is_finish_code_needed)
+    {
+        $this->is_finish_code_needed = $is_finish_code_needed;
+        return $this;
+    }
+
+    public function getIsFinishCodeNeeded()
+    {
+        return $this->is_finish_code_needed;
+    }
+
+    // 是否垫付
+    public function setIsPrepay($is_prepay)
+    {
+        $this->is_prepay = $is_prepay;
+        return $this;
+    }
+
+    public function getIsPrepay()
+    {
+        return $this->is_prepay;
+    }
+
+    // 是否保价
+    public function setIsUseInsurance($is_use_insurance)
+    {
+        $this->is_use_insurance = $is_use_insurance;
+        return $this;
+    }
+
+    public function getIsUseInsurance()
+    {
+        return $this->is_use_insurance;
+    } // 是否保价
+
+    // 预约发单时间
+    public function setDelayPublishTime($delay_publish_time)
+    {
+        $this->delay_publish_time = $delay_publish_time;
+        return $this;
+    }
+
+    public function getDelayPublishTime()
+    {
+        return $this->delay_publish_time;
+    }
+
+    // 是否根据期望送达时间预约发单
+    public function setIsExpectFinishOrder($is_expect_finish_order)
+    {
+        $this->is_expect_finish_order = $is_expect_finish_order;
+        return $this;
+    }
+
+    public function getIsExpectFinishOrder()
+    {
+        return $this->is_expect_finish_order;
+    }
+
+    // 期望送达时间
+    public function setExpectFinishTimeLimit($expect_finish_time_limit)
+    {
+        $this->expect_finish_time_limit = $expect_finish_time_limit;
+        return $this;
+    }
+
+    public function getExpectFinishTimeLimit()
+    {
+        return $this->expect_finish_time_limit;
+    }
+
+    // 订单ID
+    public function setOriginId($origin_id)
+    {
+        $this->origin_id = $origin_id;
+        return $this;
+    }
+
+    public function getOriginId()
+    {
+        return $this->origin_id;
+    }
+
+    // 取货位置
+    public function setPickUpPos($pick_up_pos)
+    {
+        $this->pick_up_pos = $pick_up_pos;
+        return $this;
+    }
+
+    public function getPickUpPos()
+    {
+        return $this->pick_up_pos;
+    }
+
+    // 商品列表
+    public function setProductList($product_list)
+    {
+        $this->product_list = $product_list;
+        return $this;
+    }
+
+    public function getProductList()
+    {
+        return $this->product_list;
+    }
+
+    // 添加单个商品
+    public function addProductItem($product_item)
+    {
+        $this->product_list[] = $product_item;
+        return $this;
+    }
+
+    // 收货人地址
+    public function setReceiverAddress($receiver_address)
+    {
+        $this->receiver_address = $receiver_address;
+        return $this;
+    }
+
+    public function getReceiverAddress()
+    {
+        return $this->receiver_address;
+    }
+
+    // 收货人纬度
+    public function setReceiverLat($receiver_lat)
+    {
+        $this->receiver_lat = $receiver_lat;
+        return $this;
+    }
+
+    public function getReceiverLat()
+    {
+        return $this->receiver_lat;
+    }
+
+    // 收货人经度
+    public function setReceiverLng($receiver_lng)
+    {
+        $this->receiver_lng = $receiver_lng;
+        return $this;
+    }
+
+    public function getReceiverLng()
+    {
+        return $this->receiver_lng;
+    }
+
+    // 收货人姓名
+    public function setReceiverName($receiver_name)
+    {
+        $this->receiver_name = $receiver_name;
+        return $this;
+    }
+
+    public function getReceiverName()
+    {
+        return $this->receiver_name;
+    }
+
+    // 收货人电话
+    public function setReceiverPhone($receiver_phone)
+    {
+        $this->receiver_phone = $receiver_phone;
+        return $this;
+    }
+
+    public function getReceiverPhone()
+    {
+        return $this->receiver_phone;
+    }
+
+    // 门店编号
+    public function setShopNo($shop_no)
+    {
+        $this->shop_no = $shop_no;
+        return $this;
+    }
+
+    public function getShopNo()
+    {
+        return $this->shop_no;
+    }
+
+    // 小费
+    public function setTips($tips)
+    {
+        $this->tips = $tips;
+        return $this;
+    }
+
+    public function getTips()
+    {
+        return $this->tips;
+    }
+
+    // 业务类型
+    public function setBusinessType($business_type)
+    {
+        $this->business_type = $business_type;
+        return $this;
+    }
+
+    public function getBusinessType()
+    {
+        return $this->business_type;
+    }
+
+    // 商家地址
+    public function setSupplierAddress($supplier_address)
+    {
+        $this->supplier_address = $supplier_address;
+        return $this;
+    }
+
+    public function getSupplierAddress()
+    {
+        return $this->supplier_address;
+    }
+
+    // 商家纬度
+    public function setSupplierLat($supplier_lat)
+    {
+        $this->supplier_lat = $supplier_lat;
+        return $this;
+    }
+
+    public function getSupplierLat()
+    {
+        return $this->supplier_lat;
+    }
+
+    // 商家经度
+    public function setSupplierLng($supplier_lng)
+    {
+        $this->supplier_lng = $supplier_lng;
+        return $this;
+    }
+
+    public function getSupplierLng()
+    {
+        return $this->supplier_lng;
+    }
+
+    // 商家名称
+    public function setSupplierName($supplier_name)
+    {
+        $this->supplier_name = $supplier_name;
+        return $this;
+    }
+
+    public function getSupplierName()
+    {
+        return $this->supplier_name;
+    }
+
+    // 商家电话
+    public function setSupplierPhone($supplier_phone)
+    {
+        $this->supplier_phone = $supplier_phone;
+        return $this;
+    }
+
+    public function getSupplierPhone()
+    {
+        return $this->supplier_phone;
+    }
+
+    // 将对象转换为数组
+    public function toArray()
+    {
+        return [
+            'callback' => $this->callback,
+            'cargo_num' => $this->cargo_num,
+            'cargo_price' => $this->cargo_price,
+            'cargo_type' => $this->cargo_type,
+            'cargo_weight' => $this->cargo_weight,
+            'info' => $this->info,
+            'invoice_title' => $this->invoice_title,
+            'is_finish_code_needed' => $this->is_finish_code_needed ? 1 : 0,
+            'delay_publish_time' => $this->delay_publish_time,
+            'is_expect_finish_order' => $this->is_expect_finish_order ? 1 : 0,
+            'expect_finish_time_limit' => $this->expect_finish_time_limit,
+            'is_prepay' => $this->is_prepay ? 1 : 0,
+            'is_use_insurance' => $this->is_use_insurance ? 1 : 0,
+            'origin_id' => $this->origin_id,
+            'pick_up_pos' => $this->pick_up_pos,
+            'product_list' => $this->product_list,
+            'receiver_address' => $this->receiver_address,
+            'receiver_lat' => $this->receiver_lat,
+            'receiver_lng' => $this->receiver_lng,
+            'receiver_name' => $this->receiver_name,
+            'receiver_phone' => $this->receiver_phone,
+            'shop_no' => $this->shop_no,
+            'tips' => $this->tips,
+            'business_type' => $this->business_type,
+            'supplier_address' => $this->supplier_address,
+            'supplier_lat' => $this->supplier_lat,
+            'supplier_lng' => $this->supplier_lng,
+            'supplier_name' => $this->supplier_name,
+            'supplier_phone' => $this->supplier_phone,
+        ];
+    }
+
+    // 将对象转换为JSON
+    public function toJson()
+    {
+        return json_encode($this->toArray(), JSON_UNESCAPED_UNICODE);
+    }
+
+    private function validate()
+    {
+        if (empty($this->shop_no)) {
+            throw new \Exception('门店编号不能为空');
+        }
+        if (empty($this->origin_id)) {
+            throw new \Exception('第三方订单ID不能为空');
+        }
+        if (empty($this->cargo_price)) {
+            throw new \Exception('订单金额不能为空');
+        }
+        if (empty($this->receiver_name)) {
+            throw new \Exception('收货人名称不能为空');
+        }
+        if (empty($this->receiver_address)) {
+            throw new \Exception('收货人地址不能为空');
+        }
+        if (empty($this->receiver_lat) || empty($this->receiver_lng)) {
+            throw new \Exception('收货人地址经纬度不能为空');
+        }
+        if (empty($this->callback)) {
+            throw new \Exception('回调URL不能为空');
+        }
+        if ($this->cargo_weight <= 0) {
+            throw new \Exception('订单重量必须大于0');
+        }
+        if (empty($this->receiver_phone)) {
+            throw new \Exception('收货人手机号不能为空');
+        }
+        if (!empty($this->is_expect_finish_order) && empty($this->expect_finish_time_limit)) {
+            throw new \Exception('期望送达时间不能为空');
+        }
+    }
+
+    public function sendRequest()
+    {
+        $this->validate();
+        $body = $this->toArray();
+        foreach ($body as $key => $value) {
+            if (is_null($value)) {
+                unset($body[$key]);
+            }
+        }
+        return $this->request($body,$this->request_url);
+    }
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderTransporterPositionH5Request.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderTransporterPositionH5Request.php
similarity index 90%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderTransporterPositionH5Request.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/OrderTransporterPositionH5Request.php
index 579e8797f..da4dda245 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderTransporterPositionH5Request.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderTransporterPositionH5Request.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
-
-use app\service\core\http\HttpHelper;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
 class OrderTransporterPositionH5Request extends BaseRequest
 {
diff --git a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderTransporterPositionRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderTransporterPositionRequest.php
similarity index 88%
rename from niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderTransporterPositionRequest.php
rename to niucloud/addon/shop/core/local_delivery/sdk/dada/OrderTransporterPositionRequest.php
index 3be65c24a..b115a0b35 100644
--- a/niucloud/addon/shop/app/service/core/delivery/third_delivery/sdk/Dada/OrderTransporterPositionRequest.php
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/OrderTransporterPositionRequest.php
@@ -1,8 +1,6 @@
 <?php
 
-namespace addon\shop\app\service\core\delivery\third_delivery\sdk\Dada;
-
-use app\service\core\http\HttpHelper;
+namespace addon\shop\core\local_delivery\sdk\dada;
 
 class OrderTransporterPositionRequest extends BaseRequest
 {
@@ -32,7 +30,7 @@ class OrderTransporterPositionRequest extends BaseRequest
     public function toArray()
     {
         return [
-            'order_ids' => $this->order_ids,
+            'orderIds' => $this->order_ids,
         ];
     }
 
diff --git a/niucloud/addon/shop/core/local_delivery/sdk/dada/ShopAddRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/ShopAddRequest.php
new file mode 100644
index 000000000..fec0785cb
--- /dev/null
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/ShopAddRequest.php
@@ -0,0 +1,228 @@
+<?php
+
+namespace addon\shop\core\local_delivery\sdk\dada;
+
+class ShopAddRequest extends BaseRequest
+{
+
+    private $request_url = '/api/shop/add';
+
+    private $station_name;
+
+    private $business;
+
+    private $station_address;
+
+    private $lng;
+
+    private $lat;
+
+    private $contact_name;
+
+    private $phone;
+
+    private $origin_shop_id;
+
+    private $id_card = null;
+
+    private $username = null;
+
+    private $password = null;
+
+    private $settlement_type = 0;
+
+    public function setStationName($station_name)
+    {
+        $this->station_name = $station_name;
+        return $this;
+    }
+
+    public function getStationName()
+    {
+        return $this->station_name;
+    }
+
+    public function setBusiness($business)
+    {
+        $this->business = $business;
+        return $this;
+    }
+
+    public function getBusiness()
+    {
+        return $this->business;
+    }
+
+    public function setStationAddress($station_address)
+    {
+        $this->station_address = $station_address;
+        return $this;
+    }
+
+    public function getStationAddress()
+    {
+        return $this->station_address;
+    }
+
+    public function setLng($lng)
+    {
+        $this->lng = $lng;
+        return $this;
+    }
+
+    public function getLng()
+    {
+        return $this->lng;
+    }
+
+    public function setLat($lat)
+    {
+        $this->lat = $lat;
+        return $this;
+    }
+
+    public function getLat()
+    {
+        return $this->lat;
+    }
+
+    public function setContactName($contact_name)
+    {
+        $this->contact_name = $contact_name;
+        return $this;
+    }
+
+    public function getContactName()
+    {
+        return $this->contact_name;
+    }
+
+    public function setPhone($phone)
+    {
+        $this->phone = $phone;
+        return $this;
+    }
+
+    public function getPhone()
+    {
+        return $this->phone;
+    }
+
+    public function setOriginShopId($origin_shop_id)
+    {
+        $this->origin_shop_id = $origin_shop_id;
+        return $this;
+    }
+
+    public function getOriginShopId()
+    {
+        return $this->origin_shop_id;
+    }
+
+    public function setIdCard($id_card)
+    {
+        $this->id_card = $id_card;
+        return $this;
+    }
+
+    public function getIdCard()
+    {
+        return $this->id_card;
+    }
+
+    public function setUsername($username)
+    {
+        $this->username = $username;
+        return $this;
+    }
+
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    public function setPassword($password)
+    {
+        $this->password = $password;
+        return $this;
+    }
+
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+    public function setSettlementType($settlement_type)
+    {
+        $this->settlement_type = $settlement_type;
+        return $this;
+    }
+
+    public function getSettlementType()
+    {
+        return $this->settlement_type;
+    }
+
+    // 将对象转换为数组
+    public function toArray()
+    {
+        return [
+            'station_name' => $this->station_name,
+            'business' => $this->business,
+            'station_address' => $this->station_address,
+            'lng' => $this->lng,
+            'lat' => $this->lat,
+            'contact_name' => $this->contact_name,
+            'phone' => $this->phone,
+            'origin_shop_id' => $this->origin_shop_id,
+            'id_card' => $this->id_card,
+            'username' => $this->username,
+            'password' => $this->password,
+            'settlement_type' => $this->settlement_type,
+        ];
+    }
+
+    // 将对象转换为JSON
+    public function toJson()
+    {
+        return json_encode($this->toArray(), JSON_UNESCAPED_UNICODE);
+    }
+
+    private function validate()
+    {
+        if (empty($this->station_name)) {
+            throw new \Exception('门店名称不能为空');
+        }
+        if (empty($this->business)) {
+            throw new \Exception('门店所属行业类别不能为空');
+        }
+        if (empty($this->station_address)) {
+            throw new \Exception('门店地址不能为空');
+        }
+        if (empty($this->lng) || empty($this->lat)) {
+            throw new \Exception('门店经纬度不能为空');
+        }
+        if (empty($this->contact_name)) {
+            throw new \Exception('联系人姓名不能为空');
+        }
+        if (empty($this->phone)) {
+            throw new \Exception('联系人电话不能为空');
+        }
+        if (empty($this->origin_shop_id)) {
+            throw new \Exception('门店编号不能为空');
+        }
+    }
+
+    public function sendRequest()
+    {
+        $this->validate();
+        $body = $this->toArray();
+        foreach ($body as $key => $value) {
+            if (is_null($value)) {
+                unset($body[$key]);
+            }
+        }
+        $body = [$body];
+        return $this->request($body,$this->request_url);
+    }
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/core/local_delivery/sdk/dada/ShopEditRequest.php b/niucloud/addon/shop/core/local_delivery/sdk/dada/ShopEditRequest.php
new file mode 100644
index 000000000..eecf6ef9d
--- /dev/null
+++ b/niucloud/addon/shop/core/local_delivery/sdk/dada/ShopEditRequest.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace addon\shop\core\local_delivery\sdk\dada;
+
+class ShopEditRequest extends BaseRequest
+{
+
+    private $request_url = '/api/shop/update';
+
+    private $station_name;
+
+    private $business;
+
+    private $station_address;
+
+    private $lng;
+
+    private $lat;
+
+    private $contact_name;
+
+    private $phone;
+
+    private $origin_shop_id;
+
+    private $settlement_type = 0;
+
+    public function setStationName($station_name)
+    {
+        $this->station_name = $station_name;
+        return $this;
+    }
+
+    public function getStationName()
+    {
+        return $this->station_name;
+    }
+
+    public function setBusiness($business)
+    {
+        $this->business = $business;
+        return $this;
+    }
+
+    public function getBusiness()
+    {
+        return $this->business;
+    }
+
+    public function setStationAddress($station_address)
+    {
+        $this->station_address = $station_address;
+        return $this;
+    }
+
+    public function getStationAddress()
+    {
+        return $this->station_address;
+    }
+
+    public function setLng($lng)
+    {
+        $this->lng = $lng;
+        return $this;
+    }
+
+    public function getLng()
+    {
+        return $this->lng;
+    }
+
+    public function setLat($lat)
+    {
+        $this->lat = $lat;
+        return $this;
+    }
+
+    public function getLat()
+    {
+        return $this->lat;
+    }
+
+    public function setContactName($contact_name)
+    {
+        $this->contact_name = $contact_name;
+        return $this;
+    }
+
+    public function getContactName()
+    {
+        return $this->contact_name;
+    }
+
+    public function setPhone($phone)
+    {
+        $this->phone = $phone;
+        return $this;
+    }
+
+    public function getPhone()
+    {
+        return $this->phone;
+    }
+
+    public function setOriginShopId($origin_shop_id)
+    {
+        $this->origin_shop_id = $origin_shop_id;
+        return $this;
+    }
+
+    public function getOriginShopId()
+    {
+        return $this->origin_shop_id;
+    }
+
+    public function setSettlementType($settlement_type)
+    {
+        $this->settlement_type = $settlement_type;
+        return $this;
+    }
+
+    public function getSettlementType()
+    {
+        return $this->settlement_type;
+    }
+
+    // 将对象转换为数组
+    public function toArray()
+    {
+        return [
+            'station_name' => $this->station_name,
+            'business' => $this->business,
+            'station_address' => $this->station_address,
+            'lng' => $this->lng,
+            'lat' => $this->lat,
+            'contact_name' => $this->contact_name,
+            'phone' => $this->phone,
+            'origin_shop_id' => $this->origin_shop_id,
+            'settlement_type' => $this->settlement_type,
+        ];
+    }
+
+    // 将对象转换为JSON
+    public function toJson()
+    {
+        return json_encode($this->toArray(), JSON_UNESCAPED_UNICODE);
+    }
+
+    private function validate()
+    {
+        if (empty($this->origin_shop_id)) {
+            throw new \Exception('门店编号不能为空');
+        }
+    }
+
+    public function sendRequest()
+    {
+        $this->validate();
+        $body = $this->toArray();
+        foreach ($body as $key => $value) {
+            if (is_null($value)) {
+                unset($body[$key]);
+            }
+        }
+        return $this->request($body,$this->request_url);
+    }
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/info.json b/niucloud/addon/shop/info.json
index 9be8690ad..6e5fdc276 100644
--- a/niucloud/addon/shop/info.json
+++ b/niucloud/addon/shop/info.json
@@ -2,9 +2,9 @@
   "title": "商城系统",
   "desc": "实物虚拟商品，订单，物流同城配送，门店自提",
   "key": "shop",
-  "version": "6.4.9",
+  "version": "6.5.0",
   "author": "niucloud",
   "type": "app",
   "support_app": "",
-  "support_version": "1.5.7"
+  "support_version": "1.5.8"
 }
diff --git a/niucloud/addon/shop/resource/diy/index/hot_btn_bg.png b/niucloud/addon/shop/resource/diy/index/hot_btn_bg.png
new file mode 100644
index 000000000..2fac088b9
Binary files /dev/null and b/niucloud/addon/shop/resource/diy/index/hot_btn_bg.png differ
diff --git a/niucloud/addon/shop/resource/diy/index/hot_indicate.png b/niucloud/addon/shop/resource/diy/index/hot_indicate.png
new file mode 100644
index 000000000..a4e415ffa
Binary files /dev/null and b/niucloud/addon/shop/resource/diy/index/hot_indicate.png differ
diff --git a/niucloud/addon/shop/resource/diy/member/nav_my_help.png b/niucloud/addon/shop/resource/diy/member/nav_my_help.png
index a794dbc88..45c67b0f6 100644
Binary files a/niucloud/addon/shop/resource/diy/member/nav_my_help.png and b/niucloud/addon/shop/resource/diy/member/nav_my_help.png differ
diff --git a/niucloud/addon/shop/resource/local_delivery/in_delivery.png b/niucloud/addon/shop/resource/local_delivery/in_delivery.png
new file mode 100644
index 000000000..1b7ccd2db
Binary files /dev/null and b/niucloud/addon/shop/resource/local_delivery/in_delivery.png differ
diff --git a/niucloud/addon/shop/resource/local_delivery/in_stock.png b/niucloud/addon/shop/resource/local_delivery/in_stock.png
new file mode 100644
index 000000000..3ce212d2a
Binary files /dev/null and b/niucloud/addon/shop/resource/local_delivery/in_stock.png differ
diff --git a/niucloud/addon/shop/resource/local_delivery/picking_up.png b/niucloud/addon/shop/resource/local_delivery/picking_up.png
new file mode 100644
index 000000000..9d0bb0394
Binary files /dev/null and b/niucloud/addon/shop/resource/local_delivery/picking_up.png differ
diff --git a/niucloud/addon/shop/resource/payment/navigation.png b/niucloud/addon/shop/resource/payment/navigation.png
new file mode 100644
index 000000000..4b5f9ee67
Binary files /dev/null and b/niucloud/addon/shop/resource/payment/navigation.png differ
diff --git a/niucloud/addon/shop/resource/payment/phone.png b/niucloud/addon/shop/resource/payment/phone.png
new file mode 100644
index 000000000..96127da08
Binary files /dev/null and b/niucloud/addon/shop/resource/payment/phone.png differ
diff --git a/niucloud/addon/shop/resource/payment/store.png b/niucloud/addon/shop/resource/payment/store.png
new file mode 100644
index 000000000..1a8f4ded1
Binary files /dev/null and b/niucloud/addon/shop/resource/payment/store.png differ
diff --git a/niucloud/addon/shop/resource/payment/time.png b/niucloud/addon/shop/resource/payment/time.png
new file mode 100644
index 000000000..3a8531311
Binary files /dev/null and b/niucloud/addon/shop/resource/payment/time.png differ
diff --git a/niucloud/addon/shop/sql/install.sql b/niucloud/addon/shop/sql/install.sql
index f10a4e854..91ef2bc09 100644
--- a/niucloud/addon/shop/sql/install.sql
+++ b/niucloud/addon/shop/sql/install.sql
@@ -144,7 +144,7 @@ CREATE TABLE `{{prefix}}shop_delivery_company`
     `kd100_express_no`                  VARCHAR(255)  NOT NULL DEFAULT '' COMMENT '快递100:物流公司编号(用于物流跟踪)',
     `kd100_express_no_electronic_sheet` VARCHAR(255)  NOT NULL DEFAULT '' COMMENT '快递100:物流公司编号(用于电子面单)',
     PRIMARY KEY (`company_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='站点快递表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='物流公司表';
 
 
 DROP TABLE IF EXISTS `{{prefix}}shop_delivery_deliver`;
@@ -308,6 +308,8 @@ CREATE TABLE `{{prefix}}shop_goods`
     `sub_title`             varchar(255)   NOT NULL DEFAULT '' COMMENT '副标题',
     `goods_cover`           varchar(2000)  NOT NULL DEFAULT '' COMMENT '商品封面',
     `goods_image`           text COMMENT '商品图片',
+    `goods_image_width`     INT(11) NOT NULL DEFAULT 800 COMMENT '商品详情首图宽',
+    `goods_image_height`    INT(11) NOT NULL DEFAULT 800 COMMENT '商品详情首图高',
     `goods_video`           VARCHAR(555)            DEFAULT '' COMMENT '商品视频',
     `goods_category`        varchar(255)   NOT NULL DEFAULT '' COMMENT '商品分类',
     `goods_desc`            text COMMENT '商品介绍',
@@ -431,7 +433,7 @@ CREATE TABLE `{{prefix}}shop_goods_evaluate`
     `goods_id`       int(11) NOT NULL DEFAULT '0' COMMENT '商品ID',
     `member_id`      int(11) NOT NULL DEFAULT '0' COMMENT '会员ID',
     `member_head`    varchar(255)  NOT NULL DEFAULT '' COMMENT '会员头像',
-    `member_name`    varchar(100)  NOT NULL DEFAULT '' COMMENT '会员名称',
+    `member_name`    varchar(255)  NOT NULL DEFAULT '' COMMENT '会员名称',
     `content`        varchar(3000) NOT NULL DEFAULT '' COMMENT '评价内容',
     `images`         varchar(3000) NOT NULL DEFAULT '' COMMENT '评价图片',
     `is_anonymous`   tinyint(4) NOT NULL DEFAULT '1' COMMENT '1匿名  2不匿名',
@@ -579,7 +581,7 @@ CREATE TABLE `{{prefix}}shop_invoice`
     `id`               int(11) NOT NULL AUTO_INCREMENT COMMENT '发票id',
     `member_id`        int(11) NOT NULL DEFAULT '0' COMMENT '会员id',
     `trade_type`       varchar(10)    NOT NULL DEFAULT 'order' COMMENT '开票分类 order:订单',
-    `trade_id`         int(11) NOT NULL DEFAULT '0' COMMENT '业务id',
+    `trade_id`         VARCHAR(1000)  NOT NULL DEFAULT '' COMMENT '业务id集',
     `header_type`      tinyint(4) NOT NULL DEFAULT '1' COMMENT '抬头类型',
     `header_name`      varchar(100)   NOT NULL DEFAULT '' COMMENT '名称（发票抬头）',
     `type`             tinyint(4) NOT NULL DEFAULT '1' COMMENT '发票类型',
@@ -599,10 +601,10 @@ CREATE TABLE `{{prefix}}shop_invoice`
     `create_time`      int(11) NOT NULL DEFAULT '0' COMMENT '申请时间',
     `invoice_time`     int(11) NOT NULL DEFAULT '0' COMMENT '开票时间',
     `status`           int(11) NOT NULL DEFAULT '0' COMMENT '是否生效',
+    `pay_voucher`      TEXT                    DEFAULT NULL COMMENT '支付凭证',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='发票表';
 
-
 DROP TABLE IF EXISTS `{{prefix}}shop_manjian`;
 CREATE TABLE `{{prefix}}shop_manjian`
 (
@@ -760,18 +762,19 @@ CREATE TABLE `{{prefix}}shop_order_batch_delivery`
 DROP TABLE IF EXISTS `{{prefix}}shop_order_delivery`;
 CREATE TABLE `{{prefix}}shop_order_delivery`
 (
-    `id`                 int(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
-    `order_id`           int(11) NOT NULL DEFAULT '0',
-    `name`               varchar(50)   NOT NULL DEFAULT '' COMMENT '包裹名称',
-    `delivery_type`      varchar(50)   NOT NULL DEFAULT '' COMMENT '配送方式',
-    `sub_delivery_type`  varchar(50)   NOT NULL DEFAULT '' COMMENT '详细配送方式',
-    `express_company_id` int(11) NOT NULL DEFAULT '0' COMMENT '快递公司id',
-    `express_number`     varchar(50)   NOT NULL DEFAULT '' COMMENT '配送单号',
-    `local_deliver_id`   int(11) NOT NULL DEFAULT '0' COMMENT '同城配送员',
-    `status`             int(11) NOT NULL DEFAULT '0' COMMENT '配送状态',
-    `third_delivery`     VARCHAR(50)   NOT NULL DEFAULT '' COMMENT '配送方（三方配送）',
-    `remark`             VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '备注',
-    `create_time`        int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+    `id`                      int(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `order_id`                int(11) NOT NULL DEFAULT '0',
+    `name`                    varchar(50)   NOT NULL DEFAULT '' COMMENT '包裹名称',
+    `delivery_type`           varchar(50)   NOT NULL DEFAULT '' COMMENT '配送方式',
+    `sub_delivery_type`       varchar(50)   NOT NULL DEFAULT '' COMMENT '详细配送方式',
+    `express_company_id`      int(11) NOT NULL DEFAULT '0' COMMENT '快递公司id',
+    `express_number`          varchar(50)   NOT NULL DEFAULT '' COMMENT '配送单号',
+    `local_deliver_id`        int(11) NOT NULL DEFAULT '0' COMMENT '同城配送员',
+    `status`                  int(11) NOT NULL DEFAULT '0' COMMENT '配送状态',
+    `third_delivery`          VARCHAR(50)   NOT NULL DEFAULT '' COMMENT '配送方（三方配送）',
+    `remark`                  VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '备注',
+    `create_time`             int(11) NOT NULL DEFAULT '0' COMMENT '创建时间',
+    `local_delivery_order_id` VARCHAR(255)  NOT NULL DEFAULT '' COMMENT '同城配送单号',
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='订单发货表';
 
@@ -979,24 +982,33 @@ CREATE TABLE `{{prefix}}shop_stat`
 DROP TABLE IF EXISTS `{{prefix}}shop_store`;
 CREATE TABLE `{{prefix}}shop_store`
 (
-    `store_id`        int(11) NOT NULL AUTO_INCREMENT,
-    `store_name`      varchar(255)  NOT NULL DEFAULT '' COMMENT '门店名称',
-    `store_desc`      varchar(3000) NOT NULL DEFAULT '' COMMENT '简介',
-    `store_logo`      varchar(255)  NOT NULL DEFAULT '' COMMENT '门店logo',
-    `store_mobile`    varchar(255)  NOT NULL DEFAULT '' COMMENT '手机号',
-    `province_id`     int(11) NOT NULL DEFAULT '0' COMMENT '省id',
-    `city_id`         int(11) NOT NULL DEFAULT '0' COMMENT '市',
-    `district_id`     int(11) NOT NULL DEFAULT '0' COMMENT '县（区）',
-    `address`         varchar(255)  NOT NULL DEFAULT '' COMMENT '详细地址',
-    `full_address`    varchar(255)  NOT NULL DEFAULT '' COMMENT '完整地址',
-    `longitude`       varchar(255)  NOT NULL DEFAULT '' COMMENT '经度',
-    `latitude`        varchar(255)  NOT NULL DEFAULT '' COMMENT '纬度',
-    `trade_time`      varchar(255)  NOT NULL DEFAULT '' COMMENT '营业时间(文本展示使用)',
-    `time_week`       TEXT                   DEFAULT NULL COMMENT '自定义的营业时间["0","1","2","3","4","5","6"]周日-周六',
-    `trade_time_json` TEXT                   DEFAULT NULL COMMENT '营业时间',
-    `time_interval`   INT(11) NOT NULL DEFAULT 0 COMMENT '时段设置（分钟）',
-    `create_time`     int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
-    `update_time`     int(11) NOT NULL DEFAULT '0' COMMENT '更新时间',
+    `store_id`               int(11) NOT NULL AUTO_INCREMENT,
+    `store_no`               VARCHAR(255)  NOT NULL DEFAULT '' COMMENT '门店编号',
+    `store_name`             varchar(255)  NOT NULL DEFAULT '' COMMENT '门店名称',
+    `store_desc`             varchar(3000) NOT NULL DEFAULT '' COMMENT '简介',
+    `store_logo`             varchar(255)  NOT NULL DEFAULT '' COMMENT '门店logo',
+    `store_mobile`           varchar(255)  NOT NULL DEFAULT '' COMMENT '手机号',
+    `contact_name`           VARCHAR(255)  NOT NULL DEFAULT '' COMMENT '联系人',
+    `province_id`            int(11) NOT NULL DEFAULT '0' COMMENT '省id',
+    `city_id`                int(11) NOT NULL DEFAULT '0' COMMENT '市',
+    `district_id`            int(11) NOT NULL DEFAULT '0' COMMENT '县（区）',
+    `address`                varchar(255)  NOT NULL DEFAULT '' COMMENT '详细地址',
+    `full_address`           varchar(255)  NOT NULL DEFAULT '' COMMENT '完整地址',
+    `longitude`              varchar(255)  NOT NULL DEFAULT '' COMMENT '经度',
+    `latitude`               varchar(255)  NOT NULL DEFAULT '' COMMENT '纬度',
+    `trade_time`             varchar(255)  NOT NULL DEFAULT '' COMMENT '营业时间(文本展示使用)',
+    `time_week`              TEXT                   DEFAULT NULL COMMENT '自定义的营业时间["0","1","2","3","4","5","6"]周日-周六',
+    `trade_time_json`        TEXT                   DEFAULT NULL COMMENT '营业时间',
+    `time_interval`          INT(11) NOT NULL DEFAULT 0 COMMENT '时段设置（分钟）',
+    `create_time`            int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
+    `update_time`            int(11) NOT NULL DEFAULT '0' COMMENT '更新时间',
+    `support_delivery`       TEXT                   DEFAULT NULL COMMENT '支持的配送服务商',
+    `extend_data`            TEXT                   DEFAULT NULL COMMENT '配送服务商扩展数据',
+    `time_is_open`           TINYINT(4) NOT NULL DEFAULT 0 COMMENT '配送时间设置 0 关闭1 开启',
+    `support_local_delivery` TINYINT(4) NOT NULL DEFAULT 0 COMMENT '支持同城配送',
+    `support_store`          TINYINT(4) NOT NULL DEFAULT 0 COMMENT '支持门店自提',
+    `status`                 TINYINT(4) NOT NULL DEFAULT 0 COMMENT '开启状态（1开启，0关闭）',
+    `area`                   LONGTEXT               DEFAULT NULL COMMENT '配送区域',
     PRIMARY KEY (`store_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci COMMENT='自提门店表';
 
@@ -1066,8 +1078,136 @@ CREATE TABLE `{{prefix}}shop_goods_browse`
 
 
 
-ALTER TABLE `{{prefix}}shop_invoice`
-    CHANGE COLUMN trade_id trade_id VARCHAR (1000) NOT NULL DEFAULT '' COMMENT '业务id集';
+DROP TABLE IF EXISTS `{{prefix}}shop_delivery_shop_delivery_order_log`;
+CREATE TABLE `{{prefix}}shop_delivery_shop_delivery_order_log`
+(
+    `id`           INT          NOT NULL AUTO_INCREMENT,
+    `order_id`     INT          NOT NULL DEFAULT 0 COMMENT '订单id',
+    `main_id`      INT          NOT NULL DEFAULT 0 COMMENT '操作人id',
+    `main_type`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作人类型',
+    `main_name`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作人名称',
+    `operate`      VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作类型',
+    `operate_desc` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '操作描述',
+    `status`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作后配送状态',
+    `create_time`  INT          NOT NULL DEFAULT 0 COMMENT '配送时间',
+    `remark`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '商家配送服务订单操作表';
 
-ALTER TABLE `{{prefix}}shop_invoice`
-    ADD COLUMN pay_voucher TEXT DEFAULT NULL COMMENT '支付凭证';
\ No newline at end of file
+DROP TABLE IF EXISTS `{{prefix}}shop_delivery_shop_delivery_order`;
+CREATE TABLE `{{prefix}}shop_delivery_shop_delivery_order`
+(
+    `id`                         INT            NOT NULL AUTO_INCREMENT,
+    `delivery_no`                VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送单号',
+    `out_delivery_no`            VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '三方配送单号',
+    `trade_type`                 VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '交易类型，mall商城 supply供货商',
+    `trade_no`                   VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '交易单号',
+    `trade_id`                   INT            NOT NULL DEFAULT 0 COMMENT '交易id',
+    `delivery_money`             DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '配送费用',
+    `delivery_start`             VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点（发货点）',
+    `delivery_start_province_id` INT            NOT NULL DEFAULT 0 COMMENT '配送起点省',
+    `delivery_start_city_id`     INT            NOT NULL DEFAULT 0 COMMENT '配送起点市',
+    `delivery_start_district_id` INT            NOT NULL DEFAULT 0 COMMENT '配送起点区',
+    `delivery_start_lng`         VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点经度',
+    `delivery_start_lat`         VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点纬度',
+    `delivery_end`               VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点（收货点）',
+    `delivery_end_province_id`   INT            NOT NULL DEFAULT 0 COMMENT '配送终点省',
+    `delivery_end_city_id`       INT            NOT NULL DEFAULT 0 COMMENT '配送终点市',
+    `delivery_end_district_id`   INT            NOT NULL DEFAULT 0 COMMENT '配送终点区',
+    `delivery_end_lng`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点经度',
+    `delivery_end_lat`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点纬度',
+    `delivery_distance`          DECIMAL(10, 4) NOT NULL DEFAULT 0.0000 COMMENT '配送距离',
+    `deliver_id`                 INT            NOT NULL DEFAULT 0 COMMENT '配送员id',
+    `deliver_name`               VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送员姓名',
+    `deliver_mobile`             VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送员手机号',
+    `status`                     VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送状态',
+    `create_time`                INT            NOT NULL DEFAULT 0 COMMENT '配送时间',
+    `finish_time`                INT            NOT NULL DEFAULT 0 COMMENT '送达时间',
+    `cancel_time`                INT            NOT NULL DEFAULT 0 COMMENT '取消时间',
+    `remark`                     VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '备注',
+    `body`                       VARCHAR(1000)  NOT NULL DEFAULT '' COMMENT '商品信息',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '商家配送服务订单表';
+
+DROP TABLE IF EXISTS `{{prefix}}shop_delivery_local_delivery_service`;
+CREATE TABLE `{{prefix}}shop_delivery_local_delivery_service`
+(
+    `id`          INT          NOT NULL AUTO_INCREMENT,
+    `key`         VARCHAR(255) NOT NULL DEFAULT '' COMMENT '三方配送key',
+    `name`        VARCHAR(255) NOT NULL DEFAULT '' COMMENT '三方配送名称',
+    `config`      TEXT                  DEFAULT NULL COMMENT '三方配送接入参数',
+    `is_merchant` TINYINT      NOT NULL DEFAULT 0 COMMENT '是否商家自配送',
+    `is_use`      TINYINT      NOT NULL DEFAULT 0 COMMENT '是否启用（0否，1是）',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '同城配送服务商表';
+
+
+DROP TABLE IF EXISTS `{{prefix}}shop_delivery_local_delivery_order_log`;
+CREATE TABLE `{{prefix}}shop_delivery_local_delivery_order_log`
+(
+    `id`           INT          NOT NULL AUTO_INCREMENT,
+    `order_id`     INT          NOT NULL DEFAULT 0 COMMENT '订单id',
+    `main_id`      INT          NOT NULL DEFAULT 0 COMMENT '操作人id',
+    `main_type`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作人类型',
+    `main_name`    VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作人名称',
+    `operate`      VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作类型',
+    `operate_desc` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '操作描述',
+    `status`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '操作后配送状态',
+    `create_time`  INT          NOT NULL DEFAULT 0 COMMENT '配送时间',
+    `remark`       VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '同城配送服务订单操作表';
+
+
+DROP TABLE IF EXISTS `{{prefix}}shop_delivery_local_delivery_order`;
+CREATE TABLE `{{prefix}}shop_delivery_local_delivery_order`
+(
+    `id`                         INT            NOT NULL AUTO_INCREMENT,
+    `delivery_service`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送方标识',
+    `delivery_no`                VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送单号',
+    `out_delivery_no`            VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '三方配送单号',
+    `trade_type`                 VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '交易类型，mall商城',
+    `trade_no`                   VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '交易单号',
+    `trade_id`                   INT            NOT NULL DEFAULT 0 COMMENT '交易id',
+    `delivery_money`             DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '配送费用',
+    `delivery_start`             VARCHAR(1000)  NOT NULL DEFAULT '' COMMENT '配送起点（发货点）',
+    `delivery_start_province_id` INT            NOT NULL DEFAULT 0 COMMENT '配送起点省',
+    `delivery_start_city_id`     INT            NOT NULL DEFAULT 0 COMMENT '配送起点市',
+    `delivery_start_district_id` INT            NOT NULL DEFAULT 0 COMMENT '配送起点区',
+    `delivery_start_lng`         VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点经度',
+    `delivery_start_lat`         VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送起点纬度',
+    `delivery_end`               VARCHAR(1000)  NOT NULL DEFAULT '' COMMENT '配送终点（收货点）',
+    `delivery_end_province_id`   INT            NOT NULL DEFAULT 0 COMMENT '配送终点省',
+    `delivery_end_city_id`       INT            NOT NULL DEFAULT 0 COMMENT '配送终点市',
+    `delivery_end_district_id`   INT            NOT NULL DEFAULT 0 COMMENT '配送终点区',
+    `delivery_end_lng`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点经度',
+    `delivery_end_lat`           VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送终点纬度',
+    `delivery_distance`          DECIMAL(10, 4) NOT NULL DEFAULT 0.0000 COMMENT '配送距离',
+    `status`                     VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送状态',
+    `out_status`                 VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '三方配送状态',
+    `create_time`                INT            NOT NULL DEFAULT 0 COMMENT '配送时间',
+    `finish_time`                INT            NOT NULL DEFAULT 0 COMMENT '送达时间',
+    `cancel_time`                INT            NOT NULL DEFAULT 0 COMMENT '取消时间',
+    `rider_name`                 VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '骑手姓名',
+    `rider_mobile`               VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '骑手电话',
+    `deduct_money`               DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '违约金',
+    `remark`                     VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '备注',
+    `body`                       VARCHAR(255)   NOT NULL DEFAULT '' COMMENT '配送产品信息',
+    `actual_money`               DECIMAL(10, 2) NOT NULL DEFAULT 0.00 COMMENT '实际消费费用(订单取消或完成后实际定义)',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB,
+CHARACTER SET utf8mb4,
+COLLATE utf8mb4_general_ci,
+COMMENT = '同城配送服务订单表';
diff --git a/niucloud/addon/shop/uni-app/api/order.ts b/niucloud/addon/shop/uni-app/api/order.ts
index 03183ac3c..c37da0b72 100644
--- a/niucloud/addon/shop/uni-app/api/order.ts
+++ b/niucloud/addon/shop/uni-app/api/order.ts
@@ -91,3 +91,10 @@ export function getMaterialflowList(params: Record<string, any>) {
 export function getLocal() {
     return request.get('shop/order_create/local')
 }
+
+/**
+ * 查询同城配送地图
+ */
+export function getTrackOfLocal(params: Record<string, any>) {
+    return request.get('shop/delivery/track_of_local', params)
+}
\ No newline at end of file
diff --git a/niucloud/addon/shop/uni-app/components/diy/goods-list/index.vue b/niucloud/addon/shop/uni-app/components/diy/goods-list/index.vue
index fe75a114b..28d6b0f3b 100644
--- a/niucloud/addon/shop/uni-app/components/diy/goods-list/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/goods-list/index.vue
@@ -6,7 +6,7 @@
                 <template v-if="diyComponent.style == 'style-1'">
                     <view class="bg-white w-full flex p-[20rpx] overflow-hidden" :class="{ 'mt-[20rpx]': index > 0 }"
                           :style="itemCss" v-for="(item,index) in goodsList" :key="item.goods_id" @click="toLink(item)">
-                        <up-image :radius="imageRounded.val" width="200rpx" height="200rpx" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+                        <up-image :radius="imageRounded.val" class="w-[200rpx] h-[200rpx]" width="200rpx" height="200rpx" :src="img(item.goods_cover_thumb_mid || '')" :mode="diyComponent.mode">
                             <template #error>
                                 <image class="w-[200rpx] h-[200rpx] overflow-hidden" :style="imageRounded.style" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                             </template>
@@ -42,7 +42,7 @@
 										<image v-else-if="diyGoods.priceType(item) == 'discount_price'" class="max-w-[80rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/discount.png')" mode="heightFix" />
                                     </view>
                                     <text v-if="diyComponent.saleStyle.control"
-                                          class="mt-[8rpx] text-[22rpx] text-[var(--text-color-light9)]"
+                                          class="mt-[8rpx] text-[20rpx] text-[var(--text-color-light9)]"
                                           :style="{ color : diyComponent.saleStyle.color }">
                                         已售{{ item.sale_num }}{{ item.unit || '件' }}
                                     </text>
@@ -71,7 +71,7 @@
                         <template v-for="(item,index) in goodsList">
                             <view v-if="(index%2) == 0" class="flex flex-col bg-[#fff] box-border overflow-hidden"
                                   :class="{'mt-[24rpx]': index > 1}" :style="itemCss" @click="toLink(item)">
-                                <up-image :radius="imageRounded.val" :width="style2Width" :height="style2Width" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+                                <up-image :radius="imageRounded.val" :width="style2Width" :height="style2Width" :src="img(item.goods_cover_thumb_mid || '')" :mode="diyComponent.mode">
                                     <template #error>
                                         <image :style="{'width': style2Width,'height': style2Width, 'border-radius': imageRounded.val}" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                     </template>
@@ -108,7 +108,7 @@
 												<image v-else-if="diyGoods.priceType(item) == 'discount_price'" class="max-w-[80rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/discount.png')" mode="heightFix" />
                                             </view>
                                             <text v-if="diyComponent.saleStyle.control"
-                                                  class="text-[22rpx] mt-[8rpx] text-[var(--text-color-light9)]"
+                                                  class="text-[20rpx] mt-[8rpx] text-[var(--text-color-light9)]"
                                                   :style="{ color : diyComponent.saleStyle.color }">
                                                 已售{{ item.sale_num }}{{ item.unit || '件' }}
                                             </text>
@@ -135,7 +135,7 @@
                     <view>
                         <template v-for="(item,index) in goodsList">
                             <view v-if="(index%2) == 1" class="flex flex-col bg-[#fff] box-border overflow-hidden" :class="{'mt-[24rpx]': index > 1}" :style="itemCss" @click="toLink(item)">
-                                <up-image :width="style2Width" :height="style2Width" :radius="imageRounded.val" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+                                <up-image :width="style2Width" :height="style2Width" :radius="imageRounded.val" :src="img(item.goods_cover_thumb_mid || '')" :mode="diyComponent.mode">
                                     <template #error>
                                         <image :style="{'width': style2Width,'height': style2Width, 'border-radius': imageRounded.val}" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                     </template>
@@ -170,7 +170,7 @@
 												<image v-else-if="diyGoods.priceType(item) == 'discount_price'" class="max-w-[80rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/discount.png')" mode="heightFix" />
                                             </view>
                                             <text v-if="diyComponent.saleStyle.control"
-                                                  class="text-[22rpx] mt-[8rpx] text-[var(--text-color-light9)]"
+                                                  class="text-[20rpx] mt-[8rpx] text-[var(--text-color-light9)]"
                                                   :style="{ color : diyComponent.saleStyle.color }">
                                                 已售{{ item.sale_num }}{{ item.unit || '件' }}
                                             </text>
@@ -202,7 +202,7 @@
                                   class="w-[214rpx] mb-[6rpx] inline-block bg-[#fff] box-border overflow-hidden"
                                   :class="{'!mr-[0rpx]' : index == (goodsList.length-1)}" :style="itemCss+itemStyle3"
                                   v-for="(item,index) in goodsList" :key="item.goods_id" @click="toLink(item)">
-                                <up-image width="214rpx" height="160rpx" :radius="imageRounded.val" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+                                <up-image width="214rpx" height="160rpx" :radius="imageRounded.val" :src="img(item.goods_cover_thumb_mid || '')" :mode="diyComponent.mode">
                                     <template #error>
                                         <image class="w-[214rpx] h-[160rpx]" :style="imageRounded.style" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                     </template>
diff --git a/niucloud/addon/shop/uni-app/components/diy/many-goods-list/index.vue b/niucloud/addon/shop/uni-app/components/diy/many-goods-list/index.vue
index 15de56373..28260eb2c 100644
--- a/niucloud/addon/shop/uni-app/components/diy/many-goods-list/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/many-goods-list/index.vue
@@ -36,21 +36,53 @@
                 </template>
             </template>
             <template v-else>
-                <view v-for="(item, index) in diyComponent.list" class="scroll-item"
-                      :class="[diyComponent.headStyle, { active: index == cateIndex }]" :id="'a' + index" :key="index"
-                      @click="changeCateIndex(item, index)">
-                    <view class="cate" v-if="diyComponent.headStyle == 'style-1'">
-                        <view class="name">{{ item.title }}</view>
-                        <view class="desc" :v-if="item.desc">{{ item.desc }}</view>
+                <template v-if="diyComponent.source == 'custom'">
+                    <view v-for="(item, index) in diyComponent.list" class="scroll-item"
+                          :class="[diyComponent.headStyle, { active: index == cateIndex }]" :id="'a' + index" :key="index"
+                          @click="changeCateIndex(item, index)">
+                        <view class="cate" v-if="diyComponent.headStyle == 'style-1'">
+                            <view class="name">{{ item.title }}</view>
+                            <view class="desc" :v-if="item.desc">{{ item.desc }}</view>
+                        </view>
+                        <view v-if="diyComponent.headStyle == 'style-2'" class="cate">
+                            <view class="name">{{ item.title }}</view>
+                            <text class="nc-iconfont nc-icon-xiaolian-2 !text-[40rpx] text-[var(--primary-color)] transform" v-if="index == cateIndex"></text>
+                        </view>
+                        <view v-if="diyComponent.headStyle == 'style-4'" class="cate">
+                            <view class="name">{{ item.title }}</view>
+                        </view>
                     </view>
-                    <view v-if="diyComponent.headStyle == 'style-2'" class="cate">
-                        <view class="name">{{ item.title }}</view>
-                        <text class="nc-iconfont nc-icon-xiaolian-2 !text-[40rpx] text-[var(--primary-color)] transform" v-if="index == cateIndex"></text>
+                </template>
+                <template v-if="diyComponent.source == 'goods_category'">
+                    <view class="scroll-item" :class="[diyComponent.headStyle, { active: currentCategoryId == 0 }]" @click="changeGoodsCategory({ category_id : 0 })">
+                        <view class="cate" v-if="diyComponent.headStyle == 'style-1'" >
+                            <view class="name">推荐</view>
+                            <view class="desc">猜你喜欢</view>
+                        </view>
+                        <view v-if="diyComponent.headStyle == 'style-2'" class="cate">
+                            <view class="name">全部</view>
+                            <text class="nc-iconfont nc-icon-xiaolian-2 !text-[40rpx] text-[var(--primary-color)] transform" v-if="currentCategoryId == 0"></text>
+                        </view>
+                        <view v-if="diyComponent.headStyle == 'style-4'" class="cate">
+                            <view class="name">全部</view>
+                        </view>
                     </view>
-                    <view v-if="diyComponent.headStyle == 'style-4'" class="cate">
-                        <view class="name">{{ item.title }}</view>
+                    <view v-for="(item, index) in goodsCategoryListData" class="scroll-item"
+                          :class="[diyComponent.headStyle, { active: currentCategoryId == item.category_id }]" :id="'a' + index" :key="index"
+                          @click="changeGoodsCategory(item, index)">
+                        <view class="cate" v-if="diyComponent.headStyle == 'style-1'" >
+                            <view class="name">{{ item.category_name }}</view>
+                            <view class="desc">{{ item.category_name }}</view>
+                        </view>
+                        <view v-if="diyComponent.headStyle == 'style-2'" class="cate">
+                            <view class="name">{{ item.category_name }}</view>
+                            <text class="nc-iconfont nc-icon-xiaolian-2 !text-[40rpx] text-[var(--primary-color)] transform" v-if="currentCategoryId == item.category_id"></text>
+                        </view>
+                        <view v-if="diyComponent.headStyle == 'style-4'" class="cate">
+                            <view class="name">{{ item.category_name }}</view>
+                        </view>
                     </view>
-                </view>
+                </template>
             </template>
         </scroll-view>
 
@@ -108,7 +140,7 @@ onMounted(() => {
 
 const refresh = () => {
     // 装修模式下设置默认图
-    if (diyComponent.value.headStyle == 'style-3' && diyComponent.value.source == 'goods_category' && diyComponent.value.goods_category) {
+    if (diyComponent.value.source == 'goods_category' && diyComponent.value.goods_category) {
         getGoodsCategoryFn(diyComponent.value.goods_category);
     } else {
         changeCateIndex(diyComponent.value.list[0], 0, true)
@@ -144,7 +176,7 @@ const getGoodsCategoryFn = (pid: any) => {
             if (goodsCategoryListData.value) {
                 refreshGoodsList({
                     source: 'category',
-                    goods_category: ''
+                    goods_category: pid
                 });
             }
         }
@@ -158,7 +190,7 @@ const changeGoodsCategory = (item: any) => {
     currentCategoryId.value = item.category_id
     refreshGoodsList({
         source: 'category',
-        goods_category: currentCategoryId.value
+        goods_category: currentCategoryId.value == 0 ? diyComponent.value.goods_category : currentCategoryId.value
     });
 }
 
@@ -181,7 +213,8 @@ const refreshGoodsList = (obj: any) => {
 
         elementBgColor: diyComponent.value.elementBgColor,
         topElementRounded: diyComponent.value.topElementRounded,
-        bottomElementRounded: diyComponent.value.bottomElementRounded
+        bottomElementRounded: diyComponent.value.bottomElementRounded,
+        mode: diyComponent.value.mode
     };
 
     if (obj.goods_category) {
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-exchange-goods/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-exchange-goods/index.vue
index 02d774563..a19b330e2 100644
--- a/niucloud/addon/shop/uni-app/components/diy/shop-exchange-goods/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-exchange-goods/index.vue
@@ -6,7 +6,7 @@
                 <view class="overflow-hidden bg-[#fff] flex flex-col box-border w-[calc(50%-10rpx)]"
                       :class="{'mt-[20rpx]': index > 1}" :style="itemCss" v-for="(item,index) in goodsList"
                       :key="item.goods_id" @click="toLink(item)">
-                    <up-image :width="style2Width" :height="style2Width" :radius="imageRounded.val" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+                    <up-image :width="style2Width" :height="style2Width" :radius="imageRounded.val" :src="img(item.goods_cover_thumb_mid || '')" :mode="diyComponent.mode">
                         <template #error>
                             <image class="overflow-hidden" :style="{'width': style2Width,'height': style2Width, 'border-radius': imageRounded.val}" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                         </template>
@@ -29,7 +29,7 @@
 						    </template>
 						</view>
                         <view class="text-[22rpx] leading-[28rpx] mt-[10rpx] text-[var(--text-color-light9)]" :style="{ color : diyComponent.saleStyle.color }">已兑{{ item.total_exchange_num }}人</view>
-                        <view class="flex justify-between flex-wrap items-center mt-[16rpx]">
+                        <!-- <view class="flex justify-between flex-wrap items-center mt-[16rpx]">
                             <view class="flex flex-col">
                                 <view :style="{ color : diyComponent.priceStyle.mainColor }" class="text-[var(--price-text-color)] price-font ml-[2rpx] flex items-baseline">
                                     <text class="text-[32rpx]">{{ item.point }}</text>
@@ -41,6 +41,17 @@
                                 </view>
                             </view>
                             <view class="w-[120rpx] h-[54rpx] text-[22rpx] flex-center !text-[#fff] m-0 rounded-full primary-btn-bg remove-border text-center" shape="circle">去兑换</view>
+                        </view> -->
+                        <view class="flex items-baseline mt-[14rpx]">
+                            <image class="h-[22rpx] w-[22rpx] mr-[4rpx]" :style="imageStyle2"  :src="img('addon/shop/diy/point/nav_point.png')" mode="aspectFit" />
+                            <view class="inline-block price-font text-[24rpx] leading-[1]" :style="{ color : diyComponent.priceStyle.mainColor }">
+                                <text class="text-[38rpx] price-font font-500">{{ parseInt(item.point) }}</text>
+                                <template v-if="item.price && item.price > 0">
+                                    <text class="mx-[2rpx]">+</text>
+                                    <text class="font-500">{{ parseFloat(item.price).toFixed(2) }}</text>
+                                    <text>元</text>
+                                </template>
+                            </view>
                         </view>
                     </view>
                 </view>
@@ -114,6 +125,14 @@ const imageRounded = computed(() => {
     return obj;
 })
 
+const imageStyle2 = computed(() => {
+    let style = '';
+    // #ifdef MP
+    style += 'position:relative; top:2rpx;';
+    // #endif
+    return style;
+})
+
 // 背景图加遮罩层
 const maskLayer = computed(() => {
     let style = '';
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-attr/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-attr/index.vue
index da7789718..b83f0a870 100644
--- a/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-attr/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-attr/index.vue
@@ -1,6 +1,6 @@
 <template>
     <view :style="warpCss" class="overflow-hidden">
-        <view class="goods-sku card-template" v-if="diyComponent.goods && diyComponent.goods.attr_format && Object.keys(diyComponent.goods.attr_format).length">
+        <view class="goods-sku card-template" v-if="diyComponent.goods && diyComponent.goods.attr_format && Object.keys(diyComponent.goods.attr_format).length || diyComponent.goods.goods_brand || diyComponent.weight >0 || diyComponent.volume>0">
             <view class="title mb-[30rpx]">商品属性</view>
             <view>
                 <template v-for="(item,index) in filteredAttrFormat" :key="index">
@@ -48,17 +48,42 @@ const diyComponent = computed(() => {
     }
 })
 
-// 过滤后的属性数组（去掉空值项）
+// 过滤后的属性数组（去掉空值项，包含重量和体积品牌）
 const filteredAttrFormat = computed(() => {
     const originalAttrs = diyComponent.value.goods?.attr_format || [];
-    return originalAttrs.filter(item => {
-        // 过滤掉空值项
+    // 第一步：过滤原始属性的空值项
+    const filteredOriginalAttrs = originalAttrs.filter(item => {
         if (Array.isArray(item.attr_child_value_name)) {
             return item.attr_child_value_name.length > 0;
         } else {
             return !!item.attr_child_value_name;
         }
     });
+
+    // 第二步：定义重量和体积属性项（保持和原有属性结构一致）
+    const extraAttrs = [];
+    if (diyComponent.value.goods.goods_brand) {
+        extraAttrs.push({
+            attr_value_name: '品牌',
+            attr_child_value_name: diyComponent.value.goods.goods_brand.brand_name
+        });
+    }
+    // 重量属性（非空时添加）
+    if (diyComponent.value.weight && diyComponent.value.weight > 0) {
+        extraAttrs.push({
+            attr_value_name: '重量',
+            attr_child_value_name: diyComponent.value.weight + 'kg'
+        });
+    }
+    // 体积属性（非空时添加）
+    if (diyComponent.value.volume && diyComponent.value.volume > 0) {
+        extraAttrs.push({
+            attr_value_name: '体积',
+            attr_child_value_name: diyComponent.value.volume + 'm³'
+        });
+    }
+    // 第三步：合并原始过滤后的属性 + 重量/体积属性
+    return [...extraAttrs, ...filteredOriginalAttrs];
 });
 
 const warpCss = computed(() => {
@@ -98,7 +123,7 @@ onMounted(() => {
             (newValue, oldValue) => {
                 if (newValue && newValue.componentName == 'ShopGoodsDetailAttr') {
                     nextTick(() => {
-                        if (diyComponent.value.goods && Object.keys(diyComponent.value.goods).length && diyComponent.value.goods.attr_format && Object.keys(diyComponent.value.goods.attr_format).length && diyComponent.value.isShow) {
+                        if (diyComponent.value.goods && Object.keys(diyComponent.value.goods).length && (diyComponent.value.goods.attr_format && Object.keys(diyComponent.value.goods.attr_format).length || diyComponent.value.goods.goods_brand || diyComponent.value.weight >0|| diyComponent.value.volume >0)&& diyComponent.value.isShow) {
                             emits('update:componentIsShow', true)
                         }else{
                             emits('update:componentIsShow', false)
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-basic-info/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-basic-info/index.vue
index a32071264..dc987e126 100644
--- a/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-basic-info/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-basic-info/index.vue
@@ -33,13 +33,25 @@
             <view @touchmove.stop.prevent class="media-mode absolute top-0 left-0 w-full h-full transition-transform duration-300 ease-linear transform"
                 :class="{'translate-x-0':switchMedia === 'video','-translate-x-full':switchMedia != 'video'}" :style="{background: 'url(' + img(diyComponent.goods.goods_cover_thumb_mid) + ') left bottom / cover no-repeat'}">
                 <view :style="goodsVideoHeight">
-                    <video id="goodsVideo" class="w-full h-full" :src="img(diyComponent.goods.goods_video)" :poster="img(diyComponent.goods.goods_cover_thumb_mid)" objectFit="cover" play-btn-position="center"></video>
+                    <video 
+                        id="goodsVideo"
+                        class="w-full h-full" 
+                        :src="currentVideoSrc"
+                        :poster="currentVideoPoster"
+                        objectFit="cover" 
+                        play-btn-position="center"
+                        :show-play-btn="true"
+                        :enable-play-gesture="true"
+                        :autoplay="false"
+                        :loop="false"
+                        :show-center-play-btn="true"
+                    ></video>
                 </view>
             </view>
             <!-- 切换视频、图片 -->
             <view class="media-mode bg-[rgb(0,0,0,.5)] flex items-center rounded-[50rpx] p-[4rpx] absolute bottom-[130rpx] right-[20rpx] text-center leading-[46rpx]" v-if="diyComponent.goods.goods_video != ''">
-                <text class="tab-item" :class="{ '!bg-[#fff] !text-[#666]': switchMedia == 'video' }" @click="switchMedia = 'video'">视频</text>
-                <view class="tab-item flex items-center" :class="{ '!bg-[#fff] !text-[#666]': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">
+                <text class="tab-item" :class="{ '!bg-[#fff] !text-[#666]': switchMedia == 'video' }" @click="switchToVideo">视频</text>
+                <view class="tab-item flex items-center" :class="{ '!bg-[#fff] !text-[#666]': switchMedia == 'img' }" @click="switchToImage">
                     <text class="mr-[4rpx]">图片</text>
                     <text v-if="switchMedia == 'img' && diyComponent?.goods?.goods_image?.length > 1">{{swiperCurrentIndex}}/{{diyComponent.goods.goods_image.length}}</text>
                 </view>
@@ -158,6 +170,8 @@ const topNav = ref(false);
 const switchMedia: any = ref('img');
 const swiperCurrentIndex = ref(1); // 轮播图当前索引
 const videoContext: any = ref(null)
+const currentVideoSrc = ref('')
+const currentVideoPoster = ref('')
 const discountTime = ref(0)
 const swiperImageHeight = ref('100vw') // 轮播图高度
 const diyGoods = useGoods();
@@ -368,6 +382,30 @@ const swiperChangeFn = (e: any) => {
     swiperCurrentIndex.value = e.current + 1;
 }
 
+// 切换到视频
+const switchToVideo = () => {
+    // 重新加载视频源
+    currentVideoSrc.value = img(diyComponent.value.goods.goods_video);
+    currentVideoPoster.value = img(diyComponent.value.goods.goods_cover_thumb_mid)
+    // 切换状态
+    switchMedia.value = 'video';
+}
+
+// 切换到图片
+const switchToImage = () => {
+    // 切换状态
+    switchMedia.value = 'img';
+
+    // 暂停视频
+    videoContext.value.pause();
+
+    // #ifndef H5
+    // 通过清空视频 src 来强制停止视频
+    currentVideoSrc.value = '';
+    currentVideoPoster.value = ''
+    // #endif
+}
+
 // 价格类型
 //''=>原价，新人价=>newcomer_price，discount_price=>折扣价，member_price=>会员价
 const priceType = computed(() => {
@@ -526,6 +564,8 @@ const backToPrevious = () => {
 const initFn = () => {
     if (diyComponent.value?.goods.goods_video != '') {
         switchMedia.value = 'video'
+        currentVideoSrc.value = img(diyComponent.value.goods.goods_video);
+        currentVideoPoster.value = img(diyComponent.value.goods.goods_cover_thumb_mid)
         videoContext.value = uni.createVideoContext('goodsVideo');
     }
     saleInfo.value = (typeof diyComponent.value?.saleInfo == 'object') ? diyComponent.value?.saleInfo : diyComponent.value?.saleInfo.split(',');
@@ -689,4 +729,10 @@ onMounted(() => {
     height: 120rpx;
     background-size: 30%;
 }
+:deep(.u-swiper-indicator__wrapper--line){
+    height: 4rpx !important;
+} 
+:deep(.u-swiper-indicator__wrapper--line__bar){
+    height: 4rpx !important;
+}
 </style>
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-bottom/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-bottom/index.vue
index d0ce29081..8868f4d0b 100644
--- a/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-bottom/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-bottom/index.vue
@@ -5,38 +5,44 @@
             <view class="flex items-center">
                 <view v-if="menuContent.includes('index')" class="flex flex-col justify-center items-center mr-[38rpx]" @click="redirect({ url: '/addon/shop/pages/index', mode: 'reLaunch' })">
                     <view class="nc-iconfont nc-icon-shouyeV6xx11 text-[36rpx]"></view>
-                    <text class="text-[20rpx] mt-[10rpx]">首页</text>
-                </view>
-                <view v-if="menuContent.includes('service')" class="flex flex-col justify-center items-center mr-[38rpx]"
-                      @click="redirect({ url: '/app/pages/member/contact', param: {send_title: sendMessageTitle, send_path: encodeURIComponent(sendMessagePath), send_img: encodeURIComponent(sendMessageImg)} })">
-                    <text class="nc-iconfont text-[36rpx] nc-icon-kefuV6xx-1 text-[#303133]"></text>
-                    <text class="text-[20rpx] mt-[10rpx]">客服</text>
+                    <text class="text-[18rpx] mt-[6rpx]">首页</text>
                 </view>
+                <template v-if="menuContent.includes('service')">
+                    <!--  #ifdef H5 -->
+                    <view class="flex flex-col justify-center items-center mr-[38rpx]"
+                        @click="redirect({ url: '/app/pages/member/contact', param: {send_title: sendMessageTitle, send_path: encodeURIComponent(sendMessagePath), send_img: encodeURIComponent(sendMessageImg)} })">
+                        <text class="nc-iconfont text-[36rpx] nc-icon-kefuV6xx-1 text-[#303133]"></text>
+                        <text class="text-[18rpx] mt-[6rpx]">客服</text>
+                    </view>
+                    <!-- #endif -->
+                    <!-- #ifdef MP-WEIXIN -->
+                    <view>
+                        <nc-contact
+                            :send-message-title="sendMessageTitle"
+                            :send-message-path="sendMessagePath"
+                            :send-message-img="sendMessageImg">
+                            <view class="flex flex-col justify-center items-center mr-[38rpx]">
+                                <text class="nc-iconfont nc-icon-kefuV6xx-1 text-[36rpx]"></text>
+                                <text class="text-[18rpx] mt-[6rpx]">客服</text>
+                            </view>
+                        </nc-contact>
+                    </view> 
+                    <!-- #endif -->
+                </template>
+               
                 <view v-if="menuContent.includes('cart')" class="flex flex-col justify-center items-center mr-[38rpx]" @click="redirect({ url: '/addon/shop/pages/goods/cart'})">
                     <view class="iconfont icongouwuche2 text-[38rpx]"></view>
-                    <text class="text-[20rpx] mt-[10rpx]">购物车</text>
+                    <text class="text-[18rpx] mt-[6rpx]">购物车</text>
                 </view>
                 <view v-if="menuContent.includes('collect')" class="flex flex-col justify-center items-center mr-[38rpx]" @click="collectFn">
                     <text class="nc-iconfont text-[36rpx]" :class="{'text-[#ff0000] nc-icon-xihuanV6mm': isCollect, 'text-[#303133] nc-icon-guanzhuV6xx' : !isCollect}"></text>
-                    <text class="text-[20rpx] mt-[10rpx]">收藏</text>
+                    <text class="text-[18rpx] mt-[6rpx]">收藏</text>
                 </view>
                 <view v-if="menuContent.includes('share')" class="flex flex-col justify-center items-center mr-[38rpx]"  @click="openShareFn">
                     <text class="nc-iconfont text-[36rpx] nc-icon-fenxiangV6xx text-[#303133]"></text>
-                    <text class="text-[20rpx] mt-[10rpx]">分享</text>
+                    <text class="text-[18rpx] mt-[6rpx]">分享</text>
                 </view>
-                <!-- #ifdef MP-WEIXIN -->
-                <!-- <view>
-                    <nc-contact
-                        :send-message-title="sendMessageTitle"
-                        :send-message-path="sendMessagePath"
-                        :send-message-img="sendMessageImg">
-                        <view class="flex flex-col justify-center items-center mr-[38rpx]">
-                            <text class="nc-iconfont nc-icon-kefuV6xx-1 text-[36rpx]"></text>
-                            <text class="text-[20rpx] mt-[10rpx]">客服</text>
-                        </view>
-                    </nc-contact>
-                </view> -->
-                <!-- #endif -->
+                
             </view>
             <view class="flex flex-1" v-if="diyComponent.goods.status == 1">
                 <button v-if="diyComponent.goods.is_gift"
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-purchase-service/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-purchase-service/index.vue
index c2b2f736d..aa12ef2b0 100644
--- a/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-purchase-service/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-goods-detail-purchase-service/index.vue
@@ -102,7 +102,7 @@
                         </view>
                     </scroll-view>
                     <view class="btn-wrap">
-                        <button class="primary-btn-bg btn" @click="couponListShow = false">确定</button>
+                        <!-- <button class="primary-btn-bg btn" @click="couponListShow = false">确定</button> -->
                     </view>
                 </view>
             </u-popup>
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-goods-hot/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-goods-hot/index.vue
new file mode 100644
index 000000000..473b97148
--- /dev/null
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-goods-hot/index.vue
@@ -0,0 +1,235 @@
+<template>
+    <view :style="warpCss" class="overflow-hidden" v-if="goodsList.length && !loading">
+        <view class="flex items-center relative">
+            <view class="desc flex flex-col justify-center items-center mr-[20rpx]">
+                <text v-if="diyComponent.titleStyle.way == 'text'" class="whitespace-nowrap mb-[12rpx]" :style="titleCss"  @click="diyStore.toRedirect(diyComponent.titleStyle.link)">{{ diyComponent.titleStyle.text }}</text>
+                <image v-else-if="diyComponent.titleStyle.imgUrl" class="h-[40rpx] max-w-[120rpx] mb-[12rpx]" @click="diyStore.toRedirect(diyComponent.titleStyle.link)" :src="img(diyComponent.titleStyle.imgUrl)" mode="heightFix" />
+                <text v-if="diyComponent.subTitleStyle.text" class="h-[36rpx] mb-[18rpx] px-[8rpx] whitespace-nowrap flex items-center" :style="subTitleCss">{{ diyComponent.subTitleStyle.text }}</text>
+                <view v-if="diyComponent.btnStyle.text" class="bg-[#fff] buy-btn   text-[#FF4142] rounded-[50rpx] font-bold pl-[20rpx] pr-[14rpx] leading-[normal] py-[2rpx]" :style="titleBtnCss" @click="diyStore.toRedirect(diyComponent.btnStyle.link)">
+                    <text class="whitespace-nowrap">{{ diyComponent.btnStyle.text }}</text>
+                    <text class="iconfont iconxiangyoujiantou !text-[20rpx] pt-[4rpx]"></text>
+                </view>
+            </view>
+            <scroll-view scroll-x="true" v-if="goodsList.length >= 1" class="flex-1"  style="width: 0" >
+                <view class="flex">
+                    <template v-for="(item,index) in goodsList" :key="index">
+                        <view v-if="index == 0" class="box-border p-[10rpx] pr-[18rpx] inline-flex relative" @click="toDetail(item)" :style="goodsItemCss">
+                            <view class="relative overflow-hidden" :style="goodsImgCss">
+                                <up-image width="150rpx" height="186rpx" :src="img(item.goods_cover_thumb_small || '')"  :mode="diyComponent.mode">
+                                    <template #error>
+                                        <image class="w-[150rpx] h-[186rpx] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
+                                    </template>
+                                </up-image>
+                                <text class="absolute left-0 top-0 z-[10] px-[8rpx] py-[6rpx] rounded-br-[20rpx] leading-[1]" :style="labelCss">{{ diyComponent.goodsStyle.labelText }}</text>
+                            </view>
+                            <view class="ml-[10rpx] flex flex-col">
+                                <view class="text-[24rpx] w-[160rpx] leading-[1.5] text-[#303133] multi-hidden whitespace-pre-wrap mb-[10rpx]">{{ item.goods_name }}</view>
+                                <view class="flex flex-col mt-[auto] items-start">
+                                    <view
+                                        class="px-[8rpx] py-[6rpx] flex items-center save-money-bg text-[#fff] text-[22rpx] inline-block rounded-[6rpx]">
+                                        <image :src="img('/addon/shop/diy/index/hot_indicate.png')" class="w-[20rpx] h-[16rpx]" />
+                                        <text class="ml-[6rpx]">低至{{getDiscount(item)}}折</text>
+                                    </view>
+                                    <text class="iconfont icona-xiangxiaV6xx1 leading-1 text-[#FF0000] ml-[14rpx]"></text>
+                                </view>
+                                <view class="flex items-baseline leading-[1]">
+                                    <view
+                                        class="font-bold text-[var(--price-text-color)] price-font block truncate max-w-[350rpx]">
+                                        <text class="text-[20rpx] font-500 mr-[4rpx]">￥</text>
+                                        <text class="text-[32rpx] font-500">{{ Number(item.goodsSku.show_price) }}</text>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <view v-else class="box-border p-[8rpx] inline-flex flex-col items-center relative ml-[18rpx]" @click="toDetail(item)" :style="goodsItemCss">
+                            <view class="relative overflow-hidden" :style="goodsImgCss">
+                                <up-image width="140rpx" height="140rpx" :src="img(item.goods_cover_thumb_small || '')"  :mode="diyComponent.mode">
+                                    <template #error>
+                                        <image class="w-[140rpx] h-[140rpx] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
+                                    </template>
+                                </up-image>
+                                <text class="absolute left-0 top-0 z-[10] bg-[red] text-[22rpx] px-[8rpx] py-[6rpx] rounded-br-[20rpx] text-[#fff]" :style="labelCss">{{ diyComponent.goodsStyle.labelText }}</text>
+                            </view>
+                            <view class="flex w-[100%] items-center bg-[#FFE2E2] h-[40rpx] mt-[auto] rounded-[50rpx]">
+                                <view
+                                class="font-bold flex-1 text-[var(--price-text-color)] price-font block truncate max-w-[80rpx] text-center">
+                                    <text class="text-[20rpx] font-500 mr-[4rpx]">￥</text>
+                                    <text class="text-[32rpx] font-500">{{ Number(item.goodsSku.show_price) }}</text>
+                                </view>
+                                <view class="flex items-center h-[100%] text-[#fff] w-[58rpx] box-border pl-[16rpx] flex items-center" :style="{'background-image':'url(' + img('/addon/shop/diy/index/hot_btn_bg.png') + ')','background-size':'100% 100%','background-repeat':'no-repeat'}">
+                                    <text class="text-[22rpx]">抢</text>
+                                    <text class="iconfont iconarrow-right pt-[2rpx] !text-[16rpx]"></text>
+                                </view>
+                            </view>
+                        </view>
+                    </template>
+                </view>
+            </scroll-view>
+        </view>
+        <!-- 装修时，防止点击 -->
+        <view v-if="diyStore.mode == 'decorate'" class="absolute z-10 top-0 right-0 bottom-0 left-0"></view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, watch, onMounted, nextTick } from 'vue';
+import { redirect, img } from '@/utils/common';
+import useDiyStore from '@/app/stores/diy';
+import { getGoodsComponents } from '@/addon/shop/api/goods';
+
+const props = defineProps(['component', 'index', 'value']);
+const diyStore = useDiyStore();
+const goodsList = ref([]) // 商品列表
+
+const diyComponent = computed(() => {
+    if (props.value) {
+        return props.value;
+    } else if (diyStore.mode == 'decorate') {
+        return diyStore.value[props.index];
+    } else {
+        return props.component;
+    }
+})
+
+// 组件框架样式
+const warpCss = computed(() => {
+    let style = '';
+    style += 'position:relative;';
+    if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${ diyComponent.value.componentGradientAngle },${ diyComponent.value.componentStartBgColor },${ diyComponent.value.componentEndBgColor });`;
+    else style += 'background-color:' + (diyComponent.value.componentStartBgColor || diyComponent.value.componentEndBgColor) + ';';
+
+    if (diyComponent.value.componentBgUrl) {
+        style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+        style += 'background-size: cover;background-repeat: no-repeat;';
+    }
+
+    if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+    if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+    if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+    if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+    return style;
+})
+
+const titleCss = computed(() => {
+    let style = ''
+    style += 'color:' + diyComponent.value.titleStyle.textColor + ';';
+    style += 'font-size:' + diyComponent.value.titleStyle.fontSize*2 + 'rpx;';
+    if(diyComponent.value.titleStyle.fontWeight == 'bold') style += 'font-weight:' + diyComponent.value.titleStyle.fontWeight + ';';
+    return style
+})
+
+
+const subTitleCss = computed(() => {
+    let style = ''
+    style += 'color:' + diyComponent.value.subTitleStyle.textColor + ';';
+    style += 'background-color:' + diyComponent.value.subTitleStyle.bgColor + ';';
+    style += 'font-size:' + diyComponent.value.subTitleStyle.fontSize*2 + 'rpx;';
+    style += 'border-radius:' + diyComponent.value.subTitleStyle.rounded*2 + 'rpx;';
+    return style
+})
+
+const titleBtnCss = computed(() => {
+    let style = ''
+    style += 'color:' + diyComponent.value.btnStyle.textColor + ';';
+    style += 'font-size:' + diyComponent.value.btnStyle.fontSize*2 + 'rpx;';
+    if (diyComponent.value.btnStyle.startBgColor && diyComponent.value.btnStyle.endBgColor) {
+        if(diyComponent.value.btnStyle.gradientType == 'radial'){
+            style += `background:radial-gradient(${ diyComponent.value.btnStyle.startBgColor },${ diyComponent.value.btnStyle.endBgColor });`;
+        }else{
+            style += `background:linear-gradient(${ diyComponent.value.btnStyle.startBgColor },${ diyComponent.value.btnStyle.endBgColor });`;
+        }
+    } else style += 'background-color:' + (diyComponent.value.btnStyle.startBgColor || diyComponent.value.btnStyle.endBgColor) + ';';
+    return style
+})
+
+const labelCss = computed(() => {
+    let style = ''
+    style += 'color:' + diyComponent.value.goodsStyle.labelColor + ';';
+    style += 'background-color:' + diyComponent.value.goodsStyle.labelBgColor + ';';
+    style += 'font-size:' + diyComponent.value.goodsStyle.labelSize*2 + 'rpx;';
+    return style
+})
+
+const goodsItemCss = computed(() => {
+    let style = ''
+    style += 'background-color:' + diyComponent.value.goodsStyle.bgColor + ';';
+    style += 'border-radius:' + diyComponent.value.goodsStyle.rounded*2 + 'rpx;';
+    return style
+})
+
+const goodsImgCss = computed(() => {
+    let style = ''
+    style += 'border-radius:' + diyComponent.value.goodsStyle.imgRounded*2 + 'rpx;';
+    return style
+})
+
+const getDiscount = (item: any) => {
+    if (item.goodsSku.market_price == 0) item.goodsSku.market_price = item.goodsSku.price
+    let discount = Number((item.goodsSku.show_price / item.goodsSku.market_price).toFixed(2))
+    discount = Number((discount * 10).toFixed(1))
+    return discount
+}
+
+const loading = ref(false)
+const refreshGoodsList = () => {
+    loading.value = true
+    let data = {
+        num: diyComponent.value.goodsStyle.source == 'all' ? diyComponent.value.goodsStyle.num : '',
+        goods_ids: diyComponent.value.goodsStyle.source == 'custom' ? diyComponent.value.goodsStyle.goodsIds : ''
+    }
+    getGoodsComponents(data).then((res) => {
+        goodsList.value = res.data
+        loading.value = false
+    });
+}
+
+onMounted(() => {
+    refresh();
+    // 装修模式下刷新
+    if (diyStore.mode == 'decorate') {
+        goodsList.value = [
+            {
+                goods_cover_thumb_small: '',
+                goods_name: '商品名称',
+                goodsSku: {
+
+                    market_price: 500,
+                    show_price: 200
+                }
+            },{
+                goods_cover_thumb_small: '',
+                goods_name: '商品名称',
+                goodsSku: {
+
+                    market_price: 500,
+                    show_price: 200
+                }
+            }
+        ]
+    } else {
+        refreshGoodsList()
+    }
+});
+
+const refresh = () => {
+    // 装修模式下设置默认图
+    if (diyStore.mode == 'decorate') {
+
+    } else {
+
+    }
+}
+
+const toDetail = (item: any) => {
+    if (diyStore.mode == 'decorate') return;
+    redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: item.goods_id } })
+}
+</script>
+<style lang="scss" scoped>
+.buy-btn{
+    background: radial-gradient(#FFEBC8, #FFEBC8, #fff);
+}
+.save-money-bg{
+    background: linear-gradient(to right, #FF0000, #FF6200);
+}
+</style>
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-goods-ranking/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-goods-ranking/index.vue
index 57ef6166b..fdb4e835a 100644
--- a/niucloud/addon/shop/uni-app/components/diy/shop-goods-ranking/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-goods-ranking/index.vue
@@ -27,7 +27,7 @@
                                     <view class="absolute top-[2rpx] left-[-3rpx] flex items-center justify-center w-[50rpx] h-[50rpx]" :style="{ zIndex: 3 }">
                                         <text class="text-[20rpx] font-bold text-[#fff]">{{ goods.rank_num }}</text>
                                     </view>
-                                    <up-image radius="var(--goods-rounded-big)" width="130rpx" height="130rpx" :src="img(goods.goods_cover_thumb_mid || '')" model="aspectFill">
+                                    <up-image radius="var(--goods-rounded-big)" width="130rpx" height="130rpx" :src="img(goods.goods_cover_thumb_mid || '')" :mode="diyComponent.mode">
                                         <template #error>
                                             <image class="w-[130rpx] h-[130rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                         </template>
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-goods-recommend/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-goods-recommend/index.vue
index 3efd926d6..6f6fbcfa8 100644
--- a/niucloud/addon/shop/uni-app/components/diy/shop-goods-recommend/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-goods-recommend/index.vue
@@ -16,7 +16,7 @@
                             </view>
                             <view class="mt-[-71rpx] h-[278rpx] w-full px-[20rpx] pt-[18rpx] box-border bg-white" :style="itemCss">
                                 <view class="flex items-center justify-center w-[184rpx] h-[184rpx]">
-                                    <up-image width="184rpx" height="184rpx" :radius="imageRounded.val" :src="img(item.info.goods_cover_thumb_mid || '')" model="aspectFill">
+                                    <up-image width="184rpx" height="184rpx" :radius="imageRounded.val" :src="img(item.info.goods_cover_thumb_mid || '')" :mode="diyComponent.mode">
                                         <template #error>
                                             <image class="w-[184rpx] h-[184rpx]" :style="imageRounded.style" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                         </template>
diff --git a/niucloud/addon/shop/uni-app/components/diy/shop-newcomer/index.vue b/niucloud/addon/shop/uni-app/components/diy/shop-newcomer/index.vue
index ab2221013..1f1b9b18d 100644
--- a/niucloud/addon/shop/uni-app/components/diy/shop-newcomer/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/shop-newcomer/index.vue
@@ -34,7 +34,7 @@
                 <view class="flex">
                     <view class="inline-flex bg-[#fff] p-[16rpx] box-border" :style="commonTempCss()" @click="toDetail(list[0])">
                         <view class="w-[150rpx] h-[150rpx] flex items-center justify-center">
-                            <up-image :radius="imageRounded.val" width="150rpx" height="150rpx" :src="img(list[0].sku_image || '')" model="aspectFill">
+                            <up-image :radius="imageRounded.val" width="150rpx" height="150rpx" :src="img(list[0].sku_image || '')" :mode="diyComponent.mode">
                                 <template #error>
                                     <image class="w-[150rpx] h-[150rpx] overflow-hidden" :style="imageRounded.style" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                 </template>
@@ -56,7 +56,7 @@
                               class="ml-[10rpx] inline-flex flex-col items-center p-[16rpx] bg-[#fff] box-border"
                               :style="commonTempCss()" @click="toDetail(item)">
                             <view class="w-[110rpx] h-[110rpx] flex items-center justify-center">
-                                <up-image :radius="imageRounded.val" width="110rpx" height="110rpx" :src="img(item.sku_image || '')" model="aspectFill">
+                                <up-image :radius="imageRounded.val" width="110rpx" height="110rpx" :src="img(item.sku_image || '')" :mode="diyComponent.mode">
                                     <template #error>
                                         <image class="w-[110rpx] h-[110rpx] overflow-hidden" :style="imageRounded.style" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                     </template>
@@ -108,7 +108,7 @@
                           class="item-bg mr-[10rpx] inline-flex flex-col items-center p-[6rpx] bg-[#fff] box-border"
                           :style="commonTempCss()" @click="toDetail(item)">
                         <view class="flex items-center justify-center w-[146rpx] h-[146rpx]">
-                            <up-image :radius="imageRounded.val" width="146rpx" height="146rpx" :src="img(item.sku_image || '')" model="aspectFill">
+                            <up-image :radius="imageRounded.val" width="146rpx" height="146rpx" :src="img(item.sku_image || '')" :mode="diyComponent.mode">
                                 <template #error>
                                     <image class="w-[146rpx] h-[146rpx] overflow-hidden" :style="imageRounded.style" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                 </template>
@@ -164,7 +164,7 @@
                         <view
                             class="bg-[#f8f8f8] flex items-center justify-center w-[152rpx] h-[152rpx] overflow-hidden"
                             :style="imageRounded.style">
-                            <up-image :radius="imageRounded.val" width="152rpx" height="152rpx" :src="img(item.sku_image || '')" model="aspectFill">
+                            <up-image :radius="imageRounded.val" width="152rpx" height="152rpx" :src="img(item.sku_image || '')" :mode="diyComponent.mode">
                                 <template #error>
                                     <image class="w-[152rpx] h-[152rpx] overflow-hidden" :style="imageRounded.style" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                 </template>
@@ -216,7 +216,7 @@
                           :class="{'mr-[20rpx]': index != (list.length-1)}" :style="commonTempCss()"
                           @click="toDetail(item)">
                         <view class="relative flex items-center justify-center w-[100%] h-[130rpx] pt-[40rpx] mb-[10rpx]">
-                            <up-image :radius="imageRounded.val" width="130rpx" height="130rpx" :src="img(item.sku_image || '')" model="aspectFill">
+                            <up-image :radius="imageRounded.val" width="130rpx" height="130rpx" :src="img(item.sku_image || '')" :mode="diyComponent.mode">
                                 <template #error>
                                     <image class="w-[130rpx] h-[130rpx] overflow-hidden" :style="imageRounded.style" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                                 </template>
diff --git a/niucloud/addon/shop/uni-app/components/diy/single-recommend/index.vue b/niucloud/addon/shop/uni-app/components/diy/single-recommend/index.vue
index bdedc8d3c..875f15499 100644
--- a/niucloud/addon/shop/uni-app/components/diy/single-recommend/index.vue
+++ b/niucloud/addon/shop/uni-app/components/diy/single-recommend/index.vue
@@ -43,7 +43,7 @@
 
             <view class="w-[340rpx] h-[504rpx] flex flex-col bg-[#fff] box-border overflow-hidden" :style="goodsTempCss" @click="toLink(goodsList[0])">
                 <view :style="goodsImgCss" class="w-[346rpx] h-[350rpx] overflow-hidden">
-                    <up-image width="346rpx" height="350rpx" :src="img(goodsList[0].goods_cover_thumb_mid || '')" model="aspectFill">
+                    <up-image width="346rpx" height="350rpx" :src="img(goodsList[0].goods_cover_thumb_mid || '')" :mode="diyComponent.mode">
                         <template #error>
                             <image class="w-[346rpx] h-[350rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
                         </template>
diff --git a/niucloud/addon/shop/uni-app/components/ns-goods-sku/ns-goods-sku.vue b/niucloud/addon/shop/uni-app/components/ns-goods-sku/ns-goods-sku.vue
index 2faa9fafd..2847866c6 100644
--- a/niucloud/addon/shop/uni-app/components/ns-goods-sku/ns-goods-sku.vue
+++ b/niucloud/addon/shop/uni-app/components/ns-goods-sku/ns-goods-sku.vue
@@ -17,9 +17,9 @@
                                     <text class="text-[32rpx] font-bold price-font">￥</text>
                                     <text class="text-[48rpx] price-font">{{ parseFloat(goodsPrice).toFixed(2).split('.')[0] }}</text>
                                     <text class="text-[32rpx] mr-[6rpx] price-font">.{{ parseFloat(goodsPrice).toFixed(2).split('.')[1] }}</text>
-                                    <image class="h-[24rpx] ml-[6rpx] max-w-[60rpx]" v-if="priceType() == 'newcomer_price'" :src="img('addon/shop/newcomer.png')" mode="heightFix" />
-                                    <image class="h-[24rpx] ml-[6rpx] max-w-[44rpx]" v-if="priceType() == 'member_price'" :src="img('addon/shop/VIP.png')" mode="heightFix" />
-                                    <image class="h-[24rpx] ml-[6rpx] max-w-[80rpx]" v-if="priceType() == 'discount_price'" :src="img('addon/shop/discount.png')" mode="heightFix" />
+                                    <image class="h-[24rpx] ml-[6rpx] max-w-[60rpx]" v-if="priceType == 'newcomer_price'" :src="img('addon/shop/newcomer.png')" mode="heightFix" />
+                                    <image class="h-[24rpx] ml-[6rpx] max-w-[44rpx]" v-if="priceType == 'member_price'" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+                                    <image class="h-[24rpx] ml-[6rpx] max-w-[80rpx]" v-if="priceType == 'discount_price'" :src="img('addon/shop/discount.png')" mode="heightFix" />
                                 </view>
                                 <view class="text-[26rpx] leading-[32rpx] text-[var(--text-color-light6)] mt-[12rpx]">库存{{ goodsDetail.detail.stock }}{{ goodsDetail.goods.unit }}</view>
                             </view>
@@ -137,7 +137,7 @@ const goodsPrice = computed(() => {
 })
 
 // 价格类型
-const priceType = () => {
+const priceType = computed(() => {
     let type = "";
 	if(goodsDetail.value.detail.type == 'newcomer_discount' && goodsDetail.value.detail.newcomer_price){
 		type='newcomer_price'
@@ -145,7 +145,7 @@ const priceType = () => {
 		type = goodsDetail.value.detail.show_type
 	}
     return type;
-}
+})
 
 // 会员信息
 const memberStore = useMemberStore()
diff --git a/niucloud/addon/shop/uni-app/hooks/useDiyGoodsDetail.ts b/niucloud/addon/shop/uni-app/hooks/useDiyGoodsDetail.ts
index 903bb887c..86d764b70 100644
--- a/niucloud/addon/shop/uni-app/hooks/useDiyGoodsDetail.ts
+++ b/niucloud/addon/shop/uni-app/hooks/useDiyGoodsDetail.ts
@@ -85,7 +85,7 @@ export function useDiyGoodsDetail(params: any = {}) {
 
             goodsDetailParameter.goods_id = option.goods_id || '';
             goodsDetailParameter.sku_id = option.sku_id || '';
-            goodsDetailParameter.type = option.type || '';
+            goodsDetailParameter.type = option.type == 'nd' ? 'newcomer_discount' : option.type || ''; 
 
             id.value = option.id || '';
             if (name.value == '') name.value = option.name || '';
@@ -119,8 +119,8 @@ export function useDiyGoodsDetail(params: any = {}) {
                     name: name.value
                 }).then((res: any) => {
                     Object.assign(requestData, res.data);
-                    handleComponentDataFn()
                     diyStore.mode = 'decorate';
+                    handleComponentDataFn()
                     diyStore.value = diyData.value;
                     diyStore.global = diyData.global;
 
@@ -150,7 +150,7 @@ export function useDiyGoodsDetail(params: any = {}) {
                     diyData.global.goodsParameter = {}
                     diyData.global.goodsParameter.goods_id = goodsDetailParameter.goods_id
                     diyData.global.goodsParameter.sku_id = goodsDetailParameter.sku_id
-                    diyData.global.goodsParameter.type = goodsDetailParameter.type
+                    diyData.global.goodsParameter.type = goodsDetailParameter.type == 'newcomer_discount' ? 'nd' : goodsDetailParameter.type
                     // 组装商品组件数据
                     assembleGoodsDetailData(diyData, res.data)
 
@@ -185,8 +185,10 @@ export function useDiyGoodsDetail(params: any = {}) {
             
             diyData.value = sources.value;
             diyData.value.forEach((item: any, index) => {
-
-                const detailComponent = ['ShopGoodsDetailBottom','ShopGoodsDetailDesc','ShopGoodsDetailAttr','ShopGoodsDetailEvaluate','ShopGoodsDetailSow','ShopGoodsDetailPurchaseService','ShopGoodsDetailBasicInfo']
+                let detailComponent:any = []
+                if(diyStore.mode != 'decorate'){
+                    detailComponent = ['ShopGoodsDetailBottom','ShopGoodsDetailDesc','ShopGoodsDetailAttr','ShopGoodsDetailEvaluate','ShopGoodsDetailSow','ShopGoodsDetailPurchaseService','ShopGoodsDetailBasicInfo']
+                }
                 if(detailComponent.indexOf(item.componentName) > -1){
                     item.componentIsShow = false // 是否显示
                 }else{
diff --git a/niucloud/addon/shop/uni-app/pages/evaluate/order_evaluate.vue b/niucloud/addon/shop/uni-app/pages/evaluate/order_evaluate.vue
index b63cd40f7..e50565256 100644
--- a/niucloud/addon/shop/uni-app/pages/evaluate/order_evaluate.vue
+++ b/niucloud/addon/shop/uni-app/pages/evaluate/order_evaluate.vue
@@ -60,7 +60,7 @@ import { getShopOrderDetail } from '@/addon/shop/api/order';
 import { setOrderEvaluate } from '@/addon/shop/api/evaluate';
 import { onLoad } from '@dcloudio/uni-app';
 import { img, redirect, goback } from '@/utils/common';
-// import uploadImg from '@/addon/shop/pages/evaluate/components/upload-img'
+import uploadImg from '@/addon/shop/pages/evaluate/components/upload-img'
 
 const info = ref<Array<any>>([])
 const form = ref<Array<any>>([])
diff --git a/niucloud/addon/shop/uni-app/pages/goods/category.vue b/niucloud/addon/shop/uni-app/pages/goods/category.vue
index 53c9855ee..e51040472 100644
--- a/niucloud/addon/shop/uni-app/pages/goods/category.vue
+++ b/niucloud/addon/shop/uni-app/pages/goods/category.vue
@@ -1,13 +1,14 @@
 <template>
     <view :style="themeColor()">
         <!-- #ifdef MP-WEIXIN || APP-PLUS -->
-        <top-tabbar :data="topTabbarData" scrollBool="1" :isBack="false" />
+        <top-tabbar :data="topTabbarData" scrollBool="1" :isBack="false" v-if="!config.search?.control" />
         <!-- #endif -->
         <view class="relative">
             <category-template-one-one class="category" v-if="config.level===1 && config.template === 'style-1'" :categoryId="categoryId" :config="config" />
             <category-template-two-one v-if="config.level===2 && config.template === 'style-1'" :categoryId="categoryId" :config="config" />
             <category-template-two-two class="category" v-if="config.level===2 && config.template === 'style-2'" :categoryId="categoryId" :config="config" />
         </view>
+        <tabbar addon="shop"/>
     </view>
 </template>
 <script setup lang="ts">
@@ -21,17 +22,20 @@ import { topTabar } from '@/utils/topTabbar';
 import useSystemStore from '@/stores/system';
 const systemStore = useSystemStore()
 
+const config: any = ref({
+})
+const categoryId = ref(0)
+
+
 /********* 自定义头部 - start ***********/
 const topTabarObj = topTabar()
-let topTabbarData = topTabarObj.setTopTabbarParam({ title: '商品分类', topStatusBar: { textColor: '#333' }})
+let topTabbarData = ref(topTabarObj.setTopTabbarParam({ title: '商品分类', topStatusBar: { textColor: '#333' }}))
 /********* 自定义头部 - end ***********/
 
-const config: any = ref({})
-const categoryId = ref(0)
-
 const getGoodsCategoryConfigFn = () => {
     getGoodsCategoryConfig().then(res => {
         config.value = res.data
+        topTabbarData.value.title = config.value.page_title
         uni.setNavigationBarTitle({
             title: config.value.page_title
         });
diff --git a/niucloud/addon/shop/uni-app/pages/goods/components/category-template-one-one.vue b/niucloud/addon/shop/uni-app/pages/goods/components/category-template-one-one.vue
index 411627da4..cf20aa5fb 100644
--- a/niucloud/addon/shop/uni-app/pages/goods/components/category-template-one-one.vue
+++ b/niucloud/addon/shop/uni-app/pages/goods/components/category-template-one-one.vue
@@ -3,13 +3,15 @@
         <view class="mescroll-box bg-[var(--page-bg-color)]"
               :class="{ 'cart': config.cart.control && config.cart.event === 'cart', 'detail': !(config.cart.control && config.cart.event === 'cart') }" v-if="tabsData.length">
               <mescroll-body ref="mescrollRef" :down="{ use: false }" @init="mescrollInit" @up="getListFn">
-                <view v-if="config.search.control" class="search-box z-10 bg-[#f6f6f6] fixed top-0 left-0 right-0 h-[100rpx] box-border"  :style="{'top': systemStore.topTabbarInfo.fullHeight || 0}">
-                    <view class="flex-1 search-input bg-[#fff]">
-                        <text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
-                        <input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" @confirm="searchNameFn" placeholderClass="text-[var(--text-color-light9)]">
-                        <text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+                <view v-if="config.search.control" class="search-box z-10 bg-[#f6f6f6] fixed top-0 left-0 right-0 box-border">
+                    <view class="h-[100rpx] flex-1 flex items-center justify-between" :style="navbarInnerStyle">
+                        <view class="flex-1 search-input bg-[#fff]">
+                            <text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+                            <input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" @confirm="searchNameFn" placeholderClass="text-[var(--text-color-light9)]">
+                            <text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+                        </view>
                     </view>
-                </view>
+                </view>    
                 <!--  #ifdef H5 -->
                 <view class="tabs-box z-2 fixed left-0 bg-[#fff] bottom-[50px] top-0"
                       :class="{ '!top-[100rpx]': config.search.control, 'pb-[98rpx]': config.cart.control && config.cart.event === 'cart' }">
@@ -37,7 +39,7 @@
                     </scroll-view>
                 </view>
                 <!--  #endif -->
-                <view class="flex justify-center flex-wrap pl-[188rpx] pb-[20rpx]" :class="{ ' pt-[120rpx]': config.search.control, ' pt-[20rpx]': !(config.search.control) }">
+                <view class="flex justify-center flex-wrap pl-[188rpx] pb-[20rpx]" :style="listBoxCss"> 
                     <template v-for="(item, index) in list" :key="item.goods_id">
                         <view class="box-border bg-white w-full flex mr-[20rpx] py-[24rpx] px-[20rpx] rounded-[var(--rounded-small)]" :class="{ 'mt-[16rpx]': index }" @click.stop="toLink(item.goods_id)">
                             <view class="w-[168rpx] h-[168rpx] flex items-center justify-center rounded-[var(--goods-rounded-small)] overflow-hidden">
@@ -170,7 +172,6 @@
         <mescroll-empty v-if="!tabsData.length && !loading" :option="{tip : '暂无商品分类'}"></mescroll-empty>
         <loading-page :loading="loading"></loading-page>
 
-        <tabbar />
         <!-- 强制绑定手机号 -->
         <bind-mobile ref="bindMobileRef" />
     </view>
@@ -194,6 +195,20 @@ import { cloneDeep } from 'lodash-es'
 import useSystemStore from '@/stores/system';
 const systemStore = useSystemStore()
 
+
+const navbarInnerStyle = ref('')
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+let rightButtonWidth = systemStore.menuButtonInfo.width ? systemStore.menuButtonInfo.width * 2 + 'rpx' : '70rpx';
+navbarInnerStyle.value += 'padding-right:calc(' + rightButtonWidth + ' + 30rpx);';
+navbarInnerStyle.value += 'padding-top:' + systemStore.menuButtonInfo.top + 'px;';
+navbarInnerStyle.value += 'padding-bottom: 8px;';
+navbarInnerStyle.value+= 'height:' + systemStore.menuButtonInfo.height + 'px;';
+// #endif
+
+// #ifdef APP-PLUS
+navbarInnerStyle.value += 'padding-top:' + systemStore.systemInfo.statusBarHeight + 'px;';
+// #endif
+
 // 查询购物车列表
 const cartStore = useCartStore();
 cartStore.getList();
@@ -201,7 +216,13 @@ cartStore.getList();
 const tabsBoxCss = computed(() => {
     let style = ''
     if(config.search.control){
-        style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 98rpx);`
+        // #ifdef H5
+         style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 100rpx);`
+        // #endif
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+         style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 0rpx);`
+        // #endif
+       
     }else{
         style += `top: ${ systemStore.topTabbarInfo.height || 0 }px;`
     }
@@ -212,6 +233,21 @@ const tabsBoxCss = computed(() => {
     return style
 })
 
+const listBoxCss = computed(() => {
+    let style = ''
+    if(config.search.control){
+        // #ifdef H5
+        style += `padding-top: calc(${ systemStore.menuButtonInfo.top || 0 }px + 100rpx);`
+        // #endif
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+        style += `padding-top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 0rpx);`
+        // #endif
+    }else{
+        style += `padding-top:0rpx`
+    }
+    return style
+})
+
 const cartList = computed(() => cartStore.cartList)
 const totalNum = computed(() => cartStore.totalNum)
 const totalMoney = computed(() => cartStore.totalMoney)
@@ -694,7 +730,7 @@ const goodsPrice = (data: any) => {
     position: relative;
     color: var(--primary-color);
     font-weight: bold;
-    // background-color: var(--primary-color-light2);
+    background-color: #f6f6f6;
 
     &::before {
         display: inline-block;
diff --git a/niucloud/addon/shop/uni-app/pages/goods/components/category-template-two-one.vue b/niucloud/addon/shop/uni-app/pages/goods/components/category-template-two-one.vue
index fbfdceab6..14f2d0b14 100644
--- a/niucloud/addon/shop/uni-app/pages/goods/components/category-template-two-one.vue
+++ b/niucloud/addon/shop/uni-app/pages/goods/components/category-template-two-one.vue
@@ -1,13 +1,15 @@
 <template>
     <view class=" bg-[var(--page-bg-color)] overflow-hidden min-h-screen">
         <view class="mescroll-box" v-if="tabsData.length">
-            <view v-if="config.search.control" class="search-box box-border z-10 fixed top-0 left-0 right-0  h-[100rpx] bg-[#f6f6f6]" :style="{'top': systemStore.topTabbarInfo.fullHeight || 0}">
-                <view class="flex-1 search-input bg-[#fff]">
-                    <text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
-                    <input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" placeholderClass="text-[var(--text-color-light9)]" @confirm="searchNameFn">
-                    <text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+            <view v-if="config.search.control" class="search-box z-10 bg-[#f6f6f6] fixed top-0 left-0 right-0 box-border">
+                <view class="h-[100rpx] flex-1 flex items-center justify-between" :style="navbarInnerStyle">
+                    <view class="flex-1 search-input bg-[#fff]">
+                        <text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+                        <input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" @confirm="searchNameFn" placeholderClass="text-[var(--text-color-light9)]">
+                        <text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+                    </view>
                 </view>
-            </view>
+            </view>    
             <view class="tabs-box z-2 fixed left-0 bg-[#fff] bottom-[50px] top-0" :style="tabsBoxCss">
                 <scroll-view :scroll-y="true" class="scroll-height">
                     <view class="bg-[var(--temp-bg)]">
@@ -20,7 +22,7 @@
                 </scroll-view>
             </view>
             <scroll-view class="h-[100vh]" :scroll-y="true">
-                <view class="pl-[188rpx] scroll-ios pt-[20rpx] pr-[20rpx]" :class="{ '!pt-[120rpx]': config.search.control }">
+                <view class="pl-[188rpx] scroll-ios pr-[20rpx]" :style="listBoxCss">
                     <view class="bg-[#fff] grid grid-cols-3 gap-x-[50rpx] gap-y-[32rpx] py-[32rpx] px-[24rpx] rounded-[var(--rounded-big)]"
                         v-if="tabsData[tabActive]?.child_list && !loading">
                         <template v-for="(item, index) in tabsData[tabActive]?.child_list" :key="item.category_id">
@@ -39,7 +41,6 @@
                 </view>
             </scroll-view>
         </view>
-        <tabbar />
         <mescroll-empty v-if="!tabsData.length && !loading" :option="{tip : '暂无商品分类'}"></mescroll-empty>
         <loading-page :loading="loading"></loading-page>
     </view>
@@ -54,6 +55,18 @@ import { t } from '@/locale';
 import useSystemStore from '@/stores/system';
 const systemStore = useSystemStore()
 
+const navbarInnerStyle = ref('')
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+let rightButtonWidth = systemStore.menuButtonInfo.width ? systemStore.menuButtonInfo.width * 2 + 'rpx' : '70rpx';
+navbarInnerStyle.value += 'padding-right:calc(' + rightButtonWidth + ' + 30rpx);';
+navbarInnerStyle.value += 'padding-top:' + systemStore.menuButtonInfo.top + 'px;';
+navbarInnerStyle.value += 'padding-bottom: 8px;';
+navbarInnerStyle.value+= 'height:' + systemStore.menuButtonInfo.height + 'px;';
+// #endif
+
+// #ifdef APP-PLUS
+navbarInnerStyle.value += 'padding-top:' + systemStore.systemInfo.statusBarHeight + 'px;';
+// #endif
 const prop = defineProps({
     config: {
         type: Object,
@@ -78,13 +91,33 @@ onMounted(() => {
 const tabsBoxCss = computed(() => {
     let style = ''
     if(config.search.control){
+        // #ifdef H5
         style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 100rpx);`
+        // #endif
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+         style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 0rpx);`
+        // #endif
     }else{
         style += `top: ${ systemStore.topTabbarInfo.height || 0 }px;`
     }
     return style
 })
 
+const listBoxCss = computed(() => {
+    let style = ''
+    if(config.search.control){
+        // #ifdef H5
+        style += `padding-top: calc(${ systemStore.menuButtonInfo.top || 0 }px + 100rpx);`
+        // #endif
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+        style += `padding-top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 0rpx);`
+        // #endif
+    }else{
+        style += `padding-top:0rpx`
+    }
+    return style
+})
+
 /**
  * @description 获取分类数据
  * */
@@ -226,7 +259,7 @@ const searchNameFn = () => {
     position: relative;
     color: var(--primary-color);
     font-weight: bold;
-    // background-color: var(--temp-bg);
+    background-color: #f6f6f6;
 
     &::before {
         display: inline-block;
diff --git a/niucloud/addon/shop/uni-app/pages/goods/components/category-template-two-two.vue b/niucloud/addon/shop/uni-app/pages/goods/components/category-template-two-two.vue
index 746f0980a..7806ec2c4 100644
--- a/niucloud/addon/shop/uni-app/pages/goods/components/category-template-two-two.vue
+++ b/niucloud/addon/shop/uni-app/pages/goods/components/category-template-two-two.vue
@@ -2,13 +2,16 @@
     <view class="min-h-screen bg-[var(--page-bg-color)] overflow-hidden">
         <view class="mescroll-box bg-[#f6f6f6]" :class="{ 'cart': config.cart.control && config.cart.event === 'cart', 'detail': !(config.cart.control && config.cart.event === 'cart') }" v-if="tabsData.length">
             <mescroll-body ref="mescrollRef" :down="{ use: false }" @init="mescrollInit" @up="getListFn">
-                <view v-if="config.search.control" class="box-border search-box z-10 bg-[#f6f6f6] fixed top-0 left-0 right-0 h-[96rpx]" :style="{'top': systemStore.topTabbarInfo.fullHeight || 0}">
-                    <view class="flex-1 search-input bg-[#fff]">
-                        <text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
-                        <input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" placeholderClass="text-[var(--text-color-light9)]" @confirm="searchNameFn">
-                        <text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+
+                <view v-if="config.search.control" class="search-box z-10 bg-[#f6f6f6] fixed top-0 left-0 right-0 box-border">
+                    <view class="h-[100rpx] flex-1 flex items-center justify-between" :style="navbarInnerStyle">
+                        <view class="flex-1 search-input bg-[#fff]">
+                            <text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+                            <input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" @confirm="searchNameFn" placeholderClass="text-[var(--text-color-light9)]">
+                            <text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+                        </view>
                     </view>
-                </view>
+                </view>    
 
                 <!--  #ifdef  H5 -->
                 <view class="tabs-box z-2 fixed left-0 bg-[#fff] bottom-[50px] top-0" :class="{ '!top-[96rpx]': config.search.control, 'pb-[98rpx]': config.cart.control && config.cart.event === 'cart' }">
@@ -72,8 +75,7 @@
                         </view>
                     </u-popup>
                 </view>
-                <view class="flex justify-center flex-wrap pl-[168rpx] pt-[20rpx] pb-[20rpx]"
-                      :class="{ '!pt-[214rpx]': config.search.control && tabsData[tabActive]?.child_list && tabsData[tabActive]?.child_list.length, 'pt-[120rpx]': config.search.control && (!tabsData[tabActive].child_list || !tabsData[tabActive].child_list.length), 'pt-[118rpx]': tabsData[tabActive]?.child_list && tabsData[tabActive]?.child_list.length && !config.search.control }">
+                <view class="flex justify-center flex-wrap pl-[168rpx] pt-[20rpx] pb-[20rpx]"  :style="listBoxCss">
                     <template v-for="(item, index) in list" :key="item.goods_id">
                         <view class="w-[536rpx] box-border bg-white w-full flex mx-[20rpx] py-[24rpx] px-[20rpx] rounded-[var(--rounded-small)]"
                             :class="{ 'mt-[20rpx]': index }" @click.stop="toLink(item.goods_id)">
@@ -214,7 +216,6 @@
             <mescroll-empty :option="{tip : '暂无商品分类'}"></mescroll-empty>
         </view>
         <loading-page :loading="loading"></loading-page>
-        <tabbar />
         <!-- 强制绑定手机号 -->
         <bind-mobile ref="bindMobileRef" />
     </view>
@@ -238,6 +239,19 @@ import { cloneDeep } from 'lodash-es'
 import useSystemStore from '@/stores/system';
 const systemStore = useSystemStore()
 
+const navbarInnerStyle = ref('')
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+let rightButtonWidth = systemStore.menuButtonInfo.width ? systemStore.menuButtonInfo.width * 2 + 'rpx' : '70rpx';
+navbarInnerStyle.value += 'padding-right:calc(' + rightButtonWidth + ' + 30rpx);';
+navbarInnerStyle.value += 'padding-top:' + systemStore.menuButtonInfo.top + 'px;';
+navbarInnerStyle.value += 'padding-bottom: 8px;';
+navbarInnerStyle.value+= 'height:' + systemStore.menuButtonInfo.height + 'px;';
+// #endif
+
+// #ifdef APP-PLUS
+navbarInnerStyle.value += 'padding-top:' + systemStore.systemInfo.statusBarHeight + 'px;';
+// #endif
+
 const instance = getCurrentInstance(); // 获取组件实例
 const cartStore = useCartStore();
 // 查询购物车列表
@@ -307,7 +321,13 @@ const getListFn = (mescroll: mescrollStructure) => {
 const tabsBoxCss = computed(() => {
     let style = ''
     if(config.search.control){
-        style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 96rpx);`
+         // #ifdef H5
+         style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 100rpx);`
+        // #endif
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+         style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 0rpx);`
+        // #endif
+       
     }else{
         style += `top: ${ systemStore.topTabbarInfo.height || 0 }px;`
     }
@@ -321,7 +341,13 @@ const tabsBoxCss = computed(() => {
 const twoTabCss = computed(() => {
     let style = ''
     if(config.search.control){
-        style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 94rpx) !important;`
+        // #ifdef H5
+         style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 50px) !important;`
+        // #endif
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+         style += `top: calc(${ systemStore.topTabbarInfo.height || 0 }px) !important;`
+        // #endif
+       
     }else{
         style += `top: ${ systemStore.topTabbarInfo.height || 0 }px !important;`
     }
@@ -332,7 +358,7 @@ const twoTabCss = computed(() => {
 const labelPopupCss = computed(() => {
     let style = ''
     // #ifdef MP-WEIXIN
-    style = `padding-top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 20rpx) !important;`
+    style = `padding-top: calc(${ systemStore.topTabbarInfo.height || 0 }px) !important;`
     // #endif
     // #ifdef H5
     style = `padding-top: 20rpx !important;`
@@ -340,6 +366,44 @@ const labelPopupCss = computed(() => {
     return style
 })
 
+const listBoxCss = computed(() => {
+  let style = '';
+  const hasSearch = config.search.control; // 是否有搜索框
+  const hasChildList = tabsData.value[tabActive.value]?.child_list && tabsData.value[tabActive.value].child_list.length > 0; // 是否有子列表
+
+  // 处理 padding-top（核心逻辑：迁移行内 class 判断）
+  if (hasSearch) {
+    if (hasChildList) {
+      // 有搜索框 + 有子列表 → !pt-[214rpx]
+        // #ifdef H5
+        style += `padding-top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 214rpx);`
+        // #endif
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+        style += `padding-top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 114rpx);`
+        // #endif
+      
+    } else {
+      // 有搜索框 + 无子列表 → pt-[120rpx]
+        // #ifdef H5
+         style += `padding-top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 100rpx);`
+        // #endif
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+        style += `padding-top: calc(${ systemStore.topTabbarInfo.height || 0 }px + 0rpx);`
+        // #endif
+      
+    }
+  } else {
+    if (hasChildList) {
+      // 无搜索框 + 有子列表 → pt-[118rpx]
+      style += 'padding-top: 118rpx;';
+    } else {
+      // 无搜索框 + 无子列表 → 基础 20rpx（原 else 逻辑）
+      style += 'padding-top: 0rpx;';
+    }
+  }
+  return style;
+});
+
 const goodsMaxBuy = () => {
     list.value.forEach((data, index) => {
         data.isMaxBuy = false;
@@ -788,7 +852,7 @@ const goodsPrice = (data: any) => {
     position: relative;
     color: var(--primary-color);
     font-weight: bold;
-    // background-color: #f6f6f6;
+    background-color: #f6f6f6;
 
     &::before {
         display: inline-block;
diff --git a/niucloud/addon/shop/uni-app/pages/goods/detail.vue b/niucloud/addon/shop/uni-app/pages/goods/detail.vue
index d409ab5a4..5f3cbdb97 100644
--- a/niucloud/addon/shop/uni-app/pages/goods/detail.vue
+++ b/niucloud/addon/shop/uni-app/pages/goods/detail.vue
@@ -83,7 +83,8 @@ diy.onShow((data: any) => {
         },
         weapp: {
             ...share
-        }
+        },
+        isStop:true
     });
     diyGroupRef.value?.refresh();
 
diff --git a/niucloud/addon/shop/uni-app/pages/goods/list.vue b/niucloud/addon/shop/uni-app/pages/goods/list.vue
index 9fad48edc..4f1d9efc6 100644
--- a/niucloud/addon/shop/uni-app/pages/goods/list.vue
+++ b/niucloud/addon/shop/uni-app/pages/goods/list.vue
@@ -39,7 +39,7 @@
             </view>
         </view>
         <u-popup :show="labelPopup" mode="top" @close="labelPopup = false">
-            <view @touchmove.prevent.stop class="h-[50vh] overflow-auto mt-[30rpx]">
+            <scroll-view scroll-y class="h-[50vh] overflow-auto mt-[30rpx]">
 				<view v-for="(item, index) in categoryList" :key="index">
 					<view class="text-[28rpx] px-[20rpx] mt-[10rpx]">{{item.category_name}}</view>
 					<view class="flex flex-wrap pl-[20rpx] pt-[20rpx]">
@@ -57,7 +57,7 @@
 					    </text>
 					</view>
 				</view>
-            </view>
+            </scroll-view>
         </u-popup>
 
         <mescroll-body ref="mescrollRef" top="176rpx" bottom="60px" @init="mescrollInit" :down="{ use: false }" @up="getAllAppListFn">
diff --git a/niucloud/addon/shop/uni-app/pages/index.vue b/niucloud/addon/shop/uni-app/pages/index.vue
index 6eff83bcd..cf58a4d4f 100644
--- a/niucloud/addon/shop/uni-app/pages/index.vue
+++ b/niucloud/addon/shop/uni-app/pages/index.vue
@@ -20,6 +20,10 @@
         <!-- 小程序隐私协议 -->
         <wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
         <!-- #endif -->
+        
+        <template v-if="diyStore && diyStore.mode == '' && diyStore.global && diyStore.global.bottomTabBar && diyStore.global.bottomTabBar.isShow">
+            <tabbar :addon="diyStore.global.bottomTabBar.designNav?.key" />  
+        </template>
     </view>
 </template>
 
@@ -28,12 +32,13 @@ import { ref, nextTick } from 'vue';
 import { useDiy } from '@/hooks/useDiy'
 import { useShare } from '@/hooks/useShare'
 import diyGroup from '@/addon/components/diy/group/index.vue'
+import useDiyStore from '@/app/stores/diy'
 
 const { setShare } = useShare()
 const diy = useDiy({
     name: 'DIY_SHOP_INDEX'
 })
-
+const diyStore = useDiyStore()
 const diyGroupRef = ref(null)
 
 const wxPrivacyPopupRef: any = ref(null)
diff --git a/niucloud/addon/shop/uni-app/pages/member/index.vue b/niucloud/addon/shop/uni-app/pages/member/index.vue
index 24cae019d..ab1e8267c 100644
--- a/niucloud/addon/shop/uni-app/pages/member/index.vue
+++ b/niucloud/addon/shop/uni-app/pages/member/index.vue
@@ -18,7 +18,9 @@
         <!-- 小程序隐私协议 -->
         <wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
         <!-- #endif -->
-
+        <template v-if="diyStore && diyStore.mode == '' && diyStore.global && diyStore.global.bottomTabBar && diyStore.global.bottomTabBar.isShow">
+            <tabbar :addon="diyStore.global.bottomTabBar.designNav?.key" />  
+        </template>
     </view>
 </template>
 
@@ -28,10 +30,12 @@ import { useDiy } from '@/hooks/useDiy'
 import { useShare } from '@/hooks/useShare'
 import diyGroup from '@/addon/components/diy/group/index.vue'
 import useMemberStore from '@/stores/member'
+import useDiyStore from '@/app/stores/diy'
 
 const { setShare } = useShare()
 // 会员信息
 const memberStore = useMemberStore()
+const diyStore = useDiyStore()
 const userInfo = computed(() => memberStore.info)
 
 const diy = useDiy({
diff --git a/niucloud/addon/shop/uni-app/pages/order/components/delivery-record/delivery-record.vue b/niucloud/addon/shop/uni-app/pages/order/components/delivery-record/delivery-record.vue
new file mode 100644
index 000000000..d4fdb3e2e
--- /dev/null
+++ b/niucloud/addon/shop/uni-app/pages/order/components/delivery-record/delivery-record.vue
@@ -0,0 +1,55 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="bottom" :round="10">
+        <view @touchmove.prevent.stop class="popup-common">
+            <view class="title">配送记录</view>
+            <scroll-view scroll-y="true" class="h-[50vh]">
+                <view class="px-[20rpx] py-[40rpx]" v-if="deliveryRecord && deliveryRecord.length">
+
+                    <view class="flex" v-for="(item,index) in deliveryRecord" :key="index">
+						<view class="flex-shrink-0">
+							<view class="w-[8rpx] h-[8rpx] mx-auto bg-[#999] rounded-full"></view>
+							<view v-if="index + 1 != deliveryRecord.length" class="w-[2rpx] h-[60rpx] bg-[#ccc] mx-auto my-[20rpx]"></view>
+						</view>
+						<view class="flex-1 ml-[20rpx]">
+							<view class="text-[26rpx] flex items-start justify-between mt-[-10rpx]">
+								<view class="leading-[34rpx] multi-hidden">
+                                    <text>{{ item.operate_desc }}</text>
+                                    <text v-if="item.main_type == 'rider'">，配送员：{{ item.main_name }}</text>
+                                </view>
+                                <text class="flex-shrink-0 ml-[30rpx]">{{ item.create_time }}</text>
+							</view>
+						</view>
+					</view>
+                </view>
+                <view  class="empty-page-popup !mt-0 empty-height" v-else>
+                    <image class="img" :src="img('static/resource/images/system/empty.png')" model="aspectFit" />
+                    <view class="desc">暂无配送记录</view>
+                </view>
+            </scroll-view>
+        </view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { img } from '@/utils/common';
+
+const show = ref(false)
+const deliveryRecord = ref<any>(null)
+const activeStep = ref(0)
+const open = (data: any) => {
+    show.value = true;
+    deliveryRecord.value = data;
+    activeStep.value = deliveryRecord.value ? deliveryRecord.value.length - 1 : 0;
+}
+
+defineExpose({
+    open
+})
+</script>
+
+<style lang="scss" scoped>
+.empty-height{
+    height: calc(100% - 100rpx);
+}
+</style>
\ No newline at end of file
diff --git a/niucloud/addon/shop/uni-app/pages/order/components/map-show/map-show.vue b/niucloud/addon/shop/uni-app/pages/order/components/map-show/map-show.vue
new file mode 100644
index 000000000..b75424cb4
--- /dev/null
+++ b/niucloud/addon/shop/uni-app/pages/order/components/map-show/map-show.vue
@@ -0,0 +1,156 @@
+<template>
+    <view  class="container" v-if="!loading">
+        <!-- 微信小程序地图组件 -->
+		<map  id="mapContainer"  :latitude="marker.center.latitude" :longitude="marker.center.longitude" :polyline="polyline" :include-points="marker.center" :markers="marker.points" :scale="scale" :min-scale="10" :max-scale="20" :style="mapStyle" enable-zoom></map>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { img } from '@/utils/common';
+import { getTrackOfLocal } from '@/addon/shop/api/order'
+const prop = defineProps({
+    tradeNo:{
+      type: String,
+      default: ''
+    },
+    height: {
+        type: String,
+        default: 'calc(50vh  + 150rpx)'
+    }
+})
+const mapStyle = computed(() => {
+    let style = ''
+    style += `width:100%;`
+    style += `height:${prop.height};`
+    return style
+})
+
+const emit = defineEmits(['comfirm']);
+
+// 查询地图
+let marker = ref<any>({
+    center: { 
+        latitude: 39.909, 
+        longitude: 116.39742 
+    },
+})
+const loading = ref<any>(true)
+let polyline = ref<any>(null)
+let scale = ref<any>(12)
+const getTrackOfLocalFn = () => {
+    loading.value = true;
+    getTrackOfLocal({ trade_no: prop.tradeNo }) .then((res: any) => {
+        marker.value = res.data;
+        if(marker.value){
+            marker.value.points?.forEach((item: any) => {
+                item.id = getRandomInt(1, 200)
+                item.iconPath = img(item.icon_path)
+                item.width = 40
+                item.height = 40
+                if(item.callout.content){
+                    item.callout.padding = 11
+                    item.callout.display = 'ALWAYS'
+                    item.callout.bgColor = '#fa5050'
+                    item.callout.color = '#fff'
+                    item.callout.borderRadius = 6
+                    item.callout.fontSize = 12
+                }
+            })
+            processRouteData(marker.value.driving)
+            scale.value = estimateZoomLevel(haversineDistance(marker.value.points[0].latitude, marker.value.points[0].longitude, marker.value.points[1].latitude, marker.value.points[marker.value.points.length - 1].longitude))
+        }
+        emit('comfirm', res.data)
+        loading.value = false;
+    }).catch(() => {
+        loading.value = false;
+    })
+}
+const  getRandomInt = (min: Number, max: Number) => {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+onMounted(() => {
+   getTrackOfLocalFn()
+})
+const  processRouteData = (result: any) => {
+    if (!result) {
+        return false
+    }
+    
+    const route = result.routes[0];
+    const coords = route.polyline;
+    
+    // 坐标解压（腾讯地图采用的压缩算法）
+    const kr = 1000000;
+    for (let i = 2; i < coords.length; i++) {
+        coords[i] = Number(coords[i - 2]) + Number(coords[i]) / kr;
+    }
+    
+    // 转换为polyline数据格式
+    const points = [];
+    for (let i = 0; i < coords.length; i += 2) {
+        points.push({
+            latitude: coords[i],
+            longitude: coords[i + 1]
+        });
+    }
+    
+    // 更新地图路线
+    polyline.value = [{
+        points: points,
+        color: '#f48aa2',
+        width: 4,
+        arrowLine: true // 显示方向箭头
+    }];
+}
+const  haversineDistance = (lat1: any, lon1: any, lat2: any, lon2: any) => {
+    var R = 6371; // 地球半径，单位为公里
+    var dLat = deg2rad(lat2 - lat1);
+    var dLon = deg2rad(lon2 - lon1);
+    var a = 
+      Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+      Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) * 
+      Math.sin(dLon / 2) * Math.sin(dLon / 2);
+    var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    var distance = R * c; // 距离，单位为公里
+    return distance * 1000;
+}
+
+const deg2rad = (deg: any) => {
+    return deg * (Math.PI / 180);
+}
+
+
+const estimateZoomLevel = (distance: any) => {
+    let zoomLevel;
+    if (distance > 1000000) {
+    zoomLevel = 5 - ((distance - 1000000) / 3000000) * 10;
+    } else if (distance > 100000 && distance <= 1000000) {
+    zoomLevel = 7 + ((distance - 100000) / 900000) * 6;
+    } else if (distance > 50000 && distance <= 100000) {
+    zoomLevel = 10 + (distance / 1000000) * 9;
+    } else if (distance > 10000 && distance <= 50000) {
+    zoomLevel = 11 + (distance / 1000000) * 6.5;
+    } else if (distance > 5000 && distance <= 10000) {
+    zoomLevel = 13 + (distance / 100000) * 6;
+    } else if (distance > 900 && distance <= 5000) {
+    zoomLevel = 14 + (distance / 100000) * 8;
+    } else if (distance > 500 && distance <= 900) {
+    zoomLevel = 16 + (distance / 10000) * 3;
+    } else if (distance > 100 && distance <= 500) {
+    zoomLevel = 16.5 + (distance / 10000) * 2;
+    } else {
+    zoomLevel = 17 + (distance / 10000) * 2;
+    }
+    // 限制缩放级别在合理范围内，假设缩放级别范围是3 - 17
+    return parseInt(Math.max(3, Math.min(19, zoomLevel)) - 1);
+}
+
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/niucloud/addon/shop/uni-app/pages/order/components/select-store/select-store.vue b/niucloud/addon/shop/uni-app/pages/order/components/select-store/select-store.vue
index a98b912f8..22594e951 100644
--- a/niucloud/addon/shop/uni-app/pages/order/components/select-store/select-store.vue
+++ b/niucloud/addon/shop/uni-app/pages/order/components/select-store/select-store.vue
@@ -1,34 +1,40 @@
 <template>
     <u-popup :show="show" @close="show = false" mode="bottom" :round="10">
         <view class="popup-common">
-            <view class="title">请选择自提点</view>
+            <view class="title">请选择门店</view>
             <scroll-view scroll-y="true" class="h-[50vh]">
                 <view class="p-[var(--popup-sidebar-m)] pt-0 text-sm">
-                    <view
-                        class="mt-[var(--top-m)] border-1 border-[#eee] border-solid rounded-[var(--rounded-mid)] px-[var(--pad-sidebar-m)] py-[var(--pad-top-m)] mb-[var(--top-m)]"
-                        :class="{'!border-primary bg-[var(--primary-color-light2)]': store && store.store_id == item.store_id}"
+                    <view class="card-template mt-[var(--top-m)] border-1 border-[#eee] border-solid  mb-[var(--top-m)]" :class="{'!border-primary bg-[var(--primary-color-light2)]': store && store.store_id == item.store_id}"
                         v-for="item in storeList" @click="selectStore(item)">
-                        <view class="flex">
-                            <view class="flex-1 w-0">
-                                <text class="text-[30rpx] text-[#333]">{{ item.store_name }}</text>
-                                <text class="text-[26rpx] ml-[12rpx] text-[var(--text-color-light6)]">{{ item.store_mobile }}</text>
+                        <view class="flex items-center mb-[20rpx]">
+                            <view class="flex-1 using-hidden text-[30rpx] text-[#333]">{{ item.store_name }} </view>
+                            <view v-if="item.hasOwnProperty('distance')" class="flex-shrink-0 ml-[20rpx] text-[#999] text-[24rpx] font-normal">{{ distanceVal(item) }}</view>
+                        </view>
+                        <view class="flex items-center justify-between">
+                            <view class="flex-1">
+                                <view class=" text-[22rpx] leading-[1.4] text-[#666]">
+                                    <text class="nc-iconfont nc-icon-dizhiguanliV6xx text-[26rpx] mr-[12rpx]"></text>
+                                    <text class="flex-shrink-0">门店地址：</text>
+                                    <text>{{ item.full_address }}</text>
+                                </view>
+                                <view class="mt-[12rpx] text-[22rpx] text-[#666]">
+                                    <text class="nc-iconfont nc-icon-shijianV6xx text-[26rpx] mr-[12rpx]"></text>
+                                    <text>营业时间：{{ item.trade_time }}</text>
+                                </view>
                             </view>
-                            <view v-if="item.distance">
-                                <text class="text-red text-[26rpx] font-normal">{{ distanceFormat(item.distance) }}</text>
+                            <view class="w-[1rpx] h-[42rpx] bg-[#ddd] mx-[24rpx]"></view>
+                            <view class="flex-shrink-0">
+                                <image @click="callFn(item.store_mobile)" class="w-[42rpx] h-[42rpx] mr-[20rpx]" :src="img('addon/shop/payment/phone.png')" mode="heightFix" />
+                                <image @click="getAddress(item)" class="w-[42rpx] h-[42rpx]" :src="img('addon/shop/payment/navigation.png')" mode="heightFix" />
                             </view>
                         </view>
-                        <view class="mt-[20rpx] text-[26rpx] leading-[1.4] flex">
-                            <text class="flex-shrink-0">门店地址：</text>
-                            <text>{{ item.full_address }}</text>
-                        </view>
-                        <view class="mt-[16rpx] text-[26rpx]">营业时间：{{ item.trade_time }}</view>
                     </view>
                 </view>
                 <view class="h-[50vh] flex items-center flex-col justify-center" v-if="loading">
                     <u-loading-icon :vertical="true"></u-loading-icon>
                 </view>
                 <view class="h-[95%] flex items-center flex-col justify-center" v-if="!loading && !storeList.length">
-                    <u-empty text="没有可选择的自提点" width="214" :icon="img('static/resource/images/empty.png')" />
+                    <u-empty text="没有可选择的门店" width="214" :icon="img('static/resource/images/empty.png')" />
                 </view>
             </scroll-view>
             <view class="btn-wrap">
@@ -39,9 +45,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive } from 'vue'
+import { ref, reactive, computed } from 'vue'
 import { getStoreList } from '@/addon/shop/api/order'
-import { img } from '@/utils/common'
+import { img, isWeixinBrowser } from '@/utils/common'
+import wechat from '@/utils/wechat'
 
 const show = ref(false)
 const loaded = ref(false)
@@ -52,6 +59,63 @@ const latlng = reactive({
     lat: 0,
     lng: 0
 })
+const distanceFn = (distance: string | number) => {
+	const dist = typeof distance === 'string' ? parseFloat(distance) : distance;
+	if (isNaN(dist)) return distance.toString();
+	return dist < 1 ? parseInt((dist * 1000).toString()) + 'm' : dist.toFixed(1) + 'km'
+}
+
+const distanceVal = (item:any)=>{
+    if(item?.distance){
+        return distanceFn(item.distance)
+    }
+    return ''
+}
+
+// 位置
+// #ifdef H5
+if (isWeixinBrowser()) {
+    wechat.init();
+}
+// #endif
+const getAddress = (data: any) => {
+    // #ifdef H5
+    if (isWeixinBrowser()) {
+        wechat.openLocation({
+            latitude: Number(data.latitude),
+            longitude: Number(data.longitude),
+            name: data.full_address,
+            address: data.full_address
+        })
+    }
+    // #endif
+    // #ifdef MP
+	uni.openLocation({
+		latitude: Number(data.latitude),
+		longitude: Number(data.longitude),
+        name: data.full_address,
+        address: data.full_address,
+		success: function () { }
+	});
+    // #endif
+}
+
+const callFn = (data: any) => {
+    uni.makePhoneCall({
+        phoneNumber: data,
+        success: (res: any) => {
+        },
+        fail: (res: any) => {
+        }
+    })
+}
+
+const open = (data: any) => {
+    storeList.value = data.store_list || []
+    store.value = data.take_store || storeList.value[0] || null
+    loading.value = false
+    show.value = true
+}
 
 const getStoreListFn = (callback: any) => {
     if (!loaded.value) {
@@ -107,9 +171,6 @@ const getStoreListFn = (callback: any) => {
     }
 }
 
-const open = () => {
-    show.value = true
-}
 
 const selectStore = (data: object) => {
     if (store.value) {
@@ -122,19 +183,16 @@ const selectStore = (data: object) => {
 const emits = defineEmits(['confirm'])
 
 const confirm = () => {
+    if (!store.value) {
+        uni.showToast({ title: '请选择自提点', icon: 'none' })
+        return
+    }
     emits('confirm', store.value)
+    store.value = null
     show.value = false
 }
 
-const distanceFormat = (distance: any) => {
-    distance = parseFloat(distance)
-    if (distance < 1000) {
-        return `${ distance }m`;
-    } else {
-        const km = (distance / 1000).toFixed(2)
-        return `${ km }km`;
-    }
-}
+
 
 defineExpose({
     open,
diff --git a/niucloud/addon/shop/uni-app/pages/order/detail.vue b/niucloud/addon/shop/uni-app/pages/order/detail.vue
index be2830532..ab527cc42 100644
--- a/niucloud/addon/shop/uni-app/pages/order/detail.vue
+++ b/niucloud/addon/shop/uni-app/pages/order/detail.vue
@@ -1,8 +1,14 @@
 <template>
     <view :style="themeColor()">
-        <view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" v-if="!loading">
+        <view class="bg-[var(--page-bg-color)] min-h-screen" v-if="!loading">
             <view v-if="!loading" class="pb-20rpx">
-                <view v-if="detail.status_name" class="pl-[40rpx] pr-[35rpx] bg-linear pb-[100rpx]">
+                <view style="min-height: calc(50vh  + 150rpx);" v-if="isShowLocalDelivery">
+                    <!-- #ifdef MP-WEIXIN -->
+                    <top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" />
+                    <!-- #endif -->
+                    <map-show ref="mapShowRef"  :tradeNo="detail.order_no" @comfirm="handleComfirm"  v-if="detail.order_no" />
+                </view>
+                <view v-if="detail.status_name  && !isShowLocalDelivery" class="pl-[40rpx] pr-[35rpx] bg-linear pb-[100rpx]">
                     <!-- #ifdef MP-WEIXIN || APP-PLUS -->
                     <top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" />
                     <!-- #endif -->
@@ -27,7 +33,30 @@
                         </view>
                     </view>
                 </view>
-                <view class="sidebar-margin mt-[-86rpx] card-template" v-if="detail.delivery_type != 'virtual'&& detail.taker_name">
+                <view class="sidebar-margin card-template mt-[-86rpx] relative" v-if="detail.delivery_type == 'local_delivery' && isShowLocalDelivery">
+                    <view class="flex items-center" @click="localeDeliveryFn">
+                        <view class="flex-1">
+                            <view class="mb-[20rpx] flex items-baseline leading-[40rpx] min-h-[46rpx]">
+                                <text class="text-[26rpx] font-500 mr-[10rpx]">预计</text>
+                                <text class="text-[46rpx] font-600">{{ expectedFinishTime }}</text>
+                            </view>
+                            
+                            <view class="flex">
+                                <text class="text-[26rpx] font-500 mr-[10rpx] flex-shrink-0">送至</text>
+                                <view class="flex flex-col">
+                                    <text class="text-[26rpx] mb-[12rpx] leading-[26rpx]">{{ detail.taker_full_address }}</text>
+                                    <view class="flex leading-[38rpx] overflow-hidden">
+                                        <text class="text-[26rpx]">{{ detail.taker_name }}</text>
+                                        <text class="text-[26rpx] ml-[15rpx]">{{ detail.taker_mobile }}</text>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <text class="nc-iconfont nc-icon-youV6xx ml-[10rpx]" v-if="detail.delivery_type == 'local_delivery' && ['3','5'].indexOf(detail.status) != -1"></text>
+                    </view>
+                    
+                </view>
+                <view class="sidebar-margin mt-[-86rpx] card-template" v-if="detail.delivery_type != 'virtual'&& detail.taker_name && !isShowLocalDelivery">
                     <view v-if="detail.delivery_type == 'express'">
                         <view class="text-[#303133] flex">
                             <text class="nc-iconfont nc-icon-dizhiguanliV6xx text-[40rpx] pt-[12rpx] mr-[20rpx]"></text>
@@ -424,6 +453,7 @@
             <view class="tab-bar-placeholder"></view>
             <pay ref="payRef" @close="payClose"></pay>
             <logistics-tracking ref="materialRef"></logistics-tracking>
+            <delivery-record ref="deliveryRecordRef"></delivery-record>
             <!-- 满减 -->
             <ns-goods-manjian ref="manjianShowRef"></ns-goods-manjian>
         </view>
@@ -446,17 +476,20 @@ import { getShopOrderDetail, orderClose, orderFinish } from '@/addon/shop/api/or
 import { getEvaluateConfig } from '@/addon/shop/api/shop';
 import { getVerifyCode } from '@/app/api/verify';
 import logisticsTracking from '@/addon/shop/pages/order/components/logistics-tracking/logistics-tracking.vue'
+import deliveryRecord from '@/addon/shop/pages/order/components/delivery-record/delivery-record.vue'
 import useConfigStore from "@/stores/config";
 import nsGoodsManjian from '@/addon/shop/components/ns-goods-manjian/ns-goods-manjian.vue';
 import { topTabar } from '@/utils/topTabbar';
 import { cloneDeep } from 'lodash-es';
 import diyFormDetail from '@/addon/components/diy-form-detail/index.vue'
+import mapShow from '@/addon/shop/pages/order/components/map-show/map-show.vue'
 
 /********* 自定义头部 - start ***********/
 const topTabarObj = topTabar()
 let topTabbarData = topTabarObj.setTopTabbarParam({ title: '订单详情' })
 /********* 自定义头部 - end ***********/
 
+const isShowLocalDelivery = ref(false)
 const detail: any = ref<Object>({});
 const loading = ref<boolean>(true);
 const type = ref('')
@@ -497,6 +530,10 @@ const orderDetailFn = (id: any) => {
     loading.value = true;
     getShopOrderDetail(id).then((res: any) => {
         detail.value = res.data;
+        isShowLocalDelivery.value = detail.value.show_local_delivery_info
+        if(isShowLocalDelivery.value){
+           topTabbarData = topTabarObj.setTopTabbarParam({ title: '订单详情', topStatusBar: { textColor: '#333' }})
+        }
         if (res.data.order_goods && res.data.order_goods.length && isShowVerify.value) {
             let obj: any = {};
             obj.order_goods_id = res.data.order_goods[0].order_goods_id
@@ -675,6 +712,18 @@ const orderBtnFn = (type = '') => {
     }
 }
 
+// 是否展示地图
+let expectedFinishTime = ref()
+const handleComfirm = (val: any) => {
+    if(val){
+        isShowLocalDelivery.value = true
+    } else {
+        isShowLocalDelivery.value = false
+    }
+    expectedFinishTime.value = val?.expected_finish_time
+
+}
+
 const dateFormat = (res: any, type: any) => {
     let data;
     if (res.indexOf('/') != -1) {
@@ -786,6 +835,14 @@ const orderDiyFormData = ref([]);
 const getOrderDiyFormDetailCallback = (data: any) => {
     orderDiyFormData.value = data;
 }
+
+// 配送记录
+const deliveryRecordRef = ref(null)
+const localeDeliveryFn = () => {
+    if(detail.value.delivery_type == 'local_delivery' && ['3','5'].indexOf(detail.value.status) != -1){
+        deliveryRecordRef.value?.open(detail.value.local_delivery_order_log);
+    }
+}
 </script>
 <style lang="scss" scoped>
 .text-item {
diff --git a/niucloud/addon/shop/uni-app/pages/order/list.vue b/niucloud/addon/shop/uni-app/pages/order/list.vue
index 2aaaee90f..b712220e7 100644
--- a/niucloud/addon/shop/uni-app/pages/order/list.vue
+++ b/niucloud/addon/shop/uni-app/pages/order/list.vue
@@ -6,7 +6,7 @@
                 <view class="back-wrap text-[26px] nc-iconfont nc-icon-zuoV6xx" @click="back"></view>
                 <!-- #endif -->
                 <view class="search-input bg-[#fff]">
-                    <text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+                    <text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 text-[var(--text-color-light9)] text-[26rpx] mr-[18rpx]"></text>
                     <input class="input" type="text" v-model.trim="searchName" placeholder="请输入商品名称" @confirm="searchNameFn" placeholderClass="text-[var(--text-color-light9)]">
                     <text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
                 </view>
@@ -14,12 +14,12 @@
         </view>
         <view class="fixed left-0 top-0 right-0 z-10" v-if="statusLoading" :style="`top: ${categoryTop}`">
             <view class="flex justify-center items-center">
-                <scroll-view :scroll-x="true" class="tab-style-2  pr-[180rpx]" scroll-with-animation :scroll-into-view="'id' + orderState">
+                <scroll-view :scroll-x="true" class="tab-style-2" scroll-with-animation :scroll-into-view="'id' + orderState" :class="{'pr-[160rpx]':invoiceConfig.is_invoice==1}">
                     <view class="tab-content">
-                        <view :id="'id' + index"  class="tab-items mr-[40rpx] flex-shrink-0" :class="{ 'class-select': orderState === item.status.toString() }" @click="orderStateFn(item.status)" v-for="(item, index) in orderStateList">{{ item.name }}</view>
+                        <view :id="'id' + index"  class="tab-items flex-shrink-0" :class="{ 'class-select': orderState === item.status.toString(), 'mr-[34rpx]':invoiceConfig.is_invoice==1 }" @click="orderStateFn(item.status)" v-for="(item, index) in orderStateList">{{ item.name }}</view>
                     </view>
                 </scroll-view>
-                <view @click="isEdit = !isEdit" class="text-[#333] text-[28rpx] bg-[#f6f6f6] flex items-center pr-[20rpx] absolute right-0 top-0 h-[88rpx] z-10">
+                <view @click="isEdit = !isEdit" v-if="invoiceConfig.is_invoice==1" class="text-[#333] text-[26rpx] bg-[#f6f6f6] flex items-center pr-[20rpx] absolute right-0 top-0 h-[88rpx] z-10">
                     <image class="h-[30rpx] w-[1rpx] mr-[20rpx]" :src="img('addon/shop/rectangle.png')" mode="heightFix" />
                     <image class="h-[26rpx] w-[26rpx]" :src="img('addon/shop/invoice.png')" mode="heightFix" />
                     <view class="flex-1 whitespace-nowrap ml-[10rpx]">开发票</view>
@@ -27,7 +27,7 @@
             </view>
         </view>
         <mescroll-body ref="mescrollRef" :top="listTop" @init="mescrollInit" :down="{ use: false }" @up="getShopOrderFn">
-            <view class="sidebar-margin pt-[var(--top-m)]" v-if="list.length">
+            <view class="sidebar-margin" v-if="list.length">
                 <template v-for="(item, index) in list" :key="index">
                     <view class="flex justify-between items-center">
                         <view class="flex items-center h-[34rpx] mb-[20rpx]" v-if="isEdit">
@@ -125,7 +125,7 @@
                                 <view class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid border-[#ccc] rounded-full ml-[20rpx]  text-[var(--text-color-light3)] box-border"
                                     v-if="item.status == 5 && evaluateConfig.evaluate_is_show && evaluateConfig.is_evaluate == 1"
                                     @click.stop="orderBtnFn(item, 'evaluate')">{{ item.is_evaluate == 1 ? t('selectedEvaluate') : t('evaluate') }}</view>
-                                <view class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid border-[#ccc] rounded-full text-[var(--text-color-light3)] ml-[20rpx] box-border" v-if="item.is_can_invoice" @click.stop="orderBtnFn(item, 'invoice')">开票</view>
+                                <view class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid border-[#ccc] rounded-full text-[var(--text-color-light3)] ml-[20rpx] box-border" v-if="item.is_can_invoice && invoiceConfig.is_invoice==1" @click.stop="orderBtnFn(item, 'invoice')">开票</view>
 
                             </view>
                         
@@ -136,7 +136,7 @@
             </view>
             <mescroll-empty v-if="!list.length && loading" :option="{tip : '暂无订单'}"></mescroll-empty>
         </mescroll-body>
-        <view v-if="list.length && isEdit" class="fixed left-0 right-0 bottom-0 z-200 bg-[#fff]  pb-ios">
+        <view v-if="list.length && isEdit" class="fixed left-0 right-0 bottom-0 z-200 bg-[#fff] pb-ios">
             <view v-if="checkedNum"
                   class="h-[66rpx] flex items-center justify-between pl-[30rpx] pr-[20rpx] border-0  border-b-[1rpx] border-solid border-[#f6f6f6]">
                 <view class="text-[24rpx]">
@@ -168,6 +168,7 @@ import { ref, nextTick,computed } from 'vue';
 import { t } from '@/locale'
 import { img, redirect, copy ,pxToRpx} from '@/utils/common'
 import { getShopOrderStatus, getShopOrder, orderClose, orderFinish } from '@/addon/shop/api/order';
+import { getInvoiceConfig } from '@/addon/shop/api/config'
 import { getEvaluateConfig } from '@/addon/shop/api/shop';
 import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
 import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
@@ -225,6 +226,7 @@ const wxPrivacyPopupRef: any = ref(null)
 onLoad((option: any) => {
     orderState.value = option.status || "";
     evaluateEvent()
+    getInvoiceConfigFn()
     getShopOrderStatusFn();
     // #ifdef MP
     nextTick(() => {
@@ -241,6 +243,12 @@ onShow(() => {
         }
     })
 })
+const invoiceConfig = ref({})
+const getInvoiceConfigFn = () => {
+    getInvoiceConfig().then((data: any) => {
+        invoiceConfig.value = data.data
+    })
+}
 
 const evaluateEvent = () => {
     getEvaluateConfig().then((data: any) => {
@@ -505,4 +513,8 @@ const finish = (item: any) => {
 .bg-color {
     background-color: var(--primary-color);
 }
+
+input{
+    color: var(--text-color-light9) !important;
+}
 </style>
diff --git a/niucloud/addon/shop/uni-app/pages/order/payment.vue b/niucloud/addon/shop/uni-app/pages/order/payment.vue
index 3a3f8dac8..5dedda1bd 100644
--- a/niucloud/addon/shop/uni-app/pages/order/payment.vue
+++ b/niucloud/addon/shop/uni-app/pages/order/payment.vue
@@ -17,23 +17,57 @@
                     </view>
                     <view class="min-h-[140rpx] flex items-center px-[30rpx]">
                         <!-- 收货地址 -->
-                        <view class="w-full" v-if="['express', 'local_delivery'].includes(createData.delivery.delivery_type)" @click="toSelectAddress">
-                            <view v-if="!$u.test.isEmpty(orderData.delivery.take_address)" class="pt-[20rpx] pb-[30rpx] flex items-center">
-                                <image class="w-[60rpx] h-[60rpx] mr-[20rpx] flex-shrink-0" :src="img('addon/shop/payment/position_01.png')" mode="aspectFit"/>
-                                <view class="flex flex-col overflow-hidden">
-                                    <text class="text-[26rpx] text-[var(--text-color-light9)] mt-[16rpx] truncate max-w-[536rpx]">{{ orderData.delivery.take_address.full_address.substring(0, orderData.delivery.take_address.full_address.lastIndexOf(orderData.delivery.take_address.address)) }}</text>
-                                    <text class="font-500 text-[30rpx] mt-[14rpx] text-[#333] truncate max-w-[536rpx]">{{ orderData.delivery.take_address.address }}</text>
-                                    <view class="flex items-center text-[26rpx] text-[var(--text-color-light6)] mt-[16rpx]">
-                                        <text class="mr-[16rpx]">{{ orderData.delivery.take_address.name }}</text>
-                                        <text>{{ mobileHide(orderData.delivery.take_address.mobile) }}</text>
+                        <view class="w-full" v-if="['express', 'local_delivery'].includes(createData.delivery.delivery_type)">
+                            <view @click="toSelectAddress">
+                                <view v-if="!$u.test.isEmpty(orderData.delivery.take_address)" class="pt-[20rpx] pb-[30rpx] flex items-center">
+                                    <image class="w-[60rpx] h-[60rpx] mr-[20rpx] flex-shrink-0" :src="img('addon/shop/payment/position_01.png')" mode="aspectFit"/>
+                                    <view class="flex flex-col overflow-hidden">
+                                        <text class="text-[26rpx] text-[var(--text-color-light9)] mt-[16rpx] truncate max-w-[536rpx]">{{ orderData.delivery.take_address.full_address.substring(0, orderData.delivery.take_address.full_address.lastIndexOf(orderData.delivery.take_address.address)) }}</text>
+                                        <text class="font-500 text-[30rpx] mt-[14rpx] text-[#333] truncate max-w-[536rpx]">{{ orderData.delivery.take_address.address }}</text>
+                                        <view class="flex items-center text-[26rpx] text-[var(--text-color-light6)] mt-[16rpx]">
+                                            <text class="mr-[16rpx]">{{ orderData.delivery.take_address.name }}</text>
+                                            <text>{{ mobileHide(orderData.delivery.take_address.mobile) }}</text>
+                                        </view>
+                                        <view v-if="orderData.delivery.error" class="text-[24rpx] text-primary mt-[16rpx]">
+                                            <text class="nc-iconfont nc-icon-tanhaoV6xx text-primary text-[24rpx]"></text>
+                                            {{ orderData.delivery.error }}
+                                        </view>
+                                    </view>
+                                    <text class="ml-auto nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                                </view>
+                                <view v-else class="flex items-center min-h-[140rpx]">
+                                    <image class="w-[26rpx] h-[30rpx] mr-[10rpx]" :src="img('addon/shop/payment/position_02.png')" mode="aspectFit"/>
+                                    <text class="text-[28rpx]">添加收货地址</text>
+                                    <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)] ml-auto"></text>
+                                </view>
+                            </view>
+                            <view class="pt-[22rpx] border-0 border-t-[1rpx] border-solid border-[#F2F2F2]" v-if="createData.delivery.delivery_type == 'local_delivery' && (orderData.delivery.take_store.time_is_open || orderData.config.local_delivery.is_local_delivery_store_select)">
+                                <view v-if="orderData.delivery.take_store.time_is_open && !$u.test.isEmpty(orderData.delivery.take_store)">
+                                    <view class="flex justify-between items-center mb-[40rpx]"
+                                    @click="handleTime">
+                                        <view class="text-color text-[26rpx] flex items-center">
+                                            <image class="w-[30rpx] h-[30rpx] mr-[12rpx]" :src="img('addon/shop/payment/time.png')" mode="aspectFit"/>
+                                            <text>{{createData.delivery.local_delivery_type =='subscribe' ? '预约配送' : '配送时间'}}</text>
+                                        </view>
+
+                                        <view class="flex items-center">
+                                            <view v-if="createData.delivery.local_delivery_type =='subscribe'" class="text-[26rpx] ml-2 text-right" :class="{'text-[#63676D]': !createData.delivery.buyer_ask_delivery_time }">{{ createData.delivery.buyer_ask_delivery_time ? showGetDate : '选择时间' }}</view>
+                                            <view v-else class="text-[26rpx] ml-2 text-right" >{{ isDelivery ? '立即配送' : '当前时间不支持配送'}}</view>
+                                            <text class="text-[26rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-youV6xx"></text>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="flex justify-between items-center mb-[38rpx] " @click="openSelectStore()" v-if="orderData.config.local_delivery.is_local_delivery_store_select">
+                                    <view class="text-color text-[26rpx] flex items-center">
+                                        <image class="w-[30rpx] h-[30rpx] mr-[12rpx]" :src="img('addon/shop/payment/store.png')" mode="aspectFit"/>
+                                        <text>配送门店</text>
+                                    </view>
+                                    <view class="flex items-center ">
+                                        <text class="text-[26rpx] font-500 text-[#333] max-w-[300rpx] truncate">{{ orderData.delivery.take_store.store_name || '请选择配送门店' }}</text>
+                                        <text class="px-[4rpx] h-[28rpx] leading-[28rpx] text-[20rpx] bg-[#F2F2F2] text-[#999] rounded-[4rpx] mx-[6rpx]" v-if="orderData.delivery.take_store.distance">{{ distanceFn(orderData.delivery.take_store.distance) }}</text>
+                                        <text class="text-[26rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-youV6xx"></text>
                                     </view>
                                 </view>
-                                <text class="ml-auto nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
-                            </view>
-                            <view v-else class="flex items-center">
-                                <image class="w-[26rpx] h-[30rpx] mr-[10rpx]" :src="img('addon/shop/payment/position_02.png')" mode="aspectFit"/>
-                                <text class="text-[28rpx]">添加收货地址</text>
-                                <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)] ml-auto"></text>
                             </view>
                         </view>
 
@@ -64,41 +98,33 @@
                             </view>
                         </view>
                     </view>
-                    <view v-if="createData.delivery.delivery_type == 'store'">
+                    <view v-if="createData.delivery.delivery_type == 'store'" class="pb-[10rpx]">
                         <!-- 姓名 -->
                         <view class="px-[20rpx] py-[14rpx]">
-                            <view class="flex justify-between items-center">
+                            <view class="flex justify-between items-center h-[30rpx]">
                                 <view class="text-color text-[26rpx]" @click="handleTime">姓名</view>
                                 <input class="text-right" maxlength="20" placeholder-style="color:#B1B3B5;font-size:26rpx" placeholder="请输入" v-model="createData.delivery.taker_name" />
                             </view>
                         </view>
                         <!-- 预留手机 -->
                         <view class="px-[20rpx] py-[14rpx]">
-                            <view class="flex justify-between items-center">
+                            <view class="flex justify-between items-center h-[30rpx]">
                                 <view class="text-color text-[26rpx]">预留手机</view>
                                 <input class="text-right" maxlength="11" placeholder-style="color:#B1B3B5;font-size:26rpx" placeholder="请输入" v-model="createData.delivery.taker_mobile" />
                             </view>
                         </view>
                         <!-- 提货时间 -->
-                        <view class="flex justify-between items-center px-[20rpx] pt-[14rpx] pb-[24rpx]">
-                            <view class="text-color text-[26rpx]">提货时间</view>
-                            <view class="flex" @click="handleTime">
-                                <view class="text-[26rpx] ml-2 text-right" :class="{'text-[#63676D]': !createData.delivery.buyer_ask_delivery_time }">{{ createData.delivery.buyer_ask_delivery_time ? showGetDate : '选择提货时间' }}</view>
-                                <text class="text-[26rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-youV6xx"></text>
+                        <view class="px-[20rpx] py-[14rpx]">
+                            <view class="flex justify-between items-center h-[30rpx]">
+                                <view class="text-color text-[26rpx]">提货时间</view>
+                                <view class="flex" @click="handleTime">
+                                    <view class="text-[26rpx] ml-2 text-right" :class="{'text-[#63676D]': !createData.delivery.buyer_ask_delivery_time }">{{ createData.delivery.buyer_ask_delivery_time ? showGetDate : '选择提货时间' }}</view>
+                                    <text class="text-[26rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-youV6xx"></text>
+                                </view>
                             </view>
+
                         </view>
                     </view>
-					<view v-if="createData.delivery.delivery_type == 'local_delivery' && localConfig.time_is_open" >
-						<view class="flex justify-between items-center  px-[20rpx] pt-[14rpx] pb-[24rpx]"
-                        @click="handleTime">
-						    <view class="text-color text-[26rpx]">{{createData.delivery.local_delivery_type =='subscribe' ?'预约配送':''}}</view>
-						    <view class="flex items-center">
-						        <view v-if="createData.delivery.local_delivery_type =='subscribe'" class="text-[26rpx] ml-2 text-right" :class="{'text-[#63676D]': !createData.delivery.buyer_ask_delivery_time }">{{ createData.delivery.buyer_ask_delivery_time ? showGetDate : '选择时间' }}</view>
-								 <view v-else class="text-[26rpx] ml-2 text-right" >{{isDelivery?'立即配送':'当前时间不支持配送'}}</view>
-						        <text class="text-[26rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-youV6xx"></text>
-						    </view>
-						</view>
-					</view>
                 </view>
                 <view v-if="orderData.basic.has_goods_types.includes('real') && !delivery_type_list.length" class="mb-[var(--top-m)] card-template h-[100rpx] flex items-center">
                     <p class="text-[28rpx] text-[var(--primary-color)]">商家尚未配置配送方式</p>
@@ -267,7 +293,7 @@
         <ns-goods-manjian ref="manjianShowRef" />
         <pay ref="payRef" @close="payClose"/>
 
-        <ns-select-time ref="selectTime" :rules="service_time" v-if="Object.keys(service_time).length" :isQuantum="true" :isOpen="localConfig.time_is_open" @change="getTime" @getStamp="getStamp" @getDate="getDate"></ns-select-time>
+        <ns-select-time ref="selectTime" :rules="service_time" v-if="Object.keys(service_time).length" :isQuantum="true" :isOpen="orderData.delivery.take_store.time_is_open" @change="getTime" @getStamp="getStamp" @getDate="getDate"></ns-select-time>
         <message-open ref="messageOpenRef" @submit="confirmMessage" :default-message="createData.member_remark" />
 
     </view>
@@ -293,6 +319,11 @@ import { cloneDeep } from 'lodash-es'
 import { topTabar } from '@/utils/topTabbar'
 import diyForm from '@/addon/components/diy-form/index.vue'
 import useMemberStore from '@/stores/member'
+import { useLocation } from '@/hooks/useLocation'
+
+/************** 定位-start ****************/
+const locationVal = useLocation(true);
+/************** 定位-end ****************/
 
 const memberStore = useMemberStore()
 const info = computed(() => memberStore.info)
@@ -333,6 +364,13 @@ const diyFormGoodsRef: any = ref(null)
 const storeClickNum = ref(0) // 记录门店自提点击次数
 const service_time = ref({}) //获取配置时间
 const selectTime = ref(null)
+
+onShow(() => { 
+    // 刷新定位
+	locationVal.refresh();
+    createData.value.position = systemStore.diyAddressInfo
+})
+
 const handleTime = () => {
     if (selectTime.value) {
         selectTime.value.show = true;
@@ -372,27 +410,21 @@ const getDate = (e) => {
 		showGetDate.value = e
 	}
 }
-const localConfig = ref({})
-onShow(async () => {
-	const res = await getLocal();
-	localConfig.value = res.data;
+
+onShow(() => {
     // 解决在创建订单时，使用优惠券并在切换页面后，提示优惠券已失效的问题
     if(!payRef.value?.payInfo){
-        calculate(); // 确保在 localConfig 赋值后执行
+        createData.value.order_key = ''
+        calculate(); 
     }
 })
 
 const openSelectStore = () => {
-    if (storeRef.value) {
-        if (!createData.value.delivery.take_store_id) {
-            storeRef.value.getData((data: any) => {
-                if (data.length) {
-                    createData.value.delivery.take_store_id = ((data[0] && data[0].store_id) ? data[0].store_id : 0)
-                }
-            });
-        }
+    let obj = {
+        take_store: cloneDeep(orderData.value.delivery.take_store),
+        store_list: cloneDeep(orderData.value.delivery.take_store_list),
     }
-    storeRef.value.open()
+    storeRef.value.open(obj)
 }
 
 // 选择地址之后跳转回来
@@ -481,23 +513,41 @@ const calculate = (params: any = {}) => {
         }
         if(orderData.value.delivery.delivery_type == 'local_delivery'){
             service_time.value = {
-                time_interval: localConfig.value.time_interval,
-                time_week: formatTimeWeek(localConfig.value.time_type, localConfig.value.time_week),
-                trade_time_json: localConfig.value.delivery_time,
-                most_day: localConfig.value.most_day,
-                advance_day: localConfig.value.advance_day,
+                time_interval: orderData.value.delivery.take_store.time_interval,
+                time_week: formatTimeWeek(0, orderData.value.delivery.take_store.time_week),
+                trade_time_json: orderData.value.delivery.take_store.trade_time_json,
+                most_day:  7,
+                advance_day: 0,
 				type:"subscribe"
             }
         }
 
         createData.value.order_key = data.order_key
         if (orderData.value.delivery.delivery_type_list) {
-            delivery_type_list.value = cloneDeep(Object.values(orderData.value.delivery.delivery_type_list))
+            // 订单中只有一个商品时，该商品不支持的配送方式将不展示
+            if(orderData.value.goods.length == 1){
+                let deliveryTypeArr = orderData.value.goods[0].goods.delivery_type
+                let deliveryTypeListArr = Object.keys(orderData.value.delivery.delivery_type_list)
+                let deliveryTypeListObj = cloneDeep(orderData.value.delivery.delivery_type_list)
+                deliveryTypeListArr.forEach((item, index)=>{
+                    if(deliveryTypeArr.indexOf(item) == -1){
+                        delete deliveryTypeListObj[item]
+                    }
+                })
+                delivery_type_list.value = Object.values(deliveryTypeListObj)
+                if(deliveryTypeArr.indexOf('express') == -1 && !calculateData.delivery.delivery_type){
+                    createData.value.delivery.delivery_type = delivery_type_list.value[0].key
+                    calculate()
+                    return false
+                }
+            }else{
+                delivery_type_list.value = cloneDeep(Object.values(orderData.value.delivery.delivery_type_list))
+            }
         }
         if (orderData.value.discount && orderData.value.discount.manjian) {
             orderData.value.manjian = orderData.value.discount.manjian
         }
-        if (orderData.value.delivery.take_store) {
+        if (orderData.value.delivery.take_store && orderData.value.delivery.delivery_type == 'store') {
             service_time.value = {
                 time_interval: orderData.value.delivery.take_store.time_interval,
                 time_week: orderData.value.delivery.take_store.time_week,
@@ -674,7 +724,7 @@ const verify = () => {
             return false
         }
     }
-	if(data.delivery.delivery_type == 'local_delivery' && !isDelivery.value && localConfig.value.time_is_open){
+	if(data.delivery.delivery_type == 'local_delivery' && !isDelivery.value && orderData.value.delivery.take_store.time_is_open){
 		uni.showToast({ title: '当前时间不支持配送', icon: 'none' })
 		return false
 	}
@@ -717,17 +767,17 @@ const confirmSelectCoupon = (coupon: any) => {
  */
 const confirmSelectStore = (store: any) => {
     createData.value.delivery.take_store_id = ((store && store.store_id) ? store.store_id : 0)
-    if (store) {
-        service_time.value = {
-            time_interval: store.time_interval,
-            time_week: store.time_week,
-            trade_time_json: store.trade_time_json
-        };
-    }else{
-        service_time.value = {}
-        createData.value.delivery.buyer_ask_delivery_time = ''
+    // if (store) {
+    //     service_time.value = {
+    //         time_interval: store.time_interval,
+    //         time_week: store.time_week,
+    //         trade_time_json: store.trade_time_json
+    //     };
+    // }else{
+    //     service_time.value = {}
+    //     createData.value.delivery.buyer_ask_delivery_time = ''
 
-    }
+    // }
     calculate()
 }
 
@@ -749,6 +799,13 @@ const confirmMessage = (message: string) => {
     console.log(message)
   createData.value.member_remark = message
 }
+
+
+const distanceFn = (distance: string | number) => {
+	const dist = typeof distance === 'string' ? parseFloat(distance) : distance;
+	if (isNaN(dist)) return distance.toString();
+	return dist < 1 ? parseInt((dist * 1000).toString()) + 'm' : dist.toFixed(1) + 'km'
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/niucloud/addon/shop/uni-app/pages/point/detail.vue b/niucloud/addon/shop/uni-app/pages/point/detail.vue
index faa59ab4b..b21d4d369 100644
--- a/niucloud/addon/shop/uni-app/pages/point/detail.vue
+++ b/niucloud/addon/shop/uni-app/pages/point/detail.vue
@@ -20,13 +20,25 @@
                 <view @touchmove.stop.prevent class="media-mode absolute top-0 left-0 w-full h-full transition-transform duration-300 ease-linear transform"
                 :class="{'translate-x-0':switchMedia === 'video','-translate-x-full':switchMedia != 'video'}" :style="{background: 'url(' + img(goodsDetail.goods.goods_cover_thumb_mid) + ') left bottom / cover no-repeat'}">
                   <view class="goods-video-height">
-                        <video id="goodsVideo" class="w-full h-full" :src="img(goodsDetail.goods.goods_video)" :poster="img(goodsDetail.goods.goods_cover_thumb_mid)" objectFit="cover" play-btn-position="center"></video>
+                      <video
+                          id="goodsVideo"
+                          class="w-full h-full"
+                          :src="currentVideoSrc"
+                          :poster="currentVideoPoster"
+                          objectFit="cover"
+                          play-btn-position="center"
+                          :show-play-btn="true"
+                          :enable-play-gesture="true"
+                          :autoplay="false"
+                          :loop="false"
+                          :show-center-play-btn="true"
+                      ></video>
                     </view>
                 </view>
                 <!-- 切换视频、图片 -->
                 <view class="media-mode bg-[rgb(0,0,0,.5)] rounded-[50rpx] p-[4rpx] absolute bottom-[130rpx] right-[20rpx] text-center leading-[46rpx]" v-if="goodsDetail.goods.goods_video != ''">
-                    <text class="tab-item" :class="{ '!bg-[#fff] !text-[#666]': switchMedia == 'video' }" @click="switchMedia = 'video'">视频</text>
-                    <view class="tab-item flex items-center" :class="{ '!bg-[#fff] !text-[#666]': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">
+                    <text class="tab-item" :class="{ '!bg-[#fff] !text-[#666]': switchMedia == 'video' }" @click="switchToVideo">视频</text>
+                    <view class="tab-item flex items-center" :class="{ '!bg-[#fff] !text-[#666]': switchMedia == 'img' }" @click="switchToImage">
                         <text class="mr-[4rpx]">图片</text>
                         <text v-if="switchMedia == 'img' && goodsDetail?.goods?.goods_image?.length > 1">{{swiperCurrentIndex}}/{{goodsDetail?.goods?.goods_image?.length}}</text>
                     </view>
@@ -263,6 +275,8 @@ const { setShare } = useShare()
 const swiperCurrentIndex = ref(1); // 轮播图当前索引
 const switchMedia: any = ref('img');
 const videoContext: any = ref(null)
+const currentVideoSrc = ref('')
+const currentVideoPoster = ref('')
 
 // 会员信息
 const memberStore = useMemberStore()
@@ -322,6 +336,9 @@ onLoad((option: any) => {
         if (goodsDetail.value.goods.goods_video != '') {
             switchMedia.value = 'video'
             videoContext.value = uni.createVideoContext('goodsVideo');
+            // 设置视频源
+            currentVideoSrc.value = img(goodsDetail.value.goods.goods_video);
+            currentVideoPoster.value = img(goodsDetail.value.goods.goods_cover_thumb_mid)
         }
         sendMessageTitle.value = goodsDetail.value.goods.goods_name
         sendMessagePath.value = '/addon/shop/pages/point/detail?sku_id=' + goodsDetail.value.sku_id;
@@ -610,6 +627,30 @@ onUnload(() => {
 const swiperChangeFn = (e: any) => {
     swiperCurrentIndex.value = e.current + 1;
 }
+
+// 切换到视频
+const switchToVideo = () => {
+    // 重新加载视频源
+    currentVideoSrc.value = img(goodsDetail.value.goods.goods_video);
+    currentVideoPoster.value = img(goodsDetail.value.goods.goods_cover_thumb_mid)
+    // 切换状态
+    switchMedia.value = 'video';
+}
+
+// 切换到图片
+const switchToImage = () => {
+    // 切换状态
+    switchMedia.value = 'img';
+
+    // 暂停视频
+    videoContext.value.pause();
+
+    // #ifndef H5
+    // 通过清空视频 src 来强制停止视频
+    currentVideoSrc.value = '';
+    currentVideoPoster.value = ''
+    // #endif
+}
 </script>
 <style lang="scss" scoped>
 @import '@/addon/shop/styles/common.scss';
diff --git a/niucloud/addon/shop/uni-app/pages/point/index.vue b/niucloud/addon/shop/uni-app/pages/point/index.vue
index 141be0949..b48083389 100644
--- a/niucloud/addon/shop/uni-app/pages/point/index.vue
+++ b/niucloud/addon/shop/uni-app/pages/point/index.vue
@@ -19,6 +19,9 @@
         <wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
         <!-- #endif -->
 
+        <template v-if="diyStore && diyStore.mode == '' && diyStore.global && diyStore.global.bottomTabBar && diyStore.global.bottomTabBar.isShow">
+            <tabbar :addon="diyStore.global.bottomTabBar.designNav?.key" />
+        </template>
     </view>
 </template>
 
@@ -27,8 +30,10 @@ import { ref, nextTick } from 'vue';
 import { useDiy } from '@/hooks/useDiy'
 import { useShare } from '@/hooks/useShare'
 import diyGroup from '@/addon/components/diy/group/index.vue'
+import useDiyStore from '@/app/stores/diy'
 
 const { setShare } = useShare()
+const diyStore = useDiyStore()
 const diy = useDiy({
     name: 'DIY_SHOP_POINT_INDEX'
 })
diff --git a/niucloud/addon/shop/uni-app/pages/point/list.vue b/niucloud/addon/shop/uni-app/pages/point/list.vue
index 874f5b4a0..7d14b477a 100644
--- a/niucloud/addon/shop/uni-app/pages/point/list.vue
+++ b/niucloud/addon/shop/uni-app/pages/point/list.vue
@@ -67,15 +67,16 @@
 						     </template>
 						 </view>
                             <view class="text-[24rpx] font-400 leading-[34rpx] mt-[10rpx] text-[var(--text-color-light9)]">已兑{{ item.total_exchange_num }}人</view>
-                            <view class="flex justify-between flex-wrap items-center mt-[16rpx]">
-                                <view class="flex flex-col">
-                                    <view class="text-[var(--price-text-color)] price-font ml-[2rpx] flex items-center">
-                                        <text class="text-[32rpx]">{{ item.point }}</text>
-                                        <text class="text-[26rpx] ml-[4rpx]">积分</text>
-                                    </view>
-                                    <view v-if="item.price&&item.price>0" class="flex items-center price-font mt-[6rpx]">
-                                        <text class="text-[var(--price-text-color)] font-400 text-[32rpx]">+{{ parseFloat(item.price).toFixed(2) }}</text>
-                                        <text class="text-[var(--price-text-color)] font-400 ml-[4rpx] text-[20rpx]">元</text>
+                            <view class="flex justify-between flex-wrap items-center mt-[16rpx] gap-[10rpx]">
+                                <view class="flex items-baseline">
+                                    <image class="h-[22rpx] w-[22rpx] mr-[4rpx]" :style="imageStyle2"  :src="img('addon/shop/diy/point/nav_point.png')" mode="aspectFit" />
+                                    <view class="inline-block price-font text-[24rpx] leading-[1] text-[var(--price-text-color)]">
+                                        <text class="text-[38rpx] price-font font-500">{{ parseInt(item.point) }}</text>
+                                        <template v-if="item.price && item.price > 0">
+                                            <text class="mx-[2rpx]">+</text>
+                                            <text class="font-500">{{ parseFloat(item.price).toFixed(2) }}</text>
+                                            <text>元</text>
+                                        </template>
                                     </view>
                                 </view>
                                 <view class="w-[120rpx] h-[54rpx] text-[22rpx] flex-center !text-[#fff] m-0 rounded-full primary-btn-bg remove-border text-center" shape="circle">去兑换</view>
@@ -92,7 +93,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted, computed } from 'vue'
 import { t } from '@/locale'
 import { redirect, img } from '@/utils/common';
 import { getExchangeGoodsList } from '@/addon/shop/api/point';
@@ -147,6 +148,14 @@ const getAllAppListFn = (mescroll: mescrollStructure) => {
     })
 }
 
+const imageStyle2 = computed(() => {
+    let style = '';
+    // #ifdef MP
+    style += 'position:relative; top:2rpx;';
+    // #endif
+    return style;
+})
+
 // 搜索
 const searchTypeFn = (type: string) => {
     searchType.value = type;