From 6f9614f40c03b69761a371267026246d38d16db8 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 28 Oct 2025 14:03:59 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=B8=81=E7=A7=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pub/controller/ConfigBaseController.java | 13 +- .../manage/BdAccountController.java | 168 ++++++------------ 2 files changed, 61 insertions(+), 120 deletions(-) diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/config/pub/controller/ConfigBaseController.java b/bd-business/bd-business-system/src/main/java/com/hzs/config/pub/controller/ConfigBaseController.java index 10839be0..93bd659b 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/config/pub/controller/ConfigBaseController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/config/pub/controller/ConfigBaseController.java @@ -16,17 +16,13 @@ import java.util.Date; import java.util.List; /** - * @Description: 配置controller - * @Author: sui q - * @Time: 2023/3/10 15:45 - * @Classname: ConfigBaseController - * @PackageName: com.hzs.config.pub.controller + * 配置controller */ @Slf4j public abstract class ConfigBaseController extends BaseController { @DubboReference - private IDelayedMessageApi delayedMessageApi; + IDelayedMessageApi delayedMessageApi; protected boolean sendDelayedMessage(Object config, Integer delayBusType, String key, String... otherKey) { Integer pkId = null; @@ -63,10 +59,7 @@ public abstract class ConfigBaseController extends BaseController { } /** - * @description: 校验object的属性值是Long类型还是Integer - * @author: zhang jing - * @date: 2024/5/20 16:01 - * @param: [field, object] + * 校验object的属性值是Long类型还是Integer **/ public static boolean isLong(Object object) { if (object instanceof Long) { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAccountController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAccountController.java index e0644460..4032c59f 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAccountController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/manage/BdAccountController.java @@ -2,12 +2,10 @@ package com.hzs.system.config.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.hzs.common.core.annotation.Log; import com.hzs.common.core.constant.CacheConstants; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; @@ -21,7 +19,6 @@ import com.hzs.common.core.web.page.TableDataInfo; import com.hzs.common.domain.system.config.BdAccount; import com.hzs.common.domain.system.config.ext.BdAccountExt; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; import com.hzs.config.pub.controller.ConfigBaseController; import com.hzs.system.base.ITransactionServiceApi; @@ -36,13 +33,9 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * 币种配置表 前端控制器 - * - * @author zhangjing - * @since 2022-08-25 */ @Slf4j @RestController @@ -50,34 +43,22 @@ import java.util.Map; public class BdAccountController extends ConfigBaseController { @Autowired - private IBdAccountService accountService; - @Autowired - private ITransactionCommonService iTransactionCommonService; - - @DubboReference - ITransactionServiceApi iTransactionServiceApi; + private IBdAccountService iBdAccountService; @Autowired private RedisService redisService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - + @DubboReference + ITransactionServiceApi iTransactionServiceApi; /** - * @description: 查询币种配置列表 - * @author: zhang jing - * @date: 2022/8/29 9:56 - * @param: [account] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询币种配置列表 **/ @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.SELECT) @GetMapping("/list") public TableDataInfo list(BdAccountExt bdAccountExt) { startPage(); bdAccountExt.setPkCountry(SecurityUtils.getPkCountry()); - List list = accountService.selectBdAccountList(bdAccountExt); + List list = iBdAccountService.selectBdAccountList(bdAccountExt); return getDataTable(list); } @@ -90,25 +71,21 @@ public class BdAccountController extends ConfigBaseController { @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, BdAccountExt bdAccountExt) { - List list = accountService.selectBdAccountList(bdAccountExt); + List list = iBdAccountService.selectBdAccountList(bdAccountExt); ExcelUtil util = new ExcelUtil<>(BdAccountExt.class); util.exportExcel(response, list, "币种配置"); } /** - * @description: 查询转换币种列表 - * @author: zhang jing - * @date: 2022/10/25 16:20 - * @param: [] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 查询转换币种列表 **/ @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.SELECT) @GetMapping("/pkBdAccountList") public TableDataInfo list() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - queryWrapper.orderByAsc("SORT"); - List list = accountService.list(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdAccount::getPkCountry, SecurityUtils.getPkCountry()); + queryWrapper.orderByAsc(BdAccount::getSort); + List list = iBdAccountService.list(queryWrapper); List paList = new ArrayList<>(); list.forEach(item -> paList.add(BeanUtil.copyProperties(item, PkBdAccountParam.class))); return getDataTable(paList); @@ -116,27 +93,19 @@ public class BdAccountController extends ConfigBaseController { /** - * @description: 充值列表 - * @author: zhang jing - * @date: 2023/7/12 14:06 - * @param: [] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 充值列表 **/ @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.SELECT) @GetMapping("/rechargeList") public TableDataInfo rechargeList(PkBdAccountParam accountParam) { - List list = accountService.queryAccountByType(accountParam.getAccountProperty(), SecurityUtils.getPkCountry()); + List list = iBdAccountService.queryAccountByType(accountParam.getAccountProperty(), SecurityUtils.getPkCountry()); List paList = new ArrayList<>(); list.forEach(item -> paList.add(BeanUtil.copyProperties(item, PkBdAccountParam.class))); return getDataTable(paList); } /** - * @description: 新增币种配置 - * @author: zhang jing - * @date: 2022/8/29 9:58 - * @param: [account] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 新增币种配置 **/ @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.INSERT) @PostMapping("/save") @@ -155,28 +124,28 @@ public class BdAccountController extends ConfigBaseController { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL)); } - QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.eq("SORT", account.getSort()); - queryWrapper1.eq("PK_COUNTRY", pkCountry); - List list1 = accountService.list(queryWrapper1); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BdAccount::getSort, account.getSort()); + queryWrapper1.eq(BdAccount::getPkCountry, pkCountry); + List list1 = iBdAccountService.list(queryWrapper1); if (CollectionUtil.isNotEmpty(list1)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SORT_NOT_REPEAT)); } //校验在线充值 if (StringUtils.isNotNull(account.getOnLineRecharge()) && account.getOnLineRecharge() == EYesNo.YES.getIntValue()) { - QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("ON_LINE_RECHARGE", account.getOnLineRecharge()); - queryWrapper2.eq("PK_COUNTRY", pkCountry); - List list2 = accountService.list(queryWrapper2); + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(BdAccount::getOnLineRecharge, account.getOnLineRecharge()); + queryWrapper2.eq(BdAccount::getPkCountry, pkCountry); + List list2 = iBdAccountService.list(queryWrapper2); if (CollectionUtil.isNotEmpty(list2)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.RECHARGE_NOT_REPEAT)); } } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_COUNTRY", pkCountry); - queryWrapper.eq("FIELD_VALUE", account.getFieldValue()); - List list = accountService.list(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdAccount::getPkCountry, pkCountry); + queryWrapper.eq(BdAccount::getFieldValue, account.getFieldValue()); + List list = iBdAccountService.list(queryWrapper); if (CollectionUtil.isEmpty(list)) { account.setPkCountry(pkCountry); account.setPkCreator(SecurityUtils.getUserId()); @@ -185,18 +154,14 @@ public class BdAccountController extends ConfigBaseController { R pkTransactionKey = iTransactionServiceApi.createTransaction(pkCountry, ETransactionKey.ACCOUNT, account.getAccountName(), EYesNo.YES, EYesNo.NO); account.setPkTransactionKey(pkTransactionKey.getData()); - accountService.save(account); + iBdAccountService.save(account); } sendDelayedMessage(account, EDelayBusType.CURRENCY.getValue(), CacheConstants.BD_ACCOUNT + account.getPkId()); return AjaxResult.success(); } /** - * @description: 修改币种配置 - * @author: zhang jing - * @date: 2022/8/29 9:58 - * @param: [account] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改币种配置 **/ @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.UPDATE) @PostMapping("/update") @@ -214,22 +179,22 @@ public class BdAccountController extends ConfigBaseController { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EFFECTIVE_DATE_NOT_NULL)); } Integer pkCountry = SecurityUtils.getPkCountry(); - QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.eq("PK_COUNTRY", pkCountry); - queryWrapper1.eq("SORT", account.getSort()); - queryWrapper1.ne("PK_ID", account.getPkId()); - List list1 = accountService.list(queryWrapper1); + LambdaQueryWrapper queryWrapper1 = new LambdaQueryWrapper<>(); + queryWrapper1.eq(BdAccount::getPkCountry, pkCountry); + queryWrapper1.eq(BdAccount::getSort, account.getSort()); + queryWrapper1.ne(BdAccount::getPkId, account.getPkId()); + List list1 = iBdAccountService.list(queryWrapper1); if (CollectionUtil.isNotEmpty(list1)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SORT_NOT_REPEAT)); } //校验在线充值 if (account.getOnLineRecharge() == EYesNo.YES.getIntValue()) { - QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("ON_LINE_RECHARGE", account.getOnLineRecharge()); - queryWrapper2.eq("PK_COUNTRY", pkCountry); - queryWrapper2.ne("PK_ID", account.getPkId()); - List list2 = accountService.list(queryWrapper2); + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(BdAccount::getOnLineRecharge, account.getOnLineRecharge()); + queryWrapper2.eq(BdAccount::getPkCountry, pkCountry); + queryWrapper2.ne(BdAccount::getPkId, account.getPkId()); + List list2 = iBdAccountService.list(queryWrapper2); if (CollectionUtil.isNotEmpty(list2)) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.RECHARGE_NOT_REPEAT)); } @@ -263,32 +228,22 @@ public class BdAccountController extends ConfigBaseController { redisService.deleteObject(CacheConstants.BD_ACCOUNT_CHANGE + account.getPkId()); } } - - - return toAjax(accountService.updateById(account)); + return toAjax(iBdAccountService.updateById(account)); } /** - * @description: 获取单条币种配置信息 - * @author: zhang jing - * @date: 2022/8/29 9:58 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 获取单条币种配置信息 **/ @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.SELECT) @GetMapping("/getOne/{pkId}") public AjaxResult getOne(@PathVariable Long pkId) { - BdAccount account = accountService.getById(pkId); + BdAccount account = iBdAccountService.getById(pkId); BdAccountExt accountExt = BeanUtil.copyProperties(account, BdAccountExt.class); return AjaxResult.success(accountExt); } /** - * @description: 修改启用禁用状态 - * @author: zhang jing - * @date: 2022/8/29 9:58 - * @param: [pkId, enable] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 修改启用禁用状态 **/ @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.UPDATE) @PostMapping("/updateEnable/{pkId}/{enable}") @@ -298,23 +253,19 @@ public class BdAccountController extends ConfigBaseController { account.setEnableState(enable); account.setPkModified(SecurityUtils.getUserId()); account.setModifiedTime(new Date()); - accountService.updateById(account); + iBdAccountService.updateById(account); redisService.deleteObject(CacheConstants.BD_ACCOUNT + pkId); redisService.deleteObject(CacheConstants.BD_ACCOUNT_CHANGE + account.getPkId()); return AjaxResult.success(); } /** - * @description: 删除币种配置 - * @author: zhang jing - * @date: 2022/8/29 9:58 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 删除币种配置 **/ @Log(module = EOperationModule.WALLET_CONFIG, business = EOperationBusiness.CURRENCY_CONFIG, method = EOperationMethod.DELETE) @DeleteMapping("/{pkId}") public AjaxResult delete(@PathVariable Long pkId) { - BdAccount account = accountService.getById(pkId); + BdAccount account = iBdAccountService.getById(pkId); BdAccountExt bdAccountExt = new BdAccountExt(); Integer accountCount = 0; if (StringUtils.isNotNull(account)) { @@ -342,19 +293,19 @@ public class BdAccountController extends ConfigBaseController { if (account.getFieldValue() == EAccount.REPURCHASE.getValue()) { bdAccountExt.setAccount8(account.getFieldValue()); } - accountCount = accountService.selectMemberAccountCount(bdAccountExt); + accountCount = iBdAccountService.selectMemberAccountCount(bdAccountExt); } if (accountCount > 0) { return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.ENABLE_STATE_NOT_DELETE)); } else { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(BdAccount::getPkId, pkId); + updateWrapper.set(BdAccount::getDelFlag, EDelFlag.DELETE.getValue()); + updateWrapper.set(BdAccount::getPkModified, SecurityUtils.getUserId()); + updateWrapper.set(BdAccount::getModifiedTime, new Date()); redisService.deleteObject(CacheConstants.BD_ACCOUNT + pkId); redisService.deleteObject(CacheConstants.BD_ACCOUNT_CHANGE + account.getPkId()); - return AjaxResult.success(accountService.update(updateWrapper)); + return AjaxResult.success(iBdAccountService.update(updateWrapper)); } } @@ -370,15 +321,12 @@ public class BdAccountController extends ConfigBaseController { // 返回数据 List enumEntityList = new ArrayList<>(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in(SystemFieldConstants.PK_ID, pkIdList); - List list = accountService.list(queryWrapper); - - // 翻译MAP - Map transactionMap = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_ACC); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(BdAccount::getPkId, pkIdList); + List list = iBdAccountService.list(queryWrapper); for (BdAccount bdAccount : list) { - enumEntityList.add(new EnumEntity(bdAccount.getPkId(), transactionMap.get(bdAccount.getPkTransactionKey()))); + enumEntityList.add(new EnumEntity(bdAccount.getPkId(), bdAccount.getAccountName())); } return AjaxResult.success(enumEntityList);