退费

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/退费记录Controller.cs → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Controllers/FinaChargeRefundController.cs

@@ -13,9 +13,10 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
     /// 日 期：2023-08-18 18:07
     /// 描 述：FinaChargeRefund
     /// </summary>
-    public class 退费记录Controller : MvcControllerBase
+    public class FinaChargeRefundController : MvcControllerBase
     {
-        private 退费记录IBLL 退费记录IBLL = new 退费记录BLL();
+        private FinaChargeRefundIBLL FinaChargeRefundIBLL = new FinaChargeRefundBLL();
+        private FinaChargeStuYearItemIBLL finaChargeStuYearItemIbll = new FinaChargeStuYearItemBLL();
 
         #region 视图功能
 
@@ -52,7 +53,7 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         public ActionResult GetPageList(string pagination, string queryJson)
         {
             Pagination paginationobj = pagination.ToObject<Pagination>();
-            var data = 退费记录IBLL.GetPageList(paginationobj, queryJson);
+            var data = FinaChargeRefundIBLL.GetPageList(paginationobj, queryJson);
             var jsonData = new
             {
                 rows = data,
@@ -71,9 +72,9 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var FinaChargeRefundData = 退费记录IBLL.GetFinaChargeRefundEntity( keyValue );
+            var FinaChargeRefundList = finaChargeStuYearItemIbll.GetFinaChargeRefundList( keyValue );
             var jsonData = new {
-                FinaChargeRefund = FinaChargeRefundData,
+                FinaChargeRefundList = FinaChargeRefundList,
             };
             return Success(jsonData);
         }
@@ -90,25 +91,24 @@ namespace Learun.Application.Web.Areas.ReceiveSendFeeManagement.Controllers
         [AjaxOnly]
         public ActionResult DeleteForm(string keyValue)
         {
-            退费记录IBLL.DeleteEntity(keyValue);
+            FinaChargeRefundIBLL.DeleteEntity(keyValue);
             return Success("删除成功！");
         }
+
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
-        /// <param name="keyValue">主键</param>
+        /// <param name="FinaChargeRefundList">FinaChargeRefundList</param>
         /// <param name="strEntity">实体</param>
         /// <returns></returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AjaxOnly]
-        public ActionResult SaveForm(string keyValue, string strEntity)
+        public ActionResult SaveForm(string FinaChargeRefundList,string strEntity)
         {
+            List<FinaChargeStuYearItemEntity> list = FinaChargeRefundList.ToObject<List<FinaChargeStuYearItemEntity>>();
             FinaChargeRefundEntity entity = strEntity.ToObject<FinaChargeRefundEntity>();
-            退费记录IBLL.SaveEntity(keyValue,entity);
-            if (string.IsNullOrEmpty(keyValue))
-            {
-            }
+            FinaChargeRefundIBLL.SaveEntity(list, entity);
             return Success("保存成功！");
         }
         #endregion

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Form.cshtml

@@ -0,0 +1,18 @@
+@{
+    ViewBag.Title = "FinaChargeRefund";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="FinaChargeRefundList"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FinaChargeRefund">
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="FinaChargeRefund">
+        <div class="lr-form-item-title">退费方式</div>
+        <div id="RType"></div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Form.js

@@ -0,0 +1,105 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-08-18 18:07
+ * 描  述：FinaChargeRefund
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' });
+            $('#RType').lrDataItemSelect({ code: 'RType' });
+            $('#FinaChargeRefundList').jfGrid({
+                headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    {
+                        label: "专业", name: "MajorNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "ClassNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "缴费年度", name: "FSYear", width: 80, align: "left" },
+                    { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left" },
+                    { label: "收费项名称", name: "ChargeItemName", width: 100, align: "left" },
+                    {
+                        label: "收费项目类型", name: "ChargeItemType", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'ChargeItemType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "收费标准", name: "Standard", width: 80, align: "left" },
+                    { label: "实缴金额", name: "SJAmount", width: 80, align: "left" },
+                    { label: "应退费金额", name: "FSBlance", width: 80, align: "left" },
+                ],
+                height: 400,
+                mainId: 'FSYIId'
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            FinaChargeRefundList: JSON.stringify($('#FinaChargeRefundList').jfGridGet("rowdatas")),
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/SaveForm', postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/退费记录/Index.cshtml → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.cshtml

@@ -41,4 +41,4 @@
         </div>
     </div>
 </div>
-@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/退费记录/Index.js")
+@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/退费记录/Index.js → Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeRefund/Index.js

@@ -26,7 +26,7 @@ var bootstrap = function ($, learun) {
                 learun.layerForm({
                     id: 'form',
                     title: '新增',
-                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/退费记录/Form',
+                    url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/Form',
                     width: 600,
                     height: 400,
                     callBack: function (id) {
@@ -41,7 +41,7 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'form',
                         title: '编辑',
-                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/退费记录/Form?keyValue=' + keyValue,
+                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/Form?keyValue=' + keyValue,
                         width: 600,
                         height: 400,
                         callBack: function (id) {
@@ -56,7 +56,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res) {
                         if (res) {
-                            learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/退费记录/DeleteForm', { keyValue: keyValue}, function () {
+                            learun.deleteForm(top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/DeleteForm', { keyValue: keyValue}, function () {
                                 refreshGirdData();
                             });
                         }
@@ -67,7 +67,7 @@ var bootstrap = function ($, learun) {
         // 初始化列表
         initGird: function () {
             $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/ReceiveSendFeeManagement/退费记录/GetPageList',
+                url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/GetPageList',
                 headData: [
                     { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left"},
                     { label: "收费项目名称", name: "ChargeItemName", width: 100, align: "left"},

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuBalance/Index.js

@@ -15,7 +15,7 @@ var bootstrap = function ($, learun) {
             page.bind();
         },
         bind: function () {
-            $("#ChangeType").lrDataItemSelect({ code:'ChangeType'});
+            $("#ChangeType").lrDataItemSelect({ code: 'ChangeType' });
             // 时间搜索框
             $('#datesearch').lrdate({
                 dfdata: [
@@ -56,38 +56,46 @@ var bootstrap = function ($, learun) {
             $('#gridtable').lrAuthorizeJfGrid({
                 url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeStuBalance/GetPageList',
                 headData: [
-                    { label: "学号", name: "StuNo", width: 100, align: "left"},
-                    { label: "缴费年度", name: "FSYear", width: 100, align: "left"},
-                    { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left"},
-                    { label: "收费项目名称", name: "ChargeItemName", width: 100, align: "left"},
-                    { label: "收费标准", name: "Standard", width: 100, align: "left"},
-                    { label: "本次待缴金额", name: "DJAmount", width: 100, align: "left"},
-                    { label: "变动金额", name: "PaymentAmount", width: 100, align: "left"},
-                    { label: "剩余待缴金额", name: "QJAmount", width: 100, align: "left"},
-                    { label: "当前余额", name: "OldBalance", width: 100, align: "left"},
-                    { label: "本次变动金额", name: "ChangeAmount", width: 100, align: "left"},
-                    { label: "本次余额", name: "NowBalance", width: 100, align: "left"},
-                    { label: "变动时间", name: "ChangeDate", width: 100, align: "left"},
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "缴费年度", name: "FSYear", width: 100, align: "left" },
+                    { label: "收费项目编号", name: "ChargeItemCode", width: 100, align: "left" },
+                    { label: "收费项目名称", name: "ChargeItemName", width: 100, align: "left" },
+                    { label: "收费标准", name: "Standard", width: 100, align: "left" },
+                    { label: "本次待缴金额", name: "DJAmount", width: 100, align: "left" },
+                    { label: "变动金额", name: "PaymentAmount", width: 100, align: "left" },
+                    { label: "剩余待缴金额", name: "QJAmount", width: 100, align: "left" },
+                    { label: "当前余额", name: "OldBalance", width: 100, align: "left" },
+                    { label: "本次变动金额", name: "ChangeAmount", width: 100, align: "left" },
+                    { label: "本次余额", name: "NowBalance", width: 100, align: "left" },
+                    { label: "变动时间", name: "ChangeDate", width: 150, align: "left" },
                     {
                         label: "变动原因", name: "ChangeType", width: 100, align: "left", formatter: function (cellvalue, row) {
                             if (cellvalue === 1) {
                                 return '<span class=\"label label-success\">二维码缴费</span>';
                             } else if (cellvalue === 2) {
-                                return '<span class=\"label label-default\">已缴费</span>';
+                                return '<span class=\"label label-success\">导入贷款</span>';
                             } else if (cellvalue === 3) {
+                                return '<span class=\"label label-success\">导入现金</span>';
+                            } else if (cellvalue === 4) {
                                 return '<span class=\"label label-warning\">退费</span>';
+                            } else if (cellvalue === 5) {
+                                return '<span class=\"label label-info\">自动分配扣减</span>';
+                            } else if (cellvalue === 6) {
+                                return '<span class=\"label label-warning\">自动分配增加</span>';
                             }
-                        }},
+                        }
+                    },
                 ],
-                mainId:'Id',
-                isPage: true
+                mainId: 'Id',
+                isPage: true,
+                sidx:'ChangeDate'
             });
         },
         search: function (param) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
-            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
     refreshGirdData = function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FinaChargeStuYearItem/IndexForRefund.js

@@ -49,9 +49,9 @@ var bootstrap = function ($, learun) {
                     learun.layerForm({
                         id: 'formrefund',
                         title: '退费',
-                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeItem/Form',
-                        width: 600,
-                        height: 400,
+                        url: top.$.rootUrl + '/ReceiveSendFeeManagement/FinaChargeRefund/Form?keyValue=' + keyValue,
+                        width: 1200,
+                        height: 700,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/退费记录/Form.cshtml

@@ -1,31 +0,0 @@
-@{
-    ViewBag.Title = "FinaChargeRefund";
-    Layout = "~/Views/Shared/_Form.cshtml";
-}
-<div class="lr-form-wrap" id="form">
-    <div class="col-xs-12 lr-form-item"  data-table="FinaChargeRefund" >
-        <div class="lr-form-item-title">收费项目编号</div>
-        <input id="ChargeItemCode" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FinaChargeRefund" >
-        <div class="lr-form-item-title">收费项目名称</div>
-        <input id="ChargeItemName" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FinaChargeRefund" >
-        <div class="lr-form-item-title">收费项目类型</div>
-        <div id="ChargeItemType"  ></div>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FinaChargeRefund" >
-        <div class="lr-form-item-title">退费金额</div>
-        <input id="Amount" type="text" class="form-control"  />
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FinaChargeRefund" >
-        <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
-    </div>
-    <div class="col-xs-12 lr-form-item"  data-table="FinaChargeRefund" >
-        <div class="lr-form-item-title">退费方式</div>
-        <div id="RType"  ></div>
-    </div>
-</div>
-@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/退费记录/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/退费记录/Form.js

@@ -1,52 +0,0 @@
-/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
- * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
- * 创建人：超级管理员
- * 日  期：2023-08-18 18:07
- * 描  述：FinaChargeRefund
- */
-var acceptClick;
-var keyValue = request('keyValue');
-var bootstrap = function ($, learun) {
-    "use strict";
-    var page = {
-        init: function () {
-            $('.lr-form-wrap').lrscroll();
-            page.bind();
-            page.initData();
-        },
-        bind: function () {
-            $('#ChargeItemType').lrDataItemSelect({ code: 'ChargeItemType' });
-            $('#RType').lrDataItemSelect({ code: 'RefundStatus' });
-        },
-        initData: function () {
-            if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/ReceiveSendFeeManagement/退费记录/GetFormData?keyValue=' + keyValue, function (data) {
-                    for (var id in data) {
-                        if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
-                        }
-                        else {
-                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
-                        }
-                    }
-                });
-            }
-        }
-    };
-    // 保存数据
-    acceptClick = function (callBack) {
-        if (!$('body').lrValidform()) {
-            return false;
-        }
-        var postData = {
-            strEntity: JSON.stringify($('body').lrGetFormData())
-        };
-        $.lrSaveForm(top.$.rootUrl + '/ReceiveSendFeeManagement/退费记录/SaveForm?keyValue=' + keyValue, postData, function (res) {
-            // 保存成功后才回调
-            if (!!callBack) {
-                callBack();
-            }
-        });
-    };
-    page.init();
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -892,7 +892,7 @@
     <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FinaChargeStuOrderController.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FinaChargeStuOrderDetailController.cs" />
     <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FinaChargeStuBalanceController.cs" />
-    <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\退费记录Controller.cs" />
+    <Compile Include="Areas\ReceiveSendFeeManagement\Controllers\FinaChargeRefundController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6674,10 +6674,10 @@
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuBalance\Index.js" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuBalance\Form.cshtml" />
     <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeStuBalance\Form.js" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\退费记录\Index.cshtml" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\退费记录\Index.js" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\退费记录\Form.cshtml" />
-    <Content Include="Areas\ReceiveSendFeeManagement\Views\退费记录\Form.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeRefund\Index.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeRefund\Index.js" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeRefund\Form.cshtml" />
+    <Content Include="Areas\ReceiveSendFeeManagement\Views\FinaChargeRefund\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\AwardAndPunishment\" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1854,10 +1854,10 @@
     <Compile Include="ReceiveSendFeeManagement\FinaChargeStuBalance\FinaChargeStuBalanceService.cs" />
     <Compile Include="ReceiveSendFeeManagement\FinaChargeStuBalance\FinaChargeStuBalanceBLL.cs" />
     <Compile Include="ReceiveSendFeeManagement\FinaChargeStuBalance\FinaChargeStuBalanceIBLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\退费记录\FinaChargeRefundEntity.cs" />
-    <Compile Include="ReceiveSendFeeManagement\退费记录\退费记录Service.cs" />
-    <Compile Include="ReceiveSendFeeManagement\退费记录\退费记录BLL.cs" />
-    <Compile Include="ReceiveSendFeeManagement\退费记录\退费记录IBLL.cs" />
+    <Compile Include="ReceiveSendFeeManagement\FinaChargeRefund\FinaChargeRefundEntity.cs" />
+    <Compile Include="ReceiveSendFeeManagement\FinaChargeRefund\FinaChargeRefundService.cs" />
+    <Compile Include="ReceiveSendFeeManagement\FinaChargeRefund\FinaChargeRefundBLL.cs" />
+    <Compile Include="ReceiveSendFeeManagement\FinaChargeRefund\FinaChargeRefundIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/退费记录/退费记录BLL.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundBLL.cs

@@ -12,9 +12,9 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     /// 日 期：2023-08-18 18:07
     /// 描 述：FinaChargeRefund
     /// </summary>
-    public class 退费记录BLL : 退费记录IBLL
+    public class FinaChargeRefundBLL : FinaChargeRefundIBLL
     {
-        private 退费记录Service 退费记录Service = new 退费记录Service();
+        private FinaChargeRefundService FinaChargeRefundService = new FinaChargeRefundService();
 
         #region 获取数据
 
@@ -28,7 +28,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                return 退费记录Service.GetPageList(pagination, queryJson);
+                return FinaChargeRefundService.GetPageList(pagination, queryJson);
             }
             catch (Exception ex)
             {
@@ -52,7 +52,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                return 退费记录Service.GetFinaChargeRefundEntity(keyValue);
+                return FinaChargeRefundService.GetFinaChargeRefundEntity(keyValue);
             }
             catch (Exception ex)
             {
@@ -79,7 +79,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                退费记录Service.DeleteEntity(keyValue);
+                FinaChargeRefundService.DeleteEntity(keyValue);
             }
             catch (Exception ex)
             {
@@ -93,18 +93,18 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 }
             }
         }
-
+        
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
         /// <returns></returns>
-        public void SaveEntity(string keyValue, FinaChargeRefundEntity entity)
+        public void SaveEntity(List<FinaChargeStuYearItemEntity> list, FinaChargeRefundEntity entity)
         {
             try
             {
-                退费记录Service.SaveEntity(keyValue, entity);
+                FinaChargeRefundService.SaveEntity(list, entity);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/退费记录/退费记录IBLL.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundIBLL.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     /// 日 期：2023-08-18 18:07
     /// 描 述：FinaChargeRefund
     /// </summary>
-    public interface 退费记录IBLL
+    public interface FinaChargeRefundIBLL
     {
         #region 获取数据
 
@@ -41,7 +41,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        void SaveEntity(string keyValue, FinaChargeRefundEntity entity);
+        void SaveEntity(List<FinaChargeStuYearItemEntity> list, FinaChargeRefundEntity entity);
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/退费记录/退费记录Service.cs → Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeRefund/FinaChargeRefundService.cs

@@ -15,7 +15,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
     /// 日 期：2023-08-18 18:07
     /// 描 述：FinaChargeRefund
     /// </summary>
-    public class 退费记录Service : RepositoryFactory
+    public class FinaChargeRefundService : RepositoryFactory
     {
         #region 获取数据
 
@@ -56,10 +56,10 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 }
                 if (!queryParam["RType"].IsEmpty())
                 {
-                    dp.Add("RType",queryParam["RType"].ToString(), DbType.String);
+                    dp.Add("RType", queryParam["RType"].ToString(), DbType.String);
                     strSql.Append(" AND t.RType = @RType ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<FinaChargeRefundEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<FinaChargeRefundEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -110,7 +110,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<FinaChargeRefundEntity>(t=>t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<FinaChargeRefundEntity>(t => t.Id == keyValue);
             }
             catch (Exception ex)
             {
@@ -130,19 +130,67 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// </summary>
         /// <param name="keyValue">主键</param>
         /// <param name="entity">实体</param>
-        public void SaveEntity(string keyValue, FinaChargeRefundEntity entity)
+        public void SaveEntity(List<FinaChargeStuYearItemEntity> list, FinaChargeRefundEntity entity)
         {
             try
             {
-                if (!string.IsNullOrEmpty(keyValue))
+                foreach (var finaChargeStuYearItemEntity in list)
                 {
-                    entity.Modify(keyValue);
-                    this.BaseRepository("CollegeMIS").Update(entity);
-                }
-                else
-                {
-                    entity.Create();
-                    this.BaseRepository("CollegeMIS").Insert(entity);
+                    var db = BaseRepository("CollegeMIS").BeginTrans();
+                    try
+                    {
+                        var finaChargeRefundEntity = new FinaChargeRefundEntity();
+                        finaChargeRefundEntity.Create();
+                        finaChargeRefundEntity.Remark = entity.Remark;
+                        finaChargeRefundEntity.RType = entity.RType;
+                        finaChargeRefundEntity.FSYIId = finaChargeStuYearItemEntity.FSYIId;
+                        finaChargeRefundEntity.ChargeItemCode = finaChargeStuYearItemEntity.ChargeItemCode;
+                        finaChargeRefundEntity.ChargeItemName = finaChargeStuYearItemEntity.ChargeItemName;
+                        finaChargeRefundEntity.ChargeItemType = finaChargeStuYearItemEntity.ChargeItemType;
+                        finaChargeRefundEntity.Amount = finaChargeStuYearItemEntity.FSBlance;
+                        db.Insert(finaChargeRefundEntity);
+                        //退费状态修改，余额归零
+                        finaChargeStuYearItemEntity.RefundStatus = true;
+                        finaChargeStuYearItemEntity.FSBlance = 0;
+                        //退费后实缴值也要更新
+                        finaChargeStuYearItemEntity.SJAmount = finaChargeStuYearItemEntity.SJAmount- finaChargeRefundEntity.Amount;
+                        db.Update(finaChargeStuYearItemEntity);
+                        //FinaChargeStuYear年度余额计算
+                        db.ExecuteBySql("update FinaChargeStuYear set SJAmount=SJAmount-"+ finaChargeRefundEntity.Amount + ",FSBlance=FSBlance-" + finaChargeRefundEntity.Amount + " where FSYId='" + finaChargeStuYearItemEntity.FSYId + "'");
+                        //学生余额扣减
+                        db.ExecuteBySql("update FinaChargeStudent set FSBlance=FSBlance-" + finaChargeRefundEntity.Amount + " where StuNo='" + finaChargeStuYearItemEntity.StuNo + "'");
+                        //交易流水记录
+                        var finaChargeStuBalance=new FinaChargeStuBalanceEntity();
+                        finaChargeStuBalance.Create();
+                        finaChargeStuBalance.StuNo = finaChargeStuYearItemEntity.StuNo;
+                        finaChargeStuBalance.FSYear = finaChargeStuYearItemEntity.FSYear;
+                        finaChargeStuBalance.FCSOId = finaChargeRefundEntity.Id;
+                        finaChargeStuBalance.ChargeItemCode = finaChargeRefundEntity.ChargeItemCode;
+                        finaChargeStuBalance.ChargeItemName = finaChargeRefundEntity.ChargeItemName;
+                        finaChargeStuBalance.Standard = finaChargeStuYearItemEntity.Standard;
+                        finaChargeStuBalance.DJAmount = 0;
+                        finaChargeStuBalance.PaymentAmount = -finaChargeRefundEntity.Amount;
+                        finaChargeStuBalance.QJAmount = 0;
+                        finaChargeStuBalance.OldBalance = finaChargeRefundEntity.Amount;
+                        finaChargeStuBalance.ChangeAmount = finaChargeStuBalance.PaymentAmount;
+                        finaChargeStuBalance.NowBalance = 0;
+                        finaChargeStuBalance.ChangeDate = DateTime.Now;
+                        finaChargeStuBalance.ChangeType = 4;
+                        db.Insert(finaChargeStuBalance);
+                        db.Commit();
+                    }
+                    catch (Exception ex)
+                    {
+                        db.Rollback();
+                        if (ex is ExceptionEx)
+                        {
+                            throw;
+                        }
+                        else
+                        {
+                            throw ExceptionEx.ThrowServiceException(ex);
+                        }
+                    }
                 }
             }
             catch (Exception ex)

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuBalance/FinaChargeStuBalanceEntity.cs

@@ -85,7 +85,7 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         [Column("CHANGEDATE")]
         public DateTime? ChangeDate { get; set; }
         /// <summary>
-        /// 变动原因（1二维码缴费，2导入缴费，3退费）
+        /// 变动原因（1二维码缴费，2导入贷款，3导入现金，4退费，5自动分配扣减，6自动分配增加）
         /// </summary>
         [Column("CHANGETYPE")]
         public int? ChangeType { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemBLL.cs

@@ -157,6 +157,25 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             }
         }
 
+        public IEnumerable<FinaChargeStuYearItemEntity> GetFinaChargeRefundList(string keyValue)
+        {
+            try
+            {
+                return FinaChargeStuYearItemService.GetFinaChargeRefundList(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemIBLL.cs

@@ -46,5 +46,6 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
 
         void UnDeleteEntity(string keyValue);
         string ExecuteImportExcel(DataTable dt, string fileGuid, string queryJson);
+        IEnumerable<FinaChargeStuYearItemEntity> GetFinaChargeRefundList(string keyValue);
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStuYearItem/FinaChargeStuYearItemService.cs

@@ -406,5 +406,29 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
                 }
             }
         }
+
+        public IEnumerable<FinaChargeStuYearItemEntity> GetFinaChargeRefundList(string keyValue)
+        {
+            try
+            {
+                List<string> keys = keyValue.Split(',').ToList().Select(m=>"'"+m.Clone().ToString()+"'").ToList();
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.*,b.StuNo,b.StuName,b.MajorNo,b.ClassNo,b.DeptNo,b.IdentityCardNo ");
+                strSql.Append("  FROM FinaChargeStuYearItem t left join FinaChargeStuYear a on t.FSYId=a.FSYId left join FinaChargeStudent b on a.StuNo=b.StuNo ");
+                strSql.Append("  WHERE 1=1 and b.F_CheckMark=1 and t.FSBlance>0 and t.FSYIId in(" + string.Join(",", keys)+")");
+                return this.BaseRepository("CollegeMIS").FindList<FinaChargeStuYearItemEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
     }
 }