wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-05-09 11:07:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

# 2022-03-22

Browse Source 
### 1.4.1 开源社区版：
无
### 0.3.1 专业版：
【新增】前端全局配置增加不同海报类型的全局配置，方便调用。
【修复】修复拼团订单详情分享他人参团的异常问题。
【修复】修复个人服务码列表，点击不弹出弹窗的问题。
【修复】商家中心核销服务码界面显示异常的问题。#I4YR6N
【修复】修复自定义交易组件维护商品选择品牌数据未关联的问题。
This commit is contained in:
JianWeie
2022-03-22 01:08:27 +08:00
parent 37c3ff7bf3
commit c5a5d808b7
17 changed files with 307 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CoreCms.Net.Web.Admin/Controllers/ServiceGoods/CoreCmsUserServicesOrderController.cs
View File

@@ -919,7 +919,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
jm.msg = "不存在此信息";
return jm;
}
oldModel.status = (int)GlobalEnumVars.ServicesTicketStatus.Cancellation;
oldModel.status = (int)GlobalEnumVars.ServicesTicketStatus.作废;
var bl = await _coreCmsUserServicesTicketServices.UpdateAsync(oldModel);

22
CoreCms.Net.Web.Admin/Controllers/WeChat/WeChatTransactionComponentGoodController.cs
View File

@@ -56,12 +56,15 @@ namespace CoreCms.Net.Web.Admin.Controllers
private readonly ICoreCmsProductsServices _productsServices;
private readonly WeChat.Service.HttpClients.IWeChatApiHttpClientFactory _weChatApiHttpClientFactory;
private readonly IWeChatTransactionComponentBrandAuditServices _weChatTransactionComponentBrandAuditServices;
/// <summary>
/// 构造函数
///</summary>
public WeChatTransactionComponentGoodController(IWebHostEnvironment webHostEnvironment
, IWeChatTransactionComponentGoodServices weChatTransactionComponentGoodsServices, IWeChatTransactionComponentGoodSKUServices weChatTransactionComponentGoodSkuServices, ICoreCmsProductsServices productsServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, IWeChatTransactionComponentAuditCategoryServices weChatTransactionComponentAuditCategoryServices)
, IWeChatTransactionComponentGoodServices weChatTransactionComponentGoodsServices, IWeChatTransactionComponentGoodSKUServices weChatTransactionComponentGoodSkuServices, ICoreCmsProductsServices productsServices, IWeChatApiHttpClientFactory weChatApiHttpClientFactory, IWeChatTransactionComponentAuditCategoryServices weChatTransactionComponentAuditCategoryServices, IWeChatTransactionComponentBrandAuditServices weChatTransactionComponentBrandAuditServices)
{
_webHostEnvironment = webHostEnvironment;
_weChatTransactionComponentGoodsServices = weChatTransactionComponentGoodsServices;
@@ -69,6 +72,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
_productsServices = productsServices;
_weChatApiHttpClientFactory = weChatApiHttpClientFactory;
_weChatTransactionComponentAuditCategoryServices = weChatTransactionComponentAuditCategoryServices;
_weChatTransactionComponentBrandAuditServices = weChatTransactionComponentBrandAuditServices;
}
#region 获取列表============================================================
@@ -279,10 +283,18 @@ namespace CoreCms.Net.Web.Admin.Controllers
/// <returns></returns>
[HttpPost]
[Description("创建数据")]
public AdminUiCallBack GetCreate()
public async Task<AdminUiCallBack> GetCreate()
{
//返回数据
var jm = new AdminUiCallBack { code = 0 };
var brand = await _weChatTransactionComponentBrandAuditServices.QueryListByClauseAsync(p => p.brandId > 0 && p.status == (int)AuditEnum.AuditCategoryStatus.审核成功);
jm.data = new
{
brand
};
return jm;
}
#endregion
@@ -328,13 +340,15 @@ namespace CoreCms.Net.Web.Admin.Controllers
var products = await _productsServices.QueryListByClauseAsync(p => p.goodsId == goodId && p.isDel == false, p => p.id, OrderByType.Asc, true);
var sku = await _weChatTransactionComponentGoodSkuServices.QueryListByClauseAsync(p => p.outProductId == model.outProductId, p => p.id, OrderByType.Asc, true);
var brand = await _weChatTransactionComponentBrandAuditServices.QueryListByClauseAsync(p => p.brandId > 0 && p.status == (int)AuditEnum.AuditCategoryStatus.审核成功);
jm.code = 0;
jm.data = new
{
model,
products,
sku
sku,
brand
};
return jm;
@@ -418,7 +432,7 @@ namespace CoreCms.Net.Web.Admin.Controllers
request.HeadImageUrlList = new List<string>(model.headImg.Split(","));
var category = await _weChatTransactionComponentAuditCategoryServices.QueryByClauseAsync(p => p.level3 == model.thirdCatId, true);
if (category!=null && !string.IsNullOrEmpty(category.certificateImage))
if (category != null && !string.IsNullOrEmpty(category.certificateImage))
{
request.QualificationPictureUrlList = new List<string>(category.certificateImage.Split(","));
}

120
CoreCms.Net.Web.Admin/Doc.xml
View File

@@ -625,6 +625,12 @@
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.GetGoodWxCode(CoreCms.Net.Model.FromBody.FMIntId)">
<summary>
后台生成商品小程序码
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.ToolsController.GetPageWxCode(CoreCms.Net.Model.FromBody.FMStringId)">
<summary>
后台生成预览页面设计小程序码
@@ -3121,6 +3127,41 @@
<param name="entity"></param>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.Shop.CoreCmsCheckInController">
<summary>
日历签到设置
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.Shop.CoreCmsCheckInController.#ctor(CoreCms.Net.IServices.ICoreCmsSettingServices,CoreCms.Net.IServices.ICoreCmsUserGradeServices,CoreCms.Net.IServices.ICoreCmsContinuousCheckInRuleDetailsServices,CoreCms.Net.IServices.ICoreCmsContinuousCheckInRulesServices,CoreCms.Net.IServices.ICoreCmsCumulativeCheckInRulesServices)">
<summary>
构造函数
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.Shop.CoreCmsCheckInController.GetIndex">
<summary>
首页数据
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.Shop.CoreCmsCheckInController.DoSave(CoreCms.Net.Model.FromBody.FMCoreCmsSettingDoSaveModel)">
<summary>
保存提交
</summary>
<param name="model"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.Shop.CoreCmsCheckInController.DoSaveCumulativeCheckInRules(CoreCms.Net.Model.FromBody.FMDoSaveCumulativeCheckInRules)">
<summary>
保存累计签到规则
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.Shop.CoreCmsCheckInController.DoSaveContinuousCheckInRules(CoreCms.Net.Model.FromBody.FMDoSaveContinuousCheckInRules)">
<summary>
保存连续签到规则
</summary>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.CoreCmsLogisticsController">
<summary>
物流公司表
@@ -5303,6 +5344,76 @@
<param name="entity"></param>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController">
<summary>
自定义交易组件上传品牌信息
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.IWeChatTransactionComponentBrandAuditServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory)">
<summary>
构造函数
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.GetPageList">
<summary>
获取列表
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.GetIndex">
<summary>
首页数据
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.GetCreate">
<summary>
创建数据
</summary>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.DoCreate(CoreCms.Net.Model.Entities.WeChatTransactionComponentBrandAudit)">
<summary>
创建提交
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.GetEdit(CoreCms.Net.Model.FromBody.FMIntId)">
<summary>
编辑数据
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.DoEdit(CoreCms.Net.Model.Entities.WeChatTransactionComponentBrandAudit)">
<summary>
编辑提交
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.DoDelete(CoreCms.Net.Model.FromBody.FMIntId)">
<summary>
单选删除
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.GetDetails(CoreCms.Net.Model.FromBody.FMIntId)">
<summary>
预览数据
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentBrandAuditController.DoAudit(CoreCms.Net.Model.FromBody.FMIntId)">
<summary>
提交审核
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentDeliveryCompanyController">
<summary>
自定义交易组件快递公司
@@ -5336,7 +5447,7 @@
自定义交易组件商品列表
</summary>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentGoodController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.IWeChatTransactionComponentGoodServices,CoreCms.Net.IServices.IWeChatTransactionComponentGoodSKUServices,CoreCms.Net.IServices.ICoreCmsProductsServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory)">
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentGoodController.#ctor(Microsoft.AspNetCore.Hosting.IWebHostEnvironment,CoreCms.Net.IServices.IWeChatTransactionComponentGoodServices,CoreCms.Net.IServices.IWeChatTransactionComponentGoodSKUServices,CoreCms.Net.IServices.ICoreCmsProductsServices,CoreCms.Net.WeChat.Service.HttpClients.IWeChatApiHttpClientFactory,CoreCms.Net.IServices.IWeChatTransactionComponentAuditCategoryServices,CoreCms.Net.IServices.IWeChatTransactionComponentBrandAuditServices)">
<summary>
构造函数
</summary>
@@ -5443,6 +5554,13 @@
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentGoodController.WithoutAuditUpdateSKU(CoreCms.Net.Model.FromBody.FMIntId)">
<summary>
提交更新
</summary>
<param name="entity"></param>
<returns></returns>
</member>
<member name="T:CoreCms.Net.Web.Admin.Controllers.WeChatTransactionComponentThirdCategoryController">
<summary>
自定义交易组件三级类目

5
CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/create.html
View File

@@ -30,7 +30,10 @@
<label for="brand_id" class="layui-form-label layui-form-required">品牌id</label>
<div class="layui-input-inline layui-inline-4">
<select name="brandId">
<option value="2100000000" selected="selected">无品牌</option>
<option value="0" selected="selected">无品牌</option>
{{# layui.each(d.params.data.brand, function(index, item){ }}
<option value="{{ item.brandId }}" {{d.params.data.model.brandId == item.brandId ? 'selected="selected"' :''}}>{{ item.brand_wording }}</option>
{{# }); }}
</select>
</div>
<label for="thirdCatId" class="layui-form-label layui-form-required">所属类目</label>

5
CoreCms.Net.Web.Admin/wwwroot/views/wechat/transactioncomponent/goods/edit.html
View File

@@ -23,7 +23,10 @@
<label for="brand_id" class="layui-form-label layui-form-required">品牌id</label>
<div class="layui-input-inline layui-inline-4">
<select name="brandId">
<option value="2100000000" selected="selected">无品牌</option>
<option value="0" selected="selected">无品牌</option>
{{# layui.each(d.params.data.brand, function(index, item){ }}
<option value="{{ item.brandId }}">{{ item.brand_wording }}</option>
{{# }); }}
</select>
</div>
<label for="thirdCatId" class="layui-form-label layui-form-required">所属类目</label>