From cdb62ef0e5e583983434092ec499e89bdad28cff Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 17 May 2021 18:27:21 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/otc/dao/OtcMarketBussinessMapper.java | 7 +
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 13 ++
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java | 14 ++
src/main/resources/mapper/otc/OtcMarketBussinessMapper.xml | 5
src/main/resources/mapper/otc/OtcEntrustOrderMapper.xml | 5
src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderMapper.java | 8 +
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderAppealServiceImpl.java | 13 ++
src/main/resources/application-app.yml | 6
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java | 13 ++
src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java | 62 ++++++++++
src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java | 7 +
src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java | 33 +++++
src/main/java/com/xcong/excoin/modules/otc/service/OtcMarketBussinessService.java | 7 +
src/main/resources/mapper/otc/OtcOrderMapper.xml | 5
src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderMapper.java | 7 +
src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java | 7 +
src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderAppealService.java | 8 +
src/main/resources/mapper/otc/OtcOrderAppealMapper.xml | 5
src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java | 51 ++++++++
src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java | 25 ++++
src/main/resources/application.yml | 14 +-
src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderAppealMapper.java | 7 +
22 files changed, 312 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderMapper.java b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderMapper.java
new file mode 100644
index 0000000..3c14bf3
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderMapper.java
@@ -0,0 +1,8 @@
+package com.xcong.excoin.modules.otc.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xcong.excoin.modules.otc.entity.OtcEntrustOrder;
+
+public interface OtcEntrustOrderMapper extends BaseMapper<OtcEntrustOrder> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dao/OtcMarketBussinessMapper.java b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcMarketBussinessMapper.java
new file mode 100644
index 0000000..6e4b733
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcMarketBussinessMapper.java
@@ -0,0 +1,7 @@
+package com.xcong.excoin.modules.otc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness;
+
+public interface OtcMarketBussinessMapper extends BaseMapper<OtcMarketBussiness> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderAppealMapper.java b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderAppealMapper.java
new file mode 100644
index 0000000..3a7cd2b
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderAppealMapper.java
@@ -0,0 +1,7 @@
+package com.xcong.excoin.modules.otc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xcong.excoin.modules.otc.entity.OtcOrderAppeal;
+
+public interface OtcOrderAppealMapper extends BaseMapper<OtcOrderAppeal> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderMapper.java b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderMapper.java
new file mode 100644
index 0000000..b872a0e
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderMapper.java
@@ -0,0 +1,7 @@
+package com.xcong.excoin.modules.otc.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xcong.excoin.modules.otc.entity.OtcOrder;
+
+public interface OtcOrderMapper extends BaseMapper<OtcOrder> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java
new file mode 100644
index 0000000..60c6c40
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java
@@ -0,0 +1,51 @@
+package com.xcong.excoin.modules.otc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("otc_entrust_order")
+public class OtcEntrustOrder extends BaseEntity {
+
+ private Long memberId;
+
+ private Long mbId;
+
+ /**
+ * 单价
+ */
+ private BigDecimal unitPrice;
+
+ /**
+ * 数量
+ */
+ private BigDecimal coinAmount;
+
+ /**
+ * 剩余数量
+ */
+ private BigDecimal remainCoinAmount;
+
+ /**
+ * 限额
+ */
+ private BigDecimal limitMinAmount;
+
+ /**
+ * 限额
+ */
+ private BigDecimal limitMaxAmount;
+
+ /**
+ * 委托单类型 B-买S-卖
+ */
+ private String orderType;
+
+ /**
+ * 1-上线 2-下线
+ */
+ private Integer status;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java
new file mode 100644
index 0000000..31e2b9b
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java
@@ -0,0 +1,33 @@
+package com.xcong.excoin.modules.otc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@TableName("otc_market_bussiness")
+public class OtcMarketBussiness extends BaseEntity {
+
+ private Long memberId;
+
+ private String nikename;
+
+ private String declaration;
+
+ /**
+ * 1-待审核2-审核通过3-审核拒绝
+ */
+ private Integer status;
+
+ private Integer buyCnt;
+
+ private Integer totalOrderCnt;
+
+ private BigDecimal finishRatio;
+
+ private Integer avgPayTime;
+
+ private Integer avgCoinTime;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java
new file mode 100644
index 0000000..b60c192
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java
@@ -0,0 +1,62 @@
+package com.xcong.excoin.modules.otc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName("otc_order")
+public class OtcOrder extends BaseEntity {
+
+ private Long memberId;
+
+ /**
+ * 订单编号
+ */
+ private String orderNo;
+
+ /**
+ * 单价
+ */
+ private BigDecimal unitPrice;
+
+ /**
+ * 数量
+ */
+ private BigDecimal coinAmount;
+
+ /**
+ * 总额
+ */
+ private BigDecimal totalAmount;
+
+ /**
+ * 订单状态 1-已提交未付款2-已付款3-已完成
+ */
+ private Integer status;
+
+ /**
+ * 付款时间
+ */
+ private Date payTime;
+
+ /**
+ * 完成时间
+ */
+ private Date finishTime;
+
+ /**
+ * 委托单ID
+ */
+ private Long entrustOrderId;
+
+ private Long mbId;
+
+ /**
+ * 支付市商ID
+ */
+ private Long payMbId;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java
new file mode 100644
index 0000000..fc5ec0d
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java
@@ -0,0 +1,25 @@
+package com.xcong.excoin.modules.otc.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.xcong.excoin.common.system.base.BaseEntity;
+import lombok.Data;
+
+@Data
+@TableName("otc_order_appeal")
+public class OtcOrderAppeal extends BaseEntity {
+
+ private Long memberId;
+
+ private Long orderId;
+
+ /**
+ * 申诉原因
+ */
+ private String reason;
+
+ /**
+ * 申诉内容
+ */
+ private String content;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java b/src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java
new file mode 100644
index 0000000..6df6fb4
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java
@@ -0,0 +1,7 @@
+package com.xcong.excoin.modules.otc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.excoin.modules.otc.entity.OtcEntrustOrder;
+
+public interface OtcEntrustOrderService extends IService<OtcEntrustOrder> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/OtcMarketBussinessService.java b/src/main/java/com/xcong/excoin/modules/otc/service/OtcMarketBussinessService.java
new file mode 100644
index 0000000..e72f3eb
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/OtcMarketBussinessService.java
@@ -0,0 +1,7 @@
+package com.xcong.excoin.modules.otc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness;
+
+public interface OtcMarketBussinessService extends IService<OtcMarketBussiness> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderAppealService.java b/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderAppealService.java
new file mode 100644
index 0000000..37d4d9a
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderAppealService.java
@@ -0,0 +1,8 @@
+package com.xcong.excoin.modules.otc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.excoin.common.system.base.IBaseService;
+import com.xcong.excoin.modules.otc.entity.OtcOrderAppeal;
+
+public interface OtcOrderAppealService extends IService<OtcOrderAppeal> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java b/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java
new file mode 100644
index 0000000..165241b
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java
@@ -0,0 +1,7 @@
+package com.xcong.excoin.modules.otc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xcong.excoin.modules.otc.entity.OtcOrder;
+
+public interface OtcOrderService extends IService<OtcOrder> {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
new file mode 100644
index 0000000..292ead7
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
@@ -0,0 +1,14 @@
+package com.xcong.excoin.modules.otc.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.excoin.modules.otc.entity.OtcEntrustOrder;
+import com.xcong.excoin.modules.otc.dao.OtcEntrustOrderMapper;
+import com.xcong.excoin.modules.otc.service.OtcEntrustOrderService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class OtcEntrustOrderServiceImpl extends ServiceImpl<OtcEntrustOrderMapper, OtcEntrustOrder> implements OtcEntrustOrderService {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
new file mode 100644
index 0000000..20d147b
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
@@ -0,0 +1,13 @@
+package com.xcong.excoin.modules.otc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness;
+import com.xcong.excoin.modules.otc.dao.OtcMarketBussinessMapper;
+import com.xcong.excoin.modules.otc.service.OtcMarketBussinessService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class OtcMarketBussinessServiceImpl extends ServiceImpl<OtcMarketBussinessMapper, OtcMarketBussiness> implements OtcMarketBussinessService {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderAppealServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderAppealServiceImpl.java
new file mode 100644
index 0000000..a042e2f
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderAppealServiceImpl.java
@@ -0,0 +1,13 @@
+package com.xcong.excoin.modules.otc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.excoin.modules.otc.entity.OtcOrderAppeal;
+import com.xcong.excoin.modules.otc.dao.OtcOrderAppealMapper;
+import com.xcong.excoin.modules.otc.service.OtcOrderAppealService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class OtcOrderAppealServiceImpl extends ServiceImpl<OtcOrderAppealMapper, OtcOrderAppeal> implements OtcOrderAppealService {
+}
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
new file mode 100644
index 0000000..ce27473
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -0,0 +1,13 @@
+package com.xcong.excoin.modules.otc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xcong.excoin.modules.otc.entity.OtcOrder;
+import com.xcong.excoin.modules.otc.dao.OtcOrderMapper;
+import com.xcong.excoin.modules.otc.service.OtcOrderService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class OtcOrderServiceImpl extends ServiceImpl<OtcOrderMapper, OtcOrder> implements OtcOrderService {
+}
diff --git a/src/main/resources/application-app.yml b/src/main/resources/application-app.yml
index 5e4b9a5..75266b2 100644
--- a/src/main/resources/application-app.yml
+++ b/src/main/resources/application-app.yml
@@ -7,9 +7,9 @@
profiles:
active: app
datasource:
- url: jdbc:mysql://192.168.0.151:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: db_hibit
- password: hibit123!@#
+ url: jdbc:mysql://192.168.0.151:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: db_otc
+ password: db_otc123!@#
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f9a22bd..bf3ccc3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,9 +10,9 @@
# url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
# username: ctcoin_data
# password: ctcoin_123
- url: jdbc:mysql://124.70.222.34:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: db_hibit
- password: hibit123!@#
+ url: jdbc:mysql://120.27.238.55:3306/db_otc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: ct_test
+ password: 123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -51,7 +51,7 @@
## redis配置
redis:
## Redis数据库索引（默认为0）
- database: 0
+ database: 2
## Redis服务器地址
host: 121.37.162.173
## Redis服务器连接端口
@@ -75,10 +75,10 @@
## 连接超时时间（毫秒）
timeout: 30000
rabbitmq:
- host: 121.37.162.173
+ host: 120.27.238.55
port: 5672
- username: hibit
- password: hibit123
+ username: ct_rabbit
+ password: 123456
publisher-confirm-type: correlated
diff --git a/src/main/resources/mapper/otc/OtcEntrustOrderMapper.xml b/src/main/resources/mapper/otc/OtcEntrustOrderMapper.xml
new file mode 100644
index 0000000..964c9ec
--- /dev/null
+++ b/src/main/resources/mapper/otc/OtcEntrustOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.otc.dao.OtcEntrustOrderMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/otc/OtcMarketBussinessMapper.xml b/src/main/resources/mapper/otc/OtcMarketBussinessMapper.xml
new file mode 100644
index 0000000..9b06956
--- /dev/null
+++ b/src/main/resources/mapper/otc/OtcMarketBussinessMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.otc.dao.OtcMarketBussinessMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/otc/OtcOrderAppealMapper.xml b/src/main/resources/mapper/otc/OtcOrderAppealMapper.xml
new file mode 100644
index 0000000..2d8d14f
--- /dev/null
+++ b/src/main/resources/mapper/otc/OtcOrderAppealMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.otc.dao.OtcOrderAppealMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/otc/OtcOrderMapper.xml b/src/main/resources/mapper/otc/OtcOrderMapper.xml
new file mode 100644
index 0000000..afac93a
--- /dev/null
+++ b/src/main/resources/mapper/otc/OtcOrderMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.otc.dao.OtcOrderMapper">
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1