root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request '票务抽数改造' (#57) from zzw-one into master
All checks were successful
continuous-integration/drone/tag Build is passing
Details
continuous-integration/drone Build is passing
Details

Browse Source 
Reviewed-on: #57
This commit is contained in:
root 2024-08-29 11:33:13 +08:00
commit dd08b68454
5 changed files with 4 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/saledata/SaleDataApi.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.datacenter.controller.app.saledata;
import cn.iocoder.yudao.module.datacenter.service.saledata.SaleDataService;
import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.validation.annotation.Validated;
@ -9,13 +8,8 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* @Description 售票

3
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicket.java
View File

@ -3,7 +3,8 @@ package cn.iocoder.yudao.module.datacenter.dal.dataobject.checkticket;
import lombok.Data;
import org.springframework.data.mongodb.core.mapping.Document;
@Document("checkticket")
//@Document("checkticket")
@Document("check_ticket_today")
//@Document("checktickettest")
@Data
public class CheckTicket {

21
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/dataobject/checkticket/CheckTicketToday.java
View File

@ -1,21 +0,0 @@
package cn.iocoder.yudao.module.datacenter.dal.dataobject.checkticket;
import lombok.Data;
import org.springframework.data.mongodb.core.mapping.Document;
@Document("check_ticket_today")
//@Document("checktickettest")
@Data
public class CheckTicketToday {
private String id;
private String dataId;
private String checkstation;
private String checkstationname;
private String ticket;
private String checkticketdate;
private String checktickettime;
private Integer personcount;
private String sdshipping;
private String salepropetyvaluename;
}

28
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mongodb/checkticket/CheckTicketTodayRepository.java
View File

@ -1,28 +0,0 @@
package cn.iocoder.yudao.module.datacenter.dal.mongodb.checkticket;
import cn.iocoder.yudao.module.datacenter.dal.dataobject.checkticket.CheckTicket;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.mongodb.repository.MongoRepository;
import org.springframework.data.mongodb.repository.Query;
import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface CheckTicketTodayRepository extends MongoRepository<CheckTicket,String> {
@Query("{'name': {'$regex': '?0', '$options': 'i'}}")
Page<CheckTicket> findByName(String q, PageRequest pageable);
@Query("{'checkticketdate':{'$gte': ?0, '$lt': ?1}}")
List<CheckTicket> countByCheckticketdateBetween(String starTime, String endTime);
@Query("{'checktickettime':{'$gte': ?0, '$lt': ?1},'checkticketdate':{'$dt': ?2}}")
List<CheckTicket> findByTimestampBetweenAndCheckticketdate(String startTime, String endTime,String day);
List<CheckTicket> findByCheckticketdateAndChecktickettimeBetween(String day,String startTime, String endTime);
@Query("{'checkticketdate':{'$gte': ?0, '$lt': ?1} , 'checktickettime':{'$gte': ?2, '$lt': ?3}}")
List<CheckTicket> findByCheckticketdateBetweenAndChecktickettimeBetween(String startTime, String endTime,String beingTime, String resultTime);
}

4
ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/checkticket/CheckTicketServiceImpl.java
View File

@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.datacenter.service.checkticket;
import cn.iocoder.yudao.module.datacenter.dal.dataobject.checkticket.CheckTicket;
import cn.iocoder.yudao.module.datacenter.dal.mongodb.checkticket.CheckTicketTodayRepository;
import cn.iocoder.yudao.module.datacenter.dal.mongodb.checkticket.CheckTicketRepository;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@ -26,7 +26,7 @@ import java.util.Map;
public class CheckTicketServiceImpl implements CheckTicketService {
@Resource
private CheckTicketTodayRepository checkTicketRepository;
private CheckTicketRepository checkTicketRepository;
@Override