From a048515dc692f515c6d4049176587523271d80ed Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 15 十二月 2021 16:30:32 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 90 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 81 insertions(+), 9 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index c6c4013..2fad9f5 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -44,6 +44,9 @@
private readonly IAdmGoodsRecordService _admGoodsRecordService;
private readonly IAdmGoodsManageService _admGoodsManageService;
+ private readonly IFiOrderrecievemoneyService _fiOrderrecievemoneyService;
+ private readonly IFiAccountService _fiAccountService;
+ private readonly IFiAccountRecordService _iFiAccountRecordService;
public CooperOrderController(ILogger<CooperOrderController> logger, ILiaotianService liaotianService, IUserService userService, ICooperOrderService cooperOrderService
@@ -54,6 +57,9 @@
, IAskService askService
, IAdmGoodsRecordService admGoodsRecordService
, IAdmGoodsManageService admGoodsManageService
+ , IFiOrderrecievemoneyService fiOrderrecievemoneyService
+ , IFiAccountService fiAccountService
+ , IFiAccountRecordService iFiAccountRecordService
)
{
_logger = logger;
@@ -71,6 +77,9 @@
_askService = askService;
_admGoodsRecordService = admGoodsRecordService;
_admGoodsManageService = admGoodsManageService;
+ _fiOrderrecievemoneyService = fiOrderrecievemoneyService;
+ _fiAccountService = fiAccountService;
+ _iFiAccountRecordService = iFiAccountRecordService;
}
[CheckLogin]
@@ -1045,7 +1054,7 @@
return View();
}
[CheckLogin]
- public IActionResult chedantuihuan(decimal Price, string Chedanid)
+ public IActionResult chedantuihuan(string Chedanid, decimal Price=0)
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -1113,6 +1122,45 @@
dto.ShouliStatus = "0";
resultEntity = _cooperOrderService.chedan(dto);
+
+
+ var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("璁㈠崟鏀舵"+dto.OrderNo);
+ if (fiAccountRecordDTOs!= null && fiAccountRecordDTOs.Count > 0)
+ {
+ foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)
+ {
+ CooperatecustomCustomerDTO cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(dto.Khdw);
+ FiAccountRecordDTO data1 = new FiAccountRecordDTO();
+ data1.RecStatus = "A";
+ data1.Creater = curentuser.Id;
+ data1.Createtime = DateTime.Now;
+ data1.Modifier = curentuser.Id;
+ data1.Modifytime = DateTime.Now;
+ data1.SubjectId = fiAccountRecordDTO.SubjectId;
+
+ data1.AccountId = fiAccountRecordDTO.AccountId;
+ data1.Money = fiAccountRecordDTO.Money;
+ data1.PaymentUnit = cooperatecustomCustomerDTO.Name;
+ data1.OperationalMatters = "璁㈠崟鎾ゅ崟" + dto.OrderNo;
+
+
+
+ FiAccountDTO firmAccount = _fiAccountService.Get(data1.AccountId);
+
+
+ data1.RecordTypeId = "2";//閫�娆�
+ data1.Department = "";
+
+
+
+ firmAccount.AllExpenses = (firmAccount.AllExpenses ?? 0) + fiAccountRecordDTO.Money;
+ firmAccount.Balance = (firmAccount.Balance ?? 0) - fiAccountRecordDTO.Money;
+
+ data1.AccountMoney = firmAccount.Balance;
+ resultEntity = _iFiAccountRecordService.save(data1);
+ resultEntity = _fiAccountService.save(firmAccount);
+ }
+ }
scope.Complete();
}
return new JsonResult(resultEntity);
@@ -1578,10 +1626,10 @@
- ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info");//璐ㄧ枒璇锋眰
- ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question"); // 璐ㄧ枒浜嬮」
- var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");//娉曞緥
- var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law");//娉曞緥渚濇嵁
+ ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info").OrderBy(x=>x.CodeSn).ToList();//璐ㄧ枒璇锋眰
+ ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question").OrderBy(x => x.CodeSn).ToList(); // 璐ㄧ枒浜嬮」
+ var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+ var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
foreach ( var sysCodeDtl in sysCodeDtls1)
{
var sysCodeDtl1 = sysCodeDtls.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
@@ -1619,7 +1667,31 @@
return new JsonResult(resultEntity);
}
+ public IActionResult getQuestionLaw(string id, string no)
+ {
+ ResultEntity<SysCodeDtl> resultEntity = new ResultEntity<SysCodeDtl>();
+ resultEntity.Result = true;
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var sysCodeDtls = _liaotianService.GetSYScode("t_complaint_items", "law").Where(x => x.Classify1 == id).OrderBy(x => x.CodeSn).ToList().ToList();//娉曞緥渚濇嵁
+ var sysCodeDtls1 = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");//娉曞緥
+ foreach (var sysCodeDtl in sysCodeDtls)
+ {
+ var sysCodeDtl1 = sysCodeDtls1.Where(x => x.CodeSn == sysCodeDtl.Comments).FirstOrDefault();
+ if (sysCodeDtl1 != null)
+ sysCodeDtl.Comments = sysCodeDtl1.Comments;
+ }
+
+ //if (sysCodeDtl != null)
+ //{
+ // resultEntity.Message = sysCodeDtl.Contents;
+ //}
+ resultEntity.Message = no;
+ resultEntity.DataList = sysCodeDtls;
+
+ return new JsonResult(resultEntity);
+ }
/// <summary>
/// 淇濆瓨
@@ -1878,10 +1950,10 @@
- ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info");//璐ㄧ枒璇锋眰
- ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question"); // 璐ㄧ枒浜嬮」
- var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv");//娉曞緥
- var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law");//娉曞緥渚濇嵁
+ ViewBag.request_info = _liaotianService.GetSYScode("t_challengeletter", "request_info").OrderBy(x => x.CodeSn).ToList();//璐ㄧ枒璇锋眰
+ ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question").OrderBy(x => x.CodeSn).ToList(); // 璐ㄧ枒浜嬮」
+ var sysCodeDtls = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").OrderBy(x => x.CodeSn).ToList();//娉曞緥
+ var sysCodeDtls1 = _liaotianService.GetSYScode("t_complaint_items", "law").OrderBy(x => x.CodeSn).ToList();//娉曞緥渚濇嵁
foreach (var sysCodeDtl in sysCodeDtls1)
{
--
Gitblit v1.9.1