From 73e00247164939388fe6e88654a5f182dcd08d1b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 06 一月 2023 09:33:54 +0800
Subject: [PATCH] 订单撤单增加填写扯单原因
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 8afe2ac..c399e15 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -1324,9 +1324,10 @@
//dto.Id = id;
dto.Wangonger = curentuser.Id;
dto.Wangongtime = DateTime.Now;
+ dto.WangongStatus = "A";
dto.ShouliStatus = "4";
- ResultEntity resultEntity = _cooperOrderService.save(dto);
+ ResultEntity resultEntity = _cooperOrderService.Wangong(dto);
return new JsonResult(resultEntity);
}
@@ -1337,14 +1338,15 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var cooperOrderDTO = _cooperOrderService.Get(id);
ViewData["Chedanid"] = id;
-
+ ViewData["Money"] = cooperOrderDTO.Money.Value.ToString();
return View();
}
[CheckLogin]
- public IActionResult chedantuihuan(string Chedanid, decimal Price=0)
+ public IActionResult chedantuihuan(string Chedanid, decimal Price=0,string Chedanyuany="")
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
@@ -1411,7 +1413,8 @@
dto.ChedanStatus = "A";
dto.Chedan = Price;
dto.ShouliStatus = "0";
-
+ if (!string.IsNullOrWhiteSpace(Chedanyuany))
+ dto.Remark += " " + Chedanyuany;
resultEntity = _cooperOrderService.chedan(dto);
@@ -1419,8 +1422,8 @@
if (fiAccountRecordDTOs!= null && fiAccountRecordDTOs.Count > 0)
{
var sysCodeDtls = _liaotianService.GetSYScode("CooperVisit", "jtype");
- foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)
- {
+ //foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)
+ //{
CooperatecustomCustomerDTO cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(dto.Khdw);
FiAccountRecordDTO data1 = new FiAccountRecordDTO();
@@ -1429,10 +1432,10 @@
data1.Createtime = DateTime.Now;
data1.Modifier = curentuser.Id;
data1.Modifytime = DateTime.Now;
- data1.SubjectId = fiAccountRecordDTO.SubjectId;
+ data1.SubjectId = fiAccountRecordDTOs[0].SubjectId;
- data1.AccountId = fiAccountRecordDTO.AccountId;
- data1.Money = -fiAccountRecordDTO.Money;
+ data1.AccountId = fiAccountRecordDTOs[0].AccountId;
+ data1.Money = Price;
data1.PaymentUnit = cooperatecustomCustomerDTO.Name;
var ssss = sysCodeDtls.Where(x => x.CodeSn == dto.OrderType).FirstOrDefault();
if (ssss!=null)
@@ -1456,18 +1459,18 @@
FiAccountDTO firmAccount = _fiAccountService.Get(data1.AccountId);
- data1.RecordTypeId = "1";//閫�娆�
+ data1.RecordTypeId = "2";//閫�娆�
data1.Department = "";
- firmAccount.AllIncome = (firmAccount.AllIncome ?? 0) - fiAccountRecordDTO.Money;
- firmAccount.Balance = (firmAccount.Balance ?? 0) - fiAccountRecordDTO.Money;
+ firmAccount.AllIncome = (firmAccount.AllIncome ?? 0) - Price;
+ firmAccount.Balance = (firmAccount.Balance ?? 0) - Price;
data1.AccountMoney = firmAccount.Balance;
resultEntity = _iFiAccountRecordService.save(data1);
resultEntity = _fiAccountService.save(firmAccount);
- }
+ //}
}
scope.Complete();
}
--
Gitblit v1.9.1