From 82645238a5855f6f7b8c397d1f8fa8b4a3155b94 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 14 七月 2021 16:00:18 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml | 2
zhengcaioa/zhengcaioa/Startup.cs | 4
zhengcaioa/Services/AdmPieceCheckService.cs | 4
zhengcaioa/DTO/CooperatecustomCustomerDTO.cs | 2
zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs | 7
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml | 1
zhengcaioa/Model/zhengcaioaContext.cs | 62 +++
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 145 ++++++++--
zhengcaioa/Model/AdmPieceCheck.cs | 1
zhengcaioa/DTO/AdmPieceCheckDTO.cs | 1
zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs | 20 +
zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
zhengcaioa/Services/LiaotianService.cs | 47 +++
zhengcaioa/Model/CooperatecustomCustomer.cs | 3
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 63 ++--
zhengcaioa/Services/CooperatecustomCustomerService.cs | 4
zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs | 203 ++++++++++++++
zhengcaioa/DTO/LiaotianDTO.cs | 2
zhengcaioa/Model/SysUpdatetime.cs | 14 +
zhengcaioa/IServices/ILiaotianService.cs | 4
表修改.sql | 105 +++++++
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml | 57 ++-
zhengcaioa/zhengcaioa/appsettings.Development.json | 8
zhengcaioa/DTO/IntentionCustomerDTO.cs | 2
zhengcaioa/Services/IntentionCustomerService.cs | 4
zhengcaioa/Model/IntentionCustomer.cs | 2
zhengcaioa/Model/Liaotian.cs | 4
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 20 +
zhengcaioa/zhengcaioa/appsettings.json | 7
29 files changed, 701 insertions(+), 99 deletions(-)
diff --git a/zhengcaioa/DTO/AdmPieceCheckDTO.cs b/zhengcaioa/DTO/AdmPieceCheckDTO.cs
index a1637a7..8c7be65 100644
--- a/zhengcaioa/DTO/AdmPieceCheckDTO.cs
+++ b/zhengcaioa/DTO/AdmPieceCheckDTO.cs
@@ -24,6 +24,7 @@
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
+ public decimal? Shuliang { get; set; }
}
diff --git a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
index f5c6e5f..533cad9 100644
--- a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
+++ b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
@@ -58,6 +58,8 @@
public string Weixin { get; set; }
public string Shifoutianjiaweixin { get; set; }
public string HuiyuanId { get; set; }
+ public string Weixiner { get; set; }
+ public DateTime? Weixintime { get; set; }
}
public class CooperatecustomCustomerDTOSearch : SearchEntity
diff --git a/zhengcaioa/DTO/IntentionCustomerDTO.cs b/zhengcaioa/DTO/IntentionCustomerDTO.cs
index 062b1b8..f28a160 100644
--- a/zhengcaioa/DTO/IntentionCustomerDTO.cs
+++ b/zhengcaioa/DTO/IntentionCustomerDTO.cs
@@ -60,6 +60,8 @@
public string Weixin { get; set; }
public string Shifoutianjiaweixin { get; set; }
+ public string Weixiner { get; set; }
+ public DateTime? Weixintime { get; set; }
}
public class IntentionCustomerDTOSearch : SearchEntity
diff --git a/zhengcaioa/DTO/LiaotianDTO.cs b/zhengcaioa/DTO/LiaotianDTO.cs
index f722329..c91ecd0 100644
--- a/zhengcaioa/DTO/LiaotianDTO.cs
+++ b/zhengcaioa/DTO/LiaotianDTO.cs
@@ -21,6 +21,8 @@
public string Questiontype { get; set; }
public string Problemtype { get; set; }
public string ChushuStatus { get; set; }
+ public DateTime? Shenhetime { get; set; }
+ public string Shenheer { get; set; }
public string _Modifytimetxt;
public string Modifytimetxt
diff --git a/zhengcaioa/IServices/ILiaotianService.cs b/zhengcaioa/IServices/ILiaotianService.cs
index cf7e8f0..91446d7 100644
--- a/zhengcaioa/IServices/ILiaotianService.cs
+++ b/zhengcaioa/IServices/ILiaotianService.cs
@@ -27,5 +27,9 @@
List<LiaotianShoucangDTO> getListLiaotianShoucang(string userId,string LiaotianId);
+ SysUpdatetime GetSysUpdatetime(string updatename);
+
+ ResultEntity saveSysUpdatetime(SysUpdatetime sysUpdatetime);
+
}
}
diff --git a/zhengcaioa/Model/AdmPieceCheck.cs b/zhengcaioa/Model/AdmPieceCheck.cs
index 873ca4b..7add019 100644
--- a/zhengcaioa/Model/AdmPieceCheck.cs
+++ b/zhengcaioa/Model/AdmPieceCheck.cs
@@ -20,5 +20,6 @@
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
+ public decimal? Shuliang { get; set; }
}
}
diff --git a/zhengcaioa/Model/CooperatecustomCustomer.cs b/zhengcaioa/Model/CooperatecustomCustomer.cs
index 79fe3f6..4dfa563 100644
--- a/zhengcaioa/Model/CooperatecustomCustomer.cs
+++ b/zhengcaioa/Model/CooperatecustomCustomer.cs
@@ -44,6 +44,7 @@
public string Weixin { get; set; }
public string Shifoutianjiaweixin { get; set; }
public string HuiyuanId { get; set; }
-
+ public string Weixiner { get; set; }
+ public DateTime? Weixintime { get; set; }
}
}
diff --git a/zhengcaioa/Model/IntentionCustomer.cs b/zhengcaioa/Model/IntentionCustomer.cs
index 290df7a..783869e 100644
--- a/zhengcaioa/Model/IntentionCustomer.cs
+++ b/zhengcaioa/Model/IntentionCustomer.cs
@@ -47,5 +47,7 @@
public DateTime? Zuijinzhuizongtime { get; set; }
public string Weixin { get; set; }
public string Shifoutianjiaweixin { get; set; }
+ public string Weixiner { get; set; }
+ public DateTime? Weixintime { get; set; }
}
}
diff --git a/zhengcaioa/Model/Liaotian.cs b/zhengcaioa/Model/Liaotian.cs
index 602f12f..95cd5c8 100644
--- a/zhengcaioa/Model/Liaotian.cs
+++ b/zhengcaioa/Model/Liaotian.cs
@@ -19,8 +19,8 @@
public string Questiontype { get; set; }
public string Problemtype { get; set; }
public string Shiyongfatiao { get; set; }
-
public string ChushuStatus { get; set; }
-
+ public DateTime? Shenhetime { get; set; }
+ public string Shenheer { get; set; }
}
}
diff --git a/zhengcaioa/Model/SysUpdatetime.cs b/zhengcaioa/Model/SysUpdatetime.cs
new file mode 100644
index 0000000..f19196a
--- /dev/null
+++ b/zhengcaioa/Model/SysUpdatetime.cs
@@ -0,0 +1,14 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class SysUpdatetime
+ {
+ public string Id { get; set; }
+ public string Updatename { get; set; }
+ public DateTime Updatetime { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index adb9cba..27b0e58 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -90,6 +90,7 @@
public virtual DbSet<SysCode> SysCodes { get; set; }
public virtual DbSet<SysCodeDtl> SysCodeDtls { get; set; }
public virtual DbSet<Systemsetting> Systemsettings { get; set; }
+ public virtual DbSet<SysUpdatetime> SysUpdatetimes { get; set; }
public virtual DbSet<WfApplytype> WfApplytypes { get; set; }
public virtual DbSet<WfHistory> WfHistories { get; set; }
public virtual DbSet<WfLog> WfLogs { get; set; }
@@ -1208,6 +1209,10 @@
.HasColumnName("remark")
.HasComment("宸ヤ綔鍐呭");
+ entity.Property(e => e.Shuliang)
+ .HasColumnType("money")
+ .HasColumnName("shuliang");
+
entity.Property(e => e.UserId)
.HasMaxLength(50)
.HasColumnName("userId")
@@ -1638,9 +1643,9 @@
.HasComment("鑱旂郴鐢佃瘽");
entity.Property(e => e.HuiyuanId)
- .HasMaxLength(50)
- .HasColumnName("huiyuanId")
- .HasComment("浼氬憳Id");
+ .HasMaxLength(50)
+ .HasColumnName("huiyuanId")
+ .HasComment("浼氬憳Id");
entity.Property(e => e.Hyfl)
.HasMaxLength(50)
@@ -1746,6 +1751,14 @@
entity.Property(e => e.Weixin)
.HasMaxLength(50)
.HasColumnName("weixin");
+
+ entity.Property(e => e.Weixiner)
+ .HasMaxLength(50)
+ .HasColumnName("weixiner");
+
+ entity.Property(e => e.Weixintime)
+ .HasColumnType("datetime")
+ .HasColumnName("weixintime");
entity.Property(e => e.YwName)
.HasMaxLength(500)
@@ -3071,6 +3084,14 @@
.HasMaxLength(50)
.HasColumnName("weixin");
+ entity.Property(e => e.Weixiner)
+ .HasMaxLength(50)
+ .HasColumnName("weixiner");
+
+ entity.Property(e => e.Weixintime)
+ .HasColumnType("datetime")
+ .HasColumnName("weixintime");
+
entity.Property(e => e.Yixiang).HasMaxLength(50);
entity.Property(e => e.Yixiangtime).HasColumnType("datetime");
@@ -3327,13 +3348,14 @@
.HasColumnName("anwser");
entity.Property(e => e.ChushuStatus)
- .HasMaxLength(1)
- .HasColumnName("chushu_status")
- .HasDefaultValueSql("('D')");
+ .HasMaxLength(1)
+ .HasColumnName("chushu_status")
+ .HasDefaultValueSql("('D')");
entity.Property(e => e.Clientid)
.HasMaxLength(50)
- .HasColumnName("clientid");
+ .HasColumnName("clientid")
+ .HasDefaultValueSql("('a')");
entity.Property(e => e.Creater)
.IsRequired()
@@ -3376,11 +3398,18 @@
.HasColumnName("rec_status")
.HasDefaultValueSql("('a')");
+ entity.Property(e => e.Shenheer)
+ .HasMaxLength(50)
+ .HasColumnName("shenheer");
+
+ entity.Property(e => e.Shenhetime)
+ .HasColumnType("datetime")
+ .HasColumnName("shenhetime");
+
entity.Property(e => e.Shiyongfatiao)
.HasMaxLength(500)
.HasColumnName("shiyongfatiao");
});
-
modelBuilder.Entity<LiaotianShoucang>(entity =>
{
entity.ToTable("Liaotian_shoucang");
@@ -4867,6 +4896,23 @@
.HasColumnName("wedding_leave")
.HasComment("濠氬亣澶╂暟");
});
+
+ modelBuilder.Entity<SysUpdatetime>(entity =>
+ {
+ entity.ToTable("sys_updatetime");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Updatename)
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnName("updatename");
+
+ entity.Property(e => e.Updatetime)
+ .HasColumnType("datetime")
+ .HasColumnName("updatetime");
+ });
+
modelBuilder.Entity<WfApplytype>(entity =>
{
entity.ToTable("wf_applytype");
diff --git a/zhengcaioa/Services/AdmPieceCheckService.cs b/zhengcaioa/Services/AdmPieceCheckService.cs
index d6f3fca..2b5bacb 100644
--- a/zhengcaioa/Services/AdmPieceCheckService.cs
+++ b/zhengcaioa/Services/AdmPieceCheckService.cs
@@ -47,7 +47,7 @@
updateproject.WorkPro = entity.WorkPro;
updateproject.Remark = entity.Remark;
updateproject.Gongzi = entity.Gongzi;
-
+ updateproject.Shuliang = entity.Shuliang;
updateproject.Remark = entity.Remark;
updateproject.RecStatus = entity.RecStatus;
@@ -184,7 +184,7 @@
WorkProName = ccc.Project,
Gongzi = a.Gongzi ?? 0,
Remark = a.Remark,
-
+ Shuliang = a.Shuliang ?? 0,
Creater = a.Creater,
Createtime = a.Createtime,
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index 22ef326..f71cf68 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -96,6 +96,8 @@
updateproject.Weixin = cooperatecustomCustomer.Weixin;
updateproject.HuiyuanId = cooperatecustomCustomer.HuiyuanId;
updateproject.Shifoutianjiaweixin = cooperatecustomCustomer.Shifoutianjiaweixin;
+ updateproject.Weixintime = cooperatecustomCustomer.Weixintime;
+ updateproject.Weixiner = cooperatecustomCustomer.Weixiner;
}
_context.SaveChanges();
@@ -255,6 +257,8 @@
Weixin = a.Weixin,
Shifoutianjiaweixin = a.Shifoutianjiaweixin,
HuiyuanId = a.HuiyuanId,
+ Weixiner = a.Weixiner,
+ Weixintime = a.Weixintime,
}
).OrderByDescending(x => x.Modifytime).ToList();
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 22e37f2..7ffaf19 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -97,6 +97,8 @@
updateproject.Weixin = intentionCustomer.Weixin;
updateproject.Shifoutianjiaweixin = intentionCustomer.Shifoutianjiaweixin;
+ updateproject.Weixiner = intentionCustomer.Weixiner;
+ updateproject.Weixintime = intentionCustomer.Weixintime;
}
@@ -273,6 +275,8 @@
Remark = a.Remark,
Weixin = a.Weixin,
Shifoutianjiaweixin = a.Shifoutianjiaweixin,
+ Weixiner = a.Weixiner,
+ Weixintime = a.Weixintime,
RecStatus = a.RecStatus,
Modifier = a.Modifier,
Modifytime = a.Modifytime,
diff --git a/zhengcaioa/Services/LiaotianService.cs b/zhengcaioa/Services/LiaotianService.cs
index 15f76d7..360cf22 100644
--- a/zhengcaioa/Services/LiaotianService.cs
+++ b/zhengcaioa/Services/LiaotianService.cs
@@ -55,6 +55,8 @@
updateliaotian.Problemtype = liaotian.Problemtype;
updateliaotian.Shiyongfatiao = liaotian.Shiyongfatiao;
updateliaotian.ChushuStatus = liaotian.ChushuStatus;
+ updateliaotian.Shenheer = liaotian.Shenheer;
+ updateliaotian.Shenhetime = liaotian.Shenhetime;
}
_context.SaveChanges();
@@ -164,6 +166,8 @@
Problemtype = a.Problemtype,
Shiyongfatiao = a.Shiyongfatiao,
ChushuStatus= a.ChushuStatus,
+ Shenheer = a.Shenheer,
+ Shenhetime = a.Shenhetime,
}
)
.Distinct() .OrderByDescending(x => x.Modifytime).ToList();
@@ -339,5 +343,48 @@
return result;
}
+
+
+
+ public ResultEntity saveSysUpdatetime(SysUpdatetime sysUpdatetime)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+ if (String.IsNullOrEmpty(sysUpdatetime.Id))
+ {
+ sysUpdatetime.Id = Guid.NewGuid().ToString();
+ _context.SysUpdatetimes.Add(sysUpdatetime);
+ }
+ else
+ {
+ var updateliaotian = _context.SysUpdatetimes.Find(sysUpdatetime.Id);
+ updateliaotian.Updatename = sysUpdatetime.Updatename;
+ updateliaotian.Updatetime = sysUpdatetime.Updatetime;
+
+ }
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = sysUpdatetime.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
+ public SysUpdatetime GetSysUpdatetime(string updatename)
+ {
+
+ var entity = _context.SysUpdatetimes.Where(x=>x.Updatename == updatename).FirstOrDefault();
+
+ return entity;
+ }
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index 62691b1..1fce48e 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -222,46 +222,47 @@
else
{
admAskLeaveDTO.CreaterName = curentuser.UserName;
- admAskLeaveDTO.Tittle = "璇峰亣鐢宠锛�" + curentuser.UserName +"锛�";
- }
+ admAskLeaveDTO.Tittle = "璇峰亣鐢宠锛�" + curentuser.UserName + "锛�";
- if (!string.IsNullOrWhiteSpace(StratTimeName))
- {
- DateTime StratTimeName1;
- if(DateTime.TryParse(StratTimeName, out StratTimeName1))
+
+ if (!string.IsNullOrWhiteSpace(StratTimeName))
{
- admAskLeaveDTO.StratTimeName = StratTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
+ DateTime StratTimeName1;
+ if (DateTime.TryParse(StratTimeName, out StratTimeName1))
+ {
+ admAskLeaveDTO.StratTimeName = StratTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
+
+ }
+
+ }
+ else
+ {
+ admAskLeaveDTO.StratTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
}
- }
- else
- {
- admAskLeaveDTO.StratTimeName =DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.WorkingStart.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
-
- }
-
- if (!string.IsNullOrWhiteSpace(EndTimeName))
- {
- DateTime EndTimeName1;
- if (DateTime.TryParse(EndTimeName, out EndTimeName1))
+ if (!string.IsNullOrWhiteSpace(EndTimeName))
{
- admAskLeaveDTO.EndTimeName = EndTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
+ DateTime EndTimeName1;
+ if (DateTime.TryParse(EndTimeName, out EndTimeName1))
+ {
+ admAskLeaveDTO.EndTimeName = EndTimeName1.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
+
+ }
+ }
+ else
+ {
+ admAskLeaveDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
}
+ AdmAskLeaveDTO admAsk = jisianChecktime(DateTime.Parse(admAskLeaveDTO.StratTimeName), DateTime.Parse(admAskLeaveDTO.EndTimeName));
+
+ admAskLeaveDTO.LaveDay = admAsk.LaveDay;
+ admAskLeaveDTO.LavehHour = admAsk.LavehHour;
}
- else
- {
- admAskLeaveDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
-
- }
-
- AdmAskLeaveDTO admAsk = jisianChecktime(DateTime.Parse(admAskLeaveDTO.StratTimeName), DateTime.Parse(admAskLeaveDTO.EndTimeName));
-
- admAskLeaveDTO.LaveDay = admAsk.LaveDay;
- admAskLeaveDTO.LavehHour = admAsk.LavehHour;
+
ViewData.Model = admAskLeaveDTO;
@@ -796,7 +797,7 @@
{
askLeaveOffDTO.CreaterName = curentuser.UserName;
askLeaveOffDTO.Tittle = "閿�鍋囩敵璇凤紙" + curentuser.UserName +"锛�";
- }
+
@@ -832,7 +833,7 @@
askLeaveOffDTO.EndTimeName = DateTime.Now.Date.AddHours(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[0])).AddMinutes(double.Parse(admAttendanceRuleDTO.OffworkEnd.Split('.')[1])).ToString("yyyy-MM-dd HH:mm");
}
-
+ }
ResultDataEntity<SysAttachmentDTO> results = new ResultDataEntity<SysAttachmentDTO>();
if (!string.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index e9c3bbd..3c67038 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -18,10 +18,11 @@
using CommonToolsCore;
using Services;
using System.Transactions;
+using System.IdentityModel.Tokens.Jwt;
namespace zhengcaioa.Controllers.BusinessOrder
{
- [CheckLogin]
+
public class CooperOrderController : Controller
{
private readonly ILogger<CooperOrderController> _logger;
@@ -52,7 +53,7 @@
_fiMemberService = fiMemberService;
}
-
+ [CheckLogin]
public IActionResult Index()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -102,18 +103,18 @@
}
-
+ [CheckLogin]
public IActionResult GetList(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
- search.Creater = curentuser.Id;
+ //search.Creater = curentuser.Id;
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult ShouliList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -141,7 +142,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListshouli(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -152,7 +153,7 @@
}
-
+ [CheckLogin]
public IActionResult ChedanList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -180,7 +181,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListchedan(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -190,7 +191,7 @@
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult WangongList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -218,7 +219,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListwangong(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -228,7 +229,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult SonghuoList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -258,7 +259,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListsonghuo(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -268,7 +269,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult HuifangList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -296,7 +297,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListHuifang(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -306,7 +307,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
-
+ [CheckLogin]
public IActionResult PingjiaList()
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -334,7 +335,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListPingjia(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -374,7 +375,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult GetListYouhui(CooperOrderDTOSearch search)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -384,6 +385,7 @@
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
return new JsonResult(_cooperOrderService.SearchByPaging(search));
}
+ [CheckLogin]
public IActionResult Edit(string id = null, string ShouliStatus = "1")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -443,6 +445,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
///
+ [CheckLogin]
[HttpPost]
public IActionResult Save(CooperOrderDTO data)
{
@@ -478,6 +481,7 @@
/// <param name="info">瀹炰綋</param>
/// <returns></returns>
///
+ [CheckLogin]
public IActionResult Nullify(string Id = "")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -492,7 +496,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
///
-
+ [CheckLogin]
public IActionResult Shouli(string id)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -524,7 +528,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
///
-
+ [CheckLogin]
public IActionResult Wangong(string id)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -540,8 +544,8 @@
return new JsonResult(resultEntity);
}
-
+ [CheckLogin]
public IActionResult Chedan(string id = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -552,7 +556,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult chedantuihuan(decimal Price, string Chedanid)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -580,7 +584,7 @@
return new JsonResult(resultEntity);
}
-
+ [CheckLogin]
public IActionResult Huifang(string id = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -592,7 +596,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult Huifangtuihuan(CooperOrderDTO dto)
{
ResultEntity resultEntity = new ResultEntity();
@@ -619,7 +623,7 @@
/// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
/// <returns></returns>
///
-
+ [CheckLogin]
public IActionResult Songhuo(string id)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -639,7 +643,7 @@
}
-
+ [CheckLogin]
public IActionResult Songhuotuihuan(CooperOrderDTO dto)
{
ResultEntity resultEntity = new ResultEntity();
@@ -663,7 +667,7 @@
return new JsonResult(resultEntity);
}
-
+ [CheckLogin]
public IActionResult Pingjia(string id = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -674,7 +678,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult Pingjiatuihuan(string PingjiaStatus, string Pingjiaid)
{
ResultEntity resultEntity = new ResultEntity();
@@ -695,7 +699,7 @@
}
-
+ [CheckLogin]
public IActionResult Print(string id = null)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
@@ -724,7 +728,7 @@
return View();
}
-
+ [CheckLogin]
public IActionResult printList(CooperOrderDTOSearch search)
{
//JsonResult jsonResult = new JsonResult(_liaotianService.SearchByPaging(search), new Newtonsoft.Json.Serialization.DefaultContractResolver());
@@ -854,6 +858,87 @@
return result;
}
-
+
+
+
+ //鎻愰棶
+ public IActionResult GetHuiYuanOrder([FromBody]CooperOrderDTOSearch search)
+ {
+ ReturnMsg<List<UserOrders>> returnMsg = new ReturnMsg<List<UserOrders>>();
+ returnMsg.code = 2;
+ try
+ {
+ string userid = "";
+ var headers = Request.Headers;
+ if (headers != null)
+ {
+ //string SecurityKey = _configuration.GetSection("SecurityKey").Value;
+ var keyId = headers["Authorization"].FirstOrDefault();
+ if (string.IsNullOrEmpty("keyId"))
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ return new JsonResult(returnMsg);
+ }
+
+
+ JwtSecurityToken jwt = null;
+ var handler = new JwtSecurityTokenHandler();
+ var key1 = keyId.Replace("Bearer", "").Trim();
+ jwt = handler.ReadJwtToken(key1);
+ System.Security.Claims.Claim sss = jwt.Claims.Where(x => x.Type == "id").FirstOrDefault();
+ userid = sss.Value;
+
+ }
+ //LZhuanjiahuidumDTOSearch searchEntity = new LZhuanjiahuidumDTOSearch();
+ //searchEntity.Userid = userid;
+ ////searchEntity.HuidaStatus = "A";
+ //searchEntity.page = 1;
+ //searchEntity.rows = 1000;
+ search.HuiyuanId = userid;
+ ResultDataEntity<CooperOrderDTO> resultDataEntity = _cooperOrderService.SearchByPaging(search);
+ List<CooperOrderDTO> cooperOrderDTOs = resultDataEntity.DataList;
+ List<UserOrders> userOrders = new List<UserOrders>();
+ //灏佽璁㈠崟
+ foreach (var cooperOrderDTO in cooperOrderDTOs)
+ {
+ UserOrders userOrder = new UserOrders();
+ userOrder.order_goods = new List<usercart_items>();
+ usercart_items usercart_Item = new usercart_items();
+
+ userOrder.order_type = "offline";
+ userOrder.order_no = cooperOrderDTO.OrderNo;
+ userOrder.accept_name = cooperOrderDTO.Shr;
+ userOrder.mobile = cooperOrderDTO.ShrTel;
+ userOrder.address = cooperOrderDTO.ShrAddress;
+ userOrder.order_amount = cooperOrderDTO.Money.HasValue ? cooperOrderDTO.Money.Value: 0;
+ userOrder.statusChs = cooperOrderDTO.ShouliStatusName;
+ userOrder.add_time = cooperOrderDTO.Createtime;
+
+ usercart_Item.sell_price = cooperOrderDTO.Price.HasValue ? cooperOrderDTO.Price.Value : 0;
+ usercart_Item.quantity = cooperOrderDTO.OrderNum.HasValue ? decimal.ToInt32(cooperOrderDTO.OrderNum.Value) : 0;
+ usercart_Item.name = cooperOrderDTO.OrderTypeName + "-" + cooperOrderDTO.OrderType1Name + (string.IsNullOrEmpty(cooperOrderDTO.OrderType2)?"": "-"+cooperOrderDTO.OrderType2);
+
+
+
+ userOrder.order_goods.Add(usercart_Item);
+ userOrders.Add(userOrder);
+ }
+ returnMsg.code = 1;
+ returnMsg.returnObj = userOrders;
+ returnMsg.count = resultDataEntity.DataList.Count;
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
+
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
index 5635721..8e30987 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
@@ -190,6 +190,26 @@
if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
{
data.Shifoutianjiaweixin = "D";
+ data.Weixiner = null;
+ data.Weixintime = null;
+ }
+ else
+ {
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Weixiner = curentuser.Id;
+ data.Weixintime = DateTime.Now;
+ }
+ else
+ {
+ var cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(data.Id);
+ if (string.IsNullOrEmpty(cooperatecustomCustomerDTO.Weixiner) )
+ {
+ data.Weixiner = curentuser.Id;
+ data.Weixintime = DateTime.Now;
+ }
+
+ }
}
if (String.IsNullOrEmpty(data.Id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index ba21cda..9393781 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -306,6 +306,26 @@
if (string.IsNullOrEmpty(data.Shifoutianjiaweixin))
{
data.Shifoutianjiaweixin = "D";
+ data.Weixiner = null;
+ data.Weixintime = null;
+ }
+ else
+ {
+ if (String.IsNullOrEmpty(data.Id))
+ {
+ data.Weixiner = curentuser.Id;
+ data.Weixintime = DateTime.Now;
+ }
+ else
+ {
+ var cooperatecustomCustomerDTO = _intentionCustomerService.Get(data.Id);
+ if (string.IsNullOrEmpty(cooperatecustomCustomerDTO.Weixiner))
+ {
+ data.Weixiner = curentuser.Id;
+ data.Weixintime = DateTime.Now;
+ }
+
+ }
}
if (String.IsNullOrEmpty(data.Id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
index b318520..c467b76 100644
--- a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
@@ -335,6 +335,8 @@
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
data.Clientid = "D";
+ data.Shenheer = null;
+ data.Shenhetime = null;
if (String.IsNullOrEmpty(data.Id))
{
data.Creater= curentuser.Id;
@@ -504,6 +506,8 @@
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
data.Clientid = "A";
+ data.Shenheer = curentuser.Id;
+ data.Shenhetime = DateTime.Now;
if (String.IsNullOrEmpty(data.Id))
{
data.Creater = curentuser.Id;
@@ -590,6 +594,9 @@
LiaotianDTO data = _liaotianService.GetLiaotianEntity(Id);
+
+ data.Shenheer = curentuser.Id;
+ data.Shenhetime = DateTime.Now;
data.Clientid = "A";
data.Modifier = curentuser.Id;
data.Modifytime = DateTime.Now;
diff --git a/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml b/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml
index 927cc26..7540887 100644
--- a/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\netcoreapp3.1\publish\</PublishUrl>
+ <PublishUrl>D:\netcoreapp3.1\publish11111\</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>netcoreapp3.1</TargetFramework>
diff --git a/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user b/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user
index b9df574..10df99d 100644
--- a/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/zhengcaioa/zhengcaioa/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_PublishTargetUrl>D:\netcoreapp3.1\publish\</_PublishTargetUrl>
+ <_PublishTargetUrl>D:\netcoreapp3.1\publish11111\</_PublishTargetUrl>
<History>True|2021-06-18T02:23:47.0862716Z;</History>
</PropertyGroup>
<ItemGroup>
diff --git a/zhengcaioa/zhengcaioa/Startup.cs b/zhengcaioa/zhengcaioa/Startup.cs
index 58f88ba..53de1cf 100644
--- a/zhengcaioa/zhengcaioa/Startup.cs
+++ b/zhengcaioa/zhengcaioa/Startup.cs
@@ -145,6 +145,10 @@
services.AddHostedService<TimedBackgroundService>();
+ //定时执行
+ services.AddHostedService<TimerGetShopUsersService>();
+
+
services.AddAutoMapper(typeof(AutoMapperConfigs));
services.AddUEditorService("ueditor.json", true, "wwwroot");
services.AddMvc(options =>{
diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
new file mode 100644
index 0000000..8b61db4
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -0,0 +1,203 @@
+锘縰sing DTO;
+using IServices;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Transactions;
+using zhengcaioa.IService;
+using zhengcaioa.Models;
+
+namespace zhengcaioa.Timer
+{
+ public class TimerGetShopUsersService : BackgroundService
+ {
+ private readonly ILogger _logger;
+ private readonly IConfiguration _configuration;
+ private readonly ILiaotianService _liaotianService;
+ private readonly IHttpClientFactory _clientFactory;
+
+ public TimerGetShopUsersService(ILogger<TimerGetShopUsersService> logger, IServiceScopeFactory factory)
+ {
+ _logger = logger;
+ _configuration = factory.CreateScope().ServiceProvider.GetRequiredService<IConfiguration>();
+ _liaotianService = factory.CreateScope().ServiceProvider.GetRequiredService<ILiaotianService>();
+ _clientFactory = factory.CreateScope().ServiceProvider.GetRequiredService<IHttpClientFactory>();
+ }
+
+ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+ {
+ _logger.LogInformation("TimerGetShopUsersService is starting.");
+
+ //stoppingToken.Register(() => File.Create($"E:\\dotnetCore\\Practice\\Practice\\{DateTime.Now.Millisecond}.txt"));
+
+ DateTime datenow = DateTime.Now;
+ while (!stoppingToken.IsCancellationRequested)
+ {
+ _logger.LogInformation("TimerGetShopUsersService 寮�濮嬫墽琛�");
+ _logger.LogInformation(datenow.ToString("yyyy-MM-dd HH:mm:ss"));
+ //姣忎釜灏忔椂璁＄畻涓�娆�
+ if (datenow.Hour <= DateTime.Now.Hour)
+ //if (true)
+ {
+
+ try
+ {
+ await this.huoquhuiyuanAsync();
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+
+ datenow = DateTime.Now.AddHours(1);
+ }
+
+
+ await Task.Delay(TimeSpan.FromMinutes(10), stoppingToken);
+
+ _logger.LogInformation("TimerGetShopUsersService 缁х画鎵ц");
+ }
+
+ _logger.LogInformation("TimerGetShopUsersService background task is stopping.");
+ }
+
+ public override void Dispose()
+ {
+ base.Dispose();
+ }
+
+ public async Task huoquhuiyuanAsync()
+ {
+ string Shuchengurl = _configuration.GetSection("Shuchengurl").Value;
+ string GetShopUsers = _configuration.GetSection("GetShopUsers").Value;
+
+
+ string huiyuanurl = _configuration.GetSection("huiyuanurl").Value;
+ string GetDateFirstOrderUser = _configuration.GetSection("GetDateFirstOrderUser").Value;
+ string GetUserinfoAndRule = _configuration.GetSection("GetUserinfoAndRule").Value;
+
+ ResultEntity resultEntity = new ResultEntity();
+ resultEntity.Result = false;
+
+
+ //涔﹀煄
+ string result = string.Empty;
+ Uri getUrl = new Uri(Shuchengurl+ GetShopUsers+ "?start=2021-07-1&end=2021-07-12");
+
+ var httpClient = _clientFactory.CreateClient();
+ httpClient.Timeout = new TimeSpan(0, 0, 60);
+ var Result = await httpClient.GetAsync(getUrl);
+ result = Result.Content.ReadAsStringAsync().Result;
+
+
+ _logger.LogInformation("result:" + result);
+
+ //浼氬憳
+
+ string result1 = string.Empty;
+ Uri postUrl = new Uri(huiyuanurl + GetDateFirstOrderUser);
+
+ JObject questions = new JObject();
+ questions.Add("start", "2021-07-12 12:36:30");
+ questions.Add("end", "2021-07-14 12:36:30");
+
+ string requestJson = questions.ToString();
+
+ using (HttpContent httpContent = new StringContent(requestJson))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+ var httpClient1 = _clientFactory.CreateClient();
+ httpClient1.Timeout = new TimeSpan(0, 0, 60);
+ var Result1 = await httpClient1.PostAsync(postUrl, httpContent);
+ result1 = Result1.Content.ReadAsStringAsync().Result;
+ }
+
+ _logger.LogInformation("result1:" + result1);
+
+
+
+
+ string result2 = string.Empty;
+ Uri postUrl2 = new Uri(huiyuanurl + GetUserinfoAndRule);
+
+ JObject questions2 = new JObject();
+ questions2.Add("UserID", "248768ac-d083-462a-5bb4-08d940e7bc81");
+
+ string requestJson2 = questions2.ToString();
+
+ using (HttpContent httpContent = new StringContent(requestJson2))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+ var httpClient2 = _clientFactory.CreateClient();
+ httpClient2.Timeout = new TimeSpan(0, 0, 60);
+ var Result2 = await httpClient2.PostAsync(postUrl2, httpContent);
+ result2 = Result2.Content.ReadAsStringAsync().Result;
+ }
+
+ _logger.LogInformation("result2:" + result2);
+
+
+
+ using (TransactionScope scope = new TransactionScope())
+ {
+ //鑾峰彇鏈�鍚庢洿鏂版椂闂�
+ DateTime start = DateTime.Now.AddYears(-10);
+ DateTime end = DateTime.Now;
+
+ var ssss = _liaotianService.GetSysUpdatetime("getCustomers");
+
+ if (ssss != null)
+ {
+ start = ssss.Updatetime;
+ }
+ _logger.LogInformation("start:" + start);
+ _logger.LogInformation("end:" + end);
+
+
+ //鑾峰彇瀹㈡埛骞朵笖淇濆瓨鍒板悎浣滃鎴�
+
+
+
+
+ //淇濆瓨鏈�鍚庢洿鏂版椂闂�
+ if (ssss != null)
+ {
+ ssss.Updatetime = end;
+ }
+ else
+ {
+ ssss = new SysUpdatetime();
+ ssss.Updatetime = end;
+ ssss.Updatename = "getCustomers";
+ }
+ resultEntity = _liaotianService.saveSysUpdatetime(ssss);
+ if (!resultEntity.Result)
+ {
+ throw new Exception("淇濆瓨鏇存柊鏃堕棿鍑洪敊锛�");
+ }
+
+ scope.Complete();
+ }
+
+
+
+
+
+
+
+ }
+ }
+}
diff --git a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml
index 11ad651..6b322f2 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml
@@ -109,7 +109,7 @@
</div>
-
+
<label class="text-right col-sm-1 col-md-1 control-label">椤圭洰<i class="red">*</i></label>
<div class="col-sm-2 col-md-2">
<select id="WorkPro" class="form-control" name="WorkPro" data-placeholder="閫夋嫨 搴忓垪 ...">
@@ -186,35 +186,48 @@
</div>
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔鍐呭</label>
- <div class="col-sm-8 col-md-8">
- <textarea class="form-control bt" id="Remark" name="Remark" title="宸ヤ綔鍐呭" isempty="" maxlength="4000" length="long">@Model.Remark</textarea>
- </div>
-
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">宸ヤ綔鍐呭</label>
+ <div class="col-sm-8 col-md-8">
+ <textarea class="form-control bt" id="Remark" name="Remark" title="宸ヤ綔鍐呭" isempty="" maxlength="4000" length="long">@Model.Remark</textarea>
</div>
- <div class="clearfix layer-area" style="padding-bottom:15px;">
+ </div>
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缁╂晥鎻愭垚锛堝厓锛�<i class="red">*</i></label>
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="缁╂晥鎻愭垚" name="Gongzi" id="Gongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.Gongzi" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
-
- </div>
-
-
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">缁╂晥鎻愭垚锛堝厓锛�<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="缁╂晥鎻愭垚" name="Gongzi" id="Gongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.Gongzi" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
-
-
-
</div>
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鏁伴噺<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="缁╂晥鎻愭垚" name="Shuliang" id="Shuliang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.Shuliang" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+
+ </div>
+
+
+
+ </div>
+
+
+
+
+ </div>
</div>
</div>
</div>
@@ -329,9 +342,11 @@
toastr.warning("璁′欢宸ヨ祫涓嶈兘涓虹┖");
return;
}
-
-
-
+ if ($.trim($("#Shuliang").val()) == '') {
+ toastr.warning("鏁伴噺涓嶈兘涓虹┖");
+ return;
+ }
+
diff --git a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
index 9552c9e..64c4f05 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
@@ -26,6 +26,7 @@
{ label: '宸ヤ綔鍐呭', name: 'Remark', labtype: 'txt', hidden: false, width: 100 },
{ label: '缁╂晥鎻愭垚锛堝厓锛�', name: 'Gongzi', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鏁伴噺', name: 'Shuliang', labtype: 'txt', hidden: false, width: 100 },
];
dataUrl = "/AdmPieceCheck/GetList";
diff --git a/zhengcaioa/zhengcaioa/appsettings.Development.json b/zhengcaioa/zhengcaioa/appsettings.Development.json
index d75cc38..e94c623 100644
--- a/zhengcaioa/zhengcaioa/appsettings.Development.json
+++ b/zhengcaioa/zhengcaioa/appsettings.Development.json
@@ -9,6 +9,12 @@
"Microsoft.Hosting.Lifetime": "Information"
}
},
+ "AllowedHosts": "*",
"Elasticsearchurl": "http://localhost:9200",
- "SecurityKey": "superSecretKey@345"
+ "SecurityKey": "superSecretKey@345",
+ "Shuchengurl": "http://192.168.0.191:8085",
+ "GetShopUsers": "/actionapi/Shop/GetShopUsers",
+ "huiyuanurl": "http://192.168.0.113:8087",
+ "GetDateFirstOrderUser": "/api/ZCBackgRound/GetDateFirstOrderUser",
+ "GetUserinfoAndRule": "/api/ZCBackgRound/GetUserinfoAndRule"
}
diff --git a/zhengcaioa/zhengcaioa/appsettings.json b/zhengcaioa/zhengcaioa/appsettings.json
index b01ba9c..0e96c47 100644
--- a/zhengcaioa/zhengcaioa/appsettings.json
+++ b/zhengcaioa/zhengcaioa/appsettings.json
@@ -11,5 +11,10 @@
},
"AllowedHosts": "*",
"Elasticsearchurl": "http://localhost:9200",
- "SecurityKey": "superSecretKey@345"
+ "SecurityKey": "superSecretKey@345",
+ "Shuchengurl": "http://47.108.235.38:8085",
+ "GetShopUsers": "/actionapi/Shop/GetShopUsers",
+ "huiyuanurl": "http://47.108.235.38:8087",
+ "GetDateFirstOrderUser": "/api/ZCBackgRound/GetDateFirstOrderUser",
+ "GetUserinfoAndRule": "/api/ZCBackgRound/GetUserinfoAndRule"
}
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 cb08a9f..f177e5c 100644
--- "a/\350\241\250\344\277\256\346\224\271.sql"
+++ "b/\350\241\250\344\277\256\346\224\271.sql"
@@ -1,6 +1,111 @@
USE [zhengcaioa]
GO
+ALTER TABLE [dbo].[CooperatecustomCustomer] ADD [weixiner] [nvarchar](50) NULL
+
+GO
+ ALTER TABLE [dbo].[CooperatecustomCustomer] ADD [weixintime] [datetime] NULL
+
+GO
+
+
+ ALTER TABLE [dbo].[Liaotian] ADD [shenhetime] [datetime] NULL
+
+GO
+ALTER TABLE [dbo].[Liaotian] ADD [shenheer] [nvarchar](50) NULL
+
+GO
+
+
+ALTER TABLE [dbo].[adm_piece_check] ADD [shuliang] [money] NULL
+
+GO
+
+
+USE [zhengcaioa]
+GO
+
+ALTER TABLE [dbo].[IntentionCustomer] ADD [weixiner] [nvarchar](50) NULL
+
+GO
+ ALTER TABLE [dbo].[IntentionCustomer] ADD [weixintime] [datetime] NULL
+
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
+/****** Object: Table [dbo].[sys_updatetime] Script Date: 2021/7/13 14:21:26 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+CREATE TABLE [dbo].[sys_updatetime](
+ [Id] [nvarchar](50) NOT NULL,
+ [updatename] [nvarchar](100) NOT NULL,
+ [updatetime] [datetime] NOT NULL,
+ CONSTRAINT [PK_sys_updatetime] PRIMARY KEY CLUSTERED
+(
+ [Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
ALTER TABLE [dbo].[CooperatecustomCustomer] ADD [huiyuanId] [nvarchar](50) NULL
GO
--
Gitblit v1.9.1