From 4166b7ae433d4dd815a5914f6a0fe0ae7280b9be Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 01 Jun 2021 15:18:49 +0800
Subject: [PATCH] modiyf
---
src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java | 4 +-
src/test/java/com/xcong/excoin/OtcTest.java | 66 +++++++++++++++++++++++++++++++-
src/test/java/com/xcong/excoin/MemberTest.java | 5 +-
src/main/resources/application.yml | 2
4 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
index 38de88b..45596b1 100644
--- a/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/otc/service/impl/OtcOrderServiceImpl.java
@@ -341,7 +341,7 @@
buyDetail.setTotalAmount(buyOrder.getTotalAmount());
buyDetail.setUnitPrice(buyOrder.getUnitPrice());
buyDetail.setCreateTime(buyOrder.getCreateTime());
- buyDetail.setIsMb(member.getIsTrader());
+ buyDetail.setIsMb(member.getAccountType() == 1 ? 2 : 1);
buyDetail.setPayName(buyOrder.getPayName());
buyDetail.setIsOwnEntrust(member.getId().equals(buyOrder.getEntrustMemberId()) ? 1 : 2);
@@ -402,7 +402,7 @@
saleDetail.setTotalAmount(saleOrder.getTotalAmount());
saleDetail.setUnitPrice(saleOrder.getUnitPrice());
saleDetail.setCreateTime(saleOrder.getCreateTime());
- saleDetail.setIsMb(member.getIsTrader());
+ saleDetail.setIsMb(member.getAccountType() == 1 ? 2 : 1);
saleDetail.setPayName(saleOrder.getPayName());
saleDetail.setSaleName(buyMember.getName());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 73d1f29..99c137d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -112,7 +112,7 @@
loop-job: false
rabbit-consumer: false
block-job: false
- otc-job: true
+ otc-job: false
websocket-job: false
aliyun:
diff --git a/src/test/java/com/xcong/excoin/MemberTest.java b/src/test/java/com/xcong/excoin/MemberTest.java
index da4f357..ae2bdbc 100644
--- a/src/test/java/com/xcong/excoin/MemberTest.java
+++ b/src/test/java/com/xcong/excoin/MemberTest.java
@@ -14,6 +14,7 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.HashMap;
@@ -32,8 +33,9 @@
private MemberService memberService;
@Test
+ @Transactional(rollbackFor = Exception.class)
public void baseInsert() {
- for(int i = 0; i < 100; i++) {
+ for(int i = 0; i < 50; i++) {
String phonePrefix = "199999999";
if (i < 10) {
phonePrefix = phonePrefix + "0" + i;
@@ -45,7 +47,6 @@
registerDto.setAccount(phonePrefix);
registerDto.setType(1);
registerDto.setCode("a123456");
- registerDto.setRefererId("49027637");
memberService.register(registerDto);
}
}
diff --git a/src/test/java/com/xcong/excoin/OtcTest.java b/src/test/java/com/xcong/excoin/OtcTest.java
index 5c12aa9..b288801 100644
--- a/src/test/java/com/xcong/excoin/OtcTest.java
+++ b/src/test/java/com/xcong/excoin/OtcTest.java
@@ -1,12 +1,22 @@
package com.xcong.excoin;
+import cn.hutool.crypto.SecureUtil;
+import com.xcong.excoin.common.system.dto.RegisterDto;
+import com.xcong.excoin.modules.member.dao.MemberDao;
+import com.xcong.excoin.modules.member.dao.MemberPaymentMethodDao;
+import com.xcong.excoin.modules.member.entity.MemberEntity;
+import com.xcong.excoin.modules.member.entity.MemberPaymentMethodEntity;
+import com.xcong.excoin.modules.otc.dao.OtcMarketBussinessDao;
+import com.xcong.excoin.modules.otc.entity.OtcMarketBussiness;
import com.xcong.excoin.quartz.job.OtcOrderJob;
import com.xcong.excoin.rabbit.producer.OtcProducter;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.concurrent.TimeUnit;
@Slf4j
@@ -31,15 +41,65 @@
}
@Autowired
- private OtcOrderJob otcOrderJob;
+// private OtcOrderJob otcOrderJob;
@Test
public void jobTest() {
- otcOrderJob.marketBussinessJob();
+// otcOrderJob.marketBussinessJob();
}
@Test
public void mbProducterTest() {
- otcProducter.sendMarketBussinessMsg(11L, 3);
+// otcProducter.sendMarketBussinessMsg(11L, 3);
+ }
+
+ @Autowired
+ private MemberDao memberDao;
+
+ @Autowired
+ private OtcMarketBussinessDao otcMarketBussinessDao;
+
+ @Autowired
+ private MemberPaymentMethodDao memberPaymentMethodDao;
+
+ @Test
+// @Transactional(rollbackFor = Exception.class)
+ public void mbInsertTest() {
+ for(int i = 0; i < 50; i++) {
+ String phonePrefix = "199999999";
+ if (i < 10) {
+ phonePrefix = phonePrefix + "0" + i;
+ } else {
+ phonePrefix = phonePrefix + i;
+ }
+
+ MemberEntity member = memberDao.selectMemberInfoByAccount(phonePrefix);
+
+ OtcMarketBussiness otcMb = new OtcMarketBussiness();
+ otcMb.setMemberId(member.getId());
+ otcMb.setAvgCoinTime(0);
+ otcMb.setAvgPayTime(0);
+ otcMb.setTotalOrderCnt(0);
+ otcMb.setBuyCnt(0);
+ otcMb.setFinishRatio(BigDecimal.ZERO);
+ otcMb.setStatus(OtcMarketBussiness.CHECK_PASS);
+
+ member.setIsTrader(1);
+ member.setCertifyStatus(2);
+ member.setTradePassword(SecureUtil.md5("123456"));
+
+ memberDao.updateById(member);
+ otcMarketBussinessDao.insert(otcMb);
+
+ MemberPaymentMethodEntity memberPaymentMethodEntity = new MemberPaymentMethodEntity();
+ memberPaymentMethodEntity.setMemberId(member.getId());
+ memberPaymentMethodEntity.setAccount("123456789");
+ memberPaymentMethodEntity.setBank("中国银行");
+ memberPaymentMethodEntity.setName("无名");
+ memberPaymentMethodEntity.setPaymentType(MemberPaymentMethodEntity.PAYMENTTYPE_CARD.toString());
+ memberPaymentMethodEntity.setSubBank("中国银行");
+ memberPaymentMethodEntity.setIsDefualt("1");
+ memberPaymentMethodDao.insert(memberPaymentMethodEntity);
+ }
}
}
--
Gitblit v1.9.1