提交代码

Edu.Module.Course/OrderModule.cs

@@ -3177,8 +3177,8 @@ namespace Edu.Module.Course
                         {
                             CostTypeId = financeConfig?.CostTypeId ?? 533,
                             Number = demodel.GuestNum,
-                            OriginalMoney = Convert.ToDecimal(demodel.Income) ,
-                            UnitPrice = Convert.ToDecimal(demodel.Income/demodel.GuestNum) ,
+                            OriginalMoney = Convert.ToDecimal(demodel.PreferPrice) ,
+                            UnitPrice = Convert.ToDecimal(demodel.PreferPrice/demodel.GuestNum) ,
                             Remark = "甲鹤小程序用户下单自动生成财务单据"
                         }
                     };
@@ -3188,7 +3188,7 @@ namespace Edu.Module.Course
                         IsPublic = 1,
                         BType = 1,//item.AccountType,
                         AccountId = financeConfig?.ClientID ?? 54,
-                        WBMoney = Convert.ToDecimal(demodel.Income) ,
+                        WBMoney = Convert.ToDecimal(demodel.PreferPrice) ,
                         TradeDate = System.DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"),
                         AccountNumber = System.DateTime.Now.AddDays(-1).ToString("yyyyMMdd"),
                         TemplateId = financeConfig?.TempleteId ?? 139,

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -2155,7 +2155,7 @@ namespace Edu.WebApi.Controllers.Course
             var BackAccount = base.ParmJObj.GetStringValue("BackAccount");
             var StateMent = base.ParmJObj.GetStringValue("StateMent");
 
-            bool flag = orderModule.CreateBackClassApplyModule(GuestId, OrderId, applyReason, base.UserInfo, receiptFile, BackAccountName, BackAccount,StateMent,out string message);
+            bool flag = orderModule.CreateBackClassApplyModule(GuestId, OrderId, applyReason, base.UserInfo, receiptFile, BackAccountName, BackAccount, StateMent, out string message);
             return flag ? ApiResult.Success(message: message) : ApiResult.Failed(message: message);
         }
         #endregion
@@ -2192,7 +2192,7 @@ namespace Edu.WebApi.Controllers.Course
             list.ForEach(x => x.JoinType = OrderJoinTypeEnum.Normal);
             list.ForEach(x => x.OrderSource = OrderSourceEnum.MallApplet);
             list.ForEach(x => x.OrderType = OrderTypeEnum.CourseOrder);
-
+            list.ForEach(x => x.Income = 0);
             if (EnterID > 0)
             {
                 userinfo = UserReidsCache.GetUserLoginInfo(EnterID);
@@ -2231,7 +2231,7 @@ namespace Edu.WebApi.Controllers.Course
         public ApiResult UpdateGoodsSpecification()
         {
             Model.CacheModel.UserInfo userinfo = new Model.CacheModel.UserInfo();
-          
+
             List<int> list = JsonHelper.DeserializeObject<List<int>>(base.ParmJObj.GetStringValue("Order"));
             var flag = false;
             flag = orderModule.UpdateGoodsSpecification(list);