【增加】手机端：学生欠费弹出提示；

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/ReceiveSendFeeManagement/FinaChargeStuYearApi.cs

@@ -33,6 +33,7 @@ namespace Learun.Application.WebApi.Modules
         private FinaChargeStuYearIBLL finaChargeStuYearIBLL = new FinaChargeStuYearBLL();
         private FinaChargeStuOrderIBLL finaChargeStuOrderIbll = new FinaChargeStuOrderBLL();
         private TeachSwitchIBLL teachSwitchIbll = new TeachSwitchBLL();
+        private FinaChargeStudentIBLL finaChargeStudentIBLL = new FinaChargeStudentBLL();
 
         public FinaChargeStuYearApi()
           : base("/ReceiveSendFeeManagement/FinaChargeStuYearApi")
@@ -80,12 +81,20 @@ namespace Learun.Application.WebApi.Modules
             var FinaChargeStuYearData = finaChargeStuYearIBLL.GetFinaChargeStuYearEntity(keyValue);
             //学生缴费明细
             var FinaChargeStuItemList = finaChargeStuYearIBLL.GetFinaChargeStuItemList(keyValue);
+            //是否存在欠费
+            bool isOwe = false;
+            var finachargestudententity = finaChargeStudentIBLL.GetFinaChargeStudentEntityByNo(FinaChargeStuYearData?.StuNo);
+            if (finachargestudententity != null && finachargestudententity.NeedToPay > 0)
+            {
+                isOwe = true;
+            }
             var jsonData = new
             {
                 StuInfoFreshData = FinaChargeStuYearData,
                 FinaChargesStandardList = FinaChargeStuItemList,
-                PayFeeTotal =FinaChargeStuYearData.NeedToPay,
-                SJAmount = FinaChargeStuYearData.SJAmount
+                PayFeeTotal = FinaChargeStuYearData.NeedToPay,
+                SJAmount = FinaChargeStuYearData.SJAmount,
+                isOwe = isOwe
             };
             return Success(jsonData);
         }
@@ -211,7 +220,7 @@ namespace Learun.Application.WebApi.Modules
                 logEntity.WriteLog();
                 return Fail("缴费机器暂停缴费！");
             }
-            
+
             var backimgUrl = new { imgUrl };
             return Success(backimgUrl);
         }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/UserApi.cs

@@ -1,6 +1,7 @@
 using Learun.Application.Base.SystemModule;
 using Learun.Application.Organization;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
+using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement;
 using Learun.Cache.Base;
 using Learun.Cache.Factory;
 using Learun.Util;
@@ -53,6 +54,7 @@ namespace Learun.Application.WebApi
         CdMajorIBLL majorIbll = new CdMajorBLL();
         private readonly ISms aliyunSms = new AliyunSms();
         private ICache redisCache = CacheFactory.CaChe();
+        private FinaChargeStudentIBLL finaChargeStudentIBLL = new FinaChargeStudentBLL();
 
 
 
@@ -200,6 +202,9 @@ namespace Learun.Application.WebApi
                 OperatorResult res = OperatorHelper.Instance.IsOnLine(token, this.loginMark);
                 res.userInfo.password = null;
                 res.userInfo.secretkey = null;
+
+                //是否存在欠费
+                bool isOwe = false;
                 var studententity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(userEntity.F_Account);
                 if (studententity != null)
                 {
@@ -209,6 +214,11 @@ namespace Learun.Application.WebApi
                     {
                         res.userInfo.majorno = majorinfo.ID ?? "";
                     }
+                    var finachargestudententity = finaChargeStudentIBLL.GetFinaChargeStudentEntityByNo(studententity.StuNo);
+                    if (finachargestudententity != null && finachargestudententity.NeedToPay > 0)
+                    {
+                        isOwe = true;
+                    }
                 }
                 //是否强密码验证
                 bool pwd = false;
@@ -221,7 +231,8 @@ namespace Learun.Application.WebApi
                     baseinfo = res.userInfo,
                     post = postIBLL.GetListByPostIds(res.userInfo.postIds),
                     role = roleIBLL.GetListByRoleIds(res.userInfo.roleIds),
-                    pwd = pwd
+                    pwd = pwd,
+                    isOwe = isOwe
                 };
                 return Success(jsonData);
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStudent/FinaChargeStudentBLL.cs

@@ -67,6 +67,30 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             }
         }
 
+        /// <summary>
+        /// 获取FinaChargeStudent表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public FinaChargeStudentEntity GetFinaChargeStudentEntityByNo(string stuno)
+        {
+            try
+            {
+                return finaChargeStudentService.GetFinaChargeStudentEntityByNo(stuno);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStudent/FinaChargeStudentIBLL.cs

@@ -27,6 +27,12 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
         /// <param name="keyValue">主键</param>
         /// <returns></returns>
         FinaChargeStudentEntity GetFinaChargeStudentEntity(string keyValue);
+        /// <summary>
+        /// 获取FinaChargeStudent表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        FinaChargeStudentEntity GetFinaChargeStudentEntityByNo(string stuno);
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/FinaChargeStudent/FinaChargeStudentService.cs

@@ -120,6 +120,30 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement
             }
         }
 
+        /// <summary>
+        /// 获取FinaChargeStudent表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public FinaChargeStudentEntity GetFinaChargeStudentEntityByNo(string stuno)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<FinaChargeStudentEntity>(x => x.StuNo == stuno);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
         #endregion
 
         #region 提交数据

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/single.vue

@@ -177,6 +177,16 @@ export default{
 				}
 				this.SJAmount = res.SJAmount
 				this.ready = true
+				if (this.GET_STORAGE('isOwe')) {
+					if (!res.isOwe) {
+						this.TOAST("已缴清欠费,请重新登陆！")
+						setTimeout(() => {
+							this.CLEAR_GLOBAL()
+							this.CLEAR_STORAGE()
+							this.RELAUNCH_TO('/pages/login')
+						}, 500)
+					}
+				}
 			})
 		},
 		// 显示列表中的标题项

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home.vue

@@ -197,6 +197,13 @@ export default {
 		location.href = "http://" + window.location.host + "/#/pages/my/newpassword";
 		return
 	}
+	if(this.GET_STORAGE('isOwe')){
+		this.CONFIRM('数字化校园提示', '您当前存在欠费，请点击下方【确定】进入页面，缴清欠款后重新尝试登陆！', false).then(res=>{
+			if (res) {
+				this.JUMP_TO('/pages/ReceiveSendFeeManagement/PayFee/list',{},true)
+			}
+		})
+	}
     await this.init(param);
   },
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue

@@ -184,6 +184,7 @@ export default {
       this.SET_STORAGE('token', token)
 
       this.HIDE_LOADING()
+	  this.SET_STORAGE('isOwe', loginResult.isOwe)
       this.TAB_TO('/pages/home')
     },
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my.vue

@@ -97,6 +97,7 @@ export default {
       }
 
       this.CLEAR_GLOBAL()
+	  this.CLEAR_STORAGE()
       this.RELAUNCH_TO('/pages/login')
     },