From 93be07bd52b4781027df08420ed5cfe712dda6e6 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 08 十二月 2022 09:30:38 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
index 2b73183..2fa29d2 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
@@ -41,6 +41,9 @@
private readonly IConfiguration _configuration;
private readonly IHttpClientFactory _clientFactory;
private readonly IFiMemberService _iMemberService;
+ private readonly IPltPageService _pltPageService;
+ private readonly IFiBookService _fiBookService;
+ private readonly IFiMemberService _fiMemberService;
public FiOrderrecievemoneyController(ILogger<FiOrderrecievemoneyController> logger, ILiaotianService liaotianService, IFiOrderrecievemoneyService fiOrderrecievemoneyService, ICooperOrderService cooperOrderService, IFiSubjectService ifiSubjectService
, IFiAccountService fiAccountService, IFiAccountRecordService iFiAccountRecordService, ICooperatecustomCustomerService cooperatecustomCustomerService
@@ -49,7 +52,10 @@
, IFiCustomerrecievemoneyService fiCustomerrecievemoneyService
, IConfiguration configuration
, IHttpClientFactory clientFactory
- , IFiMemberService iMemberService)
+ , IFiMemberService iMemberService
+ , IPltPageService pltPageService
+ , IFiBookService fiBookService
+ , IFiMemberService fiMemberService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -65,6 +71,9 @@
_configuration = configuration;
_clientFactory = clientFactory;
_iMemberService = iMemberService;
+ _pltPageService = pltPageService;
+ _fiBookService = fiBookService;
+ _fiMemberService = fiMemberService;
}
public IActionResult Index()
@@ -81,7 +90,9 @@
actionlist.Add(actionEntity);
ViewData["ActionInfo"] = actionlist;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiOrderrecievemoney/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.OrderType = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -268,6 +279,9 @@
}
if (data.PayType != "03")
{
+ var sysCodeDtls = _liaotianService.GetSYScode("CooperVisit", "jtype");
+ var book = _fiBookService.Get(cooperOrderDTO.OrderType1);
+ var member = _fiMemberService.Get(cooperOrderDTO.OrderType1);
FiAccountRecordDTO data1 = new FiAccountRecordDTO();
data1.RecStatus = "A";
data1.Creater = curentuser.Id;
@@ -279,8 +293,24 @@
data1.AccountId = data.AccountId;
data1.Money = data.Recievemoney;
data1.PaymentUnit = cooperatecustomCustomerDTO.Name;
- data1.OperationalMatters = "璁㈠崟鏀舵" + cooperOrderDTO.OrderNo;
+ var ssss = sysCodeDtls.Where(x => x.CodeSn == cooperOrderDTO.OrderType).FirstOrDefault();
+ if (ssss != null)
+ {
+ cooperOrderDTO.OrderTypeName = ssss.Comments;
+ }
+ if (book != null)
+ {
+ cooperOrderDTO.OrderType1 = book.BookName;
+ }
+ if (member != null)
+ {
+ cooperOrderDTO.OrderType1 = member.MemberType;
+ }
+ //data1.OperationalMatters = "璁㈠崟鏀舵" + cooperOrderDTO.OrderNo;
+
+ data1.OperationalMatters = cooperOrderDTO.OrderTypeName + cooperOrderDTO.OrderType1 + cooperOrderDTO.OrderType2 + " 璁㈠崟鏀舵";
+ data1.Remark = cooperOrderDTO.OrderNo;
FiAccountDTO firmAccount = _fiAccountService.Get(data1.AccountId);
@@ -332,7 +362,9 @@
actionEntity.PageIco = "fa fa-search";
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiOrderrecievemoney/IndexCustomer/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ViewData["ActionInfo"] = actionlist;
--
Gitblit v1.9.1