From b967bac24b2fd662ac3b8826700fb76c26690aec Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 02 Dec 2025 00:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java | 19
trading-order-service/src/main/java/com/yami/trading/UD/UdunUtils.java | 84 +++
trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java | 2
trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java | 2
trading-order-service/src/main/java/com/yami/trading/service/chat/online/OnlineChatMessageServiceImpl.java | 2
trading-order-service/src/main/java/com/yami/trading/service/user/impl/W8BENServiceImpl.java | 31 +
trading-order-service/src/main/java/com/yami/trading/service/impl/RechargeBlockchainOrderServiceImpl.java | 5
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 218 +++++++-
trading-order-service/src/main/resources/mapper/exchange/ExchangeApplyOrderMapper.xml | 2
trading-order-service/src/main/java/com/yami/trading/service/user/W8BENService.java | 14
trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java | 3
trading-order-admin/src/main/java/com/yami/trading/admin/controller/chat/NewAdminOnlineChatController.java | 5
trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java | 3
trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java | 3
trading-order-admin/src/main/resources/application-dev.yml | 2
trading-order-service/src/main/resources/mapper/UserMapper.xml | 9
trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/W8BENDto.java | 44 +
trading-order-service/src/main/java/com/yami/trading/UD/UdunApi.java | 108 ++++
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java | 2
trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java | 2
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java | 4
trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java | 13
trading-order-security-common/src/main/java/com/yami/trading/security/common/adapter/ResourceServerAdapter.java | 1
trading-order-admin/src/main/java/com/yami/trading/admin/model/W8BENModel.java | 15
trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java | 5
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java | 4
trading-order-bean/src/main/java/com/yami/trading/bean/model/W8BEN.java | 48 ++
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java | 13
trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml | 11
trading-order-service/src/main/java/com/yami/trading/UD/Address.java | 31 +
trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java | 5
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java | 49 +
trading-order-service/src/main/resources/mapper/user/UserW8BENMapper.xml | 18
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethodController.java | 16
trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java | 4
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java | 61 +
trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java | 24
trading-order-service/src/main/java/com/yami/trading/UD/Coin.java | 78 +++
trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java | 4
trading-order-admin/src/main/java/com/yami/trading/admin/model/UserListModel.java | 3
trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java | 2
trading-order-service/src/main/java/com/yami/trading/dao/user/W8BENMapper.java | 14
trading-order-service/src/main/java/com/yami/trading/UD/CryptoCurrencyEnum.java | 90 +++
trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java | 26
trading-order-service/src/main/java/com/yami/trading/UD/UdunException.java | 28 +
trading-order-service/src/main/java/com/yami/trading/UD/UdunClient.java | 151 ++++++
trading-order-service/src/main/java/com/yami/trading/UD/ApiPath.java | 12
trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java | 4
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserW8BENController.java | 74 +++
trading-order-service/src/main/java/com/yami/trading/UD/ResultMsg.java | 40 +
trading-order-common/src/main/java/com/yami/trading/common/constants/RedisKeys.java | 5
51 files changed, 1,272 insertions(+), 141 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java
index dc6b12b..12d53bf 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/agent/AgentController.java
@@ -124,7 +124,7 @@
roleNames.add(Constants.SECURITY_ROLE_MEMBER);
roleNames.add(Constants.SECURITY_ROLE_TEST);
- userService.listUser(page, roleNames, null, null, null,null, childs);
+ userService.listUser(page, roleNames, null, null, null,null, childs, null);
List<AgentDto> agentDtos = new ArrayList<>();
for (UserDto userDto : page.getRecords()) {
AgentDto agentDto = new AgentDto();
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java
index 6e42f47..b13c6e5 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/auth/UserAuthController.java
@@ -117,7 +117,26 @@
@ApiOperation(value = "修改")
@PutMapping("edit")
public Result<?> edit(@RequestBody @Valid RealNameAuthUpdateDto dto) {
- RealNameAuthRecord realNameAuthRecord= realNameAuthRecordService.getById(dto.getUuid());
+ RealNameAuthRecord realNameAuthRecord;
+ User user;
+ if (dto.getUuid() == null) {
+ if (dto.getUserCode() == null) {
+ return Result.failed("请输入UID");
+ }
+ realNameAuthRecord = new RealNameAuthRecord();
+ user = userService.findUserByUserCode(dto.getUserCode());
+ if (null == user) {
+ return Result.failed("用户不存在");
+ }
+ RealNameAuthRecord record = realNameAuthRecordService.getByUserId(user.getUserId());
+ if (null != record) {
+ realNameAuthRecordService.removeById(record.getUuid());
+ }
+ realNameAuthRecord.setUserId(user.getUserId());
+ } else {
+ realNameAuthRecord= realNameAuthRecordService.getById(dto.getUuid());
+ user= userService.getById(realNameAuthRecord.getUserId());
+ }
if(realNameAuthRecord==null) {
return Result.failed("记录ID不能为空");
}
@@ -149,7 +168,6 @@
}
- User user= userService.getById(realNameAuthRecord.getUserId());
Log log = new Log();
log.setCategory(Constants.LOG_CATEGORY_OPERATION);
log.setExtra(realNameAuthRecord.getIdNumber());
@@ -158,7 +176,7 @@
log.setUserId(realNameAuthRecord.getUserId());
log.setLog("修改用户[" + user.getUserName() + "]认证申请");
logService.save(log);
- realNameAuthRecordService.updateById(realNameAuthRecord);
+ realNameAuthRecordService.saveOrUpdate(realNameAuthRecord);
return Result.ok("修改成功");
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/chat/NewAdminOnlineChatController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/chat/NewAdminOnlineChatController.java
index 661d766..9d67b8b 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/chat/NewAdminOnlineChatController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/chat/NewAdminOnlineChatController.java
@@ -360,9 +360,10 @@
if (partyId.indexOf(".") != -1 || partyId.indexOf(":") != -1) {// ip，表示游客
MessageUser messageUser = onlineChatMessageService.cacheMessageUser(partyId);
if (messageUser == null) {// 该ip没有发起聊天
- throw new BusinessException("用户不存在");
+ //throw new BusinessException("用户不存在");
}
- MessageUser user = onlineChatVisitorMessageService.saveCreate(partyId, loginUsername);
+ //MessageUser user = onlineChatVisitorMessageService.saveCreate(partyId, loginUsername);
+ MessageUser user = onlineChatMessageService.saveCreate(partyId, loginUsername);
resultObject.setData(user.getIp());
} else {
MessageUser user = onlineChatMessageService.saveCreate(partyId, loginUsername);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
index 6fc8acb..24a6767 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDarkPoolsController.java
@@ -79,7 +79,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices_dark);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices_dark, null);
}
@ApiOperation("大宗审核")
@@ -91,7 +91,7 @@
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, 0);
}
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
index 527505f..7d91b82 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminETFDzController.java
@@ -74,7 +74,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.indices, null);
}
@ApiOperation("大宗审核")
@@ -86,7 +86,7 @@
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, 0);
}
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
index 9e46ab2..b41c339 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDarkPoolsController.java
@@ -1,5 +1,6 @@
package com.yami.trading.admin.controller.dz;
+import com.yami.trading.admin.facade.PermissionFacade;
import com.yami.trading.bean.dz.StockDz;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
@@ -7,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -20,6 +22,10 @@
@Resource
StockDzService stockDzService;
+
+ @Autowired
+ private PermissionFacade permissionFacade;
+
/**
* @Description: 获取大宗列表
@@ -79,7 +85,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_DARK);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_DARK, permissionFacade.getOwnerUserIds());
}
@ApiOperation("大宗审核")
@@ -87,11 +93,12 @@
@ResponseBody
public Result check(@RequestParam(value = "id") String id,
@RequestParam(value = "checkType") Integer checkType,
- @RequestParam(value = "orderNum", required = false) Double orderNum) {
+ @RequestParam(value = "orderNum", required = false) Double orderNum,
+ @RequestParam(value = "price", required = false, defaultValue = "0") double price) {
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, price);
}
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
index 32dbacc..dbd88ec 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/dz/AdminStockDzController.java
@@ -82,7 +82,7 @@
@RequestParam(value = "pageSize", defaultValue = "15") int pageSize,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "stockCode", required = false)String stockCode) {
- return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS);
+ return stockDzService.getDzCheckList(pageNum, pageSize, state, stockCode, Constants.US_STOCKS, null);
}
@ApiOperation("大宗审核")
@@ -94,7 +94,7 @@
if(checkType != 2 && (id == null || checkType == null || orderNum == null)){
return Result.failed("参数不能为空");
}
- return stockDzService.dzCheck(id, checkType, orderNum);
+ return stockDzService.dzCheck(id, checkType, orderNum, 0);
}
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java
index 692eb09..a22f93e 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/syspara/SysparaController.java
@@ -246,9 +246,9 @@
// 设置usdt提现最低和最高限额
sysparasDto.setWithdraw_limit_usdt(sysparasDto.getWithdraw_limit_dapp());
sysparasDto.setWithdraw_limit_max_usdt(sysparasDto.getWithdraw_limit_max());
- sysparasDto.setWithdraw_limit_max(null);
+ /*sysparasDto.setWithdraw_limit_max(null);
sysparasDto.setWithdraw_limit_dapp(null);
- sysparasDto.setWithdraw_limit(null);
+ sysparasDto.setWithdraw_limit(null);*/
}
private void verificationOthers(SysparasDto sysparasDto) {
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
index 953c1a1..7b6e5ad 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
@@ -85,7 +85,7 @@
}
Page<UserDto> page = new Page(model.getCurrent(), model.getSize());
userService.listUser(page, roleNames, model.getUserCode(), model.getUserName(), model.getUserMail(), model.getUserMobile(),
- permissionFacade.getOwnerUserIds());
+ permissionFacade.getOwnerUserIds(), model.getRecomUserName());
return Result.ok(page);
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserW8BENController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserW8BENController.java
new file mode 100644
index 0000000..3c4b684
--- /dev/null
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserW8BENController.java
@@ -0,0 +1,74 @@
+package com.yami.trading.admin.controller.user;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yami.trading.admin.model.*;
+import com.yami.trading.bean.model.*;
+import com.yami.trading.bean.user.dto.W8BENDto;
+import com.yami.trading.common.domain.Result;
+import com.yami.trading.service.user.W8BENService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@CrossOrigin
+@RequestMapping("w8ben")
+@Api(tags = "用户税务信息管理")
+public class UserW8BENController {
+
+ @Autowired
+ W8BENService w8BENService;
+
+ @PostMapping("list")
+ @ApiOperation("列表")
+ public Result<Page<W8BENDto>> list(@RequestBody W8BENModel model) {
+ Page<W8BENDto> page = new Page(model.getCurrent(), model.getSize());
+ w8BENService.listUser(page, model.getUserName());
+ return Result.ok(page);
+ }
+
+ @PostMapping("update")
+ @ApiOperation("修改")
+ public Result update(@RequestBody W8BEN model) {
+ try {
+ w8BENService.updateById(model);
+ return Result.succeed(null);
+ } catch (Exception e) {
+ log.error("updateW8BEN error", e);
+ return Result.failed("失败");
+ }
+ }
+
+ @GetMapping("get")
+ @ApiOperation("获取单个")
+ public Result get(String uuid) {
+ try {
+ W8BEN w8BEN = w8BENService.getById(uuid);
+ return Result.succeed(w8BEN);
+ } catch (Exception e) {
+ log.error("getW8BEN error", e);
+ return Result.failed("失败");
+ }
+ }
+
+ @GetMapping("delete")
+ @ApiOperation("删除单个")
+ public Result delete(String uuid) {
+ try {
+ w8BENService.removeById(uuid);
+ return Result.succeed();
+ } catch (Exception e) {
+ log.error("deleteW8BEN error", e);
+ return Result.failed("失败");
+ }
+ }
+
+}
+
+
+
+
+
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserListModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserListModel.java
index 4394e43..1e0f8a6 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserListModel.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/UserListModel.java
@@ -29,4 +29,7 @@
* 手机号码
*/
private String userMobile;
+
+ @ApiModelProperty("推荐人名")
+ private String recomUserName;
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/model/W8BENModel.java b/trading-order-admin/src/main/java/com/yami/trading/admin/model/W8BENModel.java
new file mode 100644
index 0000000..c0e5daf
--- /dev/null
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/model/W8BENModel.java
@@ -0,0 +1,15 @@
+package com.yami.trading.admin.model;
+
+import com.yami.trading.common.domain.PageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel
+public class W8BENModel extends PageRequest {
+
+ @ApiModelProperty("用户名")
+ private String userName;
+
+}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethodController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethodController.java
index 9bc2f63..1f15e6d 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethodController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiPaymentMethodController.java
@@ -105,20 +105,20 @@
throw new YamiShopBindException("Parameter value 1 is required");
}
}
- if (model.getReal_name().length() > 20) {
+ /*if (model.getReal_name().length() > 20) {
if (language.equals("zh-CN")) {
throw new YamiShopBindException("真实姓名长度大于20");
} else {
throw new YamiShopBindException("Real name length greater than 20");
}
- }
- if (model.getRemark().length() > 100) {
+ }*/
+ /*if (model.getRemark().length() > 100) {
if (language.equals("zh-CN")) {
throw new YamiShopBindException("备注长度大于100");
} else {
throw new YamiShopBindException("Note length greater than 100");
}
- }
+ }*/
C2cPaymentMethodConfig methodConfig = c2cPaymentMethodConfigService.getById(model.getMethod_config_id());
if (null == methodConfig) {
@@ -129,22 +129,22 @@
}
}
if (!StrUtil.isEmpty(model.getParam_value1())) {
- if (model.getParam_value1().length() > 25) {
+ /*if (model.getParam_value1().length() > 25) {
if (language.equals("zh-CN")) {
throw new YamiShopBindException(methodConfig.getParamName1() + "长度大于25");
} else {
throw new YamiShopBindException(model.getParam_value1() + " length greater than 25");
}
- }
+ }*/
}
if (!StrUtil.isEmpty(model.getParam_value2())) {
- if (model.getParam_value2().length() > 25) {
+ /*if (model.getParam_value2().length() > 25) {
if (language.equals("zh-CN")) {
throw new YamiShopBindException(methodConfig.getParamName2() + "长度大于25");
} else {
throw new YamiShopBindException(model.getParam_value2() + " length greater than 25");
}
- }
+ }*/
}
String partyId = SecurityUtils.getUser().getUserId();
if (null == partyId) {
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
index bfd4d27..946a3de 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
@@ -1,31 +1,18 @@
package com.yami.trading.api.controller;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yami.trading.api.dto.UserDto;
import com.yami.trading.api.model.SetSafewordModel;
import com.yami.trading.api.service.UserCacheService;
-import com.yami.trading.bean.model.HighLevelAuthRecord;
-import com.yami.trading.bean.model.Log;
-import com.yami.trading.bean.model.RealNameAuthRecord;
-import com.yami.trading.bean.model.User;
-import com.yami.trading.bean.model.UserRecom;
-import com.yami.trading.bean.model.UserSafewordApply;
+import com.yami.trading.bean.model.*;
import com.yami.trading.bean.syspara.domain.Syspara;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.BusinessException;
import com.yami.trading.common.exception.YamiShopBindException;
-import com.yami.trading.common.util.DateUtils;
-import com.yami.trading.common.util.GoogleAuthenticator;
-import com.yami.trading.common.util.IPHelper;
-import com.yami.trading.common.util.ImageVerificationCodeUtil;
-import com.yami.trading.common.util.ImageVerificationEndecrypt;
-import com.yami.trading.common.util.IpUtil;
-import com.yami.trading.common.util.LockFilter;
-import com.yami.trading.common.util.RegexUtil;
-import com.yami.trading.common.util.StringUtils;
-import com.yami.trading.common.util.Strings;
-import com.yami.trading.common.util.UUIDGenerator;
+import com.yami.trading.common.util.*;
import com.yami.trading.security.common.bo.UserInfoInTokenBO;
import com.yami.trading.security.common.enums.SysTypeEnum;
import com.yami.trading.security.common.manager.TokenStore;
@@ -41,6 +28,7 @@
import com.yami.trading.service.user.UserRecomService;
import com.yami.trading.service.user.UserSafewordApplyService;
import com.yami.trading.service.user.UserService;
+import com.yami.trading.service.user.W8BENService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -48,14 +36,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
+import java.sql.Wrapper;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -97,6 +82,8 @@
LogService logService;
@Autowired
QRGenerateService qrGenerateService;
+ @Autowired
+ W8BENService w8BENService;
/**
* 用户名登录接口
@@ -1040,4 +1027,34 @@
return null;
}
+ @GetMapping("getW8BENForm")
+ @ApiOperation("获取税务信息")
+ public Result getW8BENForm() {
+ try {
+ User user = userCacheService.currentUser();
+ W8BEN w8BEN = w8BENService.getOne(new LambdaQueryWrapper<W8BEN>().eq(W8BEN::getUserId, user.getUserId()));
+ return Result.succeed(w8BEN);
+ } catch (Exception e) {
+ log.error("getW8BENForm error", e);
+ return Result.failed("失败");
+ }
+ }
+
+ @PostMapping("setW8BENForm")
+ @ApiOperation("设置税务信息")
+ public Result setW8BENForm(W8BEN model) {
+ try {
+ User user = userCacheService.currentUser();
+ String userId = user.getUserId();
+ w8BENService.remove(new LambdaQueryWrapper<W8BEN>().eq(W8BEN::getUserId, user.getUserId()));
+ model.setUserId(userId);
+ model.setCreateTime(new Date());
+ w8BENService.saveOrUpdate(model);
+ return Result.succeed(null);
+ } catch (Exception e) {
+ log.error("setW8BENForm error", e);
+ return Result.failed("失败");
+ }
+ }
+
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
index b4ad7d5..cdb65f9 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.util.StrUtil;
import com.yami.trading.api.util.ServletUtil;
+import com.yami.trading.bean.item.domain.Item;
import com.yami.trading.bean.model.User;
import com.yami.trading.bean.model.Withdraw;
import com.yami.trading.common.constants.Constants;
@@ -220,7 +221,7 @@
*/
@GetMapping("fee")
@ApiOperation("提现手续费")
- public Result fee(String channel, String amount) {
+ public Result fee(String channel, String amount, String type) {
String error = this.verif(amount);
if (!StringUtils.isNullOrEmpty(error)) {
throw new YamiShopBindException(error);
@@ -237,30 +238,34 @@
// 手续费(USDT)
// 提现手续费类型,fixed是单笔固定金额，rate是百分比，part是分段
String withdraw_fee_type = this.sysparaService.find("withdraw_fee_type").getSvalue();
- // fixed单笔固定金额 和 rate百分比 的手续费数值
- double withdraw_fee = Double.valueOf(this.sysparaService.find("withdraw_fee").getSvalue());
- if ("fixed".equals(withdraw_fee_type)) {
- fee = withdraw_fee;
- }
- if ("rate".equals(withdraw_fee_type)) {
- withdraw_fee = Arith.div(withdraw_fee, 100);
- fee = Arith.mul(amount_double, withdraw_fee);
- }
- if ("part".equals(withdraw_fee_type)) {
- // 提现手续费part分段的值
- String withdraw_fee_part = this.sysparaService.find("withdraw_fee_part").getSvalue();
- String[] withdraw_fee_parts = withdraw_fee_part.split(",");
- for (int i = 0; i < withdraw_fee_parts.length; i++) {
- double part_amount = Double.valueOf(withdraw_fee_parts[i]);
- double part_fee = Double.valueOf(withdraw_fee_parts[i + 1]);
- if (amount_double <= part_amount) {
- fee = part_fee;
- break;
+ map.put("withdraw_fee_type", withdraw_fee_type);
+ if (type!=null && type.equalsIgnoreCase(Item.cryptos)) {
+ fee = 0;
+ } else {
+ // fixed单笔固定金额 和 rate百分比 的手续费数值
+ double withdraw_fee = Double.valueOf(this.sysparaService.find("withdraw_fee").getSvalue());
+ if ("fixed".equals(withdraw_fee_type)) {
+ fee = withdraw_fee;
+ }
+ if ("rate".equals(withdraw_fee_type)) {
+ withdraw_fee = Arith.div(withdraw_fee, 100);
+ fee = Arith.mul(amount_double, withdraw_fee);
+ }
+ if ("part".equals(withdraw_fee_type)) {
+ // 提现手续费part分段的值
+ String withdraw_fee_part = this.sysparaService.find("withdraw_fee_part").getSvalue();
+ String[] withdraw_fee_parts = withdraw_fee_part.split(",");
+ for (int i = 0; i < withdraw_fee_parts.length; i++) {
+ double part_amount = Double.valueOf(withdraw_fee_parts[i]);
+ double part_fee = Double.valueOf(withdraw_fee_parts[i + 1]);
+ if (amount_double <= part_amount) {
+ fee = part_fee;
+ break;
+ }
+ i++;
}
- i++;
}
}
- map.put("withdraw_fee_type", withdraw_fee_type);
}
double volume_last = Arith.sub(amount_double, fee);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
index dd8668f..e959d46 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
@@ -4,30 +4,36 @@
import cn.hutool.extra.qrcode.QrConfig;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.yami.trading.UD.*;
+import com.yami.trading.UD.Address;
import com.yami.trading.bean.exchange.PartyBlockchain;
import com.yami.trading.bean.model.ChannelBlockchain;
+import com.yami.trading.bean.model.RechargeBlockchainOrder;
import com.yami.trading.bean.model.User;
import com.yami.trading.common.constants.Constants;
+import com.yami.trading.common.constants.RedisKeys;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.MD5;
import com.yami.trading.common.util.StringUtils;
import com.yami.trading.security.common.util.SecurityUtils;
import com.yami.trading.service.ChannelBlockchainService;
+import com.yami.trading.service.RechargeBlockchainOrderService;
import com.yami.trading.service.exchange.PartyBlockchainService;
import com.yami.trading.service.syspara.SysparaService;
import com.yami.trading.service.user.UserService;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
+import okhttp3.RequestBody;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -47,6 +53,15 @@
UserService userService;
@Autowired
PartyBlockchainService partyBlockchainService;
+
+ @Autowired
+ UdunClient udunClient;
+
+ @Autowired
+ RedisTemplate redisTemplate;
+
+ @Autowired
+ RechargeBlockchainOrderService rechargeBlockchainOrderService;
/**
* 获取所有链地址
@@ -96,51 +111,164 @@
* 根据币种获取链地址
*/
@GetMapping(action + "getBlockchainName.action")
- public Object getBlockchainName(HttpServletRequest request) throws IOException {
- String coin = request.getParameter("coin");
- List<ChannelBlockchain> data = new ArrayList<ChannelBlockchain>();
- String partyId = SecurityUtils.getUser().getUserId();
- User party = userService.getById(partyId);
- if (0 == this.sysparaService.find("can_recharge").getInteger()) {
- return Result.failed("请联系客服充值");
- }
- List<PartyBlockchain> list = partyBlockchainService.findByUserNameAndCoinSymbol(party.getUserName(), coin);
- if (null != list && !list.isEmpty()) {
- data = list.stream().map(dict -> {
- String qrImage = dict.getQrImage();
- String chainAddress = dict.getAddress();
- String chainName = dict.getChainName();
- String coinSymbol = dict.getCoinSymbol();
- String autoStr = dict.getAuto();
- boolean auto = autoStr.equals("Y") ? true : false;
- ChannelBlockchain cbc = new ChannelBlockchain();
- cbc.setBlockchain_name(chainName);
- cbc.setAddress(chainAddress);
- cbc.setCoin(coinSymbol);
- cbc.setAuto(auto);
- cbc.setImg(qrImage);
- return cbc;
- }).collect(Collectors.toList());
- }
- if (data.isEmpty()) data = this.channelBlockchainService.findByCoin(coin.toLowerCase());
- for (int i = 0; i < data.size(); i++) {
- data.get(i).setBlockchain_name(data.get(i).getBlockchainName());
- if (1 == this.sysparaService.find("can_recharge").getInteger()) {
- if (!StringUtils.isNullOrEmpty(data.get(i).getImg())) {
- QrConfig config = new QrConfig(150, 150);
- config.setMargin(3);
- String qr = QrCodeUtil.generateAsBase64(data.get(i).getAddress(), config, "png");
- data.get(i).setImgStr(qr);
-// data.get(i).setImgStr("/public/showimg!showImg.action?imagePath=" + data.get(i).getImg());
-// data.get(i).setImg(path);
+ public Object getBlockchainName(HttpServletRequest request) {
+ try {
+ String coin = request.getParameter("coin");
+
+ String partyId = SecurityUtils.getUser().getUserId();
+ if (coin.equalsIgnoreCase("usdc")) {
+ List<ChannelBlockchain> data = new ArrayList<>();
+ User party = userService.getById(partyId);
+ if (0 == this.sysparaService.find("can_recharge").getInteger()) {
+ return Result.failed("请联系客服充值");
}
+ List<PartyBlockchain> list = partyBlockchainService.findByUserNameAndCoinSymbol(party.getUserName(), coin);
+ if (null != list && !list.isEmpty()) {
+ data = list.stream().map(dict -> {
+ String qrImage = dict.getQrImage();
+ String chainAddress = dict.getAddress();
+ String chainName = dict.getChainName();
+ String coinSymbol = dict.getCoinSymbol();
+ String autoStr = dict.getAuto();
+ boolean auto = autoStr.equals("Y") ? true : false;
+ ChannelBlockchain cbc = new ChannelBlockchain();
+ cbc.setBlockchain_name(chainName);
+ cbc.setAddress(chainAddress);
+ cbc.setCoin(coinSymbol);
+ cbc.setAuto(auto);
+ cbc.setImg(qrImage);
+ return cbc;
+ }).collect(Collectors.toList());
+ }
+ if (data.isEmpty()) data = this.channelBlockchainService.findByCoin(coin.toLowerCase());
+ for (int i = 0; i < data.size(); i++) {
+ data.get(i).setBlockchain_name(data.get(i).getBlockchainName());
+ if (1 == this.sysparaService.find("can_recharge").getInteger()) {
+ if (!StringUtils.isNullOrEmpty(data.get(i).getImg())) {
+ QrConfig config = new QrConfig(150, 150);
+ config.setMargin(3);
+ String qr = QrCodeUtil.generateAsBase64(data.get(i).getAddress(), config, "png");
+ data.get(i).setImgStr(qr);
+ // data.get(i).setImgStr("/public/showimg!showImg.action?imagePath=" + data.get(i).getImg());
+ // data.get(i).setImg(path);
+ }
+ } else {
+ data.get(i).setImg(null);
+ data.get(i).setImgStr(null);
+ data.get(i).setAddress(null);
+ }
+ }
+ return Result.succeed(data);
} else {
- data.get(i).setImg(null);
- data.get(i).setImgStr(null);
- data.get(i).setAddress(null);
+ coin = coin.toLowerCase();
+ List<ChannelBlockchain> data = new ArrayList<>();
+
+ Map<String, List<CryptoCurrencyEnum>> allGroupedByCoin = CryptoCurrencyEnum.getAllGroupedByCoin();
+ List<CryptoCurrencyEnum> currencyEnums = allGroupedByCoin.get(coin);
+ List<Coin> coinList = udunClient.listSupportCoin(false);
+
+ currencyEnums.forEach((currencyEnum) -> {
+ String coinName = currencyEnum.getName();
+ Coin c = coinList.stream().filter(x -> x.getName().equals(coinName)).findFirst().orElse(null);
+ if (c != null) {
+ ChannelBlockchain rechargeAddressVo = new ChannelBlockchain();
+ //创建地址
+ Address address;
+ String ress = (String)redisTemplate.opsForValue().get(RedisKeys.BLOCKCHAIN_ADDRESS + partyId + coinName);
+ if(StringUtils.isNotEmpty(ress)){
+ rechargeAddressVo.setAddress(ress);
+ }else{
+ address = udunClient.createAddress(c.getMainCoinType());
+ rechargeAddressVo.setAddress(address.getAddress());
+ redisTemplate.opsForValue().set(RedisKeys.BLOCKCHAIN_ADDRESS + partyId + coinName, address.getAddress());
+ }
+ //rechargeAddressVo.setAddress("test" + coinName);
+ rechargeAddressVo.setCoin(currencyEnum.getCoin());
+ rechargeAddressVo.setBlockchain_name(currencyEnum.getChain());
+ rechargeAddressVo.setAuto(false);
+ rechargeAddressVo.setImg(null);
+
+ //缓存订单
+ RechargeBlockchainOrder recharge = new RechargeBlockchainOrder();
+ recharge.setBlockchainName(currencyEnum.getChain());
+ recharge.setSymbol(currencyEnum.getSymbol());
+ recharge.setPartyId(partyId);
+ redisTemplate.opsForValue().set(rechargeAddressVo.getAddress(), recharge);
+
+ data.add(rechargeAddressVo);
+ }
+ });
+ return Result.succeed(data);
}
+ }catch (Exception e){
+ log.error("获取充值地址错误：",e);
+ return Result.failed("失败");
}
- return Result.succeed(data);
+ }
+
+ @PostMapping(action +"rechargeCallback.action")
+ public ResultMsg rechargeCallback(HttpServletRequest request){
+ String timestamp = request.getParameter("timestamp");
+ String nonce = request.getParameter("nonce");
+ String sign = request.getParameter("sign");
+ String body = request.getParameter("body");
+
+ ResultMsg resultMsg = new ResultMsg();
+ try{
+ log.info("===rechargeCallback===：{}", body);
+ boolean flag = udunClient.checkSign(timestamp, nonce, body, sign);
+ log.info("===rechargeCallback===sign：{}", flag);
+
+ if (!flag){
+ resultMsg.setCode(406);
+ resultMsg.setMessage("充值回调验签失败");
+ return resultMsg;
+ }
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map<String, Object> map = objectMapper.readValue(body, HashMap.class);
+ double amounts = Double.parseDouble(map.get("amount").toString()); // 假设 amount 的值为 1000
+ double decimals = Double.parseDouble(map.get("decimals").toString());
+ double success_amount = amounts / Math.pow(10, decimals);
+ String address = map.get("address").toString();
+ Integer status = Integer.valueOf(map.get("status").toString());
+ /*RechargeBlockchainOrder blockchainOrder = rechargeBlockchainOrderService.getOne(new LambdaQueryWrapper<>(RechargeBlockchainOrder.class)
+ .eq(RechargeBlockchainOrder::getSucceeded, 0)
+ .eq(RechargeBlockchainOrder::getChannelAddress, address).last(" limit 1 "));
+ if(ObjectUtil.isEmpty(blockchainOrder)) {
+ resultMsg.setCode(200);
+ return resultMsg;
+ }*/
+
+ //查询地址订单
+ RechargeBlockchainOrder blockchainOrder = (RechargeBlockchainOrder)redisTemplate.opsForValue().get(address);
+ if (blockchainOrder == null){
+ resultMsg.setCode(200);
+ return resultMsg;
+ }
+ blockchainOrder.setAddress(null);
+ blockchainOrder.setVolume(success_amount);
+ blockchainOrder.setImg(null);
+ blockchainOrder.setSucceeded(0);
+ blockchainOrder.setChannelAddress(address);
+ blockchainOrder.setTx("");
+ rechargeBlockchainOrderService.saveOrder(blockchainOrder);
+ User user = userService.getById(blockchainOrder.getPartyId());
+
+ log.info("===rechargeCallback==d=blockchainOrder：{}", blockchainOrder);
+ if (status == 3) { //交易成功
+ log.info("===rechargeCallback==manualReceipt{}", blockchainOrder.getOrderNo());
+ rechargeBlockchainOrderService.manualReceipt(blockchainOrder.getOrderNo(), BigDecimal.valueOf(success_amount), user.getUserName());
+ } else if(status == 2) { //驳回
+ rechargeBlockchainOrderService.refusalApply(blockchainOrder.getUuid(), "订单失败：" + status, user.getUserName());
+ }
+ resultMsg.setCode(200);
+ return resultMsg;
+ }catch (Exception e){
+ e.printStackTrace();
+ resultMsg.setCode(500);
+ resultMsg.setMessage("回调处理失败");
+ return resultMsg;
+ }
}
/**
diff --git a/trading-order-admin/src/main/resources/application-dev.yml b/trading-order-admin/src/main/resources/application-dev.yml
index f09c035..68a4a9d 100644
--- a/trading-order-admin/src/main/resources/application-dev.yml
+++ b/trading-order-admin/src/main/resources/application-dev.yml
@@ -118,6 +118,8 @@
admin_url: https://localhost:8080/admin
web_url: http://localhost:8080/wap/
images_http: https://allimg.sceazy.com/
+api_http: https://allapi.sceazy.com/
+
email:
host: smtp.gmail.com
username: coinzne.com@gmail.com
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
index 51d8947..3a7b04f 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/dz/dto/ExchangeApplyOrderDzDto.java
@@ -21,4 +21,7 @@
@ApiModelProperty("浮动盈亏比例")
private double profitLossPercentage;
+ @ApiModelProperty("推荐人")
+ private String recomUserName;
+
}
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/model/W8BEN.java b/trading-order-bean/src/main/java/com/yami/trading/bean/model/W8BEN.java
new file mode 100644
index 0000000..4439e57
--- /dev/null
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/model/W8BEN.java
@@ -0,0 +1,48 @@
+package com.yami.trading.bean.model;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yami.trading.common.domain.UUIDEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户税务表信息
+ */
+
+@Data
+@TableName("tz_user_w8ben")
+public class W8BEN extends UUIDEntity {
+
+ private static final long serialVersionUID = 15254654818792589L;
+
+ private String userId;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("国籍")
+ private String citizenship;
+
+ @ApiModelProperty("居住地址")
+ private String address;
+
+ @ApiModelProperty("外国税号")
+ @TableField(value = "foreign_tin")
+ private String foreignTIN;
+
+ @ApiModelProperty("美国税号")
+ @TableField(value = "us_tin")
+ private String usTIN;
+
+ @ApiModelProperty("税收协定")
+ private String treatyBenefits;
+
+ @ApiModelProperty("提交时间")
+ private Date createTime;
+
+}
+
+
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java
index 76200b3..44aec3f 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/RealNameAuthUpdateDto.java
@@ -13,6 +13,9 @@
@ApiModelProperty("用户ID")
private String userId;
+ @ApiModelProperty("UID")
+ private String userCode;
+
@ApiModelProperty("用户")
private String userName;
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java
index f6fcc73..c526493 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/UserDto.java
@@ -60,5 +60,7 @@
@ApiModelProperty("注册时间")
private Date createTime;//create_time createTimeTs
+ @ApiModelProperty("推荐人")
+ private String recomUserName;
}
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/W8BENDto.java b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/W8BENDto.java
new file mode 100644
index 0000000..cd20db5
--- /dev/null
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/user/dto/W8BENDto.java
@@ -0,0 +1,44 @@
+package com.yami.trading.bean.user.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel
+public class W8BENDto implements Serializable {
+
+ private String uuid;
+
+ private String userId;
+
+ @ApiModelProperty("用户名")
+ private String userName;
+
+ @ApiModelProperty("姓名")
+ private String name;
+
+ @ApiModelProperty("国籍")
+ private String citizenship;
+
+ @ApiModelProperty("居住地址")
+ private String address;
+
+ @ApiModelProperty("外国税号")
+ private String foreignTIN;
+
+ @ApiModelProperty("美国税号")
+ private String usTIN;
+
+ @ApiModelProperty("税收协定")
+ private String treatyBenefits;
+
+ @ApiModelProperty("提交时间")
+ private String createTime;
+
+
+}
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java b/trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java
index a5b0cc2..a47d300 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/constants/Constants.java
@@ -22,6 +22,9 @@
public static final String IMAGES_HTTP = ApplicationUtil.getProperty("images_http");
+ public static final String API_HTTP = ApplicationUtil.getProperty("api_http");
+
+
/**
* 质押2.0下单
*/
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/constants/RedisKeys.java b/trading-order-common/src/main/java/com/yami/trading/common/constants/RedisKeys.java
index d775f8c..5424a80 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/constants/RedisKeys.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/constants/RedisKeys.java
@@ -47,6 +47,11 @@
* 区块链充值订单
*/
public final static String RECHARGE_BLOCKCHAIN_ORDERNO = "RECHARGE_BLOCKCHAIN_ORDERNO_";
+
+ /**
+ * 充值地址缓存
+ */
+ public final static String BLOCKCHAIN_ADDRESS = "BLOCKCHAIN_ADDRESS";
/**
* 提现订单
*/
diff --git a/trading-order-security-common/src/main/java/com/yami/trading/security/common/adapter/ResourceServerAdapter.java b/trading-order-security-common/src/main/java/com/yami/trading/security/common/adapter/ResourceServerAdapter.java
index 369593e..75a7583 100644
--- a/trading-order-security-common/src/main/java/com/yami/trading/security/common/adapter/ResourceServerAdapter.java
+++ b/trading-order-security-common/src/main/java/com/yami/trading/security/common/adapter/ResourceServerAdapter.java
@@ -102,6 +102,7 @@
"/api/newOnlinechat**",
"/api/exchangerateuserconfig!get.action",
"/api/exchangerateuserconfig!getList.action",
+ "/api/channelBlockchain!rechargeCallback.action",
"/api/item/itemUserOptionalList/isItemHasAddGlobal",
"/api/item/itemUserOptionalList/list",
"/api/wallet/getUsdt",
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/Address.java b/trading-order-service/src/main/java/com/yami/trading/UD/Address.java
new file mode 100644
index 0000000..d30b95f
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/Address.java
@@ -0,0 +1,31 @@
+package com.yami.trading.UD;
+
+
+public class Address {
+ private String address;
+ private int coinType;
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public int getCoinType() {
+ return coinType;
+ }
+
+ public void setCoinType(int coinType) {
+ this.coinType = coinType;
+ }
+
+ @Override
+ public String toString() {
+ return "Address{" +
+ "address='" + address + '\'' +
+ ", coinType=" + coinType +
+ '}';
+ }
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/ApiPath.java b/trading-order-service/src/main/java/com/yami/trading/UD/ApiPath.java
new file mode 100644
index 0000000..283efbb
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/ApiPath.java
@@ -0,0 +1,12 @@
+package com.yami.trading.UD;
+
+public class ApiPath {
+ public final static String CREATE_ADDRESS = "/mch/address/create";
+ public final static String WITHDRAW = "/mch/withdraw";
+ public final static String TRANSACTION = "/mch/transaction";
+ public final static String AUTO_WITHDRAW = "/mch/withdraw/proxypay";
+ public final static String SUPPORT_COIN = "/mch/support-coins";
+ public final static String CHECK_PROXY = "/mch/check-proxy";
+ public final static String CHECK_ADDRESS = "/mch/check/address";
+ public final static String CREATE_BATCH_ADDRESS = "/mch/address/create/batch";
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/Coin.java b/trading-order-service/src/main/java/com/yami/trading/UD/Coin.java
new file mode 100644
index 0000000..c410399
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/Coin.java
@@ -0,0 +1,78 @@
+package com.yami.trading.UD;
+
+import java.math.BigDecimal;
+
+public class Coin {
+ private String name;
+ private String symbol;
+ private String mainCoinType;
+ private String coinType;
+ private String decimals;
+ private Integer tokenStatus;
+ private String mainSymbol;
+ private BigDecimal balance;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getSymbol() {
+ return symbol;
+ }
+
+ public void setSymbol(String symbol) {
+ this.symbol = symbol;
+ }
+
+ public String getMainCoinType() {
+ return mainCoinType;
+ }
+
+ public void setMainCoinType(String mainCoinType) {
+ this.mainCoinType = mainCoinType;
+ }
+
+ public String getCoinType() {
+ return coinType;
+ }
+
+ public void setCoinType(String coinType) {
+ this.coinType = coinType;
+ }
+
+ public String getDecimals() {
+ return decimals;
+ }
+
+ public void setDecimals(String decimals) {
+ this.decimals = decimals;
+ }
+
+ public Integer getTokenStatus() {
+ return tokenStatus;
+ }
+
+ public void setTokenStatus(Integer tokenStatus) {
+ this.tokenStatus = tokenStatus;
+ }
+
+ public String getMainSymbol() {
+ return mainSymbol;
+ }
+
+ public void setMainSymbol(String mainSymbol) {
+ this.mainSymbol = mainSymbol;
+ }
+
+ public BigDecimal getBalance() {
+ return balance;
+ }
+
+ public void setBalance(BigDecimal balance) {
+ this.balance = balance;
+ }
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/CryptoCurrencyEnum.java b/trading-order-service/src/main/java/com/yami/trading/UD/CryptoCurrencyEnum.java
new file mode 100644
index 0000000..ed613dd
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/CryptoCurrencyEnum.java
@@ -0,0 +1,90 @@
+package com.yami.trading.UD;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @program: trading-order-master
+ * @description: 充值币种
+ * @create: 2025-08-06 16:05
+ **/
+public enum CryptoCurrencyEnum {
+ /*USDT_TRC20("usdt", "TRC20","usdt_trc20"),
+ USDT_ERC20("usdt", "ERC20","usdt_erc20"),
+ ETH("eth", "ETH","eth"),
+ BTC("btc", "BTC","btc"),
+ USDC_ERC20("usdc", "ERC20(1)","usdc_erc20(1)"),
+ USDC_ERC202("usdc", "ERC20(2)","usdc_erc20(2)"),
+ USDC_TRC20("usdc", "TRC20","usdc_trc20");*/
+
+ USDT_TRC20("usdt", "TRC20","USDT-TRC20", "usdt"),
+ USDT_ERC20("usdt", "ERC20","USDT-ERC20", "usdt"),
+ ETH("eth", "ETH","ETH", "ethusdt"),
+ BTC("btc", "BTC","BTC", "btcusdt"),
+ USDC_ERC20("usdc", "ERC20","USDC-ERC20", "usdcusdt"),
+ USDC_TRC20("usdc", "TRC20","USDC-TRC20", "usdcusdt");
+
+
+ private final String coin;
+ private final String chain;
+ private final String name;
+ private final String symbol;
+
+ CryptoCurrencyEnum(String coin, String chain, String name, String symbol) {
+ this.coin = coin;
+ this.chain = chain;
+ this.name = name;
+ this.symbol = symbol;
+ }
+
+ public String getSymbol() {
+ return symbol;
+ }
+
+ public String getCoin() {
+ return coin;
+ }
+
+ public String getChain() {
+ return chain;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ // 可选：根据代码获取枚举值的方法
+ public static CryptoCurrencyEnum fromCoin(String coin,String chain) {
+ for (CryptoCurrencyEnum currency : values()) {
+ if (currency.getCoin().equals(coin) && currency.getChain().equals(chain)) {
+ return currency;
+ }
+ }
+ throw new IllegalArgumentException("没找到对应的币种: " + coin);
+ }
+
+ /**
+ * 获取所有枚举值（返回 List）
+ */
+ public static List<CryptoCurrencyEnum> getAll() {
+ return Arrays.asList(values());
+ }
+
+ /**
+ * 获取所有枚举值（按 coin 分组，返回 Map<String, List<CryptoCurrencyEnum>>）
+ */
+ public static Map<String, List<CryptoCurrencyEnum>> getAllGroupedByCoin() {
+ return Arrays.stream(values())
+ .collect(Collectors.groupingBy(CryptoCurrencyEnum::getCoin));
+ }
+
+ /**
+ * 获取所有枚举值（按 chain 分组，返回 Map<String, List<CryptoCurrencyEnum>>）
+ */
+ public static Map<String, List<CryptoCurrencyEnum>> getAllGroupedByChain() {
+ return Arrays.stream(values())
+ .collect(Collectors.groupingBy(CryptoCurrencyEnum::getChain));
+ }
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/ResultMsg.java b/trading-order-service/src/main/java/com/yami/trading/UD/ResultMsg.java
new file mode 100644
index 0000000..f38c2c7
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/ResultMsg.java
@@ -0,0 +1,40 @@
+package com.yami.trading.UD;
+
+public class ResultMsg {
+ private Integer code;
+ private String message;
+ private String data;
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ return "ResultMsg{" +
+ "code=" + code +
+ ", message='" + message + '\'' +
+ ", data='" + data + '\'' +
+ '}';
+ }
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/UdunApi.java b/trading-order-service/src/main/java/com/yami/trading/UD/UdunApi.java
new file mode 100644
index 0000000..da89632
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/UdunApi.java
@@ -0,0 +1,108 @@
+package com.yami.trading.UD;
+
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface UdunApi {
+ /**
+ * 创建币种地址，别名和钱包编号默认，回调地址使用统一配置
+ *
+ * @param mainCoinType 主币种编号,使用获取商户币种信息接口
+ * @return 地址
+ */
+ Address createAddress(String mainCoinType) throws UdunException;
+
+ /**
+ * 创建币种地址，别名和钱包编号自定义，回调地址使用统一配置
+ *
+ * @param mainCoinType 主币种编号,使用获取商户币种信息接口
+ * @param alias 地址别名
+ * @param walletId 钱包编号
+ * @return 地址
+ */
+ Address createAddress(String mainCoinType, String alias, String walletId) throws UdunException;
+
+ /**
+ * 创建币种地址，别名和钱包编号自定义，回调地址自定义
+ *
+ * @param mainCoinType 主币种编号,使用获取商户币种信息接口
+ * @param alias 地址别名
+ * @param walletId 钱包编号
+ * @param callUrl 回调地址
+ * @return 地址
+ */
+ Address createAddress(String mainCoinType, String alias, String walletId, String callUrl) throws UdunException;
+
+
+ /**
+ * 提币，回调地址使用统一配置
+ *
+ * @param address 提币地址
+ * @param amount 提币数量
+ * @param mainCoinType 主币种编号,使用获取商户币种信息接口
+ * @param coinType 子币种编号,使用获取商户币种信息接口
+ * @param businessId 业务编号，必须保证该字段在系统内唯一，如果重复，则该笔提币钱包将不会进行接收
+ * @param memo 备注,XRP和EOS，这两种币的提币申请该字段可选，其他类型币种不填
+ * @return 返回信息
+ */
+ ResultMsg withdraw(String address, BigDecimal amount, String mainCoinType, String coinType, String businessId, String memo);
+
+ /**
+ * 提币，回调地址自定义
+ *
+ * @param address 提币地址
+ * @param amount 提币数量
+ * @param mainCoinType 主币种编号,使用获取商户币种信息接口
+ * @param coinType 子币种编号,使用获取商户币种信息接口
+ * @param businessId 业务编号，必须保证该字段在系统内唯一，如果重复，则该笔提币钱包将不会进行接收
+ * @param memo 备注,XRP和EOS，这两种币的提币申请该字段可选，其他类型币种不填
+ * @param callUrl 回调地址
+ * @return 返回信息
+ */
+ ResultMsg withdraw(String address, BigDecimal amount, String mainCoinType, String coinType, String businessId, String memo, String callUrl);
+
+ /**
+ * 代付，回调地址使用统一配置
+ *
+ * @param address 提币地址
+ * @param amount 提币数量
+ * @param mainCoinType 主币种编号,使用获取商户币种信息接口
+ * @param coinType 子币种编号,使用获取商户币种信息接口
+ * @param businessId 业务编号，必须保证该字段在系统内唯一，如果重复，则该笔提币钱包将不会进行接收
+ * @param memo 备注,XRP和EOS，这两种币的提币申请该字段可选，其他类型币种不填
+ * @return 返回信息
+ */
+ ResultMsg autoWithdraw(String address, BigDecimal amount, String mainCoinType, String coinType, String businessId, String memo);
+
+ /**
+ * 代付，回调地址自定义
+ *
+ * @param address 提币地址
+ * @param amount 提币数量
+ * @param mainCoinType 主币种编号,使用获取商户币种信息接口
+ * @param coinType 子币种编号,使用获取商户币种信息接口
+ * @param businessId 业务编号，必须保证该字段在系统内唯一，如果重复，则该笔提币钱包将不会进行接收
+ * @param memo 备注,XRP和EOS，这两种币的提币申请该字段可选，其他类型币种不填
+ * @param callUrl 回调地址
+ * @return 返回信息
+ */
+ ResultMsg autoWithdraw(String address, BigDecimal amount, String mainCoinType, String coinType, String businessId, String memo, String callUrl);
+
+ /**
+ * 检验地址合法性
+ *
+ * @param mainCoinType 主币种编号,使用获取商户币种信息接口
+ * @param address 币种地址
+ * @return 是否合法
+ */
+ boolean checkAddress(String mainCoinType, String address);
+
+ /**
+ * 获取商户支持的币种,以及余额
+ *
+ * @param showBalance 是否显示余额
+ * @return 支持币种列表
+ */
+ List<Coin> listSupportCoin(boolean showBalance);
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/UdunClient.java b/trading-order-service/src/main/java/com/yami/trading/UD/UdunClient.java
new file mode 100644
index 0000000..385893c
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/UdunClient.java
@@ -0,0 +1,151 @@
+package com.yami.trading.UD;
+
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpStatus;
+import cn.hutool.json.JSONUtil;
+import com.yami.trading.common.constants.Constants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class UdunClient implements UdunApi {
+ private static Logger logger = LoggerFactory.getLogger(UdunClient.class);
+
+ /**
+ * UDUN API Gateway
+ */
+ private final String gateway = "https://sig11.udun.io";
+
+ /**
+ * UDUN Merchant Key
+ */
+ private final String merchantKey = "cf6802e282476b74e2a3cfd16a6cf7ec";
+
+ /**
+ * UDUN Merchant Number
+ */
+ private final String merchantId = "321912";
+
+ /**
+ * Callback 充值
+ */
+ private final String defaultCallBackUrl = Constants.API_HTTP + "api/channelBlockchain!rechargeCallback.action";
+
+ /**
+ * Callback 提币
+ */
+ private final String withdrawCallBackUrl = Constants.API_HTTP + "api/withdraw/withdrawCallback.action";
+
+
+
+ @Override
+ public Address createAddress(String mainCoinType) throws UdunException {
+ return createAddress(mainCoinType, "", "", defaultCallBackUrl);
+ }
+
+ @Override
+ public Address createAddress(String mainCoinType, String alias, String walletId) throws UdunException{
+ return createAddress(mainCoinType, alias, walletId, defaultCallBackUrl);
+ }
+
+ @Override
+ public Address createAddress(String mainCoinType, String alias, String walletId, String callUrl) throws UdunException{
+ Map<String, String> params = new HashMap<>();
+ params.put("merchantId", merchantId);
+ params.put("mainCoinType", mainCoinType);
+ params.put("callUrl", callUrl);
+ params.put("walletId", walletId);
+ params.put("alias", alias);
+
+ ResultMsg result = JSONUtil.toBean(UdunUtils.post(gateway, merchantKey, ApiPath.CREATE_ADDRESS, StrUtil.format("[{}]", JSONUtil.toJsonStr(params))), ResultMsg.class);
+ if (result.getCode() != HttpStatus.HTTP_OK) {
+ logger.error("createAddress:{}",JSONUtil.toJsonStr(result));
+ throw new UdunException(result.getCode(), result.getMessage());
+ }
+ return JSONUtil.toBean(result.getData(), Address.class);
+ }
+
+ @Override
+ public ResultMsg withdraw(String address, BigDecimal amount, String mainCoinType, String coinType, String businessId, String memo) {
+ return withdraw(address, amount, mainCoinType, coinType, businessId, memo, withdrawCallBackUrl);
+ }
+
+ @Override
+ public ResultMsg withdraw(String address, BigDecimal amount, String mainCoinType, String coinType, String businessId, String memo, String callUrl) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("address", address);
+ params.put("amount", amount);
+ params.put("merchantId", merchantId);
+ params.put("mainCoinType", mainCoinType);
+ params.put("coinType", coinType);
+ params.put("callUrl", callUrl);
+ params.put("businessId", businessId);
+ params.put("memo", memo);
+ return JSONUtil.toBean(UdunUtils.post(gateway, merchantKey, ApiPath.WITHDRAW, StrUtil.format("[{}]", JSONUtil.toJsonStr(params))), ResultMsg.class);
+ }
+
+ @Override
+ public ResultMsg autoWithdraw(String address, BigDecimal amount, String mainCoinType, String coinType, String businessId, String memo) {
+ return autoWithdraw(address, amount, mainCoinType, coinType, businessId, memo, withdrawCallBackUrl);
+ }
+
+ @Override
+ public ResultMsg autoWithdraw(String address, BigDecimal amount, String mainCoinType, String coinType, String businessId, String memo, String callUrl) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("address", address);
+ params.put("amount", amount);
+ params.put("merchantId", merchantId);
+ params.put("mainCoinType", mainCoinType);
+ params.put("coinType", coinType);
+ params.put("callUrl", callUrl);
+ params.put("businessId", businessId);
+ params.put("memo", memo);
+ return JSONUtil.toBean(UdunUtils.post(gateway, merchantKey, ApiPath.AUTO_WITHDRAW, StrUtil.format("[{}]", JSONUtil.toJsonStr(params))), ResultMsg.class);
+ }
+
+ @Override
+ public boolean checkAddress(String mainCoinType, String address) {
+ Map<String, String> params = new HashMap<>();
+ params.put("merchantId", merchantId);
+ params.put("mainCoinType", mainCoinType);
+ params.put("address", address);
+ ResultMsg result = JSONUtil.toBean(UdunUtils.post(gateway, merchantKey, ApiPath.CHECK_ADDRESS, StrUtil.format("[{}]", JSONUtil.toJsonStr(params))), ResultMsg.class);
+ return result.getCode() == HttpStatus.HTTP_OK;
+ }
+
+ @Override
+ public List<Coin> listSupportCoin(boolean showBalance) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("merchantId", merchantId);
+ params.put("showBalance", showBalance);
+ ResultMsg result = JSONUtil.toBean(UdunUtils.post(gateway, merchantKey, ApiPath.SUPPORT_COIN, JSONUtil.toJsonStr(params)), ResultMsg.class);
+ if (result.getCode() != HttpStatus.HTTP_OK) {
+ Console.error(JSONUtil.toJsonStr(result));
+ return null;
+ }
+ return JSONUtil.toList(JSONUtil.parseArray(result.getData()), Coin.class);
+ }
+ public boolean checkSign(String timestamp, String nonce, String body, String sign) {
+ String checkSign = UdunUtils.sign(merchantKey, timestamp, nonce, body);
+ return checkSign.equals(sign);
+ }
+
+ public static void main(String[] args) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("merchantId", 321912);
+ params.put("showBalance", false);
+ ResultMsg result = JSONUtil.toBean(UdunUtils.post("https://sig11.udun.io", "cf6802e282476b74e2a3cfd16a6cf7ec", ApiPath.SUPPORT_COIN, JSONUtil.toJsonStr(params)), ResultMsg.class);
+ if (result.getCode() != HttpStatus.HTTP_OK) {
+ Console.error(JSONUtil.toJsonStr(result));
+ }
+ List<Coin> coins = JSONUtil.toList(JSONUtil.parseArray(result.getData()), Coin.class);
+ System.out.println(coins);
+ }
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/UdunException.java b/trading-order-service/src/main/java/com/yami/trading/UD/UdunException.java
new file mode 100644
index 0000000..5aa268e
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/UdunException.java
@@ -0,0 +1,28 @@
+package com.yami.trading.UD;
+
+public class UdunException extends RuntimeException {
+ private Integer code;
+ private String message;
+
+ public UdunException(Integer code, String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public Integer getCode() {
+ return code;
+ }
+
+ public void setCode(Integer code) {
+ this.code = code;
+ }
+
+ @Override
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/UD/UdunUtils.java b/trading-order-service/src/main/java/com/yami/trading/UD/UdunUtils.java
new file mode 100644
index 0000000..9aee3c6
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/UD/UdunUtils.java
@@ -0,0 +1,84 @@
+package com.yami.trading.UD;
+
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.json.JSONUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class UdunUtils {
+ private static Logger logger = LoggerFactory.getLogger(UdunUtils.class);
+
+ public static String post(String gateway, String merchantKey, String path, String body) {
+ try {
+ // 创建 URL 对象
+ URL url = new URL(gateway+path);
+
+ // 打开连接
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+ // 设置请求方法为 POST
+ connection.setRequestMethod("POST");
+
+ // 设置请求头
+ connection.setRequestProperty("Content-Type", "application/json");
+ connection.setRequestProperty("Accept", "application/json");
+
+ // 启用输入输出流
+ connection.setDoOutput(true);
+
+ String rawBody = parseParams(merchantKey, body);
+
+ // 写入请求体
+ try (OutputStream os = connection.getOutputStream()) {
+ byte[] input = rawBody.getBytes("utf-8");
+ os.write(input, 0, input.length);
+ }
+
+ // 获取响应代码
+ int responseCode = connection.getResponseCode();
+
+ // 读取响应
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
+ String inputLine;
+ StringBuilder response = new StringBuilder();
+ while ((inputLine = in.readLine()) != null) {
+ response.append(inputLine);
+ }
+ return response.toString();
+ }
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static String parseParams(String merchantKey, String body) {
+ Map<String, String> params = new HashMap<>();
+ String timestamp = System.currentTimeMillis() + "";
+ String nonce = RandomUtil.randomString(6);
+ String sign = sign(merchantKey, timestamp, nonce, body);
+ params.put("timestamp", timestamp);
+ params.put("nonce", nonce);
+ params.put("sign", sign);
+ params.put("body", body);
+ return JSONUtil.toJsonStr(params);
+ }
+
+ public static String sign(String key, String timestamp, String nonce, String body) {
+ String raw = body + key + nonce + timestamp;
+ return SecureUtil.md5(raw);
+ }
+
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
index 615afb7..cbdba26 100644
--- a/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
+++ b/trading-order-service/src/main/java/com/yami/trading/dao/dz/StockDzMapper.java
@@ -8,6 +8,8 @@
import com.yami.trading.bean.dz.dto.StockDzDto;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
public interface StockDzMapper extends BaseMapper<StockDz> {
@@ -29,6 +31,7 @@
Page getDzCheckList(Page page,
@Param("state") String state,
@Param("stockCode") String stockCode,
- @Param("stockType") String stockType);
+ @Param("stockType") String stockType,
+ @Param("checkedList") List<String> checkedList);
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java
index 8b9ceb5..f69faf0 100644
--- a/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java
+++ b/trading-order-service/src/main/java/com/yami/trading/dao/user/UserMapper.java
@@ -28,7 +28,7 @@
Page<UserDto> listUser(Page page,@Param("roleNames") List<String> roleNames, @Param("userCode") String userCode,
@Param("userName") String userName, @Param("userMail") String userMail, @Param("userMobile") String userMobile,
- @Param("checkedList") List<String> checkedList);
+ @Param("checkedList") List<String> checkedList, @Param("recomUserName") String recomUserName);
Page<UserDataDto> listUserAndRecom(Page page,@Param("roleNames") List<String> roleNames, @Param("userCode") String userCode,@Param("userName") String userName,
@Param("lastIp") String lastIp,@Param("checkedList") List<String> checkedList,
diff --git a/trading-order-service/src/main/java/com/yami/trading/dao/user/W8BENMapper.java b/trading-order-service/src/main/java/com/yami/trading/dao/user/W8BENMapper.java
new file mode 100644
index 0000000..96c765a
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/dao/user/W8BENMapper.java
@@ -0,0 +1,14 @@
+package com.yami.trading.dao.user;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yami.trading.bean.model.W8BEN;
+import com.yami.trading.bean.user.dto.W8BENDto;
+import org.apache.ibatis.annotations.Param;
+
+
+public interface W8BENMapper extends BaseMapper<W8BEN> {
+
+ Page<W8BENDto> listUser(Page page, @Param("userName") String userName);
+
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/chat/online/OnlineChatMessageServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/chat/online/OnlineChatMessageServiceImpl.java
index 9b2de34..c826381 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/chat/online/OnlineChatMessageServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/chat/online/OnlineChatMessageServiceImpl.java
@@ -409,7 +409,7 @@
MessageUser messageUser = cahceUser.get(party.getUserId().toString());
if (messageUser == null) {
messageUser = new MessageUser();
- messageUser.setUserUnreadmsg(1);
+ messageUser.setUserUnreadmsg(0);
messageUser.setPartyId(party.getUserId().toString());
}
messageUser.setUpdatetime(new Date());
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
index 5c0d3f2..7e3cf32 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/StockDzService.java
@@ -6,6 +6,7 @@
import com.yami.trading.common.domain.Result;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
public interface StockDzService extends IService<StockDz> {
@@ -22,11 +23,11 @@
Result getDzOrderList(int pageNum, int pageSize, String state, String userId, String stockType);
- Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType);
+ Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, List<String> checkedList);
Result buyDz(String dzId, String password, double num, String partyId);
- Result dzCheck(String id, Integer checkType, Double num);
+ Result dzCheck(String id, Integer checkType, Double num, double price);
public void intoPosition(ExchangeApplyOrderDz orderDz, String stockType);
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
index 98d906f..c3cd310 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/dz/impl/StockDzServiceImpl.java
@@ -221,10 +221,11 @@
}
@Override
- public Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType) {
+ public Result getDzCheckList(int pageNum, int pageSize, String state, String stockCode, String stockType, List<String> checkedList) {
try {
Page page = new Page(pageNum, pageSize);
- stockDzMapper.getDzCheckList(page ,state, stockCode, stockType);
+
+ stockDzMapper.getDzCheckList(page ,state, stockCode, stockType, checkedList);
return Result.succeed(page);
} catch (Exception e) {
log.error(e.getMessage());
@@ -284,8 +285,11 @@
Wallet wallet = this.walletService.saveWalletByPartyId(partyId);
BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num));
//手续费比率
- Double feeRate = sysparaService.find("exchange_apply_order_buy_fee").getDouble();
+ Double feeRate = sysparaService.find("exchange_apply_order_dz_buy_fee").getDouble();
BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
+ if (buyAmt.doubleValue() < 300) {
+ orderFree = BigDecimal.ONE;
+ }
BigDecimal orderAmt = buyAmt.add(orderFree);
if (wallet.getMoney().compareTo(orderAmt) < 0) {
return Result.failed("余额不足");
@@ -343,7 +347,7 @@
@Transactional
@Override
- public Result dzCheck(String id, Integer checkType, Double orderNum) {
+ public Result dzCheck(String id, Integer checkType, Double orderNum, double price) {
try {
ExchangeApplyOrderDz order = exchangeApplyOrderDzMapper.selectById(id);
if (order == null) {
@@ -368,6 +372,10 @@
}
BigDecimal nowPrice = stockDz.getNowPrice();
+ if (price > 0) {
+ nowPrice = BigDecimal.valueOf(price);
+ order.setPrice(price);
+ }
if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
throw new YamiShopBindException("股票价格0,请重试");
}
@@ -377,6 +385,11 @@
//手续费比率
Double feeRate = sysparaService.find("exchange_apply_order_dz_buy_fee").getDouble();
BigDecimal orderFree = buyAmt.multiply(BigDecimal.valueOf(feeRate));
+ if (buyAmt.doubleValue() < 300) {
+ orderFree = BigDecimal.ONE;
+ }
+
+
BigDecimal orderAmt = buyAmt.add(orderFree);
if (wallet.getMoney().compareTo(orderAmt) < 0) {
throw new YamiShopBindException("订单失败，资金不足");
@@ -388,6 +401,7 @@
order.setVolume(buyAmt.doubleValue());
order.setFee(orderFree.doubleValue());
order.setState(ExchangeApplyOrderDz.STATE_POSITION);
+ order.setCreateTime(new Date());
exchangeApplyOrderDzMapper.updateById(order);
walletService.update(wallet.getUserId(), Arith.sub(0, orderAmt.doubleValue()));
@@ -506,6 +520,10 @@
//手续费比率
Double feeRate = sysparaService.find("exchange_apply_order_dz_sell_fee").getDouble();
BigDecimal orderFree = sellAmt.multiply(BigDecimal.valueOf(feeRate));
+ if (sellAmt.doubleValue() < 300) {
+ orderFree = BigDecimal.ONE;
+ }
+
String symbol = stockDz.getStockCode();
Realtime realtime = this.dataService.realtime(symbol).get(0);
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
index 6e49ba3..182c375 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/exchange/impl/ExchangeApplyOrderServiceImpl.java
@@ -164,8 +164,7 @@
log.setContentType(type2 + Constants.MONEYLOG_CONTENT_CANCEL);
moneyLogService.save(log);
}
- double sub = Arith.sub(realValue, order.getFee());
- double amount = Arith.mul(sub, orderPrice);
+ double amount = Arith.mul(realValue, orderPrice) + order.getFee();
Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
double amountBefore = wallet.getMoney().doubleValue();
String type = itemService.findBySymbol(order.getSymbol()).getType();
@@ -177,7 +176,7 @@
String type2 = Constants.MONEYLOG_MAP_TYPE.get(type);
log.setAmountBefore(new BigDecimal(amountBefore));
log.setAmount(new BigDecimal(amount));
- log.setAmountAfter(wallet.getMoney().add(BigDecimal.valueOf(amount)));
+ log.setAmountAfter(BigDecimal.valueOf(amountBefore + amount));
log.setLog(name + type2 + "现货交易卖出委托单成交，订单号[" + order.getOrderNo() + "]");
log.setUserId(order.getPartyId());
log.setWalletType(Constants.WALLET);
@@ -186,7 +185,7 @@
moneyLogService.save(log);
order.setCloseTime(new Date());
order.setClosePrice(orderPrice);
- order.setWalletFee(Arith.mul(order.getFee(), orderPrice));
+ order.setWalletFee(order.getFee());
order.setState(ExchangeApplyOrder.STATE_CREATED);
updateById(order);
}
@@ -637,6 +636,9 @@
public void saveSpotTradOpen(ExchangeApplyOrder order) {
order.setOrderNo(DateUtil.getToday("yyMMddHHmmss") + RandomUtil.getRandomNum(8));
double fee = Arith.mul(order.getVolume(), sysparaService.find("exchange_apply_order_buy_fee").getDouble());
+ if (order.getVolume() < 300) {
+ fee = 1;
+ }
Wallet wallet = this.walletService.saveWalletByPartyId(order.getPartyId());
String symbol = order.getSymbol();
Item item = itemService.findBySymbol(symbol);
@@ -686,6 +688,9 @@
order.setOrderNo(DateUtil.getToday("yyMMddHHmmss") + RandomUtil.getRandomNum(8));
order.setCreateTime(new Date());
order.setFee(Arith.mul(order.getVolume(), sysparaService.find("exchange_apply_order_sell_fee").getDouble()));
+ if (order.getPrice() * order.getSymbolValue() < 300) {
+ order.setFee(1);
+ }
Item item = itemService.findBySymbol(order.getSymbol());
// 休市期间，不让下市价卖出单
if (ExchangeApplyOrder.ORDER_PRICE_TYPE_OPPONENT.equals(order.getOrderPriceType())) {
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/RechargeBlockchainOrderServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/RechargeBlockchainOrderServiceImpl.java
index ef7de6a..3781f66 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/RechargeBlockchainOrderServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/RechargeBlockchainOrderServiceImpl.java
@@ -89,7 +89,10 @@
// Date now = new Date();
RechargeBlockchainOrder recharge = getById(id);
if (recharge == null) {
- throw new YamiShopBindException("参数错误!");
+ recharge = findByOrderNo(id);
+ if (recharge == null) {
+ throw new YamiShopBindException("参数错误!");
+ }
}
User party = userService.getById(recharge.getPartyId());
if (party == null) {
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index 402ac35..95cb1f0 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -101,9 +101,9 @@
@Override
public Page<UserDto> listUser(Page page, List<String> roleNames, String userCode, String userName,
- String userMail, String userMobile, List<String> checkedList) {
+ String userMail, String userMobile, List<String> checkedList, String recomUserName) {
- Page<UserDto> userDtoPage = baseMapper.listUser(page, roleNames, userCode, userName, userMail, userMobile, checkedList);
+ Page<UserDto> userDtoPage = baseMapper.listUser(page, roleNames, userCode, userName, userMail, userMobile, checkedList, recomUserName);
// 提现限制流水开启后，提现判断用的用户当前流水是使用UserData表的当日流水1还是使用Party表里的用户当前流水2
String withdraw_limit_open_use_type = this.sysparaService.find("withdraw_limit_open_use_type").getSvalue();
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
index 74e182c..e58951f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
@@ -431,13 +431,22 @@
Syspara paramMin = sysparaService.find(symbolCodeMin);
Syspara paramMax = null;
- if (paramMin == null || (paramMax = sysparaService.find(symbolCodeMax)) == null) {
+ if (paramMin == null && (paramMax = sysparaService.find(symbolCodeMax)) == null) {
// 不需要默认的，直接返回
if (!needDefault) {
return map;
}
// 2、没有对应该币种提现额度配置，使用默认的
map.put("limit", this.sysparaService.find(defaultMinCode).getSvalue());
+ map.put("limitMax", this.sysparaService.find(defaultMaxCode).getSvalue());
+ return map;
+ } else if (paramMin != null && (paramMax = sysparaService.find(symbolCodeMax)) == null){
+ // 不需要默认的，直接返回
+ if (!needDefault) {
+ return map;
+ }
+ // 2、没有对应该币种提现额度配置，使用默认的
+ map.put("limit", paramMin.getSvalue());
map.put("limitMax", this.sysparaService.find(defaultMaxCode).getSvalue());
return map;
}
@@ -552,7 +561,7 @@
*/
double withdraw_fee = Double.valueOf(sysparaService.find("withdraw_fee").getSvalue());
double fee = 0;
- if ("fixed".equals(withdraw_fee_type)) {
+ /*if ("fixed".equals(withdraw_fee_type)) {
fee = withdraw_fee;
}
if ("rate".equals(withdraw_fee_type)) {
@@ -560,9 +569,9 @@
fee = Arith.mul(withdraw.getVolume().doubleValue(), withdraw_fee);
}
if ("part".equals(withdraw_fee_type)) {
- /**
+ *//**
* 提现手续费part分段的值
- */
+ *//*
String withdraw_fee_part = sysparaService.find("withdraw_fee_part").getSvalue();
String[] withdraw_fee_parts = withdraw_fee_part.split(",");
for (int i = 0; i < withdraw_fee_parts.length; i++) {
@@ -574,7 +583,7 @@
}
i++;
}
- }
+ }*/
/**
* 当日提现次数是否超过
*/
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java b/trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java
index 7742684..f7fbdbb 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/user/UserService.java
@@ -119,7 +119,7 @@
Page<UserDto> listUser(Page page, List<String> roleNames, String userCode, String userName,
- String userMail, String userMobile, List<String> checkedList);
+ String userMail, String userMobile, List<String> checkedList, String recomUserName);
/**
* 获取基础数据
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/user/W8BENService.java b/trading-order-service/src/main/java/com/yami/trading/service/user/W8BENService.java
new file mode 100644
index 0000000..10b921c
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/service/user/W8BENService.java
@@ -0,0 +1,14 @@
+package com.yami.trading.service.user;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yami.trading.bean.model.W8BEN;
+import com.yami.trading.bean.user.dto.W8BENDto;
+
+import java.util.List;
+
+public interface W8BENService extends IService<W8BEN> {
+
+ Page<W8BENDto> listUser(Page page, String userName);
+
+}
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/user/impl/W8BENServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/user/impl/W8BENServiceImpl.java
new file mode 100644
index 0000000..4e0e2a3
--- /dev/null
+++ b/trading-order-service/src/main/java/com/yami/trading/service/user/impl/W8BENServiceImpl.java
@@ -0,0 +1,31 @@
+package com.yami.trading.service.user.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yami.trading.bean.model.User;
+import com.yami.trading.bean.model.W8BEN;
+import com.yami.trading.bean.user.dto.UserDto;
+import com.yami.trading.bean.user.dto.W8BENDto;
+import com.yami.trading.common.domain.Result;
+import com.yami.trading.dao.user.W8BENMapper;
+import com.yami.trading.service.user.W8BENService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class W8BENServiceImpl extends ServiceImpl<W8BENMapper, W8BEN> implements W8BENService {
+
+ @Autowired
+ private W8BENMapper w8BENMapper;
+
+ @Override
+ public Page<W8BENDto> listUser(Page page, String userName) {
+ try {
+ Page<W8BENDto> listUser = w8BENMapper.listUser(page,userName);
+ return listUser;
+ } catch (Exception e) {
+ log.error("setW8BENForm error", e);
+ }
+ return null;
+ }
+}
diff --git a/trading-order-service/src/main/resources/mapper/UserMapper.xml b/trading-order-service/src/main/resources/mapper/UserMapper.xml
index e6b6054..9fe66c7 100644
--- a/trading-order-service/src/main/resources/mapper/UserMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/UserMapper.xml
@@ -38,7 +38,9 @@
<select id="listUser" resultType="com.yami.trading.bean.user.dto.UserDto">
- SELECT * FROM tz_user u LEFT JOIN tz_wallet w ON u.user_id=w.user_id
+ SELECT u.*,w.money,r.user_name AS 'recomUserName' FROM tz_user u
+ LEFT JOIN tz_wallet w ON u.user_id=w.user_id
+ LEFT JOIN tz_user r ON u.user_recom=r.user_id
where 1=1 and u.role_name in
<foreach collection="roleNames" separator="," index="index" open="(" close=")" item="r">
@@ -50,7 +52,7 @@
</if>
<if test="userName!=null and userName!=''">
- and u.user_name=#{userName} or u.user_code=#{userName}
+ and (u.user_name=#{userName} or u.user_code=#{userName})
</if>
<if test="userMail!=null and userMail!=''">
@@ -68,6 +70,9 @@
</foreach>
</if>
+ <if test="recomUserName!=null and recomUserName!=''">
+ and r.user_name like CONCAT('%', #{recomUserName}, '%')
+ </if>
order by u.create_time desc
</select>
diff --git a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
index 2c81989..e8c32b8 100644
--- a/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/dz/StockDzMapper.xml
@@ -72,10 +72,11 @@
<select id="getDzCheckList" resultType="com.yami.trading.bean.dz.dto.ExchangeApplyOrderDzDto" parameterType="map">
SELECT
- t.*,u.user_name,u.user_code,s.stock_name
+ t.*,u.user_name,u.user_code,s.stock_name,r.user_name AS 'recomUserName'
FROM t_exchange_apply_order_dz t
LEFT JOIN tz_user u ON t.party_id = u.user_id
LEFT JOIN t_stock_dz s ON s.uuid = t.dz_id
+ LEFT JOIN tz_user r ON u.user_recom = r.user_id
WHERE 1=1
<if test="state != null and state != ''">
AND t.state = #{state}
@@ -86,6 +87,14 @@
<if test="stockType != null and stockType != '' ">
AND s.stock_type = #{stockType}
</if>
+ <if test="checkedList!=null">
+ and u.user_id in
+ <foreach collection="checkedList" separator="," index="index" open="(" close=")" item="r">
+ #{r}
+ </foreach>
+
+ </if>
+
ORDER BY t.create_time DESC
</select>
diff --git a/trading-order-service/src/main/resources/mapper/exchange/ExchangeApplyOrderMapper.xml b/trading-order-service/src/main/resources/mapper/exchange/ExchangeApplyOrderMapper.xml
index cb2b691..a699723 100644
--- a/trading-order-service/src/main/resources/mapper/exchange/ExchangeApplyOrderMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/exchange/ExchangeApplyOrderMapper.xml
@@ -40,7 +40,7 @@
and item.type=#{symbolType}
</if>
<if test="userName!=null and userName!=''">
- and party.user_name=#{userName} or party.user_code=#{userName}
+ and (party.user_name=#{userName} or party.user_code=#{userName})
</if>
<if test="userCode!=null and userCode!=''">
and party.user_code=#{userCode}
diff --git a/trading-order-service/src/main/resources/mapper/user/UserW8BENMapper.xml b/trading-order-service/src/main/resources/mapper/user/UserW8BENMapper.xml
new file mode 100644
index 0000000..c7fc59d
--- /dev/null
+++ b/trading-order-service/src/main/resources/mapper/user/UserW8BENMapper.xml
@@ -0,0 +1,18 @@
+<?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.yami.trading.dao.user.W8BENMapper">
+
+
+ <select id="listUser" resultType="com.yami.trading.bean.user.dto.W8BENDto">
+ SELECT w.*,u.user_name FROM `tz_user_w8ben` w
+ LEFT JOIN tz_user u ON u.user_id=w.user_id
+ where 1=1
+ <if test="userName!=null and userName!=''">
+ and u.user_name like CONCAT('%', #{userName}, '%')
+
+ </if>
+ order by w.create_time desc
+ </select>
+
+
+</mapper>
--
Gitblit v1.9.3