From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 102 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
index 6deabc1..2fa29d2 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
@@ -18,6 +18,9 @@
using CommonToolsCore;
using Services;
using System.Transactions;
+using System.Net.Http.Headers;
+using Newtonsoft.Json.Linq;
+using Microsoft.Extensions.Configuration;
namespace zhengcaioa.Controllers.Finance
{
@@ -35,12 +38,24 @@
private readonly IProjectService _projectService;
private readonly IUserService _userService;
private readonly IFiCustomerrecievemoneyService _fiCustomerrecievemoneyService;
+ 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
, IProjectService projectService
, IUserService userService
- , IFiCustomerrecievemoneyService fiCustomerrecievemoneyService)
+ , IFiCustomerrecievemoneyService fiCustomerrecievemoneyService
+ , IConfiguration configuration
+ , IHttpClientFactory clientFactory
+ , IFiMemberService iMemberService
+ , IPltPageService pltPageService
+ , IFiBookService fiBookService
+ , IFiMemberService fiMemberService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -53,6 +68,12 @@
_projectService = projectService;
_userService = userService;
_fiCustomerrecievemoneyService = fiCustomerrecievemoneyService;
+ _configuration = configuration;
+ _clientFactory = clientFactory;
+ _iMemberService = iMemberService;
+ _pltPageService = pltPageService;
+ _fiBookService = fiBookService;
+ _fiMemberService = fiMemberService;
}
public IActionResult Index()
@@ -69,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();
@@ -200,8 +223,65 @@
resultEntity = _fiOrderrecievemoneyService.save(data);
+
+ if (data.WeishouMoney <= data.Recievemoney && cooperOrderDTO.OrderType == "05" )
+ {
+ //寮�閫氫細鍛�
+ var fiMemberDTO = _iMemberService.Get(cooperOrderDTO.OrderType1);
+ //寮�閫氫細鍛�
+ string huiyuanurl = _configuration.GetSection("huiyuanurl").Value;
+ string OAWriteChangeAsync = _configuration.GetSection("OAWriteChangeAsync").Value;
+
+ Uri postUrl2 = new Uri(huiyuanurl + OAWriteChangeAsync);
+ JObject questions2 = new JObject();
+ questions2.Add("UserID", cooperatecustomCustomerDTO.HuiyuanId);
+ questions2.Add("PhoneNumber", cooperatecustomCustomerDTO.Tel);
+ questions2.Add("VIPName", fiMemberDTO.MemberType);
+ questions2.Add("UserName", cooperatecustomCustomerDTO.Name);
+ questions2.Add("FromName", "OA");
+
+
+
+ string requestJson2 = questions2.ToString();
+ string result2 = string.Empty;
+
+ using (HttpContent httpContent = new StringContent(requestJson2))
+ {
+ httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+
+ using (HttpClient httpClient = new HttpClient())
+ {
+ httpClient.Timeout = new TimeSpan(0, 0, 10);
+ HttpResponseMessage responseMessage = httpClient.PostAsync(postUrl2, httpContent).Result;
+ result2 = responseMessage.Content.ReadAsStringAsync().Result;
+ }
+ }
+
+ _logger.LogInformation("result2:" + result2);
+ JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result2);
+
+ if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+ {
+ cooperatecustomCustomerDTO.HuiyuanId = jobjectresult["UserID"].ToString();
+ _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO);
+ resultEntity.Result = true;
+ }
+ else
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "鍐欏叆浼氬憳鏉冮檺澶辫触";
+ return new JsonResult(resultEntity);
+ }
+
+
+
+ }
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;
@@ -213,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);
@@ -266,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