From 3d4667dc5a0d56ce1ad0283c26595f68263b061f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 21 Oct 2022 10:50:00 +0800
Subject: [PATCH] 20221021
---
src/main/resources/i18n/message_zh_CN.properties | 2
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java | 4
src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java | 30 ++++++++++
src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java | 10 +-
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 18 +++++
src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java | 12 ++++
src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java | 10 +-
src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java | 3 +
src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java | 21 +++++++
src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java | 2
src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java | 38 ++++++++++++
src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java | 4 +
src/main/resources/i18n/message_en_US.properties | 2
src/main/resources/mapper/dapp/DappBankDao.xml | 10 +++
src/main/resources/templates/febs/views/onhookplan/planList.html | 10 +++
15 files changed, 161 insertions(+), 15 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java b/src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java
new file mode 100644
index 0000000..ea2ec85
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/AdminOnHookPlanController.java
@@ -0,0 +1,38 @@
+package cc.mrbird.febs.dapp.controller;
+
+import cc.mrbird.febs.common.controller.BaseController;
+import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder;
+import cc.mrbird.febs.dapp.entity.MallNewsInfo;
+import cc.mrbird.febs.dapp.service.AdminOnHookPlanService;
+import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@Slf4j
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/admin/onHook")
+public class AdminOnHookPlanController extends BaseController {
+
+ private final AdminOnHookPlanService adminOnHookPlanService;
+
+ /**
+ * 挂机-列表
+ * @return
+ */
+ @GetMapping("getplanList")
+ public FebsResponse getplanList(IgtOnHookPlanOrder igtOnHookPlanOrder, QueryRequest request) {
+ Map<String, Object> data = getDataTable(adminOnHookPlanService.getplanList(igtOnHookPlanOrder, request));
+ return new FebsResponse().success().data(data);
+ }
+
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
index b914f16..1fc8fe6 100644
--- a/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -198,8 +198,8 @@
})
@PostMapping(value = "/bankList")
public FebsResponse bankList(@RequestBody ApiBankListDto apiBankListDto) {
- Map<String, Object> data = getDataTable(dappMemberService.getBankListInPage(apiBankListDto));
- return new FebsResponse().success().data(data);
+// Map<String, Object> data = getDataTable(dappMemberService.getBankListInPage(apiBankListDto));
+ return dappMemberService.getBankListInPage(apiBankListDto);
}
@ApiOperation(value ="IGT银行卡-新增", notes = "银行卡-新增")
diff --git a/src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java b/src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java
new file mode 100644
index 0000000..9a54821
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/controller/ViewOnHookPlanController.java
@@ -0,0 +1,30 @@
+package cc.mrbird.febs.dapp.controller;
+
+import cc.mrbird.febs.common.entity.FebsConstant;
+import cc.mrbird.febs.common.utils.FebsUtil;
+import cc.mrbird.febs.dapp.service.AdminOnHookPlanService;
+import lombok.RequiredArgsConstructor;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller("onHookView")
+@RequestMapping(FebsConstant.VIEW_PREFIX + "onHookView")
+@RequiredArgsConstructor
+public class ViewOnHookPlanController {
+
+ private final AdminOnHookPlanService adminOnHookPlanService;
+
+ /**
+ * 挂机-列表
+ * @return
+ */
+ @GetMapping("planList")
+ @RequiresPermissions("planList:view")
+ public String planList() {
+ return FebsUtil.view("onhookplan/planList");
+ }
+
+
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java b/src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java
index 045f999..4cda5a8 100644
--- a/src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java
+++ b/src/main/java/cc/mrbird/febs/dapp/dto/ApiBankListDto.java
@@ -9,11 +9,11 @@
@ApiModel(value = "ApiBankListDto", description = "银行卡列表接收参数类")
public class ApiBankListDto {
- @ApiModelProperty(value = "页码")
- private Integer pageNum = 1;
-
- @ApiModelProperty(value = "每页数量")
- private Integer pageSize = 10;
+// @ApiModelProperty(value = "页码")
+// private Integer pageNum = 1;
+//
+// @ApiModelProperty(value = "每页数量")
+// private Integer pageSize = 10;
@TableField(exist = false)
private Long memberId;
diff --git a/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
index ad000a8..c76fb41 100644
--- a/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/enumerate/DataDictionaryEnum.java
@@ -15,8 +15,12 @@
/**
* 挂机设置
* 最长挂机时间
+ * 每日挂机开始时间 hh：MM：ss
+ * 每日挂机结束时间 hh：MM：ss
*/
MAX_HOURS("ONHOOK_SET","MAX_HOURS"),
+ START_TIME("ONHOOK_SET","START_TIME"),
+ END_TIME("ONHOOK_SET","END_TIME"),
/**
* 内部转账规则（默认如下）
* 1、没有手续费
diff --git a/src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java b/src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java
index 1af721b..79af432 100644
--- a/src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java
+++ b/src/main/java/cc/mrbird/febs/dapp/mapper/DappBankDao.java
@@ -8,8 +8,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
public interface DappBankDao extends BaseMapper<DappBank> {
IPage<ApiBankListVo> selectBankListInPage(@Param("record")ApiBankListDto apiBankListDto, Page<ApiBankListVo> page);
+ List<ApiBankListVo> selectBankListByMemberId(@Param("memberId")Long id);
}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java b/src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java
new file mode 100644
index 0000000..cb850b3
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/service/AdminOnHookPlanService.java
@@ -0,0 +1,12 @@
+package cc.mrbird.febs.dapp.service;
+
+import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface AdminOnHookPlanService extends IService<IgtOnHookPlanOrder> {
+
+ IPage<IgtOnHookPlanOrder> getplanList(IgtOnHookPlanOrder igtOnHookPlanOrder, QueryRequest request);
+
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
index b8846a6..95b4a65 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/DappMemberService.java
@@ -76,7 +76,7 @@
IPage<ApiMyTeammateAmountChangeListVo> findTeammateChangeListInPage(ApiAmountChangeDto apiAmountChangeDto);
- IPage<ApiBankListVo> getBankListInPage(ApiBankListDto apiBankListDto);
+ FebsResponse getBankListInPage(ApiBankListDto apiBankListDto);
FebsResponse addBank(ApiAddBankDto addBankDto);
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java
new file mode 100644
index 0000000..85a6caa
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/AdminOnHookPlanServiceImpl.java
@@ -0,0 +1,21 @@
+package cc.mrbird.febs.dapp.service.impl;
+
+import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.dapp.entity.IgtOnHookPlanOrder;
+import cc.mrbird.febs.dapp.mapper.IgtOnHookPlanOrderDao;
+import cc.mrbird.febs.dapp.service.AdminOnHookPlanService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AdminOnHookPlanServiceImpl extends ServiceImpl<IgtOnHookPlanOrderDao, IgtOnHookPlanOrder> implements AdminOnHookPlanService {
+ @Override
+ public IPage<IgtOnHookPlanOrder> getplanList(IgtOnHookPlanOrder igtOnHookPlanOrder, QueryRequest request) {
+ return null;
+ }
+}
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 6bfb37c..f8ca450 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -817,6 +817,7 @@
ApiAmountTypeVo apiAmountTypeVo = new ApiAmountTypeVo();
apiAmountTypeVo.setDescription(dataDictionaryCustom.getDescription());
apiAmountTypeVo.setCodeValue(dataDictionaryCustom.getValue());
+ apiAmountTypeVos.add(apiAmountTypeVo);
}
}
return new FebsResponse().success().data(apiAmountTypeVos);
@@ -832,12 +833,10 @@
}
@Override
- public IPage<ApiBankListVo> getBankListInPage(ApiBankListDto apiBankListDto) {
+ public FebsResponse getBankListInPage(ApiBankListDto apiBankListDto) {
DappMemberEntity member = LoginUserUtil.getAppUser();
- Page<ApiBankListVo> page = new Page<>(apiBankListDto.getPageNum(), apiBankListDto.getPageSize());
- apiBankListDto.setMemberId(member.getId());
- IPage<ApiBankListVo> apiBankListVoIPage = dappBankDao.selectBankListInPage(apiBankListDto,page);
- return apiBankListVoIPage;
+ List<ApiBankListVo> apiBankListVos = dappBankDao.selectBankListByMemberId(member.getId());
+ return new FebsResponse().success().data(apiBankListVos);
}
@Override
@@ -908,6 +907,7 @@
}
DappMemberAddress dappMemberAddress = new DappMemberAddress();
dappMemberAddress.setType(apiAddAddressDto.getType());
+ dappMemberAddress.setMemberId(member.getId());
dappMemberAddress.setAddress(apiAddAddressDto.getAddress());
dappMemberAddressDao.insert(dappMemberAddress);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index b7c87b1..7a42308 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -509,12 +509,26 @@
if(BigDecimal.ZERO.compareTo(balance) >= 0){
return new FebsResponse().fail().message(MessageSourceUtils.getString("balance_err_001"));
}
- if(ObjectUtil.isEmpty(apiTransferInsideDto.getInviteId())){
- return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_001"));
+// if(ObjectUtil.isEmpty(apiTransferInsideDto.getInviteId())){
+// return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_001"));
+// }
+ if(ObjectUtil.isEmpty(apiTransferInsideDto.getUsername())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0011"));
}
if(ObjectUtil.isEmpty(apiTransferInsideDto.getTransferCode())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
+ //每日挂机时间段内禁止内转
+ DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.START_TIME.getType(), DataDictionaryEnum.START_TIME.getCode());
+ DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.END_TIME.getType(), DataDictionaryEnum.END_TIME.getCode());
+ //获取时间对应的秒数
+ Integer dateNow = DateUtil.timeToSecond(DateUtil.formatTime(DateUtil.date()));
+ Integer startTime = DateUtil.timeToSecond(startTimeDic.getValue());
+ Integer endTime = DateUtil.timeToSecond(endTimeDic.getValue());
+ if(startTime <= dateNow && endTime >= dateNow){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
+ }
+
DappMemberEntity dappMemberEntityOut = LoginUserUtil.getAppUser();
Long memberIdOut = dappMemberEntityOut.getId();
diff --git a/src/main/resources/i18n/message_en_US.properties b/src/main/resources/i18n/message_en_US.properties
index 684aa4a..9aff626 100644
--- a/src/main/resources/i18n/message_en_US.properties
+++ b/src/main/resources/i18n/message_en_US.properties
@@ -47,6 +47,8 @@
member_err_008=Please enter a new password
member_err_009=The new passwords entered twice are inconsistent
member_err_0010=Please enter the address
+member_err_0011=Please enter the correct user name
+member_err_0012=No inward transfer during hang up period
Operation_001=Operation succeeded
Operation_002=Operation failed
\ No newline at end of file
diff --git a/src/main/resources/i18n/message_zh_CN.properties b/src/main/resources/i18n/message_zh_CN.properties
index 3b4bc98..e345b0c 100644
--- a/src/main/resources/i18n/message_zh_CN.properties
+++ b/src/main/resources/i18n/message_zh_CN.properties
@@ -45,6 +45,8 @@
member_err_008=\u8BF7\u8F93\u5165\u65B0\u7684\u5BC6\u7801
member_err_009=\u4E24\u6B21\u8F93\u5165\u7684\u65B0\u5BC6\u7801\u4E0D\u4E00\u81F4
member_err_0010=\u8BF7\u8F93\u5165\u5730\u5740
+member_err_0011=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u7528\u6237\u540D
+member_err_0012=\u6302\u673A\u65F6\u95F4\u6BB5\u5185\u7981\u6B62\u5185\u8F6C
Operation_001=\u64CD\u4F5C\u6210\u529F
Operation_002=\u64CD\u4F5C\u5931\u8D25
diff --git a/src/main/resources/mapper/dapp/DappBankDao.xml b/src/main/resources/mapper/dapp/DappBankDao.xml
index 6f07358..df539f5 100644
--- a/src/main/resources/mapper/dapp/DappBankDao.xml
+++ b/src/main/resources/mapper/dapp/DappBankDao.xml
@@ -12,5 +12,15 @@
order by a.create_time desc
</select>
+ <select id="selectBankListByMemberId" resultType="cc.mrbird.febs.dapp.vo.ApiBankListVo">
+ select
+ concat(left(a.card_code,4), '******', right(a.card_code,4)) cardCode,
+ a.member_name memberName,
+ a.id id
+ from dapp_bank a
+ where a.member_id = #{memberId}
+ order by a.create_time desc
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/onhookplan/planList.html b/src/main/resources/templates/febs/views/onhookplan/planList.html
new file mode 100644
index 0000000..566549b
--- /dev/null
+++ b/src/main/resources/templates/febs/views/onhookplan/planList.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1