记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
66c45066
Commit
66c45066
authored
May 27, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交 do
parent
ef86ef65
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
40 additions
and
20 deletions
+40
-20
PerformancePartnerDto.java
...om/liquidnet/service/kylin/dto/PerformancePartnerDto.java
+2
-0
TicketCreateParam.java
.../liquidnet/service/kylin/dto/param/TicketCreateParam.java
+3
-0
IKylinOrderTicketsService.java
...dnet/service/kylin/service/IKylinOrderTicketsService.java
+4
-1
IKylinPerformancesPartnerService.java
...lin/service/partner/IKylinPerformancesPartnerService.java
+4
-0
pom.xml
liquidnet-bus-api/pom.xml
+6
-0
MybatisPlusCodeGenerator.java
.../com/liquidnet/service/adam/MybatisPlusCodeGenerator.java
+1
-0
pom.xml
liquidnet-bus-do/pom.xml
+1
-0
pom.xml
liquidnet-bus-service/liquidnet-service-adam/pom.xml
+2
-2
pom.xml
liquidnet-bus-service/liquidnet-service-kylin/pom.xml
+2
-2
pom.xml
liquidnet-bus-service/pom.xml
+15
-15
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/PerformancePartnerDto.java
View file @
66c45066
...
@@ -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
{
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketCreateParam.java
View file @
66c45066
...
@@ -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
;
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java
View file @
66c45066
...
@@ -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
);
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/partner/IKylinPerformancesPartnerService.java
View file @
66c45066
...
@@ -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
;
/**
/**
...
...
liquidnet-bus-api/pom.xml
View file @
66c45066
...
@@ -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>
liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/MybatisPlusCodeGenerator.java
View file @
66c45066
...
@@ -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
;
...
...
liquidnet-bus-do/pom.xml
View file @
66c45066
...
@@ -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>
...
...
liquidnet-bus-service/liquidnet-service-adam/pom.xml
View file @
66c45066
...
@@ -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>
...
...
liquidnet-bus-service/liquidnet-service-kylin/pom.xml
View file @
66c45066
...
@@ -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>
...
...
liquidnet-bus-service/pom.xml
View file @
66c45066
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment