zhengcaioa.git - Gitblit

			@@ -1338,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;
			@@ -1412,16 +1413,17 @@
			dto.ChedanStatus = "A";
			dto.Chedan = Price;
			dto.ShouliStatus = "0";

			if (!string.IsNullOrWhiteSpace(Chedanyuany))
			dto.Remark += " " + Chedanyuany;
			resultEntity = _cooperOrderService.chedan(dto);


			var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("订单收款"+dto.OrderNo, dto.OrderNo);
			if (fiAccountRecordDTOs!= null && fiAccountRecordDTOs.Count > 0)
			if ( Price>0 && 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();
			@@ -1430,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)
			@@ -1457,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();
			}
			@@ -1767,7 +1769,7 @@
			{
			//string SecurityKey = _configuration.GetSection("SecurityKey").Value;
			var keyId = headers["Authorization"].FirstOrDefault();
			if (string.IsNullOrEmpty("keyId"))
			if (string.IsNullOrEmpty(keyId))
			{
			returnMsg.code = 2;
			returnMsg.error = "没有获取到token";
			@@ -2000,7 +2002,10 @@
			ViewBag.law = sysCodeDtls1;//法律依据



			if (!challengeletterDTO.PrintNum.HasValue)
			{
			challengeletterDTO.PrintNum = 1;
			}


			ViewData.Model = challengeletterDTO;
			@@ -2734,6 +2739,10 @@

			ViewBag.ChallengeletterChosen = _cooperOrderService.GetListChallengeletterChosen().Where(x => x.Createtime >= DateTime.Now.AddMonths(-2)).ToList(); ;

			if (!complaintletterDTO.PrintNum.HasValue)
			{
			complaintletterDTO.PrintNum = 1;
			}
			ViewData.Model = complaintletterDTO;
			return View();
			}
			@@ -3136,7 +3145,7 @@
			foreach (var complaintItemDTO in complaintletterDTO.complaintItemDTOs)
			{

			complaintletterDTO.SqdbId += complaintItemDTO.QuestionName + ";";
			complaintletterDTO.SqdbId += complaintItemDTO.QuestionName ;
			}
			}