Ver código fonte

限制补全

DuGuYang 6 meses atrás
pai
commit
be89511113

+ 1 - 1
Areas/Api/Controllers/Main/MerchantAddInfoController.cs

@@ -214,7 +214,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }
                 else
                 {
-                    var query = MerchantAddInfoService.Query(" CertMerchantName='" + CertMerchantName + "'");
+                    var query = MerchantAddInfoService.Query(" CertMerchantName='" + CertMerchantName + "' and BrandId=" + BrandId);
                     if (query.Id == 0)
                     {
                         Dictionary<string, object> Fiel = new Dictionary<string, object>();

+ 70 - 0
Areas/Api/Controllers/TestController.cs

@@ -0,0 +1,70 @@
+/*
+ * 测试
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.AspNetCore.Authorization;
+using MySystem.Service.Main;
+using System.Web;
+using MySystem.Models.Main;
+using LitJson;
+using Library;
+using System.Text.RegularExpressions;
+namespace MySystem.Areas.Api.Controllers.v1
+{
+    [Area("Api")]
+    [Route("/v1/kxsmain/[controller]/[action]")]
+    public class TestController : BaseController
+    {
+        public TestController(IHttpContextAccessor accessor) : base(accessor)
+        {
+        }
+
+        #region 测试方法
+
+        /// <summary>
+        /// 产品库列表
+        /// </summary>
+        /// <returns></returns>
+        // [HttpPost]
+        // [Authorize]
+        [Route("/main/test/all")]
+        public JsonResult List(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            // SystemToolUtil.CheckMachineDo("ceshi", "K00132726", "00005702230118388360", 1, 0);
+            // var userInfo = UsersService.Query(598);
+            // var OrderCount = OrdersService.Count(" UserId=" + userInfo.Id + " and PayStatus=1 and TotalPrice=600");
+            // string[] ParentNavList = userInfo.ParentNav.Trim(',').Replace(",,", ",").Split(',');
+            // var topUserInfo = new Users();
+            // var topUserInfo1 = new Users();
+            // if (ParentNavList.Length > 1)
+            // {
+            //     topUserInfo = BaseClass.GetTopUserInfo(userInfo.ParentNav, 1);
+            //     topUserInfo1 = UsersService.Query(int.Parse(ParentNavList[1]));
+            // }
+            // else
+            // {
+            //     topUserInfo = BaseClass.GetTopUserInfo(userInfo.ParentNav, 0);
+            //     topUserInfo1 = UsersService.Query(int.Parse(ParentNavList[0]));
+            // }
+            // var TopUserInfo = topUserInfo.MakerCode + " " + topUserInfo.RealName;
+            // var TopUserInfo1 = topUserInfo1.MakerCode + " " + topUserInfo1.RealName;
+            // BaseClass.AddAccountRecord(598, 1, 100, "+BalanceAmount,+TotalAmount", 0);
+            var CertMerchantName = "四川睿行文化传播有限公司";
+            var BrandId = 1;
+            var check = MerchantAddInfoService.Query(" CertMerchantName like '" + CertMerchantName + "%' and Status<1 and QueryCount<1 and BrandId=" + BrandId);
+            return Json(new AppResultJson() { Status = "1", Info = "" });
+        }
+
+        #endregion
+
+    }
+}