From 9d4be38f209331980e48ab8f9c93aa6965709e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=A4=20=E6=A2=81?= Date: Thu, 24 Aug 2023 11:03:28 +0800 Subject: [PATCH] =?UTF-8?q?fzp=20=20=E5=8F=91=E7=A5=A8=E8=B6=85=E5=87=BA?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PayFeeResultTwoController.cs | 23 ++----------------- DigitalSchoolApi/Controllers/YKTTrabs.cs | 4 ++-- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs index c47387d..7bd4357 100644 --- a/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs +++ b/DigitalSchoolApi/Controllers/PayFeeResultTwoController.cs @@ -88,27 +88,8 @@ namespace DigitalSchoolApi.Controllers } foreach (var stuorderEntity in stuorderlist) { - //新老生判断 - if (Convert.ToInt32(conn.ExecuteScalar( - "select count(1) from StuInfoFresh where StuNo='" + stuorderEntity.StuNo + "' and grade='" + stuorderEntity.YearNo.ToString().Substring(2) + "'")) > 0) - { - conn.Execute("update StuInfoFresh set PayFeeStatus='1' where StuNo='" + stuorderEntity.StuNo + "'"); - if (Convert.ToInt32(conn.ExecuteScalar( - "select count(1) from StuInfoFresh where StuNo='" + stuorderEntity.StuNo + "' and grade='" + stuorderEntity.YearNo.ToString().Substring(2) + "' and IsInvoice=0 and PayFeeStatus='1' ")) > 0) - { - //开票 - Task.Run(() => YKTTrabs.InvoiceEBillMethod(stuorderEntity.orderid, true)); - } - } - else - { - conn.Execute("update StuInfoBasic_PayFee set PayStatus='1' where StuNo='" + stuorderEntity.StuNo + "' and PayYear='" + stuorderEntity.YearNo.ToString().Substring(2) + "'"); - if (Convert.ToInt32(conn.ExecuteScalar("select count(1) from StuInfoBasic_PayFee where StuNo='" + stuorderEntity.StuNo + "' and PayYear='" + stuorderEntity.YearNo + "' and InvoiceStatus=0 and PayStatus='1'")) > 0) - { - //开票 - Task.Run(() => YKTTrabs.InvoiceEBillMethod(stuorderEntity.orderid, false)); - } - } + //开票 + Task.Run(() => YKTTrabs.InvoiceEBillMethodTwo(stuorderEntity.orderid)); } } } diff --git a/DigitalSchoolApi/Controllers/YKTTrabs.cs b/DigitalSchoolApi/Controllers/YKTTrabs.cs index c253dca..4798186 100644 --- a/DigitalSchoolApi/Controllers/YKTTrabs.cs +++ b/DigitalSchoolApi/Controllers/YKTTrabs.cs @@ -1073,7 +1073,6 @@ namespace DigitalSchoolApi.Controllers biParam.memo = "缴费年度:" + orderEntity.YearNo + ",学号:" + orderEntity.StuNo; biParam.@operator = "林智慧"; biParam.reViewer = "陈劲华"; - biParam.totalAmt = Convert.ToDouble(stuEnrollFeeOrderDetailList.Sum(x => x.YJAmount));// Convert.ToDouble(orderEntity.YJAmount); biParam.noticeMode = "0"; List itemdetailList = new List(); foreach (var itemEntity in stuEnrollFeeOrderDetailList) @@ -1083,9 +1082,10 @@ namespace DigitalSchoolApi.Controllers itemdetail.itemName = itemEntity.ChargeItemName; itemdetail.count = 1; itemdetail.standard = Convert.ToDouble(itemEntity.YJAmount); - itemdetail.amt = Convert.ToDouble(itemEntity.YJAmount); + itemdetail.amt = Convert.ToDouble((itemEntity.SJAmount> itemEntity.YJAmount? itemEntity.YJAmount: itemEntity.SJAmount)); itemdetailList.Add(itemdetail); } + biParam.totalAmt = Convert.ToDouble(itemdetailList.Sum(m=>m.amt)); biParam.itemDetail = itemdetailList; //JsonConvert.SerializeObject(biParam) using (IDbConnection conncore = new SqlConnection(_coresqlConnection))