From 13ca8b4cab099521fc95d551c4b21c1a7ae5984d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 30 十二月 2022 09:44:04 +0800
Subject: [PATCH] 合作业务-》 采购公告权限，顾问套餐（种类）
---
zhengcaioa/Model/zcUserInfoN_db/OderOfVip.cs | 27 +++++++++
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml | 9 +-
zhengcaioa/Services/CooperatecustomCustomerService.cs | 58 +++++++++++++++++++
zhengcaioa/DTO/CooperatecustomCustomerDTO.cs | 1
zhengcaioa/Model/zcUserInfoN_db/FrameworkRole.cs | 20 ++++++
zhengcaioa/Model/zcUserInfoN_db/zcUserInfoN_dbContext.cs | 48 ++++++++++++++++
6 files changed, 158 insertions(+), 5 deletions(-)
diff --git a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
index 1ec87e0..8452147 100644
--- a/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
+++ b/zhengcaioa/DTO/CooperatecustomCustomerDTO.cs
@@ -80,6 +80,7 @@
public string Zhiwu { get; set; }
public string Customertype { get; set; }
+ public string Hezuoyewu { get; set; }
}
diff --git a/zhengcaioa/Model/zcUserInfoN_db/FrameworkRole.cs b/zhengcaioa/Model/zcUserInfoN_db/FrameworkRole.cs
new file mode 100644
index 0000000..6695691
--- /dev/null
+++ b/zhengcaioa/Model/zcUserInfoN_db/FrameworkRole.cs
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class FrameworkRole
+ {
+ public Guid Id { get; set; }
+ public string RoleCode { get; set; }
+ public string RoleName { get; set; }
+ public string RoleRemark { get; set; }
+ public string TenantCode { get; set; }
+ public DateTime? CreateTime { get; set; }
+ public string CreateBy { get; set; }
+ public DateTime? UpdateTime { get; set; }
+ public string UpdateBy { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/zcUserInfoN_db/OderOfVip.cs b/zhengcaioa/Model/zcUserInfoN_db/OderOfVip.cs
new file mode 100644
index 0000000..530813d
--- /dev/null
+++ b/zhengcaioa/Model/zcUserInfoN_db/OderOfVip.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class OderOfVip
+ {
+ public Guid Id { get; set; }
+ public decimal Amout { get; set; }
+ public Guid UserId { get; set; }
+ public string RoleName { get; set; }
+ public Guid? RoleId { get; set; }
+ public int? ViPrenewType { get; set; }
+ public bool IsPayEnd { get; set; }
+ public int? Paytype { get; set; }
+ public string PayId { get; set; }
+ public DateTime? CreateTime { get; set; }
+ public string CreateBy { get; set; }
+ public DateTime? UpdateTime { get; set; }
+ public string UpdateBy { get; set; }
+ public DateTime? PayTime { get; set; }
+ public bool IsUserDell { get; set; }
+ public decimal? PayMoney { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/zcUserInfoN_db/zcUserInfoN_dbContext.cs b/zhengcaioa/Model/zcUserInfoN_db/zcUserInfoN_dbContext.cs
index 15da6f5..835cf46 100644
--- a/zhengcaioa/Model/zcUserInfoN_db/zcUserInfoN_dbContext.cs
+++ b/zhengcaioa/Model/zcUserInfoN_db/zcUserInfoN_dbContext.cs
@@ -20,6 +20,8 @@
public virtual DbSet<GadeRole> GadeRoles { get; set; }
public virtual DbSet<UsergGadeRole> UsergGadeRoles { get; set; }
public virtual DbSet<FrameworkUser> FrameworkUsers { get; set; }
+ public virtual DbSet<FrameworkRole> FrameworkRoles { get; set; }
+ public virtual DbSet<OderOfVip> OderOfVips { get; set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
@@ -122,6 +124,52 @@
entity.Property(e => e.WxOpenid).HasMaxLength(50);
});
+ modelBuilder.Entity<FrameworkRole>(entity =>
+ {
+ entity.Property(e => e.Id)
+ .ValueGeneratedNever()
+ .HasColumnName("ID");
+
+ entity.Property(e => e.CreateBy).HasMaxLength(50);
+
+ entity.Property(e => e.RoleCode).HasMaxLength(100);
+
+ entity.Property(e => e.RoleName)
+ .IsRequired()
+ .HasMaxLength(50);
+
+ entity.Property(e => e.UpdateBy).HasMaxLength(50);
+ });
+
+ modelBuilder.Entity<OderOfVip>(entity =>
+ {
+ entity.ToTable("oderOfVIPs");
+
+ entity.Property(e => e.Id)
+ .ValueGeneratedNever()
+ .HasColumnName("ID");
+
+ entity.Property(e => e.Amout).HasColumnType("decimal(18, 2)");
+
+ entity.Property(e => e.CreateBy).HasMaxLength(50);
+
+ entity.Property(e => e.IsPayEnd).HasColumnName("isPayEND");
+
+ entity.Property(e => e.PayId).HasColumnName("PayID");
+
+ entity.Property(e => e.PayMoney).HasColumnType("decimal(18, 2)");
+
+ entity.Property(e => e.Paytype).HasColumnName("paytype");
+
+ entity.Property(e => e.RoleId).HasColumnName("RoleID");
+
+ entity.Property(e => e.UpdateBy).HasMaxLength(50);
+
+ entity.Property(e => e.UserId).HasColumnName("UserID");
+
+ entity.Property(e => e.ViPrenewType).HasColumnName("viPrenewType");
+ });
+
OnModelCreatingPartial(modelBuilder);
}
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index 459f0b9..2a60265 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -17,10 +17,12 @@
{
private readonly zhengcaioaContext _context;
private readonly IMapper _mapper;
- public CooperatecustomCustomerService(zhengcaioaContext context, IMapper mapper)
+ private readonly zcUserInfoN_dbContext _zcUserInfoNcontext;
+ public CooperatecustomCustomerService(zhengcaioaContext context, IMapper mapper, zcUserInfoN_dbContext zcUserInfoNcontext)
{
_context = context;
_mapper = mapper;
+ _zcUserInfoNcontext = zcUserInfoNcontext;
}
public ResultEntity save(CooperatecustomCustomerDTO cooperatecustomCustomerDTO)
@@ -353,6 +355,60 @@
data.DangyeHeji2 = Math.Round(lianlist.Sum(x => x.Shouxinedu) ?? 0, 2);
data.DangyeHeji3 = Math.Round(lianlist.Sum(x => x.Shenyushouxin) ?? 0, 2);
data.DangyeHeji4 = Math.Round(lianlist.Sum(x => x.Moneycountde) ?? 0, 2);
+
+ if(lianlist!=null&& lianlist.Count > 0)
+ {
+ var members = _context.FiMembers.ToList();
+ foreach (var cooperatecustomCustomerDTO in lianlist)
+ {
+ cooperatecustomCustomerDTO.Hezuoyewu = "";
+
+ var cooperOrders = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.OrderType == "05" && x.Khdw == cooperatecustomCustomerDTO.Id).ToList();
+
+ foreach (var cooperOrder in cooperOrders)
+ {
+ var member = members.Where(x => x.Id == cooperOrder.OrderType1).FirstOrDefault();
+ if (member != null)
+ {
+ if (cooperatecustomCustomerDTO.Hezuoyewu.IndexOf(member.MemberType) < 0)
+ {
+ cooperatecustomCustomerDTO.Hezuoyewu += member.MemberType + " | ";
+ }
+ }
+ }
+
+ if (!string.IsNullOrEmpty(cooperatecustomCustomerDTO.HuiyuanId))
+ {
+ var huiyuanid = new Guid(cooperatecustomCustomerDTO.HuiyuanId);
+
+ var frameworkRoles = (from a in _zcUserInfoNcontext.OderOfVips
+ join b in _zcUserInfoNcontext.FrameworkRoles on a.RoleId equals b.Id
+ where a.IsPayEnd == true && a.IsUserDell == false && a.UserId == huiyuanid
+ select b
+ ).ToList();
+
+ foreach (var frameworkRole in frameworkRoles)
+ {
+ if (cooperatecustomCustomerDTO.Hezuoyewu.IndexOf(frameworkRole.RoleName) < 0)
+ {
+ cooperatecustomCustomerDTO.Hezuoyewu += frameworkRole.RoleName + " | ";
+ }
+ }
+ }
+
+
+
+ if (cooperatecustomCustomerDTO.Hezuoyewu.IndexOf("甯稿勾鏀块噰&娉曞緥椤鹃棶") >=0)
+ {
+ cooperatecustomCustomerDTO.Hezuoyewu += "閲囪喘鍏憡鏉冮檺 | ";
+ }
+
+ }
+ }
+
+
+
+
data.LoadData(searchEntity, lianlist);
return data;
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index 87534de..bd837ae 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
@@ -33,11 +33,12 @@
},
{ label: '鑱旂郴鐢佃瘽', name: 'Tel', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
- { label: '瀹㈡埛鏉ユ簮', name: 'KhlyName', labtype: 'txt', hidden: false, width: 100 },
- { label: '琛屼笟鍒嗙被', name: 'HyflName', labtype: 'txt', hidden: false, width: 100 },
- { label: '瀹㈡埛绫诲瀷', name: 'KhlxName', labtype: 'txt', hidden: false, width: 100},
+ //{ label: '瀹㈡埛鏉ユ簮', name: 'KhlyName', labtype: 'txt', hidden: false, width: 100 },
+ //{ label: '琛屼笟鍒嗙被', name: 'HyflName', labtype: 'txt', hidden: false, width: 100 },
+ //{ label: '瀹㈡埛绫诲瀷', name: 'KhlxName', labtype: 'txt', hidden: false, width: 100},
{ label: '涓氬姟缁忕悊', name: 'YwjlName', labtype: 'txt', hidden: false, width: 100 },
- { label: '璁㈠崟鏁伴噺', name: 'Ordercount', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鍚堜綔涓氬姟', name: 'Hezuoyewu', labtype: 'txt', hidden: false, width: 300 },
+ /* { label: '璁㈠崟鏁伴噺', name: 'Ordercount', labtype: 'txt', hidden: false, width: 100 },*/
{ label: '璁㈠崟浜у��', name: 'Moneycount', labtype: 'txt', hidden: false, width: 100 },
{ label: '鍓╀綑濂楅浠舵暟', name: 'Taocanjianshu', labtype: 'txt', hidden: false, width: 100 },
{
--
Gitblit v1.9.1