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:
liguoyang
2024-06-10 21:00:01 +08:00
parent 47e92be51f
commit f74b0ba43e
3 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
View File

@@ -144,6 +144,7 @@ public class BalancesController : ControllerBase
/// </summary>
/// <param name="request"></param>
[Transactional]
[IgnoreTenant]
[HttpPost("haining/import")]
public async Task Import(BalanceHainingImportRequest request)
{

2
Src/Dlhis.Canteen/Order/Request/BalanceHainingImportRequest.cs
View File

@@ -46,7 +46,7 @@ public class BalanceHainingImportRequest : IValidatableObject
/// <summary>
/// 营业点
/// </summary>
public Guid? BusinessPlaceCode { get; set; }
public string BusinessPlaceCode { get; set; }
/// <summary>
/// 消费类型 0:消费, 1:充值

47
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -45,8 +45,8 @@ public class BalanceService : IBalanceService
var page = await _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<CanteenOrderEntity>((record, ga, department, bplace, order) => record.No == order.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.LeftJoin<CanteenOrderEntity>((record, ga, department, bPlace, order) => record.No == order.No)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End)
.WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType))
@@ -57,7 +57,7 @@ public class BalanceService : IBalanceService
|| ga.Code == request.Search
)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bplace, order) => new BalanceRecordResponse
.Select((record, ga, department, bPlace, order) => new BalanceRecordResponse
{
Id = record.Id,
No = record.No,
@@ -75,7 +75,7 @@ public class BalanceService : IBalanceService
OriginTenantId = record.OriginTenantId,
Name = record.Name,
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
BusinessPlaceName = bPlace.Name,
CostDateTime = record.CostDateTime,
Factory = record.TenantId,
ShiftType = record.ShiftType,
@@ -130,12 +130,12 @@ public class BalanceService : IBalanceService
var page = await _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.Where(record => SqlFunc.DateIsSame(record.CostDate, date, DateType.Day))
.Where(record => record.DeviceUniqueNo == device.UniqueNo || record.DeviceUniqueNo == device.Code.ToString())
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bplace) => new BalanceRecordDeviceResponse
.Select((record, ga, department, bPlace) => new BalanceRecordDeviceResponse
{
Id = record.Id,
Amount = SqlFunc.Abs(record.Amount),
@@ -149,7 +149,7 @@ public class BalanceService : IBalanceService
No = record.No,
Name = record.Name,
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
BusinessPlaceName = bPlace.Name,
ShiftType = record.ShiftType,
CostDateTime = record.CostDateTime,
TenantId = record.TenantId,
@@ -179,8 +179,8 @@ public class BalanceService : IBalanceService
var queryable = _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<GainfoEntity>((record, department, bplace, gainfo) => record.UserNo == gainfo.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.LeftJoin<GainfoEntity>((record, department, bPlace, gainfo) => record.UserNo == gainfo.No)
.Where((record) => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.Where(record => myCodes.Contains(record.BusinessPlaceCode))
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start)
@@ -190,7 +190,7 @@ public class BalanceService : IBalanceService
var page = await queryable
.OrderBy(record => record.CostDateTime, OrderByType.Desc)
.Select((record, department, bplace, gainfo) => new BalanceRecordDetailPageResponse
.Select((record, department, bPlace, gainfo) => new BalanceRecordDetailPageResponse
{
Id = record.Id,
No = record.No,
@@ -201,7 +201,7 @@ public class BalanceService : IBalanceService
Source = record.Source,
UserName = record.Name,
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
BusinessPlaceName = bPlace.Name,
CostDateTime = record.CostDateTime,
ShiftType = record.ShiftType,
Werks = gainfo.Werks,
@@ -289,7 +289,7 @@ public class BalanceService : IBalanceService
var page = await _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
.LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<BusinessPlaceEntity>((record, ga, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out)
.Where(record => record.Status == BalanceRecordStatusEnumType.Valid)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start)
@@ -297,13 +297,13 @@ public class BalanceService : IBalanceService
.WhereIF(request.ApplicationType.HasValue, record => record.ApplicationType == request.ApplicationType)
.Where((record, ga) => ga.Code == jinkoCode)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, ga, department, bplace) => new BalanceRecordUserPageResponse
.Select((record, ga, department, bPlace) => new BalanceRecordUserPageResponse
{
Id = record.Id,
CurrentAmount = SqlFunc.Abs(record.Amount),
Source = record.Source,
No = record.No,
BusinessPlaceName = bplace.Name,
BusinessPlaceName = bPlace.Name,
ShiftType = record.ShiftType,
CostDateTime = record.CostDateTime,
ApplicationType = record.ApplicationType,
@@ -500,14 +500,29 @@ public class BalanceService : IBalanceService
gainfo.ThrowIfNull($"工号{request.UserCode}不存在");
var gainfoMeal = await _dbContext.Queryable<GainfoMealEntity>().Where(x => x.UserCode == request.UserCode).SingleAsync();
var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>()
.LeftJoin<BusinessPlaceShiftRelationshipEntity>((a, b) => a.Code == b.PlaceCode)
.LeftJoin<BusinessShiftEntity>((a, b, c) => b.ShiftCode == c.Code)
.Where((a, b, c) => a.CustomCode == request.BusinessPlaceCode)
.Select((a, b, c) => new
{
a.Code,
ShiftCode = c.Code
})
.SingleAsync();
if (request.Type == BalanceRecordTypeEnumType.Out)
{
businessPlace.ThrowIfNull($"营业点{request.BusinessPlaceCode}不存在");
}
await _dbContext.InsertAsync(new BalanceRecordEntity
{
Amount = request.Amount,
ApplicationType = request.ApplicationType,
Type = request.Type,
BusinessPlaceCode = request.BusinessPlaceCode,
BusinessShiftCode = null,
BusinessPlaceCode = businessPlace?.Code,
BusinessShiftCode = businessPlace?.ShiftCode,
ShiftType = request.ShiftType,
CostDate = request.CostDate,
CostDateTime = request.CostDateTime,