wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2026-03-23 12:27:20 +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(","));
}