diff --git a/.vs/BPA.KitChen.GroupMeal/v17/.suo b/.vs/BPA.KitChen.GroupMeal/v17/.suo index b62bc77..46dc6f1 100644 Binary files a/.vs/BPA.KitChen.GroupMeal/v17/.suo and b/.vs/BPA.KitChen.GroupMeal/v17/.suo differ diff --git a/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/DiningPlateService/Service/DiningPlateService.cs b/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/DiningPlateService/Service/DiningPlateService.cs index 5a15db3..d001041 100644 --- a/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/DiningPlateService/Service/DiningPlateService.cs +++ b/BPA.KitChen.GroupMeal.Application/Service/AExternalPlatform/Service/DiningPlateService/Service/DiningPlateService.cs @@ -141,6 +141,7 @@ namespace BPA.KitChen.GroupMeal.Application.Service.AExternalPlatform.Service.Di } else { + data.IsPay = inputDto.IsPay; data.ChipCode = inputDto.ChipCode; res = await SqlSugarDb.Db.Updateable(data).ExecuteCommandAsync(); } diff --git a/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Service/DiningPlateService.cs b/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Service/DiningPlateService.cs index 38c2e24..3cb58cc 100644 --- a/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Service/DiningPlateService.cs +++ b/BPA.KitChen.GroupMeal.Application/Service/OneCard/DiningPlate/Service/DiningPlateService.cs @@ -48,8 +48,8 @@ namespace BPA.KitChen.GroupMeal.Application.Service.OneCard.DiningPlate.Service { var res = db.Queryable() .Where(x => x.IsDeleted == 0) - .WhereIF(!string.IsNullOrEmpty(inputDto.QRCode), x => x.QRCode == inputDto.QRCode) - .WhereIF(!string.IsNullOrEmpty(inputDto.ChipCode), x => x.ChipCode == inputDto.ChipCode) + .WhereIF(!string.IsNullOrEmpty(inputDto.QRCode), x => x.QRCode.Contains(inputDto.QRCode) ) + .WhereIF(!string.IsNullOrEmpty(inputDto.ChipCode), x => x.ChipCode.Contains(inputDto.ChipCode) ) .WhereIF(inputDto.Status.HasValue, x => x.Status == inputDto.Status) .OrderBy(x => x.CreateAt, OrderByType.Desc) .Select(t => new DiningPlateDto