From 1d1d0b95f2b9cef7adcaf65819572d276cf70ace Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 23 十一月 2021 14:51:42 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs | 84 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
index 4a0a6b5..95b623a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -28,14 +28,17 @@
private readonly IOrderBanciService _orderBanciService;
private readonly IOrderBanciDtlService _orderBanciDtlService;
private readonly IOrderBanciOrderService _orderBanciOrderService;
+ private readonly IFiOrderrecievemoneyService _fiOrderrecievemoneyService;
public OrderBanciOrderController(ILogger<OrderBanciOrderController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService
- ,IOrderBanciOrderService orderBanciOrderService)
+ ,IOrderBanciOrderService orderBanciOrderService
+ , IFiOrderrecievemoneyService fiOrderrecievemoneyService)
{
_logger = logger;
_liaotianService = liaotianService;
_orderBanciService = orderBanciService;
_orderBanciDtlService = orderBanciDtlService;
+ _fiOrderrecievemoneyService = fiOrderrecievemoneyService;
_orderBanciOrderService = orderBanciOrderService;
}
@@ -204,8 +207,28 @@
search.BanciId = data.BanciId;
ResultDataEntity<OrderBanciOrderDTO> resultDataEntity = _orderBanciOrderService.SearchByPaging(search);
+ if (data.Baomingrenshu.HasValue)
+ {
+ //if (resultDataEntity.DataList.Count > 0)
+ //{
+ // var orderBanciOrderDTO = resultDataEntity.DataList.OrderByDescending(x => x.Baomingrenshu).FirstOrDefault();
- data.Baomingrenshu = search.totalrows + 1;
+ // data.Baomingrenshu += orderBanciOrderDTO.Baomingrenshu;
+ //}
+ }
+ else
+ {
+ //if (resultDataEntity.DataList.Count > 0)
+ //{
+ // var orderBanciOrderDTO = resultDataEntity.DataList.OrderByDescending(x => x.Baomingrenshu).FirstOrDefault();
+
+ // data.Baomingrenshu = orderBanciOrderDTO.Baomingrenshu+1;
+ //}
+ //else
+ //{
+ data.Baomingrenshu = 1;
+ //}
+ }
data.Jine = resultDataEntity.DataList.Sum(x => x.Xuefei);
data.Jine += data.Xuefei;
ResultEntity resultEntity = _orderBanciOrderService.save(data);
@@ -261,5 +284,62 @@
}
return new JsonResult(returnMsg);
}
+
+
+ //鑾峰彇褰撳墠鐨勪笟鍔＄被鍨�
+ public IActionResult GetBusinessType()
+ {
+ ReturnMsg<List<SysCodeDtl>> returnMsg = new ReturnMsg<List<SysCodeDtl>>();
+ returnMsg.code = 2;
+ try
+ {
+ var sysCodeDtls = _liaotianService.GetSYScode("CooperVisit", "jtype");
+
+
+
+ returnMsg.code = 1;
+ returnMsg.count = sysCodeDtls.Count;
+ returnMsg.returnObj = sysCodeDtls;
+
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
+
+
+ //鑾峰彇浼氬憳璁㈠崟淇℃伅锛屾敮浠樺畬鎴愮殑
+ public IActionResult GetOrderByHuiyuanId([FromBody] FiOrderrecievemoneyDTOSearch search)
+ {
+ ReturnMsg<List<FiOrderrecievemoneyDTO>> returnMsg = new ReturnMsg<List<FiOrderrecievemoneyDTO>>();
+ returnMsg.code = 2;
+ try
+ {
+
+ search.page = 1;
+ search.rows = 10000;
+ search.Fkzt = "03";
+ ResultDataEntity<FiOrderrecievemoneyDTO> resultDataEntity = _fiOrderrecievemoneyService.SearchByPaging(search);
+
+ returnMsg.code = 1;
+ returnMsg.count = search.totalrows;
+ returnMsg.returnObj = resultDataEntity.DataList;
+
+ }
+ catch (Exception ex)
+ {
+ returnMsg.code = 2;
+ returnMsg.error = "娌℃湁鑾峰彇鍒皌oken";
+ returnMsg.count = 0;
+
+ }
+ return new JsonResult(returnMsg);
+ }
+
}
}
--
Gitblit v1.9.1