zhengcaioa.git - Gitblit

			@@ -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;