页面修改

Edu.Common/Config.cs

@@ -981,5 +981,29 @@ namespace Edu.Common
                 return list;
             }
         }
+
+        /// <summary>
+        /// 需要清零的学员订单编号
+        /// </summary>
+        public static List<int> FinishOrderIdList
+        {
+            get
+            {
+                List<int> list = new List<int>();
+                try
+                {
+                    string noCheckOrdersStr = ReadConfigKey("FinishOrderIds");
+                    if (!string.IsNullOrEmpty(noCheckOrdersStr))
+                    {
+                        list = Common.ConvertHelper.StringToList(noCheckOrdersStr);
+                    }
+                }
+                catch
+                {
+                    list = new List<int>();
+                }
+                return list;
+            }
+        }
     }
 }
\ No newline at end of file

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -1230,8 +1230,17 @@ group by og.Id";
             builder.AppendFormat(@"
 SELECT A.OrderId,A.ClassId,A.Income,A.OrderState,A.CourseId,B.GuestName,B.Id,B.GuestState,B.TotalHours,B.CompleteHours 
 FROM rb_order AS A INNER JOIN rb_order_guest AS B ON A.OrderId=B.OrderId
-WHERE A.CourseId IN(215,285,301) and A.OrderState IN(1) ");
-            return Get<RB_Order_Guest_ViewModel>(builder.ToString()).ToList();
+WHERE 1=1 AND A.OrderState IN(1) ");
+            var orderList = Common.Config.FinishOrderIdList;
+            if (orderList != null && orderList.Count > 0)
+            {
+                builder.AppendFormat(" AND A.OrderId IN({0}) ", string.Join(",", orderList));
+                return Get<RB_Order_Guest_ViewModel>(builder.ToString()).ToList();
+            }
+            else
+            {
+                return new List<RB_Order_Guest_ViewModel>();
+            }
         }
     }
 }

Edu.WebApi/appsettings.json

@@ -37,8 +37,8 @@
   "FinanceKey": "FinanceMallInsertToERPViitto2020",
   "PaymentFinanceApi": "http://192.168.10.46/api/Mall/InsertFinanceBatchForMallOut",
   "IncomeFinanceApi": "http://192.168.10.214/api/Mall/InsertFinanceBatchForMallIn",
-  "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //下单回调地址
-  "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //退款回调地址
+  "sTenpayNotifyUrl": "http://eduapi.oytour.com/api/WeChatPay/WxPayCallback", //�µ��ص���ַ
+  "sTenpayNotifyRefundUrl": "http://eduapi.oytour.com/api/WeChatPay/Refunds", //�˿�ص���ַ
   "SellFinanceApi": "http://192.168.10.214/api/Mall/InsertFinanceBatchForEduOut",
   "FinanceDateBase": "reborn_finance",
   "EduDateBase": "reborn_edu",
@@ -66,70 +66,72 @@
     "RedisPwd": "Viitto2018"
   },
   "VirtualDirectory": "WebFile",
-  //未填写   未打分   下降比例
+  //δ��д   δ���   �½�����
   "OKRMatterValue": "30,100,100",
-  //是否是线上环境
+  //�Ƿ������ϻ���
   "IsOnline": false,
-  //退课流程编号
+  //�˿����̱��
   "BackClassFlowId": 1,
-  //分区校长岗位编号
+  //����У����λ���
   "SchoolPostId": 3,
-  //教务长
+  //����
   "JiaoWuZhang": 8,
-  //留学就业部门主管审核编号[王涛]
+  //��ѧ��ҵ����������˱��[����]
   "StudyAbroadDirectorId": 64,
-  //留学就业部门负责人审核编号[姚顺先]
+  //��ѧ��ҵ���Ÿ�������˱��[Ҧ˳��]
   "StudyAbroadManagerId": 52,
-  //合同默认抬头
+  //��ͬĬ��̧ͷ
   "ContractDefaultTitle": "JH-DZ-CD-",
-  //消息推送AppId
+  //��Ϣ����AppId
   "PushAppId": "JiaHeJiaoYu",
-  //是否推送消息
+  //�Ƿ�������Ϣ
   "IsPushMessage": "1",
-  //超过下班时间60分钟不能打卡
+  //�����°�ʱ��60���Ӳ��ܴ�
   "MoreThanMinutes": 60,
-  //连续缺课课时
+  //����ȱ�ο�ʱ
   "AbsentHours": 12,
-  //值班时间验证日期
+  //ֵ��ʱ����֤����
   "DutyDate": "2021-06-30",
-  //调课流程编号
+  //�������̱��
   "ChangeClassFlowId": 2,
-  //停课流程编号
+  //ͣ�����̱��
   "StopClassFlowId": 3,
-  //临时上课邀请流程编号
+  //��ʱ�Ͽ��������̱��
   "TempInvitationClassFlowId": 4,
-  //订单转班流程编号
+  //����ת�����̱��
   "OrderTransClassFlowId": 5,
-  //订单分拆流程编号
+  //�����ֲ����̱��
   "OrderSplitClassFlowId": 6,
-  //是否开启调课数据验证
+  //�Ƿ������������֤
   "IsOpenChangeClassVerify": 1,
-  //是否是本地服务
+  //�Ƿ��DZ��ط���
   "IsLocal": "1",
-  //临时Token
+  //��ʱToken
   "TempToken": "53_OVLlSPNJ0hmSrsEUfnJ6kTxFRGxfkcuJJjpBjsDuaSGmtYu95vZNNyh-wIXbFSZ9DtxzFJ1eN0At2QmJ_aWLPFjz4yrz2VrWvmR3KrEQKqfwvxesG82V2WpAgDnxW_tvvWYXRRRX1oguxCtHXSShADAKFF",
-  //学生请假流程编号
+  //ѧ��������̱��
   "StudentLeaveFlowId": 7,
-  //组卷审批流程编号
+  //����������̱��
   "ZuJuanFlowId": 8,
-  //考试申请流程编号
+  //�����������̱��
   "ExamApplyFlowId": 9,
-  //投稿审批流程编号
+  //Ͷ���������̱��
   "ContributeFlowId": 10,
-  //新业绩提成启用时间
+  //��ҵ���������ʱ��
   "NewAchievementsEnable": "2022-01-01",
-  //Vip课程申请流程编号
+  //Vip�γ��������̱��
   "VipCourseFlowId": 11,
-  //甲鹤收款手续费
+  //�׺��տ�������
   "IncomeFeeRate": "0.0025,0.0054,0.006,0.04,0.004",
-  //教师考核审批流程编号
+  //��ʦ�����������̱��
   "TeacherAssessmentFlowId": 12,
-  //不验证学员状态的订单(1382：商务日语听说班【企业课】)
+  //����֤ѧԱ״̬�Ķ���(1382������������˵�ࡾ��ҵ�Ρ�)
   "NoCheckOrders": "1382",
-  //chrome浏览器地址  
+  //chrome�������ַ  
   "chromePath": "C:/Users/Administrator/AppData/Local/Google/Chrome/Application/chrome.exe",
-  //行程头部底部图片
+  //�г�ͷ���ײ�ͼƬ
   "FeaturePath": "E:\\WebFile\\Feature\\",
-  //1-下载Chrome,0-不下载Chrome
-  "IsDownLoadChrome": "0"
+  //1-����Chrome,0-������Chrome
+  "IsDownLoadChrome": "0",
+  //需要清0的订单编号
+  "FinishOrderIds": "1440,1429"
 }
\ No newline at end of file