LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -703,7 +703,6 @@ /// </summary> public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } /// <summary> /// 实际充值金额 /// </summary> LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1130,15 +1130,19 @@ { order.PayStatus = LifePayStatusEnum.已退款; order.LifePayOrderStatus = LifePayOrderStatusEnum.已退款; order.LifePayRefundStatus = LifePayRefundStatusEnum.已退款; } else if (wxRefundResult.Status == "PROCESSING") { order.PayStatus = LifePayStatusEnum.退款中; order.LifePayOrderStatus = LifePayOrderStatusEnum.退款中; order.LifePayRefundStatus = LifePayRefundStatusEnum.退款中; } else { throw new UserFriendlyException("退款失败"); order.PayStatus = LifePayStatusEnum.待退款; order.LifePayOrderStatus = LifePayOrderStatusEnum.退款失败; order.LifePayRefundStatus = LifePayRefundStatusEnum.待退款; } break; LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -131,6 +131,13 @@ <param name="orderNo"></param> <returns></returns> </member> <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayRefundOrderDetail(System.String)"> <summary> 获取退款订单详情 </summary> <param name="orderNo"></param> <returns></returns> </member> <member name="M:LifePayment.HttpApi.LifePayController.GetUserLifePayOrderPage(LifePayment.Application.Contracts.QueryLifePayOrderListInput)"> <summary> 获取我的订单分页数据 LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -830,6 +830,11 @@ 渠道流水号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.UserPhoneNumber"> <summary> 用户账号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayType"> <summary> 生活缴费支付类型 @@ -878,6 +883,11 @@ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.FinishTime"> <summary> 完成时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.OutOrderNo"> <summary> 外部订单号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.OrderParamDetailJsonStr"> @@ -955,6 +965,106 @@ 手续费 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.Profit"> <summary> 平台利润 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.UserPhoneNumber"> <summary> 用户账号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.LifePayType"> <summary> 生活缴费支付类型 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.LifePayOrderType"> <summary> 订单类型 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.OrderNo"> <summary> 订单号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RechargeAmount"> <summary> 充值金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.DiscountAmount"> <summary> 优惠金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.PayAmount"> <summary> 实付金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.PayTime"> <summary> 支付时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.PayStatus"> <summary> 支付状态 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.LifePayOrderStatus"> <summary> 订单状态 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.FinishTime"> <summary> 完成时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.OutOrderNo"> <summary> 外部订单号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.CreationTime"> <summary> 下单时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RefundTime"> <summary> 退款时间 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RefundCredentialsImgUrl"> <summary> 退款凭证 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.ACOOLYOrderNo"> <summary> 渠道流水号 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.LifePayRefundStatus"> <summary> 平台退款状态 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.ActualRechargeAmount"> <summary> 实际充值金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RefundPrice"> <summary> 退款金额 </summary> </member> <member name="P:LifePayment.Application.Contracts.UserLifePayOrderRefundOutput.Id"> <summary> 订单编号 LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -88,11 +88,29 @@ acoolyStatus = ACOOLYStatusEnum.充值中; } else if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.充值失败) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } else if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.退款中) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; } else if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.退款完成) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; } else if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.失败关闭) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } break; case ACOOLYConstant.Sevice.ConfirmPhoneOrder: var confirmPhoneOrderResponse = JsonConvert.DeserializeObject<ConfirmPhoneOrderResponse>(body); @@ -101,26 +119,45 @@ payAmount = confirmPhoneOrderResponse.PhoneChargeOrder.PayAmount; _logger.LogError("ACOOLY回调通处理结果状态：" + confirmPhoneOrderResponse.PhoneChargeOrder.Status); if (!confirmPhoneOrderResponse.Success || (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING)) || (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING)) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值成功) if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值成功) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.充值成功; } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值中) if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值中) { status = LifePayOrderStatusEnum.待确认; acoolyStatus = ACOOLYStatusEnum.充值中; } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值失败) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.退款中) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.退款完成) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; } else if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.失败关闭) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; @@ -133,36 +170,45 @@ payAmount = confirmGasOrderResponse.GasChargeOrder.PayAmount; _logger.LogError("ACOOLY回调通处理结果状态：" + confirmGasOrderResponse.GasChargeOrder.Status); if (!confirmGasOrderResponse.Success || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING)) || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING)) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值成功) if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值成功) { status = LifePayOrderStatusEnum.已完成; // TODO 确认什么情况下可以判断是部分充值成功 //if (confirmGasOrderResponse.GasChargeOrder.ParValue == confirmGasOrderResponse.GasChargeOrder.PayAmount) //{ // acoolyStatus = ACOOLYStatusEnum.充值成功; //} //else //{ // acoolyStatus = ACOOLYStatusEnum.部分充值成功; //} acoolyStatus = ACOOLYStatusEnum.充值成功; } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值中) if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值中) { status = LifePayOrderStatusEnum.待确认; acoolyStatus = ACOOLYStatusEnum.充值中; } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值失败) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败; } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.退款中) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.退款完成) { status = LifePayOrderStatusEnum.已完成; acoolyStatus = ACOOLYStatusEnum.已退款; } else if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.失败关闭) { status = LifePayOrderStatusEnum.已失败; acoolyStatus = ACOOLYStatusEnum.充值失败;
