From 130e146e66da134e167b40dd792c79dd057f4255 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 09 八月 2021 14:04:49 +0800
Subject: [PATCH] 今日开发 更换登录页面背景图 解决https访问的问题 客户提现申请增加银行账号，银行名称，收款人姓名
---
zhengcaioa/zhengcaioa/Views/AdmAsk/CustomerWithdrawal.cshtml | 23 ++++++-
zhengcaioa/Services/AskService.cs | 4 +
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 4
zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs | 3 +
zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs | 23 +++++++
zhengcaioa/zhengcaioa/wwwroot/img/3.jpg | 0
zhengcaioa/Model/AdmCustomerWithdrawal.cs | 3 +
zhengcaioa/zhengcaioa/Views/Home/login.cshtml | 2
zhengcaioa/Model/zhengcaioaContext.cs | 6 ++
表修改.sql | 87 +++++++++++++++++++++++++++++
10 files changed, 148 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs b/zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs
index 4770749..e2df8cb 100644
--- a/zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs
+++ b/zhengcaioa/DTO/AdmCustomerWithdrawalDTO.cs
@@ -28,5 +28,8 @@
public string Content { get; set; }
public string Tongguojujue { get; set; }
public string Step { get; set; }
+ public string BankAcount { get; set; }
+ public string BankName { get; set; }
+ public string Username { get; set; }
}
}
diff --git a/zhengcaioa/Model/AdmCustomerWithdrawal.cs b/zhengcaioa/Model/AdmCustomerWithdrawal.cs
index 24b3a4a..bf89fbe 100644
--- a/zhengcaioa/Model/AdmCustomerWithdrawal.cs
+++ b/zhengcaioa/Model/AdmCustomerWithdrawal.cs
@@ -23,5 +23,8 @@
public DateTime Modifytime { get; set; }
public string CreaterName { get; set; }
public string Tittle { get; set; }
+ public string BankAcount { get; set; }
+ public string BankName { get; set; }
+ public string Username { get; set; }
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 48b9af5..5788464 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -1114,6 +1114,12 @@
entity.Property(e => e.HuiyuanPhone).HasMaxLength(50);
+ entity.Property(e => e.BankAcount).HasMaxLength(50);
+
+ entity.Property(e => e.BankName).HasMaxLength(50);
+
+ entity.Property(e => e.Username).HasMaxLength(50);
+
entity.Property(e => e.Jine)
.HasColumnType("money")
.HasDefaultValueSql("((0))");
diff --git a/zhengcaioa/Services/AskService.cs b/zhengcaioa/Services/AskService.cs
index c37b993..fcc03d9 100644
--- a/zhengcaioa/Services/AskService.cs
+++ b/zhengcaioa/Services/AskService.cs
@@ -474,6 +474,10 @@
entity.HuiyuanPhone = admAsk.HuiyuanPhone;
entity.Shenqingtime = admAsk.Shenqingtime;
+ entity.BankAcount = admAsk.BankAcount;
+ entity.BankName = admAsk.BankName;
+ entity.Username = admAsk.Username;
+
entity.ShenpiStatus = admAsk.ShenpiStatus;
entity.CreaterName = admAsk.CreaterName;
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs
index 1927179..7c3e077 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/CustomerWithdrawalController.cs
@@ -113,7 +113,28 @@
returnMsg.count = 0;
return new JsonResult(returnMsg);
}
-
+ if (string.IsNullOrWhiteSpace(data.BankAcount))
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁閾惰璐︽埛锛�";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ if (string.IsNullOrWhiteSpace(data.BankName))
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁閾惰鍚嶇О锛�";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+ if (string.IsNullOrWhiteSpace(data.Username))
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鏀舵浜哄鍚嶏紒";
+ returnMsg.count = 0;
+ return new JsonResult(returnMsg);
+ }
+
ResultEntity resultEntity = new ResultEntity();
using (TransactionScope scope = new TransactionScope())
{
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index d0fcf9d..253e624 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -3442,7 +3442,7 @@
decimal jiucuo = hrSalaryDTO.Jiucuo.HasValue ? hrSalaryDTO.Jiucuo.Value : 0;
//璁＄畻淇濆簳骞磋柂
- if (userList[i].Indate.HasValue && userList[i].miniyearsalary.HasValue)
+ if (userList[i].Indate.HasValue && userList[i].miniyearsalary.HasValue && userList[i].miniyearsalary.Value>0)
{
DateTime jixinue = userList[i].Indate.Value;
if (userList[i].Indate.Value.Day != 1)
@@ -3588,7 +3588,7 @@
hrSalaryDTO.Yufagongzi = userList[i].advancewages;
- if (userList[i].advancewages.HasValue)
+ if (userList[i].advancewages.HasValue && userList[i].advancewages.Value>0)
{
hrSalaryDTO.Yufagongziheji = 0;
HrSalaryDTO hrSalaryDTOlast = _hrSalaryService.GetListByUser(userList[i].Id, dateminkaoqin.AddMonths(-1).Year, dateminkaoqin.AddMonths(-1).Month);
diff --git a/zhengcaioa/zhengcaioa/Views/AdmAsk/CustomerWithdrawal.cshtml b/zhengcaioa/zhengcaioa/Views/AdmAsk/CustomerWithdrawal.cshtml
index 9729509..afa3bab 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmAsk/CustomerWithdrawal.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmAsk/CustomerWithdrawal.cshtml
@@ -90,13 +90,13 @@
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">浼氬憳鍚嶇О<i class="red">*</i></label>
<div class="col-sm-6 col-md-6">
- <input type="text" class="form-control" value="@Model.HuiyuanName" name="HuiyuanName" id="HuiyuanName" maxlength="500">
+ <input type="text" class="form-control" value="@Model.HuiyuanName" name="HuiyuanName" id="HuiyuanName" maxlength="100">
</div>
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">浼氬憳鐢佃瘽</label>
<div class="col-sm-2 col-md-2">
- <input type="text" class="form-control" value="@Model.HuiyuanPhone" name="HuiyuanPhone" id="HuiyuanPhone" maxlength="500">
+ <input type="text" class="form-control" value="@Model.HuiyuanPhone" name="HuiyuanPhone" id="HuiyuanPhone" maxlength="50">
<input type="hidden" id="HuiyuanId" name="HuiyuanId" value="@Model.HuiyuanId" />
<input type="hidden" id="OrderNo" name="OrderNo" value="@Model.OrderNo" />
</div>
@@ -108,7 +108,24 @@
<input class="form-control" id="Jine" name="Jine" type="text" value="@Model.JineName" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
</div>
-
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">閾惰璐︽埛</label>
+ <div class="col-sm-2 col-md-2">
+ <input type="text" class="form-control" value="@Model.BankAcount" name="BankAcount" id="BankAcount" maxlength="50">
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">閾惰鍚嶇О</label>
+ <div class="col-sm-2 col-md-2">
+ <input type="text" class="form-control" value="@Model.BankName" name="BankName" id="BankName" maxlength="50">
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">鏀舵浜哄鍚�</label>
+ <div class="col-sm-2 col-md-2">
+ <input type="text" class="form-control" value="@Model.Username" name="Username" id="Username" maxlength="50">
+ </div>
+ </div>
<div class="clearfix layer-area" style="padding-bottom:15px;" id="shenpiyijian">
diff --git a/zhengcaioa/zhengcaioa/Views/Home/login.cshtml b/zhengcaioa/zhengcaioa/Views/Home/login.cshtml
index 01919e4..bd6afe5 100644
--- a/zhengcaioa/zhengcaioa/Views/Home/login.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Home/login.cshtml
@@ -41,7 +41,7 @@
}
.login-body {
- background: #005599 url(/img/3.jpg) center bottom no-repeat fixed;
+ background: #005599 url(/img/3.jpg?v=1) center bottom no-repeat fixed;
background-size: cover;
width: 100%;
height: 100%;
diff --git a/zhengcaioa/zhengcaioa/wwwroot/img/3.jpg b/zhengcaioa/zhengcaioa/wwwroot/img/3.jpg
index d5bad70..1ba0181 100644
--- a/zhengcaioa/zhengcaioa/wwwroot/img/3.jpg
+++ b/zhengcaioa/zhengcaioa/wwwroot/img/3.jpg
Binary files differ
diff --git "a/\350\241\250\344\277\256\346\224\271.sql" "b/\350\241\250\344\277\256\346\224\271.sql"
index d20455c..83cda16 100644
--- "a/\350\241\250\344\277\256\346\224\271.sql"
+++ "b/\350\241\250\344\277\256\346\224\271.sql"
@@ -1,3 +1,90 @@
+USE [zhengcaioa]
+GO
+
+/****** Object: Table [dbo].[ADM_Customer_withdrawal] Script Date: 2021/8/9 13:43:29 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[ADM_Customer_withdrawal](
+ [Id] [nvarchar](50) NOT NULL,
+ [OrderNo] [nvarchar](50) NULL,
+ [Jine] [money] NULL,
+ [HuiyuanName] [nvarchar](100) NULL,
+ [HuiyuanId] [nvarchar](50) NULL,
+ [HuiyuanPhone] [nvarchar](50) NULL,
+
+ [BankAcount] [nvarchar](50) NULL,
+ [BankName] [nvarchar](50) NULL,
+ [Username] [nvarchar](50) NULL,
+
+
+
+ [Shenqingtime] [datetime] NOT NULL,
+ [Remark] [nvarchar](500) NULL,
+ [shenpi_status] [nvarchar](1) NULL,
+ [rec_status] [nvarchar](1) NOT NULL,
+ [creater] [nvarchar](50) NOT NULL,
+ [createtime] [datetime] NOT NULL,
+ [modifier] [nvarchar](50) NOT NULL,
+ [modifytime] [datetime] NOT NULL,
+ [createrName] [nvarchar](50) NULL,
+ [tittle] [nvarchar](50) NULL,
+ CONSTRAINT [PK__Customer_withdrawal__3214EC077AC5FA48] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, FILLFACTOR = 100) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[ADM_Customer_withdrawal] ADD DEFAULT ((0)) FOR [Jine]
+GO
+
+ALTER TABLE [dbo].[ADM_Customer_withdrawal] ADD DEFAULT (getdate()) FOR [Shenqingtime]
+GO
+
+ALTER TABLE [dbo].[ADM_Customer_withdrawal] ADD DEFAULT ('D') FOR [shenpi_status]
+GO
+
+ALTER TABLE [dbo].[ADM_Customer_withdrawal] ADD DEFAULT ('A') FOR [rec_status]
+GO
+
+ALTER TABLE [dbo].[ADM_Customer_withdrawal] ADD DEFAULT ('1') FOR [creater]
+GO
+
+ALTER TABLE [dbo].[ADM_Customer_withdrawal] ADD DEFAULT (getdate()) FOR [createtime]
+GO
+
+ALTER TABLE [dbo].[ADM_Customer_withdrawal] ADD DEFAULT ('1') FOR [modifier]
+GO
+
+ALTER TABLE [dbo].[ADM_Customer_withdrawal] ADD DEFAULT (getdate()) FOR [modifytime]
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
USE [zhengcaioa]
GO
--
Gitblit v1.9.1