|
@@ -247,9 +247,22 @@ public class RedPackApplication : IRedPackApplication, IScopeDependency
|
|
|
var industry = await _industryRepository.Queryable(includeDeleted: true)
|
|
|
.LeftJoin<OrderSnapshot>((i, o) => i.Id == o.IndustryId)
|
|
|
.Where((i, o) => o.Id == id)
|
|
|
- .Select((i, o) => new { i.Id, i.CitizenReadPackAmount, i.ArgeePoints, i.ExtraDeductedPoints, i.RefusePoints, i.IsPoints })
|
|
|
+ .Select((i, o) => new {
|
|
|
+ i.Id,
|
|
|
+ i.CitizenReadPackAmount,
|
|
|
+ i.ArgeePoints,
|
|
|
+ i.ExtraDeductedPoints,
|
|
|
+ i.RefusePoints,
|
|
|
+ i.IsPoints,
|
|
|
+ o.IsSafetyDepartment,
|
|
|
+ i.Name
|
|
|
+ })
|
|
|
.FirstAsync();
|
|
|
outDto.Amount = industry.CitizenReadPackAmount;
|
|
|
+ if (industry.Name == "安全隐患" && industry.IsSafetyDepartment.HasValue && industry.IsSafetyDepartment == true)
|
|
|
+ {
|
|
|
+ outDto.Amount = 20;
|
|
|
+ }
|
|
|
outDto.ArgeePoints = industry.ArgeePoints;
|
|
|
outDto.ExtraDeductedPoints = industry.ExtraDeductedPoints;
|
|
|
outDto.RefusePoints = industry.RefusePoints;
|