yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 当天消费记录修正

Browse Source
This commit is contained in:
cheche
2024-01-11 13:55:22 +08:00
parent 026fd7b18a
commit b278884fcf
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
View File

@@ -216,7 +216,7 @@ public class OrderService : IOrderService
var balanceRecords = await _dbContext.Queryable<BalanceRecordEntity>()
.Where(x => x.UserId == order.UserId)
.Where(x => x.CreateTime <= beginOfDay && x.CreateTime <= endOfDay) //今天消费记录
.Where(x => x.CreateTime >= beginOfDay && x.CreateTime <= endOfDay) //今天消费记录
.ToListAsync();
var dayMarketCostMax = GetSetting<decimal>(settings, CanteenSettingItemEnumType.DayMarketCostMax);

38
Src/Dlhis.ScheduledTask/Job/SyncPersonJob.cs
View File

@@ -145,47 +145,55 @@ namespace Dlhis.ScheduledTask.Job
var gainfo = await _dbContext.Queryable<GainfoEntity>().Where(x => x.IdNo == item.idno).FirstAsync();
if (gainfo != null)
{
gainfo.SapNo = item.PERNR;
gainfo.No = item.guestno;
gainfo.SapNo = item.ano;
gainfo.Type = item.@class;
gainfo.Name = item.gname;
gainfo.Code = item.ename;
gainfo.Position = item.web;
gainfo.Phone = item.phone;
gainfo.CountryNo = item.country;
gainfo.IdClass = item.idcls;
gainfo.IdNo = item.idno;
gainfo.Native = item.native;
gainfo.Gender = item.sex == "F" ? GenderEnumType.Female : GenderEnumType.Male;
gainfo.Birthday = (DateTime)item.birthday;
gainfo.Address = item.address;
gainfo.DepartmentNo = item.appellation;
gainfo.Employed = item.isowner;
gainfo.Remark = item.remark;
gainfo.Nation = item.nation;
gainfo.Phone = item.phone;
gainfo.Degree = item.email;
gainfo.Position = item.web;
gainfo.Remark = item.remark;
gainfo.Werks = item.WERKS;
gainfo.Employed = item.isowner;
await _dbContext.UpdateAsync(gainfo);
}
else
{
var info = new GainfoEntity
{
SapNo = item.ano,
No = item.guestno,
SapNo = item.ano,
Type = item.@class,
Name = item.gname,
Code = item.ename,
CountryNo = item.country,
IdClass = item.idcls,
IdNo = item.idno,
Native = item.native,
Gender = item.sex =="女性"? GenderEnumType.Female: GenderEnumType.Male,
Gender = item.sex =="F"? GenderEnumType.Female: GenderEnumType.Male,
Birthday = (DateTime)item.birthday,
Address = item.address,
//Marital 已婚未婚
//Occuption = item.occuption,
DepartmentNo = item.appellation,
Nation =item.nation,
Phone = item.phone,
Position = item.web,
//Log_id = item.log_id,
//Log_shift = item.log_shift,
//tLog_date = item.log_date,
//Log_ip = item.log_ip,
Employed = item.isowner,
Remark = item.remark,
Degree = item.email,
Werks = item.WERKS
Position = item.web,
//CarNo
Remark = item.remark,
Werks = item.WERKS,
Employed = item.isowner,
};
await _dbContext.InsertAsync(info);
}