mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-02-05 05:09:49 +08:00
【新增】弃用现在sku前端,启用全新sku组件,更加灵活,体验更好。 【新增】新增通过商品序列获取sku全新列表功能。 【新增】仓储层底层增加二级缓存功能,后面将逐步完善底层缓存中心模块。 【新增】0元购,积分兑换模式下,也去计算用户是否科技升级。 【新增】数据及业务仓储增加二级缓存功能。curd可自主控制是否缓存和清除。 【新增】订单导出excel数据增加商品名称+货品sku组合展示的方式。 【新增】自定义交易组件增加【获取商家信息】【更新商家信息】两个接口处理。 【新增】增加公告列表及公告详情页面,首页组件公告点击跳转列表展示。 【新增】个人中心增加【公告中心】入口。 【新增】后台余额变动增加说明录入。 【调整】将前端能进行分包的文件夹都进行分包,减少主包占用,方便进行二开。 【调整】因ckeditor5存在图片不可设置宽度,上传不支持mp4,排版不畅等情况,降级使用ckeditor4版本。 【修复】修复0.5.5版本售后积分返还机制积分模式判断异常的问题。 【修复】修复使用积分全额抵扣,或其他优惠政策导致的0元购,未进行短信提醒及小票打印机未打印的问题。 【修复】修复更换ckeditor4编辑器后接龙添加编辑调用失败的问题。 【修复】修复积分全额抵扣,金额0元购的情况下,进行售后执行完毕,订单未完结的情况。 【优化】去除分销申请面板按钮无用并失效报错的customStyle属性。 【优化】优化部分方法中使用手写字符串的遗留问题,统一采用enum方式。 【优化】优化前端及接口部分命名错误的问题。错将skill误写成seckill。 【优化】去除uniapp端多个客服代码。 【优化】商品详情底部完善购物车数量显示的问题。 【优化】优化团购列表,拼团列表,秒杀页面页面样式布局差异问题。 【优化】调整支付结果界面样式效果,仿微信支付结果界面。更加清晰明朗。 【优化】优化售后提交页面json计算,开放当用户下单后但未发货情况下,可以申请直接售后的操作需求。 【优化】后台商家手机号码支持设置多个,使用小写逗号分隔,方便多个商家管理员接收下单提醒。 【优化】后台售后单审核,调整售后商品为必选项。
175 lines
5.5 KiB
C#
175 lines
5.5 KiB
C#
/***********************************************************************
|
||
* Project: CoreCms
|
||
* ProjectName: 核心内容管理系统
|
||
* Web: https://www.corecms.net
|
||
* Author: 大灰灰
|
||
* Email: jianweie@163.com
|
||
* CreateTime: 2021/1/31 21:45:10
|
||
* Description: 暂无
|
||
***********************************************************************/
|
||
|
||
|
||
using System;
|
||
using System.Collections.Generic;
|
||
using System.Linq;
|
||
using System.Threading.Tasks;
|
||
using CoreCms.Net.Auth.HttpContextUser;
|
||
using CoreCms.Net.Configuration;
|
||
using CoreCms.Net.IServices;
|
||
using CoreCms.Net.Model.Entities;
|
||
using CoreCms.Net.Model.FromBody;
|
||
using CoreCms.Net.Model.ViewModels.UI;
|
||
using CoreCms.Net.Utility.Extensions;
|
||
using Microsoft.AspNetCore.Http;
|
||
using Microsoft.AspNetCore.Mvc;
|
||
using SqlSugar;
|
||
|
||
namespace CoreCms.Net.Web.WebApi.Controllers
|
||
{
|
||
/// <summary>
|
||
/// 拼团接口
|
||
/// </summary>
|
||
[Route("api/[controller]/[action]")]
|
||
[ApiController]
|
||
public class PinTuanController : ControllerBase
|
||
{
|
||
|
||
private readonly IHttpContextUser _user;
|
||
private readonly ICoreCmsPinTuanGoodsServices _pinTuanGoodsServices;
|
||
private readonly ICoreCmsPinTuanRuleServices _pinTuanRuleServices;
|
||
private readonly ICoreCmsProductsServices _productsServices;
|
||
private readonly ICoreCmsPinTuanRecordServices _pinTuanRecordServices;
|
||
private readonly ICoreCmsGoodsServices _goodsServices;
|
||
|
||
|
||
/// <summary>
|
||
/// 构造函数
|
||
/// </summary>
|
||
public PinTuanController(IHttpContextUser user
|
||
, ICoreCmsPinTuanGoodsServices pinTuanGoodsServices
|
||
, ICoreCmsPinTuanRuleServices pinTuanRuleServices
|
||
, ICoreCmsProductsServices productsServices
|
||
, ICoreCmsPinTuanRecordServices pinTuanRecordServices, ICoreCmsGoodsServices goodsServices)
|
||
{
|
||
_user = user;
|
||
_pinTuanGoodsServices = pinTuanGoodsServices;
|
||
_pinTuanRuleServices = pinTuanRuleServices;
|
||
_productsServices = productsServices;
|
||
_pinTuanRecordServices = pinTuanRecordServices;
|
||
_goodsServices = goodsServices;
|
||
}
|
||
|
||
|
||
#region 拼团列表
|
||
/// <summary>
|
||
/// 拼团列表
|
||
/// </summary>
|
||
/// <returns></returns>
|
||
[HttpPost]
|
||
public async Task<WebApiCallBack> GetList([FromBody] FMIntId entity)
|
||
{
|
||
WebApiCallBack jm;
|
||
|
||
var userId = 0;
|
||
if (_user != null)
|
||
{
|
||
userId = _user.ID;
|
||
}
|
||
var id = 0;
|
||
if (entity.id > 0)
|
||
{
|
||
id = entity.id;
|
||
}
|
||
jm = await _pinTuanRuleServices.GetPinTuanList(id, userId);
|
||
return jm;
|
||
}
|
||
|
||
#endregion
|
||
|
||
#region 获取拼团商品信息
|
||
/// <summary>
|
||
/// 获取拼团商品信息
|
||
/// </summary>
|
||
/// <returns></returns>
|
||
[HttpPost]
|
||
public async Task<WebApiCallBack> GetGoodsInfo([FromBody] FMIntId entity)
|
||
{
|
||
var jm = new WebApiCallBack();
|
||
|
||
var userId = 0;
|
||
if (_user != null)
|
||
{
|
||
userId = _user.ID;
|
||
}
|
||
var pinTuanStatus = entity.data.ObjectToInt(1);
|
||
|
||
jm.status = true;
|
||
jm.msg = "获取详情成功";
|
||
jm.data = await _pinTuanGoodsServices.GetGoodsInfo(entity.id, userId, pinTuanStatus);
|
||
|
||
return jm;
|
||
|
||
}
|
||
|
||
#endregion
|
||
|
||
#region 获取货品信息
|
||
/// <summary>
|
||
/// 获取货品信息
|
||
/// </summary>
|
||
/// <returns></returns>
|
||
[HttpPost]
|
||
public async Task<WebApiCallBack> GetProductInfo([FromBody] FMGetProductInfo entity)
|
||
{
|
||
var jm = new WebApiCallBack();
|
||
|
||
var products = await _productsServices.GetProductInfo(entity.id, false, 0, entity.type);
|
||
if (products == null)
|
||
{
|
||
jm.msg = GlobalErrorCodeVars.Code10000;
|
||
return jm;
|
||
}
|
||
//把拼团的一些属性等加上
|
||
var info = await _pinTuanRuleServices.QueryMuchFirstAsync<CoreCmsPinTuanRule, CoreCmsPinTuanGoods, CoreCmsPinTuanRule>(
|
||
(join1, join2) => new object[] { JoinType.Left, join1.id == join2.ruleId },
|
||
(join1, join2) => join1, (join1, join2) => join2.goodsId == products.goodsId);
|
||
|
||
if (info == null)
|
||
{
|
||
jm.msg = GlobalErrorCodeVars.Code10000;
|
||
return jm;
|
||
}
|
||
products.pinTuanRule = info;
|
||
jm.status = true;
|
||
jm.data = products;
|
||
return jm;
|
||
|
||
}
|
||
|
||
#endregion
|
||
|
||
#region 根据订单id取拼团信息,用在订单详情页
|
||
/// <summary>
|
||
/// 根据订单id取拼团信息,用在订单详情页
|
||
/// </summary>
|
||
/// <returns></returns>
|
||
[HttpPost]
|
||
public async Task<WebApiCallBack> GetPinTuanTeam([FromBody] FMGetPinTuanTeamPost entity)
|
||
{
|
||
var jm = new WebApiCallBack();
|
||
|
||
if (string.IsNullOrEmpty(entity.orderId) && entity.teamId == 0)
|
||
{
|
||
jm.msg = GlobalErrorCodeVars.Code15606;
|
||
return jm;
|
||
}
|
||
jm = await _pinTuanRecordServices.GetTeamList(entity.teamId, entity.orderId);
|
||
|
||
return jm;
|
||
}
|
||
|
||
#endregion
|
||
|
||
}
|
||
}
|