新增SQL控制器，去掉采购单取消接口冗余参数

BBWY.Client/APIServices/BatchPurchaseService.cs

@@ -154,20 +154,17 @@ namespace BBWY.Client.APIServices
             }, null, HttpMethod.Post);
         }
 
-        public ApiResponse<PayPurchaseOrderResponse> CancelOrder(string orderId,Platform PurchasePlatform, PurchaseAccount  purchaseAccount, string remark="")
+        public ApiResponse<PayPurchaseOrderResponse> CancelOrder(string orderId, PurchaseAccount purchaseAccount, string remark="")
         {
             return SendRequest<PayPurchaseOrderResponse>(globalContext.BBYWApiHost, "api/BatchPurchase/CancelPurchaseOrder", new
             {
                
                 orderId,
-                PurchasePlatform,
-                purchaseAccount,
+                Platform = purchaseAccount.PurchasePlatformId,
+                purchaseAccount.AppKey,
+                purchaseAccount.AppSecret,
+                purchaseAccount.AppToken,
                 remark,
-                globalContext.User.Shop.ShopId,
-                globalContext.User.Shop.ShopName,  
-                globalContext.User.Shop.AppKey,
-                globalContext.User.Shop.AppSecret,
-                globalContext.User.Shop.AppToken
             }, null, HttpMethod.Post);
         }
 

BBWY.Client/ViewModels/BatchPurchase/BatchPurchaseOrderListViewModel.cs

@@ -96,7 +96,7 @@ namespace BBWY.Client.ViewModels
 
             var purchaseAccount = globalContext.User.Shop.PurchaseAccountList.FirstOrDefault(p => p.PurchasePlatformId == PurchasePlatform);
 
-            var res = batchPurchaseService.CancelOrder(parameters[1].ToString(), PurchasePlatform, purchaseAccount, "");
+            var res = batchPurchaseService.CancelOrder(parameters[1].ToString(), purchaseAccount, "");
             if (res.Success)
             {
                 Task.Factory.StartNew(() => QueryPurchaseOrder(PageIndex));

BBWY.Common/Extensions/EncryptionExtension.cs

@@ -0,0 +1,85 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace BBWY.Common.Extensions
+{
+    public static class EncryptionExtension
+    {
+
+        public static string Md5Encrypt(this string originStr)
+        {
+            using (var md5 = MD5.Create())
+            {
+                return string.Join(string.Empty, md5.ComputeHash(Encoding.UTF8.GetBytes(originStr)).Select(x => x.ToString("x2")));
+            }
+        }
+
+        //AES加密  传入,要加密的串和, 解密key
+        public static string AESEncrypt(this string input)
+        {
+            var key = "dataplatform2019";
+            var ivStr = "1012132405963708";
+
+            var encryptKey = Encoding.UTF8.GetBytes(key);
+            var iv = Encoding.UTF8.GetBytes(ivStr); //偏移量,最小为16
+            using (var aesAlg = Aes.Create())
+            {
+                using (var encryptor = aesAlg.CreateEncryptor(encryptKey, iv))
+                {
+                    using (var msEncrypt = new MemoryStream())
+                    {
+                        using (var csEncrypt = new CryptoStream(msEncrypt, encryptor,
+                            CryptoStreamMode.Write))
+
+                        using (var swEncrypt = new StreamWriter(csEncrypt))
+                        {
+                            swEncrypt.Write(input);
+                        }
+                        var decryptedContent = msEncrypt.ToArray();
+
+                        return Convert.ToBase64String(decryptedContent);
+                    }
+                }
+            }
+        }
+
+        public static string AESDecrypt(this string cipherText)
+        {
+            var fullCipher = Convert.FromBase64String(cipherText);
+
+            var ivStr = "1012132405963708";
+            var key = "dataplatform2019";
+
+            var iv = Encoding.UTF8.GetBytes(ivStr);
+            var decryptKey = Encoding.UTF8.GetBytes(key);
+
+            using (var aesAlg = Aes.Create())
+            {
+                using (var decryptor = aesAlg.CreateDecryptor(decryptKey, iv))
+                {
+                    string result;
+                    using (var msDecrypt = new MemoryStream(fullCipher))
+                    {
+                        using (var csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read))
+                        {
+                            using (var srDecrypt = new StreamReader(csDecrypt))
+                            {
+                                result = srDecrypt.ReadToEnd();
+                            }
+                        }
+                    }
+
+                    return result;
+                }
+            }
+        }
+
+        public static string Base64Encrypt(this string originStr)
+        {
+            return Convert.ToBase64String(Encoding.UTF8.GetBytes(originStr));
+        }
+    }
+}

BBWY.Server.API/Controllers/SqlController.cs

@@ -0,0 +1,32 @@
+using BBWY.Server.Business;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System.Data;
+
+namespace BBWY.Server.API.Controllers
+{
+    [Authorize(AuthenticationSchemes = JwtBearerDefaults.AuthenticationScheme)]
+    public class SqlController : BaseApiController
+    {
+        private SqlBusiness sqlBusiness;
+
+        public SqlController(IHttpContextAccessor httpContextAccessor, SqlBusiness sqlBusiness) : base(httpContextAccessor)
+        {
+            this.sqlBusiness = sqlBusiness;
+        }
+
+        [HttpPost]
+        public int ExecuteNonQuery([FromBody]BaseSqlData baseSqlData)
+        {
+            return sqlBusiness.ExecuteNonQuery(baseSqlData);
+        }
+
+        [HttpPost]
+        public DataTable ExecuteDataTable([FromBody] BaseSqlData baseSqlData)
+        {
+            return sqlBusiness.ExecuteDataTable(baseSqlData);
+        }
+    }
+}

BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs

@@ -78,20 +78,14 @@ namespace BBWY.Server.Business
         }
         public override CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request)
         {
-
-            var data = request.PurchaseAccount;
-
             var qtResponse = quanTanOrderClient.CancelOrder(new QuanTanCancelOrderRequest
             {
                 orderId = request.OrderId,
-                userAccount = data.AccountName,
+                userAccount = request.AppToken,
                 remark = request.Remark,
-            }, request.PurchaseAccount.AppKey, request.PurchaseAccount.AppSecret);
+            }, request.AppKey, request.AppSecret);
             if (qtResponse.Status == 200) return new CancelPurchaseOrderResponse { Success = true };
 
-
-
-
             if (qtResponse.Message != null&&qtResponse.Message.Contains("已删除"))
             {
                 return new CancelPurchaseOrderResponse { Success = true };

BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@@ -454,14 +454,14 @@ namespace BBWY.Server.Business
 
         public CancelPurchaseOrderResponse CancelPurchaseOrder(CancelPurchaseOrderRequest request)
         {
-            var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.PurchasePlatform);
+            var platformSDKBusiness = platformSDKBusinessList.FirstOrDefault(p => p.Platform == request.Platform);
             var payOrderResponse = platformSDKBusiness.CancelPurchaseOrder(request);
 
             if (payOrderResponse.Success)
             {
-                var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
-                fsql.Update<PurchaseOrderV2>(order)
-      .Set(a => a.OrderState, Enums.PurchaseOrderState.已取消)
+                //var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
+                fsql.Update<PurchaseOrderV2>(request.OrderId)
+                    .Set(po => po.OrderState, Enums.PurchaseOrderState.已取消)
                     .ExecuteAffrows();
             }
 

BBWY.Server.Business/SQL/SqlBusiness.cs

@@ -0,0 +1,33 @@
+using BBWY.Common.Extensions;
+using BBWY.Common.Models;
+using System.Data;
+using Yitter.IdGenerator;
+
+namespace BBWY.Server.Business
+{
+    /// <summary>
+    /// SQL业务类，仅适用内部系统之间调用
+    /// </summary>
+    public class SqlBusiness : BaseBusiness, IDenpendency
+    {
+        public SqlBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator) : base(fsql, nLogManager, idGenerator)
+        {
+
+        }
+
+        public int ExecuteNonQuery(BaseSqlData baseSqlData)
+        {
+            return fsql.Ado.ExecuteNonQuery(baseSqlData.Sql.AESDecrypt());
+        }
+
+        public DataTable ExecuteDataTable(BaseSqlData baseSqlData)
+        {
+            return fsql.Ado.ExecuteDataTable(baseSqlData.Sql.AESDecrypt());
+        }
+    }
+
+    public class BaseSqlData
+    {
+        public string Sql { get; set; }
+    }
+}

BBWY.Server.Model/Dto/Request/PurchaseOrderV2/BatchPurchase/CancelPurchaseOrderRequest.cs

@@ -1,9 +1,4 @@
-using BBWY.Server.Model.Db;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace BBWY.Server.Model.Dto
+namespace BBWY.Server.Model.Dto
 {
     public class CancelPurchaseOrderRequest: PlatformRequest
     {
@@ -11,12 +6,5 @@ namespace BBWY.Server.Model.Dto
 
 
         public string Remark { get; set; }
-
-        public PurchaseAccount PurchaseAccount { get; set; }
-
-        /// <summary>
-        /// 采购平台
-        /// </summary>
-        public Enums.Platform PurchasePlatform { get; set; }
     }
 }