Merge branch 'feature-dgy-调整费率结果导入功能' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/PosMachinesFeeChangeRecordController.cs

@@ -320,6 +320,8 @@ namespace MySystem.Areas.Admin.Controllers
             JsonData list = JsonMapper.ToObject(ExcelData);
 
             List<int> dnposIds = new List<int>();
+            List<int> dnposIds2 = new List<int>();
+            List<int> dnposIds3 = new List<int>();
             string userIds = "";
             string warning = "";
 
@@ -328,27 +330,28 @@ namespace MySystem.Areas.Admin.Controllers
                 JsonData dr = list[i];
                 string PosNo = dr[0].ToString(); // 机具Sn
                 var Amount = double.Parse(dr[1].ToString()); // 调整费率
-                int Kind = int.Parse(dr[2].ToString()); // 1 调升 2 调低
+                int Kind = int.Parse(dr[2].ToString()); // 1 调升 2 调低(0.6) 3 调低(0.63)
                 var pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == PosNo) ?? new PosMachinesTwo();
                 if (pos.UpFeeFlag == 1 && pos.DownFeeFlag == 0)
                 {
-                    if (Kind != 2 || Amount != 0.6 || Amount != 0.63)
+                    if (Kind < 2)
                     {
                         warning += PosNo + ",该机具调低费率数值或类型不正确或已经调整，请检查好后全部重新导入";
                     }
                     else
                     {
-                        if (Kind == 2 && (Amount == 0.6 || Amount == 0.63))
-                        {
-                            pos.DownFeeFlag = 1;
-                            pos.DownFeeDate = DateTime.Now;
-                            pos.DownFeeMan = SysUserName + "_" + SysRealName;
-                            var poschange = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == pos.Id);
-                            poschange.Status = 1;
-                            db.SaveChanges();
-                            dnposIds.Add(pos.Id);
+                        Dictionary<string, object> data = new Dictionary<string, object>();
+                        pos.DownFeeFlag = 1;
+                        pos.DownFeeDate = DateTime.Now;
+                        pos.DownFeeMan = SysUserName + "_" + SysRealName;
+                        var poschange = db.PosMachinesFeeChangeRecord.FirstOrDefault(m => m.PosId == pos.Id);
+                        poschange.Status = 1;
+                        db.SaveChanges();
+                        dnposIds.Add(pos.Id);
+
+                        if (Kind == 2) dnposIds2.Add(pos.Id);
+                        if (Kind == 3) dnposIds3.Add(pos.Id);
 
-                        }
                         if (!userIds.Contains(pos.BuyUserId.ToString()))
                         {
                             userIds += pos.BuyUserId + ",";
@@ -394,7 +397,8 @@ namespace MySystem.Areas.Admin.Controllers
                         snhtml += "<div style='margin-bottom: .48rem;'><div class='f16'>商户姓名：" + Name + "</div>";
                         snhtml += "<div class='f16'>机具品牌：" + brand.Name + "</div>";
                         snhtml += "<div class='f16'>SN：" + items.PosSn + "</div>";
-                        snhtml += "<div class='f16'>当前费率：0.6%</div>";
+                        if (dnposIds2.Contains(items.Id)) snhtml += "<div class='f16'>当前费率：0.6%</div>";
+                        if (dnposIds3.Contains(items.Id)) snhtml += "<div class='f16'>当前费率：0.63%</div>";
                         snhtml += "<div class='f16'>费率调整时间：" + items.DownFeeDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "</div></div>";
                     }
                     snhtml += "</div>";