查询机具信息去除押金字样

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -477,7 +477,7 @@ namespace MySystem.Areas.Admin.Controllers
                 else if (pos.BrandId == 9)
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
-                }                
+                }
                 else if (pos.BrandId == 10 || pos.BrandId == 11)
                 {
                     CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "10").Sum(m => m.TradeAmount);
@@ -697,7 +697,7 @@ namespace MySystem.Areas.Admin.Controllers
                         {
                             prizes.Add(50);
                         }
-                        else if((pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1 && ActPrize == 0) //联动首台无押金机返50
+                        else if ((pos.BrandId == 10 || pos.BrandId == 11) && pos.IsFirst == 1 && ActPrize == 0) //联动首台无押金机返50
                         {
                             prizes.Add(50);
                         }
@@ -1022,8 +1022,8 @@ namespace MySystem.Areas.Admin.Controllers
                 string results = "该机具为故障机" + "\n";
                 results += "所在仓库：" + storeInfo.StoreNo + "\n";
                 results += "仓库名称：" + storeInfo.StoreName + "\n";
-                results += "押金返现实际返现对象：" + DepositUsers + "\n";
-                results += "押金：" + Deposits + "\n";
+                results += "服务费返现实际返现对象：" + DepositUsers + "\n";
+                results += "服务费：" + Deposits + "\n";
                 results += "是否返现：" + DepositGets + "，领取时间：" + ActiveTimes + "\n";
                 return results;
             }
@@ -1156,7 +1156,7 @@ namespace MySystem.Areas.Admin.Controllers
             if (openreward.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == openreward.UserId) ?? new Users();
-                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName;
+                OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "发放时间：" + openreward.CreateDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
                 // OpenUser20 = "创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             openreward = OpenRewardDetail.FirstOrDefault(m => m.CreditRewardAmount == 10) ?? new OpenRewardDetail();
@@ -1231,11 +1231,11 @@ namespace MySystem.Areas.Admin.Controllers
             result += "是否循环：" + RecycFlag + "，申请循环时间：" + ApplyDate + "\n";
             result += "申请循环后的SN：" + applyorder.SnNos + "\n";
             result += "是否发货：" + SendStatus + "，发货时间：" + SendDate + "\n";
-            result += "押金：" + Deposit + "\n";
+            result += "服务费：" + Deposit + "\n";
             result += "是否返现：" + DepositGet + "，领取时间：" + ActiveTime + "\n";
             result += "返现金额：" + headAmount + " " + " " + footAmount + "\n";
-            result += "押金返现应返现对象：" + DepositToUser + "\n";
-            result += "押金返现实际返现对象：" + DepositUser + "\n";
+            result += "服务费返现应返现对象：" + DepositToUser + "\n";
+            result += "服务费返现实际返现对象：" + DepositUser + "\n";
             if (pos.BrandId == 6)
             {
                 result += "立刷10000奖励：" + DepositGet6 + "，领取时间：" + ActiveTime6 + "\n";
@@ -4274,7 +4274,7 @@ namespace MySystem.Areas.Admin.Controllers
                     opData.Add(oldpos.BuyUserId + ":" + oldpos.BrandId);
                 }
                 oldpos.Status = 1;
-                oldpos.PosSnType= 0;
+                oldpos.PosSnType = 0;
                 oldpos.QueryCount = 0;
                 oldpos.UpdateDate = null;
                 oldpos.ActivityList = null;