Merge branch 'feature-dgy-后台优化新' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/PosMerchantInfoListController.cs

@@ -904,10 +904,11 @@ namespace MySystem.Areas.Admin.Controllers
                 JsonData dr = list[i];
                 string KqMerNo = dr[0].ToString(); // 商户编号
                 string Amount = dr[1].ToString(); // 已退金额
+                string KqRegTime = dr[2].ToString(); // 退还时间
                 var posMerchantInfo = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == KqMerNo) ?? new PosMerchantInfo();
                 posMerchantInfo.StandardStatus = -2;
                 posMerchantInfo.Remark = Amount;
-                posMerchantInfo.KqRegTime = DateTime.Now;
+                posMerchantInfo.KqRegTime = DateTime.Parse(KqRegTime);
                 Ids += posMerchantInfo.Id + "_" + Amount + ",";
                 db.SaveChanges();
             }

Areas/Admin/Views/MainServer/PosMerchantInfoList/Indexrg.cshtml

@@ -93,7 +93,7 @@
                         }
                     </div>
                     <blockquote class="layui-elem-quote layui-text">
-                        服务费总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　达标奖总金额：<span style="color: #f00;" id="ReturnAmounts">0.00</span>
+                        服务费总金额：<span style="color: #f00;" id="ReturnAmount">0.00</span>　|　退还总金额：<span style="color: #f00;" id="ReturnAmounts">0.00</span>
                     </blockquote>
                 </div>
             </div>

wwwroot/layuiadmin/modules_main/PosMerchantInforgList_Admin.js

@@ -127,7 +127,7 @@ layui.config({
             , { field: 'SeoKeyword', width: 220, title: '服务费', sort: true }
             , { field: 'KqRegTime', width: 220, title: '导入退还时间', sort: true }
             // , { field: 'PrizeParams', width: 220, title: '设置押金', sort: true }
-            , { field: 'Remark', width: 220, title: '达标奖', sort: true }
+            , { field: 'Remark', width: 220, title: '退还金额', sort: true }
         ]]
         , where: {
         }