LifePaymentApi.git

			@@ -169,7 +169,8 @@
			{
			return await _channelFilter.GetChannelLifePayUserFilter(_lifePayUserRepository).Where(x => x.IsDeleted == false)
			.WhereIf(!string.IsNullOrEmpty(input.QueryCondition), x => x.PhoneNumber.Contains(input.QueryCondition) \|\| x.Name.Contains(input.QueryCondition))
			.WhereIf(input.CreationTime.HasValue, x => x.CreationTime.ToString("yyyy-MM-dd") == input.CreationTime.Value.ToString("yyyy-MM-dd"))
			.WhereIf(input.CreationTimeBegin.HasValue, x => x.CreationTime >= input.CreationTimeBegin)
			.WhereIf(input.CreationTimeEnd.HasValue, x => x.CreationTime <= input.CreationTimeEnd)
			.Select(x =>
			new UserListOutput()
			{
			@@ -270,15 +271,21 @@
			{
			var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
			var platformRate = await _lifePayRateRepository.FirstOrDefaultAsync(r => r.RateType == LifePayRateTypeEnum.供应商折扣价);
			var channleRate = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
			var premiumRate = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
			var channle = await _lifePayChannlesRep.FirstOrDefaultAsync(r => r.ChannlesNum == order.ChannelId);
			var premium = await _lifePayPremiumRepository.Where(x => x.IsDeleted == false && x.PremiumType == order.LifePayType).FirstOrDefaultAsync();
			CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "订单不存在");
			var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channleRate.ChannlesRakeRate / 100;
			var user = await _lifePayUserRepository.FirstOrDefaultAsync(x => x.Id == order.UserId);

			var channlesRakePrice = (order.PayAmount - (order.PlatformDeductionAmount == null ? 0 : order.PlatformDeductionAmount)) * channle.ChannlesRakeRate / 100;
			var result = new LifePayOrderOutput()
			{
			UserName = user.Name,
			UserPhoneNumber = user.PhoneNumber,
			DiscountAmount = order.DiscountAmount,
			FinishTime = order.FinishTime,
			Id = order.Id,
			OutOrderNo = order.OutOrderNo,
			LifePayChannle = channle.ChannlesName,
			LifePayOrderStatus = order.LifePayOrderStatus,
			LifePayOrderType = order.LifePayOrderType,
			LifePayType = order.LifePayType,
			@@ -299,12 +306,12 @@
			RefundPrice = order.RefundPrice,
			PlatformRate = platformRate.Rate,
			PlatformPrice = order.PlatformDeductionAmount,
			ChannleRate = channleRate.ChannlesRate,
			ChannlesRakeRate = channleRate.ChannlesRakeRate,
			ChannleRate = channle.ChannlesRate,
			ChannlesRakeRate = channle.ChannlesRakeRate,
			ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2),
			PremiumRate = premiumRate == null ? 0 : premiumRate.Rate,
			PremiumPrice = premiumRate == null ? 0 : Math.Round(order.PayAmount * premiumRate.Rate, 2),
			Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channleRate.ChannlesRakeRate / 100) - (premiumRate == null ? 0 : Math.Round(order.PayAmount * premiumRate.Rate, 2))
			PremiumRate = premium == null ? 0 : premium.Rate,
			PremiumPrice = premium == null ? 0 : Math.Round(order.PayAmount * premium.Rate, 2),
			Profit = (order.PayAmount - order.PlatformDeductionAmount) * (1.00m - channle.ChannlesRakeRate / 100) - (premium == null ? 0 : Math.Round(order.PayAmount * premium.Rate, 2))
			};

			return result;
			@@ -923,10 +930,12 @@
			OpenId = openid
			}
			};
			Logger.LogError("调用请求：" + req.ToJson());
			var timestamp = DateTimeOffset.Now.ToUnixTimeSeconds();
			string nonce = Guid.NewGuid().ToString();

			var res = await _wxPayApi.PayTransactionsJsAPI(req);
			Logger.LogError("调用结果：" + res.ToJson());
			string package = "prepay_id=" + res.PrepayId;
			ModelPaymentMiniPay info = new ModelPaymentMiniPay();
			if (res != null)