From ad21d01fde147cda967c712a158e5246261516bc Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@163.com>
Date: Sun, 8 Oct 2023 02:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83v0.7.2=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Model/CoreCms.Net.Model.xml       | 25 ++++++
 CoreCms.Net.Uni-App/CoreShop/App.vue          |  2 +-
 .../CoreCms.Net.Web.Admin.xml                 | 84 ++++++++++++++++++-
 CoreCms.Net.Web.Admin/appsettings.json        |  2 +-
 .../wwwroot/lib/layuiAdmin/config.js          |  2 +-
 CoreCms.Net.Web.WebApi/appsettings.json       |  2 +-
 6 files changed, 112 insertions(+), 5 deletions(-)

diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.xml b/CoreCms.Net.Model/CoreCms.Net.Model.xml
index 827430b9..dbc4e9ab 100644
--- a/CoreCms.Net.Model/CoreCms.Net.Model.xml
+++ b/CoreCms.Net.Model/CoreCms.Net.Model.xml
@@ -8273,6 +8273,31 @@
             <summary>
             </summary>
         </member>
+        <member name="T:CoreCms.Net.Model.Entities.WeChatShippingDelivery">
+            <summary>
+            微信发货快递公司信息
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Model.Entities.WeChatShippingDelivery.#ctor">
+            <summary>
+            构造函数
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.WeChatShippingDelivery.id">
+            <summary>
+            序列
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.WeChatShippingDelivery.deliveryId">
+            <summary>
+            快递公司编码
+            </summary>
+        </member>
+        <member name="P:CoreCms.Net.Model.Entities.WeChatShippingDelivery.deliveryName">
+            <summary>
+            快递公司名称
+            </summary>
+        </member>
         <member name="T:CoreCms.Net.Model.Entities.CoreCmsUserWeChatInfo">
             <summary>
             用户表
diff --git a/CoreCms.Net.Uni-App/CoreShop/App.vue b/CoreCms.Net.Uni-App/CoreShop/App.vue
index 5e61db87..bf9f90ab 100644
--- a/CoreCms.Net.Uni-App/CoreShop/App.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/App.vue
@@ -11,7 +11,7 @@
         },
         onLaunch() {
             //版本设置
-            const version = '0.7.1'
+            const version = '0.7.2'
             // 开发环境才提示，生产环境不会提示
             if (process.env.NODE_ENV === 'development') {
                 console.log(`\n %c \u6838\u5fc3\u5546\u57ce\u7cfb\u7edf\u0020\u0043\u006f\u0072\u0065\u0053\u0068\u006f\u0070 V${version} %c \u0068\u0074\u0074\u0070\u0073\u003a\u002f\u002f\u0077\u0077\u0077\u002e\u0063\u006f\u0072\u0065\u0073\u0068\u006f\u0070\u002e\u0063\u006e\u002f \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #f1f1f1; padding:5px 0;');
diff --git a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
index afea126f..8343d07f 100644
--- a/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
+++ b/CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.xml
@@ -2564,7 +2564,7 @@
              订单表
             </summary>
         </member>
-        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsStoreServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices,CoreCms.Net.IServices.ICoreCmsPaymentsServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsUserWeChatInfoServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsOrderItemServices)">
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.CoreCmsOrderController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsUserServices,CoreCms.Net.IServices.ICoreCmsAreaServices,CoreCms.Net.IServices.ICoreCmsBillAftersalesServices,CoreCms.Net.IServices.ICoreCmsStoreServices,CoreCms.Net.IServices.ICoreCmsLogisticsServices,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices,CoreCms.Net.IServices.ICoreCmsPaymentsServices,CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsUserWeChatInfoServices,CoreCms.Net.Caching.AutoMate.RedisCache.IRedisOperationRepository,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsOrderItemServices,CoreCms.Net.IServices.IWeChatShippingDeliveryServices)">
              <summary>
              构造函数
             </summary>
@@ -5696,6 +5696,88 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:CoreCms.Net.Web.Admin.Controllers.WeChatShippingDeliveryController">
+             <summary>
+             微信发货快递公司信息
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShippingDeliveryController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.IWeChatShippingDeliveryServices)">
+             <summary>
+             构造函数
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShippingDeliveryController.GetPageList">
+            <summary>
+            获取列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShippingDeliveryController.GetIndex">
+            <summary>
+            首页数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShippingDeliveryController.DoUpdateCompany">
+            <summary>
+                拉取数据更新
+            </summary>
+        </member>
+        <member name="T:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController">
+             <summary>
+             微信发货信息订单管理
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController.#ctor(CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.ICoreCmsBillPaymentsServices,CoreCms.Net.IServices.ICoreCmsOrderServices,CoreCms.Net.IServices.ICoreCmsOrderItemServices,CoreCms.Net.IServices.ICoreCmsServicesServices,CoreCms.Net.IServices.IWeChatShippingDeliveryServices,CoreCms.Net.IServices.ICoreCmsBillDeliveryServices)">
+            <summary>
+            构造函数
+            </summary>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController.GetPageList">
+            <summary>
+                获取列表
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController.GetIndex">
+            <summary>
+                首页数据
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController.GetCreate(CoreCms.Net.Model.FromBody.FMStringId)">
+            <summary>
+            创建发货单
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController.DoCreate(CoreCms.Net.DTO.WeChatShipping.OrderShippingCreatePost)">
+            <summary>
+            创建提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController.GetUpdate(CoreCms.Net.Model.FromBody.FMStringId)">
+            <summary>
+            重新发货
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController.DoUpdate(System.Object)">
+            <summary>
+            重新发货提交
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatShipping.WeChatShippingOrderController.GetDetails(CoreCms.Net.Model.FromBody.FMStringId)">
+            <summary>
+            预览数据
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsUserWeChatInfoController">
              <summary>
              微信用户列表
diff --git a/CoreCms.Net.Web.Admin/appsettings.json b/CoreCms.Net.Web.Admin/appsettings.json
index 7748f2de..3704fcd1 100644
--- a/CoreCms.Net.Web.Admin/appsettings.json
+++ b/CoreCms.Net.Web.Admin/appsettings.json
@@ -18,7 +18,7 @@
     "AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
     "AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
     "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
-    "AppVersion": "CoreShopProfessional v0.7.1"
+    "AppVersion": "CoreShopProfessional v0.7.2"
   },
   //redis为必须启动项，请保持redis为正常可用
   "RedisConfig": {
diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
index 483c32bb..004f6776 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
+++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js
@@ -23,7 +23,7 @@ layui.define(['all'], function (exports) {
         pageTabs: false, // 是否开启页面选项卡功能。单页版不推荐开启
 
         name: '核心商城系统',
-        version: 'CoreShopProfessional v0.7.1',
+        version: 'CoreShopProfessional v0.7.2',
         name: 'layuiAdmin',
         tableName: 'CoreShop', // 本地存储表名
         MOD_NAME: 'admin', // 模块事件名
diff --git a/CoreCms.Net.Web.WebApi/appsettings.json b/CoreCms.Net.Web.WebApi/appsettings.json
index 067f5716..d6fa8e7d 100644
--- a/CoreCms.Net.Web.WebApi/appsettings.json
+++ b/CoreCms.Net.Web.WebApi/appsettings.json
@@ -18,7 +18,7 @@
     "AppPcUrl": "https://pc.test.pro.coreshop.cn/", //PC端访问地址
     "AppH5Url": "https://h5.test.pro.coreshop.cn/", //H5端访问地址
     "AppInterFaceUrl": "https://api.test.pro.coreshop.cn/", //接口请求地址
-    "AppVersion": "CoreShopProfessional v0.7.1"
+    "AppVersion": "CoreShopProfessional v0.7.2"
   },
   //redis为必须启动项，请保持redis为正常可用
   "RedisConfig": {