查询开机奖补录机错误提示

循环机查询新版数据待重置
查询机具信息添加奖励发放时间
变更坏机为仓库机状态条件
划拨创客机具券来源创客条件补全

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1164,14 +1164,14 @@ namespace MySystem.Areas.Admin.Controllers
             if (leader10.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == leader10.UserId) ?? new Users();
-                Leader10 = "金额：" + leader10.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发奖时间：" + user.RealName;
+                Leader10 = "金额：" + leader10.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发奖时间：" + leader10.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 // Leader10 = "金额：" + leader10.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             var yyzx5 = db.UserAccountRecord.FirstOrDefault(m => m.QueryCount == pos.Id && m.ChangeType == 121) ?? new UserAccountRecord();
             if (yyzx5.Id > 0)
             {
                 Users user = db.Users.FirstOrDefault(m => m.Id == yyzx5.UserId) ?? new Users();
-                YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发奖时间：" + yyzx5.CreateDate;
+                YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，发奖时间：" + yyzx5.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss");
                 // YYZX5 = "金额：" + yyzx5.ChangeAmount + "，创客编号：" + user.MakerCode + "，姓名：" + user.RealName + "，手机号：" + user.Mobile;
             }
             MachineApply apply = db.MachineApply.FirstOrDefault(m => m.SwapSnExpand.Contains(pos.PosSn)) ?? new MachineApply();
@@ -1239,8 +1239,8 @@ namespace MySystem.Areas.Admin.Controllers
             result += "流量费发放对象：" + FluxUser6 + "\n";
             result += "开机奖20：" + OpenUser20 + "\n";
             // result += "开机奖10：" + OpenUser10 + "\n";
-            result += "盟主奖" + Leader10 + "\n";
-            result += "运营中心奖" + YYZX5 + "\n";
+            result += "盟主奖：" + Leader10 + "\n";
+            result += "运营中心奖：" + YYZX5 + "\n";
             return result;
         }
         //解析金控日志
@@ -2481,8 +2481,8 @@ namespace MySystem.Areas.Admin.Controllers
             }
             else
             {
-                var stattime = Convert.ToDateTime(pos.RecycStartDate).ToString("yyyy-MM-dd hh:mm:ss");
-                var endtime = Convert.ToDateTime(pos.RecycEndDate).ToString("yyyy-MM-dd hh:mm:ss");
+                var stattime = pos.RecycStartDate == null ? "" : pos.RecycStartDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
+                var endtime = pos.RecycEndDate== null ? "" : pos.RecycEndDate.Value.ToString("yyyy-MM-dd hh:mm:ss");
                 result += "循环开始时间：" + stattime + "\n";
                 result += "循环结束时间：" + endtime + "\n";
                 result += "来源机具/券：" + pos.SourcePosSn + "\n";
@@ -4121,12 +4121,12 @@ namespace MySystem.Areas.Admin.Controllers
             string[] PosCouponList = PosCouponCodes.Replace("\r", "").Replace("\n", ",").Split(',');
             foreach (string PosCouponCode in PosCouponList)
             {
-                PosCoupons item = db.PosCoupons.FirstOrDefault(m => m.ExchangeCode == PosCouponCode);
+                PosCoupons item = db.PosCoupons.FirstOrDefault(m => m.ExchangeCode == PosCouponCode) ?? new PosCoupons();
                 if (item.UserId != fUserId.Id)
                 {
                     return "机具券" + PosCouponCode + "不在创客" + FromMakerCode + "名下";
                 }
-                if (item == null)
+                if (item.Id == 0)
                 {
                     return "机具券" + PosCouponCode + "不存在";
                 }

Areas/Admin/Views/MainServer/SysTools/SeeSnDetail.cshtml

@@ -66,7 +66,7 @@
                 dataType: "text",
                 success: function (data) {
                     layer.close(index);
-                    layer.alert(data.replace(/\n/g, '<br />'), {area:['600px','650px']});
+                    layer.alert(data.replace(/\n/g, '<br />'), {area:['700px','750px']});
                 }
             });
         }

Areas/Admin/Views/MainServer/SysTools/SourceLoop.cshtml

@@ -30,8 +30,8 @@
                                 <div class="layui-form-item">
                                     <label class="layui-form-label">机具SN</label>
                                     <div class="layui-input-inline">
-                                        <input class="layui-input" type="text" id="PosSn"
-                                            name="PosSn" maxlength="50" lay-verify="required|"
+                                        <input class="layui-input" type="text" id="SnNo"
+                                            name="SnNo" maxlength="50" lay-verify="required|"
                                             autocomplete="off" placeholder="请输入机具SN">
                                     </div>
                                 </div>
@@ -66,7 +66,7 @@
                 dataType: "text",
                 success: function (data) {
                     layer.close(index);
-                    layer.alert(data.replace(/\n/g, '<br />'), {area:['200px','250px']});
+                    layer.alert(data.replace(/\n/g, '<br />'), {area:['300px','350px']});
                 }
             });
         }