From f1279b3dda0ae1961fd8254d467a3a2814277ec2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 04 Mar 2021 10:13:01 +0800
Subject: [PATCH] 20210303 申请交易员条件
---
src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java | 4 ++
src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java | 11 +++++
src/main/java/com/xcong/excoin/modules/documentary/vo/BeTraderConditionVo.java | 32 ++++++++++++++++
src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java | 2 +
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 8 ++++
src/main/resources/mapper/documentary/FollowTraderInfoDao.xml | 6 +++
src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java | 1
7 files changed, 64 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java b/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
index 2b1a72e..6a6b837 100644
--- a/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
+++ b/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
@@ -55,6 +55,7 @@
.antMatchers("/api/orderCoin/findCollect").permitAll()
.antMatchers("/api/orderCoin/findCollect").permitAll()
.antMatchers("/api/documentary/getFollowTraderProfitInfo").permitAll()
+ .antMatchers("/api/trader/beTraderStatusCondition").permitAll()
.antMatchers("/api/helpCenter/**").permitAll()
.anyRequest().authenticated()
.and().apply(securityConfiguereAdapter());
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java b/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
index ae140b0..733a709 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/controller/TraderController.java
@@ -15,6 +15,7 @@
import com.xcong.excoin.modules.documentary.dto.TradeOrderInfoDto;
import com.xcong.excoin.modules.documentary.dto.UpdateTradeSetInfoDto;
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
+import com.xcong.excoin.modules.documentary.vo.BeTraderConditionVo;
import com.xcong.excoin.modules.documentary.vo.TradeFollowInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeHistoryOrderInfoVo;
import com.xcong.excoin.modules.documentary.vo.TradeOrderInfoVo;
@@ -39,6 +40,16 @@
@Resource
DocumentaryService documentaryService;
+
+ /**
+ * 成为交易员---条件查询
+ */
+ @ApiOperation(value="成为交易员---条件查询", notes="成为交易员---条件查询")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = BeTraderConditionVo.class)})
+ @GetMapping(value = "/beTraderStatusCondition")
+ public Result beTraderCondition() {
+ return documentaryService.beTraderCondition();
+ }
/**
* 成为交易员---状态查询
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java
index d49b8a5..291b7c6 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/dao/FollowTraderInfoDao.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
+import com.xcong.excoin.modules.documentary.vo.BeTraderConditionVo;
+
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -15,4 +17,6 @@
FollowTraderInfoEntity selectTraderInfoByOrderId(@Param("orderId") Long orderId);
List<FollowTraderInfoEntity> selectAllTraderInfo();
+
+ List<BeTraderConditionVo> selectBeTraderCondition(@Param("type")String type);
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java b/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java
index 4d15675..9d4cb8d 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/DocumentaryService.java
@@ -72,5 +72,7 @@
public Result getTradeSetLabelInfo();
+ public Result beTraderCondition();
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index 954db79..116f51f 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -60,6 +60,7 @@
import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;
import com.xcong.excoin.modules.documentary.entity.FollowTraderProfitInfoEntity;
import com.xcong.excoin.modules.documentary.service.DocumentaryService;
+import com.xcong.excoin.modules.documentary.vo.BeTraderConditionVo;
import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderInfoVo;
import com.xcong.excoin.modules.documentary.vo.DocumentaryOrderSetInfoVo;
import com.xcong.excoin.modules.documentary.vo.FollowFollowerNoticeVo;
@@ -1158,6 +1159,13 @@
}
return Result.ok(arrayList);
}
+
+ @Override
+ public Result beTraderCondition() {
+ String type = "apply_trader_rule";
+ List<BeTraderConditionVo> beTraderConditionVos = followTraderInfoDao.selectBeTraderCondition(type);
+ return Result.ok(beTraderConditionVos);
+ }
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/BeTraderConditionVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/BeTraderConditionVo.java
new file mode 100644
index 0000000..c9673e4
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/BeTraderConditionVo.java
@@ -0,0 +1,32 @@
+package com.xcong.excoin.modules.documentary.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "BeTraderConditionVo", description = "参数返回类")
+public class BeTraderConditionVo {
+
+ /**
+ * 名称
+ */
+ @ApiModelProperty("名称")
+ private String name;
+ /**
+ * 所属分类（对应英文简写）
+ */
+ @ApiModelProperty("所属分类（对应英文简写）")
+ private String type;
+ /**
+ * 内容
+ */
+ @ApiModelProperty("内容")
+ private String content;
+ /**
+ * 状态0禁用 1 启用
+ */
+ @ApiModelProperty("状态0禁用 1 启用")
+ private int state;
+
+}
diff --git a/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml b/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
index 1633b37..d518a77 100644
--- a/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
+++ b/src/main/resources/mapper/documentary/FollowTraderInfoDao.xml
@@ -23,4 +23,10 @@
from follow_trader_info
where verify_status=1
</select>
+
+ <select id="selectBeTraderCondition" resultType="com.xcong.excoin.modules.documentary.vo.BeTraderConditionVo">
+ select *
+ from common_configuration
+ where state=1 and type = #{type}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1