Merge branch 'feature-dgy-调整消费者信息添加条件' into feature-dgy-功能测试

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

@@ -224,7 +224,7 @@ namespace MySystem.Areas.Api.Controllers.v1
 
 
         #region 消费者-支付接口
-        [Authorize]
+        // [Authorize]
         public JsonResult Pay(string value)
         {
             if (string.IsNullOrEmpty(value))
@@ -243,10 +243,10 @@ namespace MySystem.Areas.Api.Controllers.v1
             JsonData data = JsonMapper.ToObject(value);
             string SnNo = data["Sn"].ToString(); //码牌SN
             // string Machine = data["Machine"].ToString();
-            if(SnNo.Length > 20)
+            if (SnNo.Length > 20)
             {
                 SnNo = System.Web.HttpUtility.UrlDecode(SnNo);
-                if(!SnNo.EndsWith("="))
+                if (!SnNo.EndsWith("="))
                 {
                     SnNo += "=";
                 }
@@ -274,14 +274,14 @@ namespace MySystem.Areas.Api.Controllers.v1
             PosMachinesTwo pos = PosMachinesTwoDbconn.Instance.Get(SnNo) ?? new PosMachinesTwo();
             // PosMachines machine = PosMachinesDbconn.Instance.Get(qrcode.SnId) ?? new PosMachines();
             // if (machine.BindMerchantId == 0) machine.BindMerchantId = 1; // TODO: 需要绑定二维码
-            if(pos.OpId == 1)
+            if (pos.OpId == 1)
             {
                 MerchantInfo merchant = MerchantInfoDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantInfo();
                 MerchantAddInfo merchantAdd = MerchantAddInfoDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantAddInfo();
                 MerchantParamSet merchantset = MerchantParamSetDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantParamSet();
                 string openid = "";
                 if (PayMode == 1)
-                { 
+                {
                     openid = new AlipayFunction(_accessor.HttpContext).GetAlipayUserId(Code);
                     if (openid.Contains("|"))
                     {
@@ -296,7 +296,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                     openid = jsonObj["openid"].ToString();
                 }
                 int ConsumerId = 0;
-                ConsumerOpenIds check = maindb.ConsumerOpenIds.FirstOrDefault(m => m.OpenId == openid);
+                Consumers check = maindb.Consumers.FirstOrDefault(m => m.WechatOpenId == openid);
                 if (check == null)
                 {
                     // ConsumerId = PublicFunction.MakeConsumerId();
@@ -308,20 +308,15 @@ namespace MySystem.Areas.Api.Controllers.v1
                     }).Entity;
                     maindb.SaveChanges();
                     ConsumerId = consumer.Id;
-                    check = maindb.ConsumerOpenIds.Add(new ConsumerOpenIds()
-                    {
-                        OpenId = openid,
-                        ConsumerId = ConsumerId,
-                    }).Entity;
                 }
                 else
                 {
-                    ConsumerId = check.ConsumerId;
+                    ConsumerId = check.Id;
                 }
                 maindb.SaveChanges();
                 string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
                 bool ActFlag = merchantset.IsAll == 1 ? false : true;
-                if(PayMoney < merchantset.MinPayMoney) //支付金额小于活动最小金额，则不分账
+                if (PayMoney < merchantset.MinPayMoney) //支付金额小于活动最小金额，则不分账
                 {
                     ActFlag = false;
                 }
@@ -350,7 +345,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 });
                 maindb.SaveChanges();
                 if (PayMode == 1)
-                { 
+                {
                     string backString = new AlipayFunction(_accessor.HttpContext).CreateTrade(OrderNo, merchant.Name, PayMoney, openid, merchantAdd.AlipayAuthToken, SpHost + "/api/alipay/notice");
                     JsonData obj = JsonMapper.ToObject(backString);
                     if (obj["alipay_trade_create_response"]["code"].ToString() == "10000")
@@ -360,7 +355,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                         Obj.Add("tradeNo", tradeNo);
                     }
                     else
-                    { 
+                    {
                         Obj.Add("respCode", obj["alipay_trade_create_response"]["code"].ToString());
                         Obj.Add("tradeNo", "");
                         return new AppResultJson() { Status = "-1", Info = obj["alipay_trade_create_response"]["sub_msg"].ToString(), Data = Obj };

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

@@ -78,12 +78,12 @@ namespace MySystem.Areas.Api.Controllers.v1
                 }).Entity;
                 maindb.SaveChanges();
                 ConsumerId = check.Id;
-                maindb.ConsumerOpenIds.Add(new ConsumerOpenIds()
-                {
-                    OpenId = openid,
-                    ConsumerId = ConsumerId,
-                });
-                maindb.SaveChanges();
+                // maindb.ConsumerOpenIds.Add(new ConsumerOpenIds()
+                // {
+                //     OpenId = openid,
+                //     ConsumerId = ConsumerId,
+                // });
+                // maindb.SaveChanges();
             }
             else
             {
@@ -175,8 +175,8 @@ namespace MySystem.Areas.Api.Controllers.v1
         {
             JsonData data = JsonMapper.ToObject(value);
             string code = data["code"].ToString(); //微信小程序获取的code
-            // string nickName = data["nickName"].ToString(); //昵称
-            // string avatarUrl = data["avatarUrl"].ToString(); //头像地址
+            string nickName = data["nickName"].ToString(); //昵称
+            string avatarUrl = data["avatarUrl"].ToString(); //头像地址
             string encryptedData = data["encryptedData"].ToString(); //微信小程序获取手机号的数据包
             // string iv = data["iv"].ToString(); //微信小程序获取手机号的IV
             Dictionary<string, object> Obj = new Dictionary<string, object>();
@@ -194,25 +194,25 @@ namespace MySystem.Areas.Api.Controllers.v1
                 check = maindb.Consumers.Add(new Consumers()
                 {
                     CreateDate = DateTime.Now,
-                    // NickName = filterEmoji(nickName),
-                    // HeadPhoto = avatarUrl,
-                    // Mobile = mobile,
+                    NickName = filterEmoji(nickName),
+                    HeadPhoto = avatarUrl,
+                    Mobile = mobile,
                     AlipayUserId = openid,
                 }).Entity;
                 maindb.SaveChanges();
                 ConsumerId = check.Id;
-                maindb.ConsumerOpenIds.Add(new ConsumerOpenIds()
-                {
-                    OpenId = openid,
-                    ConsumerId = ConsumerId,
-                });
-                maindb.SaveChanges();
+                // maindb.ConsumerOpenIds.Add(new ConsumerOpenIds()
+                // {
+                //     OpenId = openid,
+                //     ConsumerId = ConsumerId,
+                // });
+                // maindb.SaveChanges();
             }
             else
             {
-                // check.NickName = filterEmoji(nickName);
-                // check.HeadPhoto = avatarUrl;
-                // check.Mobile = mobile;
+                check.NickName = filterEmoji(nickName);
+                check.HeadPhoto = avatarUrl;
+                check.Mobile = mobile;
                 ConsumerId = check.Id;
                 maindb.SaveChanges();
             }

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

@@ -294,7 +294,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             int PageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
             string limit = " limit " + PageSize;
-            if (PageNum == 1)
+            if (PageNum > 1)
             {
                 int skipNum = PageSize * (PageNum - 1);
                 limit = " limit " + skipNum + "," + PageSize;

Util/MerchantAmountSummayUtil.cs

@@ -61,7 +61,7 @@ namespace MySystem
                             //已通过
                             if (TradeAmount >= 10000 && check.Count > 0) Status = 2;
                             //未通过
-                            if (TradeAmount < 10000 && check.Count > 0) Status = -1;
+                            if (TradeAmount < 10000 && check.Count >= 0) Status = -1;
                         }
                     }