From f6043f17982667a9e028ff7aa5cd7c2f8318a791 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 08 八月 2025 14:07:40 +0800
Subject: [PATCH] 20250807 设计订单提成最新修改 试卷按照p数 自动合集p数、根据p数算提成
---
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index 67f71e4..26592f9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -122,10 +122,11 @@
{
var id = this.Keyid.Value.ToInt32().Value;
var money = this.txtMoney.Value.ToDecimal2().Value;
+ var molingmoney = this.txtMolingMoney.Value.ToDecimal2();
var Youwufapiao = Request["rdoReceiveQuannbu"];
var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
- if (fukuanshenqing.FukuanStatus == 2 && money>0)
+ if (fukuanshenqing.FukuanStatus == 2 && money > 0)
{
JavaScript.MessageBox("璇ョ敵璇峰凡缁忎粯娆剧粨鏉燂紒", this);
return;
@@ -135,6 +136,16 @@
{
JavaScript.MessageBox("鎿嶄綔閲戦澶т簬鍓╀綑搴斾粯閲戦锛�", this);
return;
+ }
+
+
+ if (molingmoney.HasValue && molingmoney.Value > 0)
+ {
+ if((money + molingmoney.Value ) != (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ JavaScript.MessageBox("鎿嶄綔閲戦鍔犳姽闆堕噾棰濆繀椤荤瓑浜庡墿浣欏簲浠橀噾棰濓紒", this);
+ return;
+ }
}
if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
@@ -159,6 +170,15 @@
{
fukuanshenqing.FukuanStatus = 2;
}
+
+ if (molingmoney.HasValue && molingmoney.Value > 0)
+ {
+ if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ fukuanshenqing.FukuanStatus = 2;
+ }
+ }
+
fukuanshenqing.Yishoumoney = yishoumoney + money;
fukuanshenqing.Updater = CurrentUser.ShortName;
fukuanshenqing.LastUpdateTime = DateTime.Now;
@@ -185,12 +205,7 @@
firmAccount.AllExpenses = this.txtMoney.Value.ToDecimal2() + firmAccount.AllExpenses;
firmAccount.Balance = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
sddd = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
- }
-
-
- if (sddd)
- {
if (!string.IsNullOrEmpty(this.selSubject.Value))
{
var oA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(firmAccountRecord.SubjectId);
@@ -232,6 +247,13 @@
}
}
+ }
+
+
+
+ if (sddd)
+ {
+
scope.Complete();
JavaScript.MessageBox("浠樻鎴愬姛", this, true, true);
--
Gitblit v1.9.1