diff --git a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml index a7a3d88..c0f6ef0 100644 --- a/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml +++ b/src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketMapper.xml @@ -87,11 +87,13 @@ - - + SELECT IFNULL(SUM(available_qty), 0) FROM glt_user_ticket WHERE user_id = #{userId} + AND tenant_id = #{tenantId} + AND status = 0 AND deleted = 0 diff --git a/src/main/java/com/gxwebsoft/glt/service/GltUserTicketService.java b/src/main/java/com/gxwebsoft/glt/service/GltUserTicketService.java index 1c292e9..615ef75 100644 --- a/src/main/java/com/gxwebsoft/glt/service/GltUserTicketService.java +++ b/src/main/java/com/gxwebsoft/glt/service/GltUserTicketService.java @@ -40,11 +40,12 @@ public interface GltUserTicketService extends IService { GltUserTicket getByIdRel(Integer id); /** - * 统计指定用户水票总数量(sum(total_qty)) + * 统计指定用户可用水票总数(sum(available_qty)) * * @param userId 用户ID - * @return 总数量(无记录返回0) + * @param tenantId 租户ID + * @return 可用总数(无记录返回0) */ - Integer sumTotalQtyByUserId(Integer userId); + Integer sumAvailableQtyByUserId(Integer userId, Integer tenantId); } diff --git a/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketServiceImpl.java b/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketServiceImpl.java index 06b171f..d5547a9 100644 --- a/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketServiceImpl.java +++ b/src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketServiceImpl.java @@ -45,9 +45,9 @@ public class GltUserTicketServiceImpl extends ServiceImpl