Helius
2021-05-17 cdb62ef0e5e583983434092ec499e89bdad28cff
modify
2 files modified
20 files added
322 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderMapper.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/dao/OtcMarketBussinessMapper.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderAppealMapper.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderMapper.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java 51 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java 33 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java 62 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java 25 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/OtcMarketBussinessService.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderAppealService.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java 14 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderAppealServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java 13 ●●●●● patch | view | raw | blame | history
src/main/resources/application-app.yml 6 ●●●● patch | view | raw | blame | history
src/main/resources/application.yml 14 ●●●● patch | view | raw | blame | history
src/main/resources/mapper/otc/OtcEntrustOrderMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/otc/OtcMarketBussinessMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/otc/OtcOrderAppealMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/otc/OtcOrderMapper.xml 5 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/otc/dao/OtcEntrustOrderMapper.java
New file
@@ -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> {
}
src/main/java/com/xcong/excoin/modules/otc/dao/OtcMarketBussinessMapper.java
New file
@@ -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> {
}
src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderAppealMapper.java
New file
@@ -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> {
}
src/main/java/com/xcong/excoin/modules/otc/dao/OtcOrderMapper.java
New file
@@ -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> {
}
src/main/java/com/xcong/excoin/modules/otc/entity/OtcEntrustOrder.java
New file
@@ -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;
}
src/main/java/com/xcong/excoin/modules/otc/entity/OtcMarketBussiness.java
New file
@@ -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;
}
src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrder.java
New file
@@ -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;
}
src/main/java/com/xcong/excoin/modules/otc/entity/OtcOrderAppeal.java
New file
@@ -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;
}
src/main/java/com/xcong/excoin/modules/otc/service/OtcEntrustOrderService.java
New file
@@ -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> {
}
src/main/java/com/xcong/excoin/modules/otc/service/OtcMarketBussinessService.java
New file
@@ -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> {
}
src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderAppealService.java
New file
@@ -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> {
}
src/main/java/com/xcong/excoin/modules/otc/service/OtcOrderService.java
New file
@@ -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> {
}
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcEntrustOrderServiceImpl.java
New file
@@ -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 {
}
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcMarketBussinessServiceImpl.java
New file
@@ -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 {
}
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderAppealServiceImpl.java
New file
@@ -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 {
}
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
New file
@@ -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 {
}
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:
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
src/main/resources/mapper/otc/OtcEntrustOrderMapper.xml
New file
@@ -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>
src/main/resources/mapper/otc/OtcMarketBussinessMapper.xml
New file
@@ -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>
src/main/resources/mapper/otc/OtcOrderAppealMapper.xml
New file
@@ -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>
src/main/resources/mapper/otc/OtcOrderMapper.xml
New file
@@ -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>