LifePaymentApi.git

			@@ -280,16 +280,16 @@
			DiscountAmount = a.DiscountAmount ?? 0,
			FinishTime = a.FinishTime,
			Id = a.Id,
			LifePayOrderStatus = a.LifePayOrderStatus?? 0,
			LifePayOrderStatus = a.LifePayOrderStatus ?? 0,
			LifePayOrderType = a.LifePayOrderType,
			LifePayType = a.LifePayType,
			OrderNo = a.OrderNo,
			PayAmount = a.PayAmount ?? 0,
			PhoneNumber = a.PhoneNumber,
			RechargeAmount = a.RechargeAmount??0,
			RechargeAmount = a.RechargeAmount ?? 0,
			UserId = a.UserId,
			OutOrderNo = a.OutOrderNo,
			PayStatus = a.PayStatus?? 0,
			PayStatus = a.PayStatus ?? 0,
			PayTime = a.PayTime,
			ACOOLYOrderNo = a.ACOOLYOrderNo,
			RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
			@@ -300,6 +300,7 @@
			RefundTime = a.RefundTime,
			ChannelName = b.ChannlesName,
			ActualRechargeAmount = a.RechargeAmount,
			ActualReceivedAmount = a.ActualReceivedAmount,
			PlatformDeductionAmount = a.PlatformDeductionAmount,
			ACOOLYStatus = a.ACOOLYStatus,
			LifePayRefundStatus = a.LifePayRefundStatus,
			@@ -388,7 +389,7 @@
			ACOOLYStatus = x.ACOOLYStatus,
			RefundApplyRemark = x.RefundApplyRemark,
			RechargeAmount = x.RechargeAmount,
			ActualReceivedAmount = x.ActualReceivedAmount.ToString("F2"),
			ActualReceivedAmount = (x.ActualReceivedAmount ?? 0).ToString("F2"),
			LifePayRefundStatus = x.LifePayRefundStatus,
			OrderNo = x.OrderNo,

			@@ -567,7 +568,7 @@
			DiscountAmount = x.DiscountAmount ?? 0,
			FinishTime = x.FinishTime,
			Id = x.Id,
			LifePayOrderStatus = x.LifePayOrderStatus?? 0 ,
			LifePayOrderStatus = x.LifePayOrderStatus ?? 0,
			LifePayOrderType = x.LifePayOrderType,
			LifePayType = x.LifePayType,
			OrderNo = x.OrderNo,
			@@ -610,7 +611,7 @@

			public async Task<List<CreateEditPayChannelsInput>> GetLifePayChannlesAllList(QueryLifePayChannlesInput input)
			{
			return await GetLifePayChannlesListFilter().WhereIf(input.Status.HasValue,x => x.Status == input.Status).ToListAsync();
			return await GetLifePayChannlesListFilter().WhereIf(input.Status.HasValue, x => x.Status == input.Status).ToListAsync();
			}

			public async Task<CreateEditPayChannelsInput> GetLifePayChannlesDto(Guid id)
			@@ -908,7 +909,7 @@
			return await _wxPayApi.WxPayTradeQuery(outTradeNo);
			}




			#endregion

			@@ -930,11 +931,11 @@
			var channle = await GetLifePayChannlesDtoByNum(input.ChannelId);
			CheckExtensions.IfTrueThrowUserFriendlyException(channle == null, "渠道不存在");

			var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder
			var repeatOrder = await _lifePayOrderRepository.Where(x => x.LifePayOrderType == LifePayOrderTypeEnum.PhoneOrder
			&& x.PayStatus == LifePayStatusEnum.已支付
			&& x.LifePayOrderStatus == LifePayOrderStatusEnum.充值中
			&& x.OrderParamDetailJsonStr.Contains(input.ProductData.Phone)).AnyAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "您有同户号订单正在充值中，请勿重复充值");
			CheckExtensions.IfTrueThrowUserFriendlyException(repeatOrder, "您有同户号订单正在充值中，请勿重复充值");

			var rate = await GetLifePayRate(channle, LifePayRateTypeEnum.默认话费折扣);

			@@ -2271,12 +2272,12 @@
			default:
			break;
			}


			return new SetPayTypeReturn()
			{
			Desc = desc,
			OrderNo = order.OrderNo,
			PayAmount = order.PayAmount.HasValue? order.PayAmount.Value : 0,
			PayAmount = order.PayAmount.HasValue ? order.PayAmount.Value : 0,
			LifePayType = lifePayType,
			};
			}