From efcf747dd97e355e1c1df8ce1991e5020e18ab2d Mon Sep 17 00:00:00 2001 From: "AERWEN\\26795" <123456789a> Date: Mon, 9 Oct 2023 20:59:59 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=E8=BD=AE=E6=92=AD?= =?UTF-8?q?=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Advertisement/Banners/BannerDto.cs | 54 ++++++++++ .../Business/Advertisement/Banners/Banner.cs | 65 ++++++++++++ .../Advertisement/Banners/BannerVo.cs | 49 ++++++++++ .../Advertisement/Banners/BannerRepository.cs | 20 ++++ .../PayManage/PayServiceApi.cs | 28 +----- .../Advertisement/Banners/BannerService.cs | 93 ++++++++++++++++++ .../OrderManage/Orders/OrderService.cs | 5 +- .../Advertisement/Banners/IBannerService.cs | 41 ++++++++ .../Api/Wechat/WxPay/WxPayController.cs | 8 +- .../Advertisement/Banners/BannerController.cs | 98 +++++++++++++++++++ ARW.WebApi/appsettings.json | 2 +- 11 files changed, 430 insertions(+), 33 deletions(-) create mode 100644 ARW.Model/Dto/Business/Advertisement/Banners/BannerDto.cs create mode 100644 ARW.Model/Models/Business/Advertisement/Banners/Banner.cs create mode 100644 ARW.Model/Vo/Business/Advertisement/Banners/BannerVo.cs create mode 100644 ARW.Repository/Business/Advertisement/Banners/BannerRepository.cs create mode 100644 ARW.Service/Business/BusinessService/Advertisement/Banners/BannerService.cs create mode 100644 ARW.Service/Business/IBusinessService/Advertisement/Banners/IBannerService.cs create mode 100644 ARW.WebApi/Controllers/Business/Advertisement/Banners/BannerController.cs diff --git a/ARW.Model/Dto/Business/Advertisement/Banners/BannerDto.cs b/ARW.Model/Dto/Business/Advertisement/Banners/BannerDto.cs new file mode 100644 index 0000000..92cff2d --- /dev/null +++ b/ARW.Model/Dto/Business/Advertisement/Banners/BannerDto.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using ARW.Model.Models.Business.Advertisement.Banners; + +namespace ARW.Model.Dto.Business.Advertisement.Banners +{ + /// + /// 轮播图输入对象 + /// + /// @author lwh + /// @date 2023-10-09 + /// + public class BannerDto + { + + public int BannerId { get; set; } + + public long BannerGuid { get; set; } + + [Required(ErrorMessage = "位置不能为空")] + public int BannerPosition { get; set; } + + [Required(ErrorMessage = "图片不能为空")] + public string BannerImg { get; set; } + + [Required(ErrorMessage = "排序不能为空")] + public int BannerSort { get; set; } + + + + + + } + + + /// + /// 轮播图查询对象 + /// + /// @author lwh + /// @date 2023-10-09 + /// + public class BannerQueryDto : PagerInfo + { + + public int? BannerPosition { get; set; } + + public string ids { get; set; } + } + + + + +} diff --git a/ARW.Model/Models/Business/Advertisement/Banners/Banner.cs b/ARW.Model/Models/Business/Advertisement/Banners/Banner.cs new file mode 100644 index 0000000..8e7f16f --- /dev/null +++ b/ARW.Model/Models/Business/Advertisement/Banners/Banner.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using SqlSugar; +using OfficeOpenXml.Attributes; +using Newtonsoft.Json; + +namespace ARW.Model.Models.Business.Advertisement.Banners +{ + /// + /// 轮播图,数据实体对象 + /// + /// @author lwh + /// @date 2023-10-09 + /// + [SugarTable("tb_banner")] + public class Banner : BusinessBase + { + + /// + /// 描述 : + /// 空值 : false + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "banner_id")] + public int BannerId { get; set; } + + + /// + /// 描述 : + /// 空值 : false + /// + [JsonConverter(typeof(ValueToStringConverter))] + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "banner_guid")] + public long BannerGuid { get; set; } + + + /// + /// 描述 :位置 + /// 空值 : false + /// + [SugarColumn(ColumnName = "banner_position")] + public int BannerPosition { get; set; } + + + /// + /// 描述 :图片 + /// 空值 : false + /// + [SugarColumn(ColumnName = "banner_img")] + public string BannerImg { get; set; } + + + /// + /// 描述 :排序 + /// 空值 : false + /// + [SugarColumn(ColumnName = "banner_sort")] + public int BannerSort { get; set; } + + + + + + + } +} \ No newline at end of file diff --git a/ARW.Model/Vo/Business/Advertisement/Banners/BannerVo.cs b/ARW.Model/Vo/Business/Advertisement/Banners/BannerVo.cs new file mode 100644 index 0000000..740a84f --- /dev/null +++ b/ARW.Model/Vo/Business/Advertisement/Banners/BannerVo.cs @@ -0,0 +1,49 @@ +using Newtonsoft.Json; +using OfficeOpenXml.Attributes; +using SqlSugar; +using System; + +namespace ARW.Model.Vo.Business.Advertisement.Banners +{ + /// + /// 轮播图展示对象 + /// + /// @author lwh + /// @date 2023-10-09 + /// + public class BannerVo + { + + + /// + /// 描述 : + /// + public int BannerId { get; set; } + + + /// + /// 描述 : + /// + [JsonConverter(typeof(ValueToStringConverter))] + public long BannerGuid { get; set; } + + + /// + /// 描述 :位置 + /// + public int BannerPosition { get; set; } + + + /// + /// 描述 :图片 + /// + public string BannerImg { get; set; } + + + /// + /// 描述 :排序 + /// + public int BannerSort { get; set; } + + } +} diff --git a/ARW.Repository/Business/Advertisement/Banners/BannerRepository.cs b/ARW.Repository/Business/Advertisement/Banners/BannerRepository.cs new file mode 100644 index 0000000..7bef0d3 --- /dev/null +++ b/ARW.Repository/Business/Advertisement/Banners/BannerRepository.cs @@ -0,0 +1,20 @@ +using System; +using Infrastructure.Attribute; +using ARW.Repository.System; +using ARW.Model.Models.Business.Advertisement.Banners; + +namespace ARW.Repository.Business.Advertisement.Banners +{ + /// + /// 轮播图仓储 + /// + /// @author lwh + /// @date 2023-10-09 + /// + [AppService(ServiceLifetime = LifeTime.Transient)] + public class BannerRepository : BaseRepository + { + #region 业务逻辑代码 + #endregion + } +} \ No newline at end of file diff --git a/ARW.Service/Api/BusinessService/PayManage/PayServiceApi.cs b/ARW.Service/Api/BusinessService/PayManage/PayServiceApi.cs index 614361a..9fbff80 100644 --- a/ARW.Service/Api/BusinessService/PayManage/PayServiceApi.cs +++ b/ARW.Service/Api/BusinessService/PayManage/PayServiceApi.cs @@ -1,36 +1,12 @@ using Infrastructure.Attribute; -using Microsoft.AspNetCore.Http; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; -using ARW.Model; -using ARW.Repository; using ARW.Repository.Business.ShopManager.Shops; -using ARW.Service.Api.IBusinessService.ShopManager.Shops; -using ARW.Model.Dto.Api.ShopManager.Shops; -using ARW.Model.Models.Business.ShopManager.Shops; -using ARW.Model.Vo.Api.ShopManager.Shops; -using ARW.Model.Vo.Business.GoodsManager.GoodsCategorys; using ARW.Repository.Business.GoodsManager.GoodsCategorys; using ARW.Repository.Business.Custom.Customers; -using ARW.Model.Models.Business.Custom.Customers; -using ARW.Repository.Business.LogisticsManage.Deliverys; -using ARW.Service.Business.IBusinessService.LogisticsManage.Deliverys; -using ARW.Service.Business.IBusinessService.GoodsManager.Goodss; -using ARW.Model.Models.Business.LogisticsManage.Deliverys; -using ARW.Model.Models.Business.LogisticsManage.DeliveryRules; -using ARW.Service.Business.IBusinessService.GoodsManager.GoodsServicess; -using ARW.Model.Models.Business.GoodsManager.GoodsServicess; using ARW.Model.Models.Business.Payments; -using Aliyun.OSS; -using ARW.Service.Business.IBusinessService.Payments; using Infrastructure; using static Infrastructure.WeChat.TenPay.Pay; using Infrastructure.WeChat.TenPay; -using System.Net.Http; using Senparc.CO2NET.HttpUtility; using ARW.Service.Api.IBusinessService.PayManage; using ARW.Repository.Business.Payments; @@ -39,12 +15,12 @@ using ARW.Repository.Business.OrderManage.Orders; namespace ARW.Service.Api.BusinessService.PaymentManage { /// - /// 店铺接口实现类Api + /// 支付业务实现类Api /// /// @author lwh /// @date 2023-06-12 /// - [AppService(ServiceType = typeof(IShopServiceApi), ServiceLifetime = LifeTime.Transient)] + [AppService(ServiceType = typeof(IPayServiceApi), ServiceLifetime = LifeTime.Transient)] public class PayServiceApi : BaseService, IPayServiceApi { private readonly ShopRepository _ShopRepository; diff --git a/ARW.Service/Business/BusinessService/Advertisement/Banners/BannerService.cs b/ARW.Service/Business/BusinessService/Advertisement/Banners/BannerService.cs new file mode 100644 index 0000000..4c281b9 --- /dev/null +++ b/ARW.Service/Business/BusinessService/Advertisement/Banners/BannerService.cs @@ -0,0 +1,93 @@ +using Infrastructure.Attribute; +using Microsoft.AspNetCore.Http; +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Infrastructure; +using ARW.Model; +using ARW.Repository; +using ARW.Repository.Business.Advertisement.Banners; +using ARW.Service.Business.IBusinessService.Advertisement.Banners; +using ARW.Model.Dto.Business.Advertisement.Banners; +using ARW.Model.Models.Business.Advertisement.Banners; +using ARW.Model.Vo.Business.Advertisement.Banners; + +namespace ARW.Service.Business.BusinessService.Advertisement.Banners +{ + /// + /// 轮播图接口实现类 + /// + /// @author lwh + /// @date 2023-10-09 + /// + [AppService(ServiceType = typeof(IBannerService), ServiceLifetime = LifeTime.Transient)] + public class BannerServiceImpl : BaseService, IBannerService + { + private readonly BannerRepository _BannerRepository; + + public BannerServiceImpl(BannerRepository BannerRepository) + { + this._BannerRepository = BannerRepository; + } + + #region 业务逻辑代码 + + + /// + /// 查询轮播图分页列表 + /// + public async Task> GetBannerList(BannerQueryDto parm) + { + //开始拼装查询条件d + var predicate = Expressionable.Create(); + + predicate = predicate.AndIF(parm.BannerPosition != null, s => s.BannerPosition == parm.BannerPosition); + var query = _BannerRepository + .Queryable() + .Where(predicate.ToExpression()) + .OrderBy(s => s.BannerSort,OrderByType.Asc) + .Select(s => new BannerVo + { + BannerId = s.BannerId, + BannerGuid = s.BannerGuid, + BannerPosition = s.BannerPosition, + BannerImg = s.BannerImg, + BannerSort = s.BannerSort, + }); + + + return await query.ToPageAsync(parm); + } + + /// + /// 添加或修改轮播图 + /// + public async Task AddOrUpdateBanner(Banner model) + { + if (model.BannerId != 0) + { + var response = await _BannerRepository.UpdateAsync(model); + return "修改成功!"; + } + else + { + + var response = await _BannerRepository.InsertReturnSnowflakeIdAsync(model); + return "添加成功!"; + } + } + + #region Excel处理 + + + #endregion + + + +#endregion + + } +} diff --git a/ARW.Service/Business/BusinessService/OrderManage/Orders/OrderService.cs b/ARW.Service/Business/BusinessService/OrderManage/Orders/OrderService.cs index 57a5d5e..785f282 100644 --- a/ARW.Service/Business/BusinessService/OrderManage/Orders/OrderService.cs +++ b/ARW.Service/Business/BusinessService/OrderManage/Orders/OrderService.cs @@ -83,7 +83,7 @@ namespace ARW.Service.Business.BusinessService.OrderManage.Orders .Queryable() .LeftJoin((s, c) => s.CustomerGuid == c.CustomerGuid) .Where(predicate.ToExpression()) - .WhereIF(!string.IsNullOrEmpty(parm.CustomerNickNme), (s, c) => c.CustomerNickname.Contains(parm.CustomerNickNme) ) + .WhereIF(!string.IsNullOrEmpty(parm.CustomerNickNme), (s, c) => c.CustomerNickname.Contains(parm.CustomerNickNme)) .WhereIF(!string.IsNullOrEmpty(parm.CustomerPhome), (s, c) => c.CustomerMobilePhoneNumber.Contains(parm.CustomerPhome)) .OrderBy(s => s.Create_time, OrderByType.Desc) .Select((s, c) => new OrderVo @@ -321,8 +321,9 @@ namespace ARW.Service.Business.BusinessService.OrderManage.Orders { var specName = await _GoodsSkuService.GetSpecValueFullName(orderGoods.GoodsSkuId); var sku = await _GoodsSkuService.GetByIdAsync(orderGoods.GoodsSkuId); + if (sku != null) + orderGoodsInfo.GoodsPrice = sku.GoodsSkuPrice; orderGoodsInfo.GoodsSpecName = specName; - orderGoodsInfo.GoodsPrice = sku.GoodsSkuPrice; orderGoodsInfo.GoodsCoding = goods.GoodsCoding; } else diff --git a/ARW.Service/Business/IBusinessService/Advertisement/Banners/IBannerService.cs b/ARW.Service/Business/IBusinessService/Advertisement/Banners/IBannerService.cs new file mode 100644 index 0000000..0a9bbec --- /dev/null +++ b/ARW.Service/Business/IBusinessService/Advertisement/Banners/IBannerService.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ARW.Model; +using ARW.Model.Dto.Business.Advertisement.Banners; +using ARW.Model.Models.Business.Advertisement.Banners; +using ARW.Model.Vo.Business.Advertisement.Banners; + +namespace ARW.Service.Business.IBusinessService.Advertisement.Banners +{ + /// + /// 轮播图接口类 + /// + /// @author lwh + /// @date 2023-10-09 + /// + public interface IBannerService : IBaseService + { + /// + /// 获取轮播图分页列表 + /// + /// + /// + Task> GetBannerList(BannerQueryDto parm); + + + /// + /// 添加或修改轮播图 + /// + /// + /// + Task AddOrUpdateBanner(Banner parm); + + + + + + } +} diff --git a/ARW.WebApi/Controllers/Api/Wechat/WxPay/WxPayController.cs b/ARW.WebApi/Controllers/Api/Wechat/WxPay/WxPayController.cs index f4543bc..aedbfd1 100644 --- a/ARW.WebApi/Controllers/Api/Wechat/WxPay/WxPayController.cs +++ b/ARW.WebApi/Controllers/Api/Wechat/WxPay/WxPayController.cs @@ -131,7 +131,7 @@ namespace ARW.WebApi.Controllers.Api.Wechat.WxPay throw new CustomException("订单关闭失败!"); else { - var respones = _PaymentService.UpdateAsync(f => new Payment + var respones = _PayServiceApi.UpdateAsync(f => new Payment { PaymentStatus = 3, Update_time = DateTime.Now @@ -153,7 +153,7 @@ namespace ARW.WebApi.Controllers.Api.Wechat.WxPay public async Task Refund([FromBody] OrderQueryDto parm) { Pay pay = new Pay(_httpClient); - var payment = _PaymentService.GetFirstAsync(s => s.PaymentNumber == parm.outTradeNo).Result; + var payment = _PayServiceApi.GetFirstAsync(s => s.PaymentNumber == parm.outTradeNo).Result; var transactionId = payment.PaymentWeixinNumber; string paymentRefundNumber = ""; if (!string.IsNullOrEmpty(payment.PaymentRefundNumber)) @@ -167,7 +167,7 @@ namespace ARW.WebApi.Controllers.Api.Wechat.WxPay throw new CustomException("订单退款失败!"); else { - var respones = _PaymentService.UpdateAsync(f => new Payment + var respones = _PayServiceApi.UpdateAsync(f => new Payment { PaymentRefundNumber = res.out_refund_no, }, f => f.PaymentNumber == res.out_trade_no); @@ -195,7 +195,7 @@ namespace ARW.WebApi.Controllers.Api.Wechat.WxPay logger.Info("退款回调之业务:", res.refund_status); // 业务 - var respones = _PaymentService.UpdateAsync(f => new Payment + var respones = _PayServiceApi.UpdateAsync(f => new Payment { PaymentRefundNumber = res.out_refund_no, PaymentStatus = 4, diff --git a/ARW.WebApi/Controllers/Business/Advertisement/Banners/BannerController.cs b/ARW.WebApi/Controllers/Business/Advertisement/Banners/BannerController.cs new file mode 100644 index 0000000..fce3807 --- /dev/null +++ b/ARW.WebApi/Controllers/Business/Advertisement/Banners/BannerController.cs @@ -0,0 +1,98 @@ +using Infrastructure; +using Infrastructure.Attribute; +using Infrastructure.Enums; +using Infrastructure.Model; +using Mapster; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using ARW.Admin.WebApi.Extensions; +using ARW.Admin.WebApi.Filters; +using ARW.Common; +using ARW.Model.Dto.Business.Advertisement.Banners; +using ARW.Service.Business.IBusinessService.Advertisement.Banners; +using ARW.Admin.WebApi.Controllers; +using ARW.Model.Models.Business.Advertisement.Banners; +using ARW.Model.Vo.Business.Advertisement.Banners; +using Microsoft.AspNetCore.Authorization; +using ARW.Admin.WebApi.Framework; + + +namespace ARW.WebApi.Controllers.Business.Advertisement.Banners +{ + /// + /// 轮播图控制器 + /// + /// @author lwh + /// @date 2023-10-09 + /// + [Verify] + [Route("business/[controller]")] + public class BannerController : BaseController + { + private readonly IBannerService _BannerService; + + /// + /// 依赖注入 + /// + /// 轮播图服务 + public BannerController(IBannerService BannerService) + { + _BannerService = BannerService; + } + + + /// + /// 获取轮播图列表 + /// + /// 查询参数 + /// + [HttpGet("getBannerList")] + [ActionPermissionFilter(Permission = "business:banner:list")] + public async Task GetBannerList([FromQuery] BannerQueryDto parm) + { + var res = await _BannerService.GetBannerList(parm); + return SUCCESS(res); + } + + /// + /// 添加或修改轮播图 + /// + /// + /// + [HttpPost("addOrUpdateBanner")] + [ActionPermissionFilter(Permission = "business:banner:addOrUpdate")] + [Log(Title = "添加或修改轮播图", BusinessType = BusinessType.ADDORUPDATE)] + public async Task AddOrUpdateBanner([FromBody] BannerDto parm) + { + if (parm == null) { throw new CustomException("请求参数错误"); } + + var modal = new Banner(); + if (parm.BannerId != 0) modal = parm.Adapt().ToUpdate(HttpContext); + else modal = parm.Adapt().ToCreate(HttpContext); + + var res = await _BannerService.AddOrUpdateBanner(modal); + return SUCCESS(res); + } + + /// + /// 删除轮播图 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "business:banner:delete")] + [Log(Title = "轮播图删除", BusinessType = BusinessType.DELETE)] + public IActionResult Delete(string ids) + { + long[] idsArr = Tools.SpitLongArrary(ids); + if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); } + var response = _BannerService.Delete(idsArr); + return SUCCESS("删除成功!"); + } + + + + + + + } +} diff --git a/ARW.WebApi/appsettings.json b/ARW.WebApi/appsettings.json index 1e12804..e73ff60 100644 --- a/ARW.WebApi/appsettings.json +++ b/ARW.WebApi/appsettings.json @@ -47,7 +47,7 @@ "autoPre": true, //自动去除表前缀 "author": "admin", "tablePrefix": "tb_", //"表前缀(生成类名不会包含表前缀,多个用逗号分隔)", - "vuePath": "D:\\.Net\\Aerwen\\shop_template\\shop_template_back" //前端代码存储路径eg:D:\Work\ARWAdmin-Vue3 + "vuePath": "D:\\Programming\\Net\\Aerwen\\template\\shop\\shop_back" //前端代码存储路径eg:D:\Work\ARWAdmin-Vue3 }, //邮箱配置信息 "MailOptions": {