接口调整

AppStart/Redis/Mysql/ConsumerOpenIdsDbconn.cs

@@ -12,21 +12,10 @@ namespace MySystem
         #region 获取单个字段
         public ConsumerOpenIds Get(string OpenId)
         {
-            string key = "ConsumerOpenIds:" + OpenId;
-            if (RedisDbconn.Instance.Exists(key))
-            {
-                ConsumerOpenIds obj = RedisDbconn.Instance.Get<ConsumerOpenIds>(key);
-                if (obj != null)
-                {
-                    return obj;
-                }
-            }
             WebCMSEntities db = new WebCMSEntities();
             ConsumerOpenIds order = db.ConsumerOpenIds.FirstOrDefault(m => m.OpenId == OpenId);
             if (order != null)
             {
-                RedisDbconn.Instance.Set(key, order);
-                RedisDbconn.Instance.SetExpire(key, Library.function.get_Random(1800, 5400));
             }
             return order;
         }

Areas/Api/Controllers/v1/MainServer/ConsumerOrdersController.cs

@@ -233,30 +233,34 @@ namespace MySystem.Areas.Api.Controllers.v1
                     WeChatMiniAppSecret = "b853caabd367e1f3fd729c259ac8bee6",
                 };
                 string result = function.GetWebRequest("https://api.weixin.qq.com/sns/jscode2session?appid=" + set.WeChatMiniAppId + "&secret=" + set.WeChatMiniAppSecret + "&js_code=" + Code + "&grant_type=authorization_code");
+                function.WriteLog(DateTime.Now.ToString() + "\n" + result, "微信小程序获取openid");
                 JsonData jsonObj = JsonMapper.ToObject(result);
                 openid = jsonObj["openid"].ToString();
             }
             int ConsumerId = 0;
-            ConsumerOpenIds check = ConsumerOpenIdsDbconn.Instance.Get(openid);
+            ConsumerOpenIds check = maindb.ConsumerOpenIds.FirstOrDefault(m => m.OpenId == openid);
             if (check == null)
             {
                 // ConsumerId = PublicFunction.MakeConsumerId();
-                Consumers consumer = new Consumers()
+                Consumers consumer = maindb.Consumers.Add(new Consumers()
                 {
                     Id = ConsumerId,
                     CreateDate = DateTime.Now,
                     WechatOpenId = openid,
-                };
-                check = new ConsumerOpenIds()
+                }).Entity;
+                maindb.SaveChanges();
+                ConsumerId = consumer.Id;
+                check = maindb.ConsumerOpenIds.Add(new ConsumerOpenIds()
                 {
                     OpenId = openid,
                     ConsumerId = ConsumerId,
-                };
+                }).Entity;
             }
             else
             {
                 ConsumerId = check.ConsumerId;
             }
+            maindb.SaveChanges();
             MerchantQrCode qrcode = MerchantQrCodeDbconn.Instance.Get(SnNo) ?? new MerchantQrCode();
 
             // PosMachines machine = PosMachinesDbconn.Instance.Get(qrcode.SnId) ?? new PosMachines();

Areas/Api/Controllers/v1/MainServer/MerchantAddInfoController.cs

@@ -299,6 +299,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             Obj.Add("IdCardNational", query.IdCardNational); //身份证国徽面照片
             Obj.Add("IdCardName", query.IdCardName); //身份证姓名
             Obj.Add("IdCardNumber", query.IdCardNumber); //身份证号码
+            Obj.Add("IdCardAddress", query.IdCardAddress);
             Obj.Add("CardPeriodBegin", query.CardPeriodBegin == null ? "" : query.CardPeriodBegin.Value.ToString("yyyy-MM-dd HH:mm:ss")); //身份证有效期开始时间
             Obj.Add("CardPeriodEnd", query.CardPeriodEnd == null ? "" : query.CardPeriodEnd.Value.ToString("yyyy-MM-dd HH:mm:ss")); //身份证有效期结束时间
             Obj.Add("Id", query.Id); //Id

Areas/Api/Controllers/v1/MainServer/MerchantInfoController.cs

@@ -140,7 +140,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            IQueryable<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId);
+            IQueryable<MerchantInfo> query = maindb.MerchantInfo.Where(m => m.UserId == UserId && m.Status == 2);
             DateTime today = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00");
             int TotalCount = query.Count();
             int ActCount = query.Count(m => m.ActivationDate == today);
@@ -304,6 +304,7 @@ namespace MySystem.Areas.Api.Controllers.v1
         #endregion
 
 
+
         #region 创客-首页-我的商户-商户详情-码牌
         [Authorize]
         public JsonResult QrCodeList(string value)
@@ -551,8 +552,12 @@ namespace MySystem.Areas.Api.Controllers.v1
             MerchantInfo edit = maindb.MerchantInfo.FirstOrDefault(m => m.Id == Id && m.UserId == UserId);
             if(edit != null)
             {
-                // maindb.MerchantInfo.Remove(edit);
-                edit.QueryCount = 0;
+                maindb.MerchantInfo.Remove(edit);
+                MerchantAddInfo editadd = maindb.MerchantAddInfo.FirstOrDefault(m => m.Id == Id);
+                if(editadd != null)
+                {
+                    maindb.MerchantAddInfo.Remove(editadd);
+                }
                 maindb.SaveChanges();
             }
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };