记得上下班打卡 | git大法好,push需谨慎

Commit 66c45066 authored by 胡佳晨's avatar 胡佳晨

提交 do

parent ef86ef65
...@@ -4,6 +4,8 @@ package com.liquidnet.service.kylin.dto; ...@@ -4,6 +4,8 @@ package com.liquidnet.service.kylin.dto;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Data;
@Data @Data
public class PerformancePartnerDto implements Serializable { public class PerformancePartnerDto implements Serializable {
......
...@@ -2,6 +2,9 @@ package com.liquidnet.service.kylin.dto.param; ...@@ -2,6 +2,9 @@ package com.liquidnet.service.kylin.dto.param;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.liquidnet.commons.lang.util.IDGenerator; import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.kylin.entity.KylinTicketRelations;
import com.liquidnet.service.kylin.entity.KylinTicketStatus;
import com.liquidnet.service.kylin.entity.KylinTickets;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
......
...@@ -6,6 +6,9 @@ import com.liquidnet.service.base.ResponseDto; ...@@ -6,6 +6,9 @@ import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dto.param.PayAgainParam; import com.liquidnet.service.kylin.dto.param.PayAgainParam;
import com.liquidnet.service.kylin.dto.param.PayOrderParam; import com.liquidnet.service.kylin.dto.param.PayOrderParam;
import com.liquidnet.service.kylin.dto.param.SyncOrderParam; import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
import com.liquidnet.service.kylin.dto.vo.KylinOrderListVo;
import com.liquidnet.service.kylin.dto.vo.OrderDetailsVo;
import com.liquidnet.service.kylin.dto.vo.PayResultVo;
import com.liquidnet.service.kylin.entity.KylinOrderTickets; import com.liquidnet.service.kylin.entity.KylinOrderTickets;
import java.util.List; import java.util.List;
...@@ -32,7 +35,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> { ...@@ -32,7 +35,7 @@ public interface IKylinOrderTicketsService extends IService<KylinOrderTickets> {
// 同步大麦数据接口 // 同步大麦数据接口
//订单列表(状态 待支付 已支付 倒计时 已失效) //订单列表(状态 待支付 已支付 倒计时 已失效)
PageInfo<List<KylinOrderListVo>> orderList(int page,int size); PageInfo<List<KylinOrderListVo>> orderList(int page, int size);
//订单详情 //订单详情
OrderDetailsVo orderDetails(String orderId); OrderDetailsVo orderDetails(String orderId);
......
...@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.dao.PerformancePartnerListDao; import com.liquidnet.service.kylin.dao.PerformancePartnerListDao;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerListParam;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.param.PerformanceStep1Param;
import com.liquidnet.service.kylin.dto.param.PerformanceStep2Param;
import com.liquidnet.service.kylin.entity.KylinPerformances; import com.liquidnet.service.kylin.entity.KylinPerformances;
/** /**
......
...@@ -30,5 +30,11 @@ ...@@ -30,5 +30,11 @@
<version>1.18.10</version> <version>1.18.10</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
<version>5.2.0</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -3,6 +3,7 @@ package com.liquidnet.service.adam; ...@@ -3,6 +3,7 @@ package com.liquidnet.service.adam;
import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringPool;
import com.baomidou.mybatisplus.generator.AutoGenerator; import com.baomidou.mybatisplus.generator.AutoGenerator;
import com.baomidou.mybatisplus.generator.InjectionConfig; import com.baomidou.mybatisplus.generator.InjectionConfig;
import com.baomidou.mybatisplus.generator.config.*;
import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.baomidou.mybatisplus.generator.config.po.TableInfo;
import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
<modules> <modules>
<module>liquidnet-service-kylin-do</module> <module>liquidnet-service-kylin-do</module>
<module>liquidnet-service-adam-do</module>
</modules> </modules>
<dependencies> <dependencies>
......
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<artifactId>liquidnet-service-adam</artifactId> <artifactId>liquidnet-service-adam</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>liquidnet-service-adam-do</module> <!-- <module>liquidnet-service-adam-do</module>-->
<module>liquidnet-service-adam-api</module> <!-- <module>liquidnet-service-adam-api</module>-->
<module>liquidnet-service-adam-impl</module> <module>liquidnet-service-adam-impl</module>
</modules> </modules>
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>liquidnet-service-kylin-impl</module> <module>liquidnet-service-kylin-impl</module>
<module>liquidnet-service-kylin-do</module> <!-- <module>liquidnet-service-kylin-do</module>-->
<module>liquidnet-service-kylin-api</module> <!-- <module>liquidnet-service-kylin-api</module>-->
</modules> </modules>
<dependencies> <dependencies>
......
...@@ -150,27 +150,27 @@ ...@@ -150,27 +150,27 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>29.0-jre</version> <version>29.0-jre</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.alibaba</groupId> <!-- <groupId>com.alibaba</groupId>-->
<artifactId>fastjson</artifactId> <!-- <artifactId>fastjson</artifactId>-->
<version>1.2.73</version> <!-- <version>1.2.73</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>dom4j</groupId> <groupId>dom4j</groupId>
<artifactId>dom4j</artifactId> <artifactId>dom4j</artifactId>
<version>1.6.1</version> <version>1.6.1</version>
</dependency> </dependency>
<!-- mybatis plus begin --> <!-- mybatis plus begin -->
<dependency> <!-- <dependency>-->
<groupId>com.baomidou</groupId> <!-- <groupId>com.baomidou</groupId>-->
<artifactId>mybatis-plus-boot-starter</artifactId> <!-- <artifactId>mybatis-plus-boot-starter</artifactId>-->
<version>3.4.0</version> <!-- <version>3.4.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>com.baomidou</groupId> <!-- <groupId>com.baomidou</groupId>-->
<artifactId>mybatis-plus-generator</artifactId> <!-- <artifactId>mybatis-plus-generator</artifactId>-->
<version>3.4.0</version> <!-- <version>3.4.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.github.pagehelper</groupId> <groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId> <artifactId>pagehelper-spring-boot-starter</artifactId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment