mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-03-23 16:17:21 +08:00
# 2022-01-22
### 开源社区版（会员专业版同步修改）： --无修改 ### 0.1.1 会员专业版： 【新增】增加微信支付服务商配置，支付微信支付服务商及子商户功能。 【新增】增加根据不同下单类型，控制不同的下单送货模式的功能，如普通商品购买只需要【物流快递，同城配送】，团购秒杀只需要【同城配送，上门自提】，可后台自定义。 【新增】微信直播带货功能新增【上传图片】功能，可直接将本地图片上传至微信侧，获取cdn图片进行处理。 【更新】nuget更新组件。 【修复】修复首页商品组件图片高度被错写array的问题。 【修复】修复生成海报保存路径问题，调整开发版或者预览版小程序获取不到的二维码的报错问题。 【优化】调整订单详情商品tag未设置宽度，导致撑破容易的问题。 【修复】调整订单列表左侧图片大小，防止被遮挡。I4PP1F 【修复】修复微信自定义交易组件申请商品类目失败的问题。#I4QE17
This commit is contained in:
JianWeie
@@ -1586,5 +1586,86 @@ namespace CoreCms.Net.Web.Admin.Controllers
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
//微信自定义交易组件================================================================
|
||||
|
||||
#region 自定义交易组件上传图片====================================================
|
||||
|
||||
/// <summary>
|
||||
/// 自定义交易组件上传图片
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
public async Task<AdminUiCallBack> MiNiShopOpenComponent2_UploadImg()
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
|
||||
var filesStorageOptions = await _coreCmsSettingServices.GetFilesStorageOptions();
|
||||
//初始化上传参数
|
||||
var maxSize = 1024 * 1024 * filesStorageOptions.MaxSize; //上传大小5M
|
||||
|
||||
var file = Request.Form.Files["file"];
|
||||
if (file == null)
|
||||
{
|
||||
jm.msg = "请选择文件";
|
||||
return jm;
|
||||
}
|
||||
var fileName = file.FileName;
|
||||
var fileExt = Path.GetExtension(fileName).ToLowerInvariant();
|
||||
|
||||
//检查大小
|
||||
if (file.Length > maxSize)
|
||||
{
|
||||
jm.msg = "上传文件大小超过限制，最大允许上传" + filesStorageOptions.MaxSize + "M";
|
||||
return jm;
|
||||
}
|
||||
|
||||
//检查文件扩展名
|
||||
if (string.IsNullOrEmpty(fileExt) || Array.IndexOf(filesStorageOptions.FileTypes.Split(','), fileExt.Substring(1).ToLower()) == -1)
|
||||
{
|
||||
jm.msg = "上传文件扩展名是不允许的扩展名,请上传后缀名为：" + filesStorageOptions.FileTypes;
|
||||
return jm;
|
||||
}
|
||||
|
||||
byte[] bytes;
|
||||
await using (var ms = new MemoryStream())
|
||||
{
|
||||
await file.CopyToAsync(ms);
|
||||
bytes = ms.ToArray();
|
||||
}
|
||||
|
||||
string url = string.Empty;
|
||||
var accessToken = WeChatCacheAccessTokenHelper.GetWxOpenAccessToken();
|
||||
var client = _weChatApiHttpClientFactory.CreateWxOpenClient();
|
||||
var request = new ShopImageUploadRequest();
|
||||
request.AccessToken = accessToken;
|
||||
request.ImageFileBytes = bytes;
|
||||
request.ResponseType = 1;
|
||||
|
||||
var response = await client.ExecuteShopImageUploadAsync(request);
|
||||
if (response.IsSuccessful())
|
||||
{
|
||||
jm.code = 0;
|
||||
jm.msg = "上传成功!";
|
||||
jm.data = new
|
||||
{
|
||||
fileUrl = response.Image.TempImageUrl,
|
||||
src = response.Image.TempImageUrl
|
||||
};
|
||||
}
|
||||
else
|
||||
{
|
||||
jm.code = 1;
|
||||
jm.msg = response.ErrorMessage;
|
||||
}
|
||||
jm.otherData = response;
|
||||
|
||||
return jm;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,377 @@
|
||||
/***********************************************************************
|
||||
* Project: CoreCms
|
||||
* ProjectName: 核心内容管理系统
|
||||
* Web: https://www.corecms.net
|
||||
* Author: 大灰灰
|
||||
* Email: jianweie@163.com
|
||||
* CreateTime: 2022/1/21 2:34:32
|
||||
* Description: 暂无
|
||||
***********************************************************************/
|
||||
|
||||
|
||||
using System;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using System.Threading.Tasks;
|
||||
using CoreCms.Net.Configuration;
|
||||
using CoreCms.Net.Model.Entities;
|
||||
using CoreCms.Net.Model.Entities.Expression;
|
||||
using CoreCms.Net.Model.FromBody;
|
||||
using CoreCms.Net.Model.ViewModels.UI;
|
||||
using CoreCms.Net.Filter;
|
||||
using CoreCms.Net.Loging;
|
||||
using CoreCms.Net.IServices;
|
||||
using CoreCms.Net.Utility.Helper;
|
||||
using CoreCms.Net.Utility.Extensions;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NPOI.HSSF.UserModel;
|
||||
using SqlSugar;
|
||||
|
||||
namespace CoreCms.Net.Web.Admin.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
/// 订单配送模式
|
||||
///</summary>
|
||||
[Description("订单配送模式")]
|
||||
[Route("api/[controller]/[action]")]
|
||||
[ApiController]
|
||||
[RequiredErrorForAdmin]
|
||||
[Authorize]
|
||||
public class CoreCmsOrderDistributionModelController : ControllerBase
|
||||
{
|
||||
private readonly IWebHostEnvironment _webHostEnvironment;
|
||||
private readonly ICoreCmsOrderDistributionModelServices _coreCmsOrderDistributionModelServices;
|
||||
|
||||
/// <summary>
|
||||
/// 构造函数
|
||||
///</summary>
|
||||
public CoreCmsOrderDistributionModelController(IWebHostEnvironment webHostEnvironment
|
||||
, ICoreCmsOrderDistributionModelServices coreCmsOrderDistributionModelServices
|
||||
)
|
||||
{
|
||||
_webHostEnvironment = webHostEnvironment;
|
||||
_coreCmsOrderDistributionModelServices = coreCmsOrderDistributionModelServices;
|
||||
}
|
||||
|
||||
#region 获取列表============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/GetPageList
|
||||
/// <summary>
|
||||
/// 获取列表
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("获取列表")]
|
||||
public async Task<AdminUiCallBack> GetPageList()
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
var pageCurrent = Request.Form["page"].FirstOrDefault().ObjectToInt(1);
|
||||
var pageSize = Request.Form["limit"].FirstOrDefault().ObjectToInt(30);
|
||||
var where = PredicateBuilder.True<CoreCmsOrderDistributionModel>();
|
||||
//获取排序字段
|
||||
var orderField = Request.Form["orderField"].FirstOrDefault();
|
||||
|
||||
Expression<Func<CoreCmsOrderDistributionModel, object>> orderEx = orderField switch
|
||||
{
|
||||
"id" => p => p.id,
|
||||
"orderType" => p => p.orderType,
|
||||
"description" => p => p.description,
|
||||
"isOpenMailing" => p => p.isOpenMailing,
|
||||
"isOpenHomeDelivery" => p => p.isOpenHomeDelivery,
|
||||
"isOpenSelfDelivery" => p => p.isOpenSelfDelivery,
|
||||
_ => p => p.id
|
||||
};
|
||||
|
||||
//设置排序方式
|
||||
var orderDirection = Request.Form["orderDirection"].FirstOrDefault();
|
||||
var orderBy = orderDirection switch
|
||||
{
|
||||
"asc" => OrderByType.Asc,
|
||||
"desc" => OrderByType.Desc,
|
||||
_ => OrderByType.Desc
|
||||
};
|
||||
//查询筛选
|
||||
|
||||
//序列 int
|
||||
var id = Request.Form["id"].FirstOrDefault().ObjectToInt(0);
|
||||
if (id > 0)
|
||||
{
|
||||
where = where.And(p => p.id == id);
|
||||
}
|
||||
//订单类型 int
|
||||
var orderType = Request.Form["orderType"].FirstOrDefault().ObjectToInt(0);
|
||||
if (orderType > 0)
|
||||
{
|
||||
where = where.And(p => p.orderType == orderType);
|
||||
}
|
||||
//描述 nvarchar
|
||||
var description = Request.Form["description"].FirstOrDefault();
|
||||
if (!string.IsNullOrEmpty(description))
|
||||
{
|
||||
where = where.And(p => p.description.Contains(description));
|
||||
}
|
||||
//物流快递 bit
|
||||
var isOpenMailing = Request.Form["isOpenMailing"].FirstOrDefault();
|
||||
if (!string.IsNullOrEmpty(isOpenMailing) && isOpenMailing.ToLowerInvariant() == "true")
|
||||
{
|
||||
where = where.And(p => p.isOpenMailing == true);
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(isOpenMailing) && isOpenMailing.ToLowerInvariant() == "false")
|
||||
{
|
||||
where = where.And(p => p.isOpenMailing == false);
|
||||
}
|
||||
//同城配送 bit
|
||||
var isOpenHomeDelivery = Request.Form["isOpenHomeDelivery"].FirstOrDefault();
|
||||
if (!string.IsNullOrEmpty(isOpenHomeDelivery) && isOpenHomeDelivery.ToLowerInvariant() == "true")
|
||||
{
|
||||
where = where.And(p => p.isOpenHomeDelivery == true);
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(isOpenHomeDelivery) && isOpenHomeDelivery.ToLowerInvariant() == "false")
|
||||
{
|
||||
where = where.And(p => p.isOpenHomeDelivery == false);
|
||||
}
|
||||
//上门自提 bit
|
||||
var isOpenSelfDelivery = Request.Form["isOpenSelfDelivery"].FirstOrDefault();
|
||||
if (!string.IsNullOrEmpty(isOpenSelfDelivery) && isOpenSelfDelivery.ToLowerInvariant() == "true")
|
||||
{
|
||||
where = where.And(p => p.isOpenSelfDelivery == true);
|
||||
}
|
||||
else if (!string.IsNullOrEmpty(isOpenSelfDelivery) && isOpenSelfDelivery.ToLowerInvariant() == "false")
|
||||
{
|
||||
where = where.And(p => p.isOpenSelfDelivery == false);
|
||||
}
|
||||
//获取数据
|
||||
var list = await _coreCmsOrderDistributionModelServices.QueryPageAsync(where, orderEx, orderBy, pageCurrent, pageSize, true);
|
||||
//返回数据
|
||||
jm.data = list;
|
||||
jm.code = 0;
|
||||
jm.count = list.TotalCount;
|
||||
jm.msg = "数据调用成功!";
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 首页数据============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/GetIndex
|
||||
/// <summary>
|
||||
/// 首页数据
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("首页数据")]
|
||||
public AdminUiCallBack GetIndex()
|
||||
{
|
||||
//返回数据
|
||||
var jm = new AdminUiCallBack { code = 0 };
|
||||
var orderTypes = EnumHelper.EnumToList<GlobalEnumVars.OrderType>();
|
||||
jm.data = new
|
||||
{
|
||||
orderTypes
|
||||
};
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 创建数据============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/GetCreate
|
||||
/// <summary>
|
||||
/// 创建数据
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("创建数据")]
|
||||
public AdminUiCallBack GetCreate()
|
||||
{
|
||||
//返回数据
|
||||
var jm = new AdminUiCallBack { code = 0 };
|
||||
|
||||
var orderTypes = EnumHelper.EnumToList<GlobalEnumVars.OrderType>();
|
||||
jm.data = new
|
||||
{
|
||||
orderTypes
|
||||
};
|
||||
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 创建提交============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/DoCreate
|
||||
/// <summary>
|
||||
/// 创建提交
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("创建提交")]
|
||||
public async Task<AdminUiCallBack> DoCreate([FromBody] CoreCmsOrderDistributionModel entity)
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
var isHava = await _coreCmsOrderDistributionModelServices.ExistsAsync(p => p.orderType == entity.orderType);
|
||||
if (isHava)
|
||||
{
|
||||
jm.msg = "请勿录入重复类型数据";
|
||||
return jm;
|
||||
}
|
||||
|
||||
jm = await _coreCmsOrderDistributionModelServices.InsertAsync(entity);
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 编辑数据============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/GetEdit
|
||||
/// <summary>
|
||||
/// 编辑数据
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("编辑数据")]
|
||||
public async Task<AdminUiCallBack> GetEdit([FromBody] FMIntId entity)
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
|
||||
var model = await _coreCmsOrderDistributionModelServices.QueryByIdAsync(entity.id, false);
|
||||
if (model == null)
|
||||
{
|
||||
jm.msg = "不存在此信息";
|
||||
return jm;
|
||||
}
|
||||
jm.code = 0;
|
||||
var orderTypes = EnumHelper.EnumToList<GlobalEnumVars.OrderType>();
|
||||
jm.data = new
|
||||
{
|
||||
orderTypes,
|
||||
model
|
||||
};
|
||||
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 编辑提交============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/Edit
|
||||
/// <summary>
|
||||
/// 编辑提交
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("编辑提交")]
|
||||
public async Task<AdminUiCallBack> DoEdit([FromBody] CoreCmsOrderDistributionModel entity)
|
||||
{
|
||||
var jm = await _coreCmsOrderDistributionModelServices.UpdateAsync(entity);
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 删除数据============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/DoDelete/10
|
||||
/// <summary>
|
||||
/// 单选删除
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("单选删除")]
|
||||
public async Task<AdminUiCallBack> DoDelete([FromBody] FMIntId entity)
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
|
||||
var model = await _coreCmsOrderDistributionModelServices.ExistsAsync(p => p.id == entity.id, true);
|
||||
if (!model)
|
||||
{
|
||||
jm.msg = GlobalConstVars.DataisNo;
|
||||
return jm;
|
||||
}
|
||||
jm = await _coreCmsOrderDistributionModelServices.DeleteByIdAsync(entity.id);
|
||||
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 设置物流快递============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/DoSetisOpenMailing/10
|
||||
/// <summary>
|
||||
/// 设置物流快递
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("设置物流快递")]
|
||||
public async Task<AdminUiCallBack> DoSetisOpenMailing([FromBody] FMUpdateBoolDataByIntId entity)
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
|
||||
var oldModel = await _coreCmsOrderDistributionModelServices.QueryByIdAsync(entity.id, false);
|
||||
if (oldModel == null)
|
||||
{
|
||||
jm.msg = "不存在此信息";
|
||||
return jm;
|
||||
}
|
||||
oldModel.isOpenMailing = (bool)entity.data;
|
||||
|
||||
jm = await _coreCmsOrderDistributionModelServices.UpdateAsync(oldModel);
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 设置同城配送============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/DoSetisOpenHomeDelivery/10
|
||||
/// <summary>
|
||||
/// 设置同城配送
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("设置同城配送")]
|
||||
public async Task<AdminUiCallBack> DoSetisOpenHomeDelivery([FromBody] FMUpdateBoolDataByIntId entity)
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
|
||||
var oldModel = await _coreCmsOrderDistributionModelServices.QueryByIdAsync(entity.id, false);
|
||||
if (oldModel == null)
|
||||
{
|
||||
jm.msg = "不存在此信息";
|
||||
return jm;
|
||||
}
|
||||
oldModel.isOpenHomeDelivery = (bool)entity.data;
|
||||
|
||||
jm = await _coreCmsOrderDistributionModelServices.UpdateAsync(oldModel);
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 设置上门自提============================================================
|
||||
// POST: Api/CoreCmsOrderDistributionModel/DoSetisOpenSelfDelivery/10
|
||||
/// <summary>
|
||||
/// 设置上门自提
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Description("设置上门自提")]
|
||||
public async Task<AdminUiCallBack> DoSetisOpenSelfDelivery([FromBody] FMUpdateBoolDataByIntId entity)
|
||||
{
|
||||
var jm = new AdminUiCallBack();
|
||||
|
||||
var oldModel = await _coreCmsOrderDistributionModelServices.QueryByIdAsync(entity.id, false);
|
||||
if (oldModel == null)
|
||||
{
|
||||
jm.msg = "不存在此信息";
|
||||
return jm;
|
||||
}
|
||||
oldModel.isOpenSelfDelivery = (bool)entity.data;
|
||||
|
||||
jm = await _coreCmsOrderDistributionModelServices.UpdateAsync(oldModel);
|
||||
return jm;
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user