好哒到账记录调整

Areas/Api/Controllers/Main/ConsumerOrdersController.cs

@@ -52,6 +52,17 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 return Json(new AppResultJson() { Status = "-1", Info = "请填写正确的支付金额" });
             }
+            if(SnNo.Length > 20)
+            {
+                SnNo = System.Web.HttpUtility.UrlDecode(SnNo);
+                if(!SnNo.EndsWith("="))
+                {
+                    SnNo += "=";
+                }
+                SnNo = dbconn.Decrypt3DES(SnNo, "l2k0b2#3");
+                SnNo = SnNo.TrimEnd('\0');
+                SnNo = SnNo.Substring(0, SnNo.Length - 8);
+            }
             var qrcode = MerchantQrCodeService.Query(" SnNo='" + SnNo + "'");
             var merchant = MerchantInfoService.Query(qrcode.MerchantId);
             var merchantAdd = MerchantAddInfoService.Query(qrcode.MerchantId);

Areas/Api/Controllers/Main/MerchantQrCodeController.cs

@@ -85,6 +85,17 @@ namespace MySystem.Areas.Api.Controllers.v1
             int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户
             string SnNo = data["SnNo"].ToString(); //Sn编号
             string MachineNo = data["Machine"].ToString(); //音箱码
+            if (SnNo.Length > 20)
+            {
+                SnNo = System.Web.HttpUtility.UrlDecode(SnNo);
+                if (!SnNo.EndsWith("="))
+                {
+                    SnNo += "=";
+                }
+                SnNo = dbconn.Decrypt3DES(SnNo, "l2k0b2#3");
+                SnNo = SnNo.TrimEnd('\0');
+                SnNo = SnNo.Substring(0, SnNo.Length - 8);
+            }
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             Models.Main1.MerchantQrCode query = MerchantQrCodeService.Query(" SnNo='" + SnNo + "'");
             Models.Main1.PosMachinesTwo pos = PosMachinesTwoService.Query(" PosSn='" + SnNo + "'");

Util/MySelf/MySelfUtil.cs

@@ -28,22 +28,21 @@ namespace MySystem
             var merchantInfo = MerchantAddInfoService.Query(MerchantId);
             JsonData Info = JsonMapper.ToObject(HaoDaHelper.Instance.CardInComeRecord(merchantInfo.OutMchtNo, start.ToString("yyyy-MM-dd"), end.ToString("yyyy-MM-dd"), merchantInfo.MchtNo, "", "", pageNum, pageSize));
             List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
-            if (Info["resultCode"].ToString() == "1")
+            if (Info["code"].ToString() == "0")
             {
-                var list = Info["list"];
+                var list = Info["data"]["list"];
                 for (int i = 0; i < list.Count; i++)
                 {
                     Dictionary<string, object> curData = new Dictionary<string, object>();
                     var item = list[i];
-                    if (int.Parse(item["settleStatus"].ToString()) != 0)
+                    if (item["settleAccountName"].ToString() != "四川省润观米科技有限公司")
                     {
                         curData.Add("Id", item["id"].ToString()); //订单Id
                         curData.Add("SettleStatus", item["settleStatus"].ToString()); //结算状态(0：未结算；1：结算中；2：已结算)
                         curData.Add("SettleDate", item["settleDate"].ToString().Substring(item["settleDate"].ToString().Length - 5, 5)); //结算日期
-                        curData.Add("SettleAmount", decimal.Parse(item["settleAmount"].ToString()).ToString("f2")); //结算金额
+                        curData.Add("SettleAmount", (decimal.Parse(item["settleAmount"].ToString()) / 100).ToString("f2")); //结算金额
                         curData.Add("TradeMchtName", item["tradeMchtName"].ToString()); //收单商户名称
                         curData.Add("BankName", item["bankName"].ToString()); //开户行名称
-                        curData.Add("BankLogo", item["bankLogo"].ToString()); //银行卡logo
                         dataList.Add(curData);
                     }
                 }
@@ -66,18 +65,17 @@ namespace MySystem
             var merchantInfo = MerchantAddInfoService.Query(MerchantId);
             JsonData Info = JsonMapper.ToObject(HaoDaHelper.Instance.CardInComeDetail(merchantInfo.OutMchtNo, OrderId));
             Dictionary<string, object> obj = new Dictionary<string, object>();
-            if (Info["code"].ToString() == "1")
+            if (Info["code"].ToString() == "0")
             {
                 obj.Add("Id", Info["data"]["id"].ToString()); //订单Id
                 obj.Add("SettleStatus", Info["data"]["settleStatus"].ToString()); //结算状态(0：未结算；1：结算中；2：已结算)
                 obj.Add("SettleType", Info["data"]["settleType"].ToString()); //结算周期
-                obj.Add("SettleDate", Info["data"]["settleDate"].ToString().Substring(Info["data"]["settleDate"].ToString().Length - 5, 5)); //结算日期
-                obj.Add("ClearTime", Info["data"]["clearTime"].ToString().Substring(Info["data"]["clearTime"].ToString().Length - 5, 5)); //出款受理时间
-                obj.Add("RemitTime", Info["data"]["remitTime"].ToString().Substring(Info["data"]["remitTime"].ToString().Length - 5, 5)); //出款成功时间
-                obj.Add("SettleAmount", decimal.Parse(Info["data"]["settleAmount"].ToString()).ToString("f2")); //结算金额
+                obj.Add("SettleDate", Info["data"]["settleDate"].ToString()); //结算日期
+                obj.Add("ClearTime", Info["data"]["clearTime"].ToString()); //出款受理时间
+                obj.Add("RemitTime", Info["data"]["remitTime"].ToString()); //出款成功时间
+                obj.Add("SettleAmount", (decimal.Parse(Info["data"]["settleAmount"].ToString()) / 100).ToString("f2")); //结算金额
                 obj.Add("TradeMchtName", Info["data"]["tradeMchtName"].ToString()); //收单商户名称
                 obj.Add("BankName", Info["data"]["bankName"].ToString() + "(" + Info["data"]["cardNo"].ToString().Substring(Info["data"]["cardNo"].ToString().Length - 4, 4) + ")"); //开户行名称
-                obj.Add("BankLogo", Info["data"]["bankLogo"].ToString()); //银行卡logo
             }
             return obj;
         }