fix:订单列表新增字段

zhengyuxuan

2025-03-20 149ce84eb71311ccd9719dc4a883aa9b6e63eeb6

 LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs

@@ -53,7 +53,9 @@
            var baseInfo = JsonConvert.DeserializeObject<ACOOLYRequestBaseResponse>(body);
            var orderNo = string.Empty;
            var status = LifePayOrderStatusEnum.待确认;
            var acoolyStatus = ACOOLYStatusEnum.充值失败;
            var acoolyOrderNo = string.Empty;
            decimal payAmount = 0;
            _logger.LogError("ACOOLY回调通处理类型：" + baseInfo.Service);
            _logger.LogError("ACOOLY回调内容：" + body);
            switch (baseInfo.Service)
@@ -62,27 +64,41 @@
                    var confirmElectricOrderResponse = JsonConvert.DeserializeObject<ConfirmElectricOrderResponse>(body);
                    orderNo = confirmElectricOrderResponse.ElectricChargeOrder.OutOrderNo;
                    acoolyOrderNo = confirmElectricOrderResponse.ElectricChargeOrder.BusiOrderNo;
                    payAmount = confirmElectricOrderResponse.ElectricChargeOrder.PayAmount;
                    _logger.LogError("ACOOLY回调通处理结果状态：" + confirmElectricOrderResponse.ElectricChargeOrder.Status);

                    if (!confirmElectricOrderResponse.Success
                    || (confirmElectricOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmElectricOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                    {
                        status = LifePayOrderStatusEnum.已失败;
                        acoolyStatus = ACOOLYStatusEnum.充值失败;
                    }
                    else

                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Code.SUCCESS)
                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.充值成功)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        if (confirmElectricOrderResponse.ElectricChargeOrder.ParValue == confirmElectricOrderResponse.ElectricChargeOrder.PayAmount)
                        {

                            acoolyStatus = ACOOLYStatusEnum.充值成功;
                        }
                        else
                        {
                            acoolyStatus = ACOOLYStatusEnum.部分充值成功;
                        }
                    }
                    else

                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Code.PROCESSING)
                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.充值中)
                    {
                        status = LifePayOrderStatusEnum.待确认;
                        acoolyStatus = ACOOLYStatusEnum.充值中;
                    }
                    else
                    {
                        status = LifePayOrderStatusEnum.已失败;
                        acoolyStatus = ACOOLYStatusEnum.充值失败;
                    }

                    break;
@@ -90,35 +106,88 @@
                    var confirmPhoneOrderResponse = JsonConvert.DeserializeObject<ConfirmPhoneOrderResponse>(body);
                    orderNo = confirmPhoneOrderResponse.PhoneChargeOrder.OutOrderNo;
                    acoolyOrderNo = confirmPhoneOrderResponse.PhoneChargeOrder.BusiOrderNo;
                    payAmount = confirmPhoneOrderResponse.PhoneChargeOrder.PayAmount;
                    _logger.LogError("ACOOLY回调通处理结果状态：" + confirmPhoneOrderResponse.PhoneChargeOrder.Status);
                    if (!confirmPhoneOrderResponse.Success
                    || (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                    {
                        status = LifePayOrderStatusEnum.已失败;
                        acoolyStatus = ACOOLYStatusEnum.充值失败;
                    }
                    else

                    if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Code.SUCCESS)
                    if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值成功)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        if (confirmPhoneOrderResponse.PhoneChargeOrder.ParValue == confirmPhoneOrderResponse.PhoneChargeOrder.PayAmount)
                        {

                            acoolyStatus = ACOOLYStatusEnum.充值成功;
                        }
                        else
                        {
                            acoolyStatus = ACOOLYStatusEnum.部分充值成功;
                        }
                    }
                    else

                    if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Code.PROCESSING)
                    if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.充值中)
                    {
                        status = LifePayOrderStatusEnum.待确认;
                        acoolyStatus = ACOOLYStatusEnum.充值中;
                    }
                    else
                    {
                        status = LifePayOrderStatusEnum.已失败;
                        acoolyStatus = ACOOLYStatusEnum.充值失败;
                    }
                    break;
                case ACOOLYConstant.Sevice.ConfirmGasOrder:
                    var confirmGasOrderResponse = JsonConvert.DeserializeObject<ConfirmGasOrderResponse>(body);
                    orderNo = confirmGasOrderResponse.GasChargeOrder.OutOrderNo;
                    acoolyOrderNo = confirmGasOrderResponse.GasChargeOrder.BusiOrderNo;
                    payAmount = confirmGasOrderResponse.GasChargeOrder.PayAmount;
                    _logger.LogError("ACOOLY回调通处理结果状态：" + confirmGasOrderResponse.GasChargeOrder.Status);
                    if (!confirmGasOrderResponse.Success
                    || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                    {
                        status = LifePayOrderStatusEnum.已失败;
                    }
                    else

                    if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值成功)
                    {
                        status = LifePayOrderStatusEnum.已完成;
                        // TODO 确认什么情况下可以判断是部分充值成功

                        //if (confirmGasOrderResponse.GasChargeOrder.ParValue == confirmGasOrderResponse.GasChargeOrder.PayAmount)
                        //{

                        //    acoolyStatus = ACOOLYStatusEnum.充值成功;
                        //}
                        //else
                        //{
                        //    acoolyStatus = ACOOLYStatusEnum.部分充值成功;
                        //}
                    }
                    else

                    if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.充值中)
                    {
                        status = LifePayOrderStatusEnum.待确认;
                        acoolyStatus = ACOOLYStatusEnum.充值中;
                    }
                    else
                    {
                        status = LifePayOrderStatusEnum.已失败;
                        acoolyStatus = ACOOLYStatusEnum.充值失败;
                    }
                    break;
                default:
                    break;
            }

            await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status);
            await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount);
        }
    }
}