小程序用户查询未支付订单接口，小程序用户查询已支付订单接口，云端订单列表接口

FuelCloud/Fuel.Application/Fuel.Application.csproj

@@ -7,6 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\src\Fuel.Payment.Service\Fuel.Payment.Service.csproj" />
     <ProjectReference Include="..\src\FuelServer.Core\Fuel.Core.csproj" />
   </ItemGroup>
 

FuelCloud/Fuel.Application/Service/ITransactionsService.cs

@@ -15,5 +15,7 @@ namespace Fuel.Application.Service
 
         Task<ServiceResponse> GetTransactionsAsync(TransactionsInput input);
         Task<ServiceResponse> CommitPayment(int trxId, string AuthCode);
+        Task<ServiceResponse> GetMiniProgramTransactionsUnpaidAsync(TransactionsInput input);
+        Task<ServiceResponse> GetMiniProgramTransactionsPaidAsync(TransactionsInput input);
     }
 }

FuelCloud/Fuel.Application/Service/NozzleService.cs

@@ -25,10 +25,10 @@ namespace Fuel.Application.Service
         public async Task<bool> uploadNozzle(UploadNozzle uploadNozzle)
         {
             //RedisHelper.HSetAsync("Transaction", "11:22:33:44", "3232");
-            RedisHelper.SetAsync("33:22:33:44", "qweqweqwe", 3600);
-            var fsdds = RedisHelper.GetAsync("33:22:33:44");
+            //RedisHelper.SetAsync("33:22:33:44", "qweqweqwe", 3600);
+           // var fsdds = RedisHelper.GetAsync("33:22:33:44");
             //var das = RedisHelper.ExpireAsync("33:22:33:44", 10);
-            Guid guid = Guid.Parse("12345678-9abc-def0-1234-56789abcdef0");
+            Guid guid = Guid.Parse("12345678-9abc-def0-1234-56789abcdef0");//站点id，先默认填这个
             if (uploadNozzle.type == 1)
             {
                 var isproduct = await _entityHelper.GetEntitiesAsync<product>(_ => _.Buid == guid && _.ProductName == uploadNozzle.ProductName);

FuelCloud/Fuel.Application/Service/TransactionsService.cs

@@ -1,22 +1,12 @@
 using Fuel.Core.Transactions.Dto;
-using Org.BouncyCastle.Asn1.Ocsp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static FreeSql.Internal.GlobalFilter;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using FuelServer.Core.Entity;
-using Fuel.Core.Nozzle.Dto;
-using Org.BouncyCastle.Asn1.X509;
 using System.Linq.Expressions;
 using Fuel.Core.Models;
-using DFS.Core.Abstractions.View;
 using System.Net;
 using Fuel.Payment.Service.Pay;
+using DFS.Core.Abstractions.View;
 
 
 namespace Fuel.Application.Service
@@ -109,6 +99,40 @@ namespace Fuel.Application.Service
             return ServiceResponse.Ok(result);
         }
         /// <summary>
+        /// 小程序查询未支付订单
+        /// </summary>
+        /// <returns></returns>
+        public async Task<ServiceResponse> GetMiniProgramTransactionsUnpaidAsync(TransactionsInput input) 
+        {
+            string Buid = _httpContextAccessor.HttpContext.Request.Headers["Buid"].FirstOrDefault();
+            Guid guid = Guid.Parse(Buid);
+            Expression<Func<transactions, bool>> where = p => p.Buid == guid;
+            if (input.MiniProgramID == null)
+            {
+                return ServiceResponse.Error("用户id为空");
+            }
+            where = CombineExpressions(where, p => p.MiniProgramID == input.MiniProgramID && p.OrderStatus == transactionsORDERSTATUS.Unpaid);
+            var result = await _entityHelper.GetEntitiesAsync<transactions>(where);
+            return ServiceResponse.Ok(result);
+        }
+        /// <summary>
+        /// 小程序查询已支付订单
+        /// </summary>
+        /// <returns></returns>
+        public async Task<ServiceResponse> GetMiniProgramTransactionsPaidAsync(TransactionsInput input)
+        {
+            string Buid = _httpContextAccessor.HttpContext.Request.Headers["Buid"].FirstOrDefault();
+            Guid guid = Guid.Parse(Buid);
+            Expression<Func<transactions, bool>> where = p => p.Buid == guid;
+            if (input.MiniProgramID == null)
+            {
+                return ServiceResponse.Error("用户id为空");
+            }
+            where = CombineExpressions(where, p => p.MiniProgramID == input.MiniProgramID && p.OrderStatus == transactionsORDERSTATUS.Paid);
+            var result = await _entityHelper.GetEntitiesAsync<transactions>(where);
+            return ServiceResponse.Ok(result);
+        }
+        /// <summary>
         /// 提交支付
         /// </summary>
         /// <param name="input"></param>

FuelCloud/src/Fuel.Payment.Server/Controllers/TransactionsController.cs

@@ -40,6 +40,32 @@ namespace Fuel.PaymentServer.Controllers
             var serviceResult = await _transactionsService.GetTransactionsAsync(input);
             return Ok(serviceResult);
         }
+        /// <summary>
+        /// 小程序查询未支付订单
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [Route("GetMiniProgramTransactionsUnpaidQuery")]
+        [HttpPost]
+        public async Task<IActionResult> GetMiniProgramTransactionsUnpaidAsync(TransactionsInput input)
+        {
+            var serviceResult = await _transactionsService.GetMiniProgramTransactionsUnpaidAsync(input);
+            return Ok(serviceResult);
+        }
+        /// <summary>
+        /// 小程序查询已支付订单
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [Route("GetMiniProgramTransactionsPaidQuery")]
+        [HttpPost]
+        public async Task<IActionResult> GetMiniProgramTransactionsPaidAsync(TransactionsInput input)
+        {
+            var serviceResult = await _transactionsService.GetMiniProgramTransactionsPaidAsync(input);
+            return Ok(serviceResult);
+        }
+
+
         /// <summary>
         /// 提交支付
         /// </summary>