From 1598aa79d68143f73c1b406f463c55e5e5d02433 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 29 Jun 2020 16:55:43 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin
---
src/main/java/com/xcong/excoin/modules/member/dao/AppVersionDao.java | 8 ++
src/main/resources/i18n/messages_zh_CN.properties | 1
src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java | 45 +++++++++++++++
src/main/java/com/xcong/excoin/modules/coin/parameter/dto/SubmitSalesWalletCoinOrderDto.java | 3 +
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 43 ++++++++++----
src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionVo.java | 20 ++++++
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java | 13 ++++
src/main/resources/i18n/messages_en_US.properties | 1
src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionListVo.java | 16 +++++
src/main/resources/mapper/member/AppVersionDao.xml | 5 +
src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java | 1
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java | 2
12 files changed, 144 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java b/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
index 9ef3d71..a804c57 100644
--- a/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
+++ b/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java
@@ -49,6 +49,7 @@
.antMatchers("/api/member/getMemberAccountInfo").permitAll()
.antMatchers("/api/member/memberForgetPwd").permitAll()
.antMatchers("/api/member/memberCoinInfoList").permitAll()
+ .antMatchers("/api/member/getAppVersionInfo").permitAll()
.antMatchers("/api/orderCoin/searchSymbolResultList").permitAll()
.antMatchers("/api/orderCoin/findCollect").permitAll()
.anyRequest().authenticated()
diff --git a/src/main/java/com/xcong/excoin/modules/coin/parameter/dto/SubmitSalesWalletCoinOrderDto.java b/src/main/java/com/xcong/excoin/modules/coin/parameter/dto/SubmitSalesWalletCoinOrderDto.java
index 72d4b67..b15186a 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/parameter/dto/SubmitSalesWalletCoinOrderDto.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/parameter/dto/SubmitSalesWalletCoinOrderDto.java
@@ -1,6 +1,8 @@
package com.xcong.excoin.modules.coin.parameter.dto;
import java.math.BigDecimal;
+
+import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,6 +25,7 @@
@ApiModelProperty(value = "市价：1，限价：2", example = "1")
private Integer tradeType;
+ @Min(0)
@NotNull(message = "数量不能为空")
@ApiModelProperty(value = "数量", example = "100")
private BigDecimal amount;
diff --git a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
index 842132f..1aeb253 100644
--- a/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
+++ b/src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java
@@ -22,6 +22,7 @@
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdatePwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradersPwdTimeDto;
+import com.xcong.excoin.modules.member.parameter.vo.AppVersionListVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
@@ -55,7 +56,17 @@
public class MemberController {
@Resource
- MemberService memberService;
+ MemberService memberService;
+
+ /**
+ * 获取当前版本号
+ */
+ @ApiOperation(value="获取当前版本号", notes="获取当前版本号")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = AppVersionListVo.class)})
+ @GetMapping(value = "/getAppVersionInfo")
+ public Result getAppVersionInfo() {
+ return memberService.getAppVersionInfo();
+ }
/**
* 获取我的信息
diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/AppVersionDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/AppVersionDao.java
new file mode 100644
index 0000000..d487e27
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/dao/AppVersionDao.java
@@ -0,0 +1,8 @@
+package com.xcong.excoin.modules.member.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xcong.excoin.modules.member.entity.AppVersionEntity;
+
+public interface AppVersionDao extends BaseMapper<AppVersionEntity> {
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java b/src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java
new file mode 100644
index 0000000..2261fdc
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/entity/AppVersionEntity.java
@@ -0,0 +1,45 @@
+package com.xcong.excoin.modules.member.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import lombok.Data;
+/**
+ * 版本表
+ *
+ **/
+@Data
+@TableName("app_version")
+public class AppVersionEntity implements Serializable {
+ /**
+ * 账号状态 - 禁用
+ */
+ public static final Integer type_and = 1;
+
+ /**
+ * 账号状态 - 启用
+ */
+ public static final Integer type_app = 2;
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id",type = IdType.AUTO)
+ private Long id;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createtime;
+
+ private String version;
+ private String content;
+ private String address;
+ private Integer type;
+
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionListVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionListVo.java
new file mode 100644
index 0000000..2d11e03
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionListVo.java
@@ -0,0 +1,16 @@
+package com.xcong.excoin.modules.member.parameter.vo;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AppVersionListVo", description = "版本信息列表")
+public class AppVersionListVo {
+
+ @ApiModelProperty(value = "版本信息")
+ private List<AppVersionVo> appVersionVo;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionVo.java b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionVo.java
new file mode 100644
index 0000000..e3da351
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/member/parameter/vo/AppVersionVo.java
@@ -0,0 +1,20 @@
+package com.xcong.excoin.modules.member.parameter.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AppVersionVo", description = "版本号信息")
+public class AppVersionVo {
+
+ @ApiModelProperty(value = "版本号")
+ private String version;
+
+ @ApiModelProperty(value = "下载地址")
+ private String address;
+
+ @ApiModelProperty(value = "类型：1安卓，2苹果")
+ private Integer type;
+
+}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
index 8f0ecee..916b773 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
@@ -86,5 +86,7 @@
public Result getMemberAccountInfo(String account,int type);
+ public Result getAppVersionInfo();
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
index f4010ab..31ec2cb 100644
--- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
@@ -30,19 +30,6 @@
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradePwdDto;
import com.xcong.excoin.modules.member.parameter.dto.MemberUpdateTradersPwdTimeDto;
import com.xcong.excoin.modules.member.parameter.vo.*;
-import com.xcong.excoin.modules.member.parameter.vo.MemberAuthenticationInfoVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberAvivableCoinInfoVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountListVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressCountVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressListVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberCoinAddressVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberCoinInfoListVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberCoinInfoVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberInfoVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailListVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberPaymethodDetailVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberPersonCenterInfoVo;
-import com.xcong.excoin.modules.member.parameter.vo.MemberSendCodeWayVo;
import com.xcong.excoin.modules.member.service.MemberService;
import com.xcong.excoin.modules.platform.dao.PlatformFeeSettingDao;
import com.xcong.excoin.modules.platform.dao.PlatformSymbolsCoinDao;
@@ -115,6 +102,9 @@
@Resource
MemberCoinWithdrawDao memberCoinWithdrawDao;
+
+ @Resource
+ AppVersionDao appVersionDao;
@Resource
private MemberWalletContractSimulateDao memberWalletContractSimulateDao;
@@ -469,6 +459,17 @@
if (!MemberEntity.CERTIFY_STATUS_Y.equals(member.getCertifyStatus())) {
return Result.fail(MessageSourceUtils.getString("member_service_0077"));
}
+
+ Map<String, Object> columnMap = new HashMap<>();
+ columnMap.put("member_id", memberId);
+ List<MemberPaymentMethodEntity> selectByMap = memberPaymentMethodDao.selectByMap(columnMap);
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(MemberPaymentMethodEntity memberPaymentMethodEntity : selectByMap) {
+ if(memberPaymethodDto.getAccount().equals(memberPaymentMethodEntity.getAccount())) {
+ return Result.fail(MessageSourceUtils.getString("member_service_0097"));
+ }
+ }
+ }
String account = memberPaymethodDto.getAccount();
String bank = memberPaymethodDto.getBank();
String name = memberPaymethodDto.getName();
@@ -895,6 +896,22 @@
return Result.ok("");
}
+ @Override
+ public Result getAppVersionInfo() {
+ Map<String, Object> columnMap = new HashMap<>();
+ List<AppVersionEntity> selectByMap = appVersionDao.selectByMap(columnMap);
+ List<Object> arrayList = new ArrayList<>();
+ if(CollUtil.isNotEmpty(selectByMap)) {
+ for(AppVersionEntity appVersionEntity : selectByMap) {
+ AppVersionVo appVersionVo = new AppVersionVo();
+ appVersionVo.setAddress(appVersionEntity.getAddress());
+ appVersionVo.setType(appVersionEntity.getType());
+ appVersionVo.setVersion(appVersionEntity.getVersion());
+ arrayList.add(appVersionVo);
+ }
+ }
+ return Result.ok(arrayList);
+ }
}
diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties
index 70c547e..0cb686d 100644
--- a/src/main/resources/i18n/messages_en_US.properties
+++ b/src/main/resources/i18n/messages_en_US.properties
@@ -135,6 +135,7 @@
member_service_0094=Insufficient available balance of contract usdt account
member_service_0095=Insufficient available balance of agent usdt account
member_service_0096=Transfer fail
+member_service_0097=Payment method already exists
order_service_0001=Wrong parameter value
order_service_0002=Not logged in
diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties
index d743f1a..af87df0 100644
--- a/src/main/resources/i18n/messages_zh_CN.properties
+++ b/src/main/resources/i18n/messages_zh_CN.properties
@@ -135,6 +135,7 @@
member_service_0094=合约USDT账户可用余额不足
member_service_0095=代理USDT账户可用余额不足
member_service_0096=划转失败
+member_service_0097=支付方式已存在
order_service_0001=参值有误
order_service_0002=未登录
diff --git a/src/main/resources/mapper/member/AppVersionDao.xml b/src/main/resources/mapper/member/AppVersionDao.xml
new file mode 100644
index 0000000..23a92c5
--- /dev/null
+++ b/src/main/resources/mapper/member/AppVersionDao.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xcong.excoin.modules.member.dao.AppVersionDao">
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1