diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index 4c9fe1f..8c56700 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -364,7 +364,7 @@ public class ArtificerServiceImpl extends ServiceImpl i }else{ stringBuilder.append(minuteInt); } - ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString())); + ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString()).last("limit 1")); if(artificerTime==null){ if(oldDate.equals(date)){ artificer.setTime(stringBuilder.toString()); diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java index 39d82d3..296f1e8 100644 --- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java @@ -51,7 +51,7 @@ public class UserPackageDetailServiceImpl extends ServiceImpl list = Lists.newArrayList(); if(type == 105){ list = baseMapper.findDetailUsedQuantity(userPackageDetail); - }else if(type == 106){ + }else if(type == 106 || type == 114 ){ list = baseMapper.findLcDetailUsedQuantity(userPackageDetail); }else{ list = baseMapper.findDetailList(userPackageDetail);