LifePayment/LifePayment.Application.Contracts/LifePay/ILifePayService.cs
@@ -30,6 +30,13 @@ Task<PhoneParValueResponse> GetPhoneParValue(); /// <summary> /// 话费订单查询 /// </summary> /// <param name="input"></param> /// <returns></returns> Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input); /// <summary> /// 获取燃气面值 /// </summary> /// <returns></returns> LifePayment/LifePayment.Application.Contracts/Promoter/IPromoterService.cs
@@ -5,6 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Volo.Abp; using Volo.Abp.Application.Services; using Volo.Abp.AutoMapper; using Volo.Abp.Users; @@ -24,6 +25,13 @@ Task<PageOutput<PromoterDto>> GetPromoters(GetPromotersInput input); /// <summary> /// 获取推广员信息 /// </summary> /// <param name="phoneNumber"></param> /// <returns></returns> Task<PromoterDto> GetPromoter(string phoneNumber); /// <summary> /// 获取渠道咨询列表 /// </summary> /// <param name="input"></param> @@ -31,6 +39,14 @@ Task<PageOutput<ChannelConsultationDto>> GetChannelConsultation(GetChannelConsultationsInput input); /// <summary> /// 获取渠道咨询Id /// </summary> /// <param name="id"></param> /// <returns></returns> /// <exception cref="FriendlyException"></exception> Task<ChannelConsultationDto> GetChannelConsultationById(Guid id); /// <summary> /// 获取渠道咨询回访记录 /// </summary> /// <param name="id">渠道咨询Id</param> LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -130,6 +130,16 @@ } /// <summary> /// 话费订单查询 /// </summary> /// <param name="input"></param> /// <returns></returns> public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input) { return await _aCOOLYManager.QueryPhoneOrder(input); } /// <summary> /// 获取话费面值 /// </summary> /// <param name="input"></param> @@ -1378,10 +1388,11 @@ var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync(); CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在"); //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.已完成) //{ // return; //} if (order.LifePayOrderStatus == status && order.ACOOLYStatus == acoolyStatus) { _logger.LogInformation($"订单（{orderNo}）已处理该状态"); return; } order.ActualReceivedAmount = actualParValue;
@@ -11,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Volo.Abp; using Volo.Abp.Application.Services; using Volo.Abp.AutoMapper; using Volo.Abp.Domain.Repositories; @@ -89,6 +90,29 @@ } /// <summary> /// 获取推广员信息 /// </summary> /// <param name="phoneNumber"></param> /// <returns></returns> public async Task<PromoterDto> GetPromoter(string phoneNumber) { return await lifePayPromoterRepository .Where(it => it.PhoneNumber == phoneNumber) .Select(it => new PromoterDto { Id = it.Id, CreationTime = it.CreationTime, IdNumber = it.IdNumber, Name = it.Name, PhoneNumber = it.PhoneNumber, ClickCount = it.ClickCount, ApplyCount = it.ApplyCount, Remark = it.Remark, }) .FirstOrDefaultAsync(); } /// <summary> /// 获取渠道咨询列表 /// </summary> /// <param name="input"></param> @@ -138,6 +162,36 @@ } /// <summary> /// 获取渠道咨询Id /// </summary> /// <param name="id"></param> /// <returns></returns> /// <exception cref="FriendlyException"></exception> public async Task<ChannelConsultationDto> GetChannelConsultationById(Guid id) { var query = from cc in lifePayChannelConsultationRepository join p in lifePayPromoterRepository on cc.PromoterId equals p.Id into pg from pgd in pg.DefaultIfEmpty() select new ChannelConsultationDto { Id = cc.Id, CreationTime = cc.CreationTime, Name = cc.Name, AgentType = cc.AgentType, PhoneNumber = cc.PhoneNumber, CompanyName = cc.CompanyName, CustomerResources = cc.CustomerResources, PromoterIdNumber = pgd.IdNumber, PromoterName = pgd.Name, PromoterPhoneNumber = pgd.PhoneNumber, FollowupStatus = cc.FollowupStatus, LastFollowupTime = cc.LastFollowupTime, FollowupRemark = cc.FollowupRemark, }; return await query.FirstOrDefaultAsync(); } /// <summary> /// 获取渠道咨询回访记录 /// </summary> /// <param name="id">渠道咨询Id</param> LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYConstant.cs
@@ -38,6 +38,11 @@ public const string PhoneParValue = "phoneParValue"; /// <summary> /// 话费订单查询 /// </summary> public const string QueryPhoneOrder = "queryPhoneOrder"; /// <summary> /// 提交电话费订单 /// </summary> public const string ConfirmPhoneOrder = "confirmPhoneOrder"; LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYInput.cs
@@ -205,6 +205,23 @@ } /// <summary> /// 话费订单查询请求参数 /// </summary> public class QueryPhoneOrderRequestInput : ACOOLYRequestBaseInput { /// <summary> /// 外部商户订单号 /// </summary> [JsonProperty("outOrderNo")] public string OutOrderNo { get; set; } /// <summary> /// 平台订单号 /// </summary> [JsonProperty("busiOrderNo")] public string BusiOrderNo { get; set; } } /// <summary> /// 提交电话费订单请求参数 /// </summary> public class ConfirmPhoneOrderRequestInput : ACOOLYRequestBaseInput LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYOutput.cs
@@ -378,6 +378,18 @@ } /// <summary> /// 话费订单查询返回参数 /// </summary> public class QueryPhoneOrderResponse : ACOOLYRequestBaseResponse { /// <summary> /// 话费充值订单 /// </summary> [JsonProperty("phoneChargeOrder")] public PhoneChargeOrderOutput PhoneChargeOrder { get; set; } } /// <summary> /// 话费面值返回参数 /// </summary> public class PhoneParValueResponse : ACOOLYRequestBaseResponse LifePayment/LifePayment.Domain.Shared/Enum/LifePay/LifePayEnum.cs
@@ -106,6 +106,8 @@ 部分充值成功 = 40, [Description("充值失败")] 充值失败 = 50, [Description("退款中")] 退款中 = 51, [Description("已退款")] 已退款 = 60, } LifePayment/LifePayment.Domain/ACOOLY/ACOOLYManager.cs
@@ -150,6 +150,18 @@ #region 话费 /// <summary> /// 话费订单查询 /// </summary> /// <param name="input"></param> /// <returns></returns> public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input) { SetBaseInfo(input, ACOOLYConstant.Sevice.QueryPhoneOrder); return await PostAsync<QueryPhoneOrderRequestInput, QueryPhoneOrderResponse>(input); } /// <summary> /// 获取话费面值 /// </summary> /// <param name="input"></param> LifePayment/LifePayment.Domain/ACOOLY/IACOOLYManager.cs
@@ -59,6 +59,13 @@ #region 话费 /// <summary> /// 话费订单查询 /// </summary> /// <param name="input"></param> /// <returns></returns> Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input); /// <summary> /// 获取话费面值 /// </summary> /// <param name="input"></param> LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -116,6 +116,13 @@ </summary> <returns></returns> </member> <member name="M:LifePayment.HttpApi.LifePayController.QueryPhoneOrder(LifePayment.Domain.Shared.QueryPhoneOrderRequestInput)"> <summary> 话费订单查询 </summary> <param name="input"></param> <returns></returns> </member> <member name="M:LifePayment.HttpApi.LifePayController.GetGasParValue(LifePayment.Domain.Shared.ChannelsBaseInput)"> <summary> 获取燃气面值 @@ -520,6 +527,13 @@ <param name="input"></param> <returns></returns> </member> <member name="M:LifePayment.HttpApi.PromoterController.GetPromoter(System.String)"> <summary> 获取推广员信息 </summary> <param name="phoneNumber"></param> <returns></returns> </member> <member name="M:LifePayment.HttpApi.PromoterController.GetChannelConsultation(LifePayment.Application.Contracts.GetChannelConsultationsInput)"> <summary> 获取渠道咨询列表 @@ -534,6 +548,14 @@ <param name="id">渠道咨询Id</param> <returns></returns> </member> <member name="M:LifePayment.HttpApi.PromoterController.GetChannelConsultationById(System.Guid)"> <summary> 获取渠道咨询Id </summary> <param name="id"></param> <returns></returns> <exception cref="T:Volo.Abp.FriendlyException"></exception> </member> <member name="M:LifePayment.HttpApi.PromoterController.CreateOrUpdatePromoter(LifePayment.Application.Contracts.CreateOrUpdatePromoterInput)"> <summary> 创建或更新推广员 LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -22,6 +22,13 @@ </summary> <returns></returns> </member> <member name="M:LifePayment.Application.Contracts.ILifePayService.QueryPhoneOrder(LifePayment.Domain.Shared.QueryPhoneOrderRequestInput)"> <summary> 话费订单查询 </summary> <param name="input"></param> <returns></returns> </member> <member name="M:LifePayment.Application.Contracts.ILifePayService.GetGasParValue"> <summary> 获取燃气面值 @@ -2304,6 +2311,13 @@ <param name="input"></param> <returns></returns> </member> <member name="M:LifePayment.Application.Contracts.IPromoterService.GetPromoter(System.String)"> <summary> 获取推广员信息 </summary> <param name="phoneNumber"></param> <returns></returns> </member> <member name="M:LifePayment.Application.Contracts.IPromoterService.GetChannelConsultation(LifePayment.Application.Contracts.GetChannelConsultationsInput)"> <summary> 获取渠道咨询列表 @@ -2311,6 +2325,14 @@ <param name="input"></param> <returns></returns> </member> <member name="M:LifePayment.Application.Contracts.IPromoterService.GetChannelConsultationById(System.Guid)"> <summary> 获取渠道咨询Id </summary> <param name="id"></param> <returns></returns> <exception cref="T:Volo.Abp.FriendlyException"></exception> </member> <member name="M:LifePayment.Application.Contracts.IPromoterService.GetChannelConsultationFollowupList(System.Guid)"> <summary> 获取渠道咨询回访记录 LifePayment/LifePayment.Host/Properties/launchSettings.json
@@ -2,6 +2,7 @@ "profiles": { "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -100,13 +100,13 @@ else if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.退款中) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; status = LifePayOrderStatusEnum.退款中; acoolyStatus = ACOOLYStatusEnum.退款中; } else if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.退款完成) { status = LifePayOrderStatusEnum.已完成; status = LifePayOrderStatusEnum.待退款; acoolyStatus = ACOOLYStatusEnum.已退款; } else @@ -158,13 +158,13 @@ else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.退款中) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; status = LifePayOrderStatusEnum.退款中; acoolyStatus = ACOOLYStatusEnum.退款中; } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.退款完成) { status = LifePayOrderStatusEnum.已完成; status = LifePayOrderStatusEnum.待退款; acoolyStatus = ACOOLYStatusEnum.已退款; } else @@ -215,13 +215,13 @@ else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.退款中) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; status = LifePayOrderStatusEnum.退款中; acoolyStatus = ACOOLYStatusEnum.退款中; } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.退款完成) { status = LifePayOrderStatusEnum.已完成; status = LifePayOrderStatusEnum.待退款; acoolyStatus = ACOOLYStatusEnum.已退款; } else LifePayment/LifePayment.HttpApi/LifePay/LifePayController.cs
@@ -162,6 +162,18 @@ } /// <summary> /// 话费订单查询 /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpPost] [AllowAnonymous] public async Task<QueryPhoneOrderResponse> QueryPhoneOrder(QueryPhoneOrderRequestInput input) { return await _lifePayService.QueryPhoneOrder(input); } /// <summary> /// 获取燃气面值 /// </summary> /// <returns></returns> LifePayment/LifePayment.HttpApi/LifePay/PromoterController.cs
@@ -15,6 +15,7 @@ using ZeroD.Util.Fadd; using Volo.Abp.Uow; using Nest; using Volo.Abp; namespace LifePayment.HttpApi { @@ -44,6 +45,17 @@ } /// <summary> /// 获取推广员信息 /// </summary> /// <param name="phoneNumber"></param> /// <returns></returns> [HttpGet] public async Task<PromoterDto> GetPromoter(string phoneNumber) { return await promoterService.GetPromoter(phoneNumber); } /// <summary> /// 获取渠道咨询列表 /// </summary> /// <param name="input"></param> @@ -65,6 +77,18 @@ return await promoterService.GetChannelConsultationFollowupList(id); } /// <summary> /// 获取渠道咨询Id /// </summary> /// <param name="id"></param> /// <returns></returns> /// <exception cref="FriendlyException"></exception> [HttpGet] public async Task<ChannelConsultationDto> GetChannelConsultationById(Guid id) { return await promoterService.GetChannelConsultationById(id); } #endregion #region 写入
