diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java
index bfd4156f..0fd98ec8 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java
@@ -32,9 +32,6 @@ import java.util.List;
/**
* 会员银行卡 前端控制器
- *
- * @author hzs
- * @since 2022-09-06
*/
@RestController
@RequestMapping("/api/bank")
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java
index 0fcde073..b92ccdd7 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/dto/CuMemberBankParam.java
@@ -1,17 +1,11 @@
package com.hzs.member.account.dto;
-
import lombok.*;
import java.io.Serializable;
/**
- *
* 会员信息-银行卡信息
- *
- *
- * @author hzs
- * @since 2022-08-31
*/
@Data
@AllArgsConstructor
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBankMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBankMapper.java
index abc10cb1..419bf5fc 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBankMapper.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/mapper/CuMemberBankMapper.java
@@ -8,14 +8,13 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
- *
* 会员信息-银行卡信息 Mapper 接口
- *
*
* @author hzs
* @since 2022-08-31
*/
public interface CuMemberBankMapper extends BaseMapper {
+
/**
* 根据会员批量重置银行卡
*
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBankService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBankService.java
index 9c3fcd8e..288c4bc9 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBankService.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBankService.java
@@ -9,14 +9,10 @@ import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
import java.util.List;
/**
- *
* 会员信息-银行卡信息 服务类
- *
- *
- * @author hzs
- * @since 2022-08-31
*/
public interface ICuMemberBankService extends IService {
+
/**
* 根据主键查询银行卡信息
*
@@ -36,8 +32,8 @@ public interface ICuMemberBankService extends IService {
/**
* 解绑银行卡
*
- * @param pkId 银行卡ID
- * @param pkMember 会员ID
+ * @param pkId 银行卡ID
+ * @param pkMember 会员ID
* @return Boolean
*/
Boolean unbindBank(Long pkId, Long pkMember);
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBaseService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBaseService.java
index be17cac1..c2eabbd0 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBaseService.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberBaseService.java
@@ -16,12 +16,6 @@ import java.util.Map;
/**
* 会员服务的公用调用三方服务
- *
- * @Description:
- * @Author: ljc
- * @Time: 2022/10/11 15:21
- * @Classname: ICuMemberBaseService
- * @Package_name: com.hzs.member.account.service
*/
public interface ICuMemberBaseService {
@@ -41,7 +35,6 @@ public interface ICuMemberBaseService {
*/
CurrencyDTO getCurrencyById(Integer currencyId);
-
/**
* 根据ID查询 账户信息
*
@@ -50,7 +43,6 @@ public interface ICuMemberBaseService {
*/
BdAccount getAccount(Integer pkId);
-
/**
* 根据 模块类型、 国家ID查询账户类型
*
@@ -60,7 +52,6 @@ public interface ICuMemberBaseService {
*/
List getAccountByCountry(Integer accountType, Integer pkCountry);
-
/**
* 根据国家ID查询账户类型
*
@@ -69,7 +60,6 @@ public interface ICuMemberBaseService {
*/
List getAccountByCountryId(Integer pkCountry);
-
/**
* 查询翻译的KEY值
*
@@ -78,7 +68,6 @@ public interface ICuMemberBaseService {
*/
Integer translateAccountValue(Integer pkAccount);
-
/**
* 根据币种ID查询币种对应的值
*
@@ -95,7 +84,6 @@ public interface ICuMemberBaseService {
*/
List getAccountValuesByPkCountry(Integer pkCountry);
-
/**
* 金额为正时，只插入MemberTradeDetail
*
@@ -103,7 +91,6 @@ public interface ICuMemberBaseService {
*/
void saveMemberTradeDetail(String sourceCode);
-
/**
* 金额为负时，插入MemberTradeDetail MemberTradeBonus
*
@@ -123,7 +110,6 @@ public interface ICuMemberBaseService {
*/
void handleRepeatMemberTradeDetailAndBonus(List memberAccountList, Integer module);
-
/**
* 从数据库直译币种（导出用）
*
@@ -182,7 +168,6 @@ public interface ICuMemberBaseService {
*/
Boolean isExistRealName(Long pkMember, Integer pkCountry, Integer businessModule);
-
/**
* 操作日志MQ
*/
@@ -196,16 +181,13 @@ public interface ICuMemberBaseService {
* @param accountValue 账户值
* @return Boolean
*/
-
Boolean restPeriodMemberUserWallet(Long pkMember, Integer expireStatus, Integer accountValue);
-
/**
* 会员户籍变更修改续约有效期MQ
*/
void memberContinueMQ(List memberContinueDTOList);
-
/**
* 如果有服务编号优先使用，没有则使用会员编号
*
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java
index 3d9a2ff0..56ddecb5 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/ICuMemberWithdrawService.java
@@ -13,11 +13,9 @@ import java.util.List;
/**
* 会员提现表 服务类
- *
- * @author hzs
- * @since 2022-09-06
*/
public interface ICuMemberWithdrawService extends IService {
+
/**
* 根据用户ID查询用户的提现次数
*
@@ -34,7 +32,6 @@ public interface ICuMemberWithdrawService extends IService {
*/
List selectWithdrawByBatch(String batchNO);
-
/**
* 保存提现
*
@@ -51,7 +48,6 @@ public interface ICuMemberWithdrawService extends IService {
*/
Integer updateWithdrawByCode(MemberAccountAudit memberAccountAudit);
-
/**
* 查询列表信息
*
@@ -60,7 +56,6 @@ public interface ICuMemberWithdrawService extends IService {
*/
Object[] selectMemberWithdrawList(CuMemberWithdrawVO cuMemberWithdrawVO);
-
/**
* 查询提现信息详情
*
@@ -85,7 +80,6 @@ public interface ICuMemberWithdrawService extends IService {
*/
Integer withdrawPaymentPositiveByPkId(CuMemberWithdrawVO memberWithdrawVO);
-
/**
* 获取余额
*
@@ -138,7 +132,6 @@ public interface ICuMemberWithdrawService extends IService {
*/
BigDecimal getAccountBalance(Integer accountsType, CuMemberAccount cuMemberAccount);
-
/**
* @param pkIds 主键集合
* @param approveState 审核状态
@@ -190,7 +183,6 @@ public interface ICuMemberWithdrawService extends IService {
*/
Integer updateWithdrawStatusByPkId(Long pkId, Long pkModified);
-
/**
* 查询会员是否存在提现记录
*
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java
index b7ffdf00..c84915f6 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBankServiceImpl.java
@@ -1,8 +1,8 @@
package com.hzs.member.account.service.impl;
import cn.hutool.core.bean.BeanUtil;
-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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.enums.EBankCardStatus;
import com.hzs.common.core.enums.EDefault;
@@ -20,44 +20,36 @@ import java.util.Date;
import java.util.List;
/**
- *
* 会员信息-银行卡信息 服务实现类
- *
- *
- * @author hzs
- * @since 2022-08-31
*/
@Service
public class CuMemberBankServiceImpl extends ServiceImpl implements ICuMemberBankService {
-
@Override
public CuMemberBankVO selectCuMemberBankById(Long pkId) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("PK_ID", pkId);
- queryWrapper.eq("DEFAULT_CARD", EDefault.YES.getValue());
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(CuMemberBank::getPkId, pkId);
+ queryWrapper.eq(CuMemberBank::getDefaultCard, EDefault.YES.getValue());
CuMemberBank cuMemberBank = this.getOne(queryWrapper);
return cuMemberBank == null ? null : BeanUtil.copyProperties(cuMemberBank, CuMemberBankVO.class);
}
-
@Override
public CuMemberBankVO isBindBank(Long pkMember, Integer pkCountry) {
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("PK_COUNTRY", pkCountry);
- queryWrapper.eq("PK_MEMBER", pkMember);
- queryWrapper.eq("DEFAULT_CARD", EDefault.YES.getValue());
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(CuMemberBank::getPkCountry, pkCountry);
+ queryWrapper.eq(CuMemberBank::getPkMember, pkMember);
+ queryWrapper.eq(CuMemberBank::getDefaultCard, EDefault.YES.getValue());
return BeanUtil.copyProperties(this.getOne(queryWrapper), CuMemberBankVO.class);
}
-
@Override
public Boolean unbindBank(Long pkId, Long pkMember) {
- UpdateWrapper updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue())
- .set("MODIFIED_TIME", new Date())
- .set("PK_MODIFIED", pkMember)
- .eq("PK_ID", pkId);
+ LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.set(CuMemberBank::getDelFlag, EDelFlag.DELETE.getValue())
+ .set(CuMemberBank::getModifiedTime, new Date())
+ .set(CuMemberBank::getPkModified, pkMember)
+ .eq(CuMemberBank::getPkId, pkId);
return update(updateWrapper);
}
@@ -84,8 +76,8 @@ public class CuMemberBankServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("DEFAULT_CARD", EBankCardStatus.YES.getValue()).eq("PK_ID", pkId);
+ LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.set(CuMemberBank::getDefaultCard, EBankCardStatus.YES.getValue()).eq(CuMemberBank::getPkId, pkId);
return update(updateWrapper);
}
@@ -97,11 +89,11 @@ public class CuMemberBankServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>();
- updateWrapper.set("DEFAULT_CARD", EBankCardStatus.NO.getValue())
- .eq("DEFAULT_CARD", EBankCardStatus.YES.getValue())
- .eq("PK_MEMBER", pkMember)
- .eq("PK_COUNTRY", pkCountry);
+ LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.set(CuMemberBank::getDefaultCard, EBankCardStatus.NO.getValue())
+ .eq(CuMemberBank::getDefaultCard, EBankCardStatus.YES.getValue())
+ .eq(CuMemberBank::getPkMember, pkMember)
+ .eq(CuMemberBank::getPkCountry, pkCountry);
return update(updateWrapper);
}
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java
index be088fd6..8db627ac 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberBaseServiceImpl.java
@@ -39,80 +39,58 @@ import java.util.Map;
import java.util.stream.Collectors;
/**
- * @Description:
- * @Author: ljc
- * @Time: 2022/10/11 15:22
- * @Classname: ICuMemberBaseServiceImpl
- * @Package_name: com.hzs.member.account.service.impl
+ * 会员服务的公用调用三方服务
*/
@Service
public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
- @DubboReference
- private ICurrencyServiceApi currencyServiceApi;
-
- @DubboReference
- private IAccountServiceApi accountServiceApi;
-
@Autowired
- private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
-
+ private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired
- private ICuMemberTradeDetailService cuMemberTradeDetailService;
-
+ private ICuMemberTradeDetailService iCuMemberTradeDetailService;
@Autowired
- private ICuMemberTradeBonusService cuMemberTradeBonusService;
-
+ private ICuMemberTradeBonusService iCuMemberTradeBonusService;
@Autowired
- private ICuMemberTradeService cuMemberTradeService;
-
+ private ICuMemberTradeService iCuMemberTradeService;
@Autowired
private ITransactionCommonService iTransactionCommonService;
-
-
@Autowired
- private ICuMemberAuthenticationService authenticationService;
-
-
+ private ICuMemberAuthenticationService iCuMemberAuthenticationService;
@Autowired
- private ICuMemberBusinessLicenseService cuMemberBusinessLicenseService;
-
-
+ private ICuMemberBusinessLicenseService iCuMemberBusinessLicenseService;
@Autowired
private ICuMemberService iCuMemberService;
-
- @DubboReference
- private ITradeConfigServiceApi tradeConfigServiceApi;
-
-
- @DubboReference
- private ICuMemberAgreementWhiteApi cuMemberAgreementWhiteApi;
-
-
@Autowired
private RabbitTemplate rabbitTemplate;
+ @DubboReference
+ ICurrencyServiceApi iCurrencyServiceApi;
+ @DubboReference
+ IAccountServiceApi iAccountServiceApi;
+ @DubboReference
+ ITradeConfigServiceApi iTradeConfigServiceApi;
+ @DubboReference
+ ICuMemberAgreementWhiteApi iCuMemberAgreementWhiteApi;
@Override
public CurrencyDTO getCurrency(Integer pkCountry) {
- R currency = currencyServiceApi.getCurrency(pkCountry);
+ R currency = iCurrencyServiceApi.getCurrency(pkCountry);
return currency.getData();
}
@Override
public CurrencyDTO getCurrencyById(Integer pkId) {
- return currencyServiceApi.getByHistoryPkId(pkId).getData();
+ return iCurrencyServiceApi.getByHistoryPkId(pkId).getData();
}
-
@Override
public BdAccount getAccount(Integer pkId) {
- return accountServiceApi.getAccount(pkId).getData();
+ return iAccountServiceApi.getAccount(pkId).getData();
}
@Override
public List getAccountByCountry(Integer accountType, Integer pkcountry) {
- return accountServiceApi.queryAccountByType(accountType, pkcountry).getData();
+ return iAccountServiceApi.queryAccountByType(accountType, pkcountry).getData();
}
@Override
@@ -121,7 +99,6 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
return awardsKey == null ? pkAccount : awardsKey.getPkTransactionKey();
}
-
@Override
public Integer getAccountValueById(Integer pkAccount) {
BdAccount bdAccount = getAccount(pkAccount);
@@ -130,7 +107,7 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
@Override
public List getAccountByCountryId(Integer pkCountry) {
- return accountServiceApi.queryAccountByType(null, pkCountry).getData();
+ return iAccountServiceApi.queryAccountByType(null, pkCountry).getData();
}
@Override
@@ -143,15 +120,14 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
public void saveMemberTradeDetail(String sourceCode) {
String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, new Date());
//获取期数
- CuMemberSettlePeriod cuMemberSettlePeriodByDate = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date);
- cuMemberTradeDetailService.batchInsertMemberTradeDetailFromTrade(sourceCode, cuMemberSettlePeriodByDate.getPkId());
+ CuMemberSettlePeriod cuMemberSettlePeriodByDate = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(date);
+ iCuMemberTradeDetailService.batchInsertMemberTradeDetailFromTrade(sourceCode, cuMemberSettlePeriodByDate.getPkId());
}
-
@Override
public void handleMemberTradeDetailAndBonus(List memberAccountList, String sourceCode, Map idsMap, Integer module) {
//查询充值奖金币的交易流水
- List cuMemberTradesList = cuMemberTradeService.selectMemberTradeBySourceCode(sourceCode);
+ List cuMemberTradesList = iCuMemberTradeService.selectMemberTradeBySourceCode(sourceCode);
Map map = cuMemberTradesList.stream().collect(Collectors.toMap(CuMemberTrade::getPkMember, o -> o));
for (CuMemberAccount cuMemberAccount : memberAccountList) {
Long pkMember = cuMemberAccount.getPkMember();
@@ -161,7 +137,6 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
}
}
-
@Override
public void handleRepeatMemberTradeDetailAndBonus(List memberAccountList, Integer module) {
for (CuMemberAccountRechargeExt cuMemberAccount : memberAccountList) {
@@ -199,23 +174,21 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
bonus.setPkCountry(cuMemberAccount.getPkCountry());
bonus.setPkCreator(pkModified);
//插入奖金发放流水
- cuMemberTradeBonusService.save(bonus);
+ iCuMemberTradeBonusService.save(bonus);
}
//扣除金额
BigDecimal amount = tradeAmount.add(withdrawAccount);
- List cuMemberTradeDetails = cuMemberTradeDetailService.selectMemberTradeDetailByPkMember(pkMember);
+ List cuMemberTradeDetails = iCuMemberTradeDetailService.selectMemberTradeDetailByPkMember(pkMember);
//扣除可消费金额
deductionConsumeAmount(amount, cuMemberTradeDetails, pkMember, pkId, pkModified, module);
} else {
//扣除可提现金额
CuMemberTradeBonus bonus = gerCuMemberTradeBonus(pkMember, pkId, null, tradeAmount, cuMemberAccount.getPkCountry(), pkModified, module);
//插入奖金发放流水
- cuMemberTradeBonusService.save(bonus);
+ iCuMemberTradeBonusService.save(bonus);
}
-
}
-
/**
* 扣费（包括重复会员金额）
*
@@ -244,20 +217,19 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
bonus.setPkCountry(cuMemberAccount.getPkCountry());
bonus.setPkCreator(pkModified);
//插入奖金发放流水
- cuMemberTradeBonusService.save(bonus);
+ iCuMemberTradeBonusService.save(bonus);
}
//扣除金额
BigDecimal amount = tradeAmount.add(withdrawAccount);
- List cuMemberTradeDetails = cuMemberTradeDetailService.selectMemberTradeDetailByPkMember(pkMember);
+ List cuMemberTradeDetails = iCuMemberTradeDetailService.selectMemberTradeDetailByPkMember(pkMember);
//扣除可消费金额
deductionConsumeAmount(amount, cuMemberTradeDetails, pkMember, pkId, pkModified, module);
} else {
//扣除可提现金额
CuMemberTradeBonus bonus = gerCuMemberTradeBonus(pkMember, pkId, null, tradeAmount, cuMemberAccount.getPkCountry(), pkModified, module);
//插入奖金发放流水
- cuMemberTradeBonusService.save(bonus);
+ iCuMemberTradeBonusService.save(bonus);
}
-
}
/**
@@ -276,21 +248,20 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
//更新余额为零
CuMemberTradeDetail detail = CuMemberTradeDetail.builder().pkId(detailPkId)
.consumeMoney(BigDecimal.ZERO).build();
- cuMemberTradeDetailService.updateById(detail);
+ iCuMemberTradeDetailService.updateById(detail);
CuMemberTradeBonus bonus = gerCuMemberTradeBonus(pkMember, pkId, detailPkId, consumeMoney, cuMemberTradeDetail.getPkCountry(), pkModified, module);
//插入奖金发放流水
- cuMemberTradeBonusService.save(bonus);
+ iCuMemberTradeBonusService.save(bonus);
} else {
//更新余额值
CuMemberTradeDetail detail = CuMemberTradeDetail.builder().pkId(detailPkId)
.consumeMoney(balance).build();
- cuMemberTradeDetailService.updateById(detail);
+ iCuMemberTradeDetailService.updateById(detail);
CuMemberTradeBonus bonus = gerCuMemberTradeBonus(pkMember, pkId, detailPkId, consumeMoney.subtract(balance), cuMemberTradeDetail.getPkCountry(), pkModified, module);
//插入奖金发放流水
- cuMemberTradeBonusService.save(bonus);
+ iCuMemberTradeBonusService.save(bonus);
break;
}
-
}
}
@@ -327,9 +298,9 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
public Boolean verificationRealNameAndLicense(Long pkMember, Integer pkCountry) {
boolean result = true;
//查询是否已实名认证
- CuMemberAuthenticationVO authenticationVO = authenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build());
+ CuMemberAuthenticationVO authenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build());
if (null != authenticationVO && StringUtils.isNotEmpty(authenticationVO.getAccountName())) {
- CuMemberBusinessLicenseVO cuMemberBusinessLicenseVO = cuMemberBusinessLicenseService.selectBusinessLicenseById(pkMember, pkCountry);
+ CuMemberBusinessLicenseVO cuMemberBusinessLicenseVO = iCuMemberBusinessLicenseService.selectBusinessLicenseById(pkMember, pkCountry);
if (null != cuMemberBusinessLicenseVO && StringUtils.isNotEmpty(cuMemberBusinessLicenseVO.getLegalName())) {
String accountName = authenticationVO.getAccountName();
//法人姓名
@@ -351,7 +322,7 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
whiteDTO.setTransferState(EYesNo.YES.getIntValue());
}
//查询配置实名认证白名证
- return tradeConfigServiceApi.selectTradeWhiteConfigByCondition(whiteDTO).getData();
+ return iTradeConfigServiceApi.selectTradeWhiteConfigByCondition(whiteDTO).getData();
}
@Override
@@ -367,12 +338,12 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
tradeConfigDTO.setLicenseState(EYesNo.YES.getIntValue());
}
//查询配置是否实名认证
- return tradeConfigServiceApi.selectTradeConfigByCondition(tradeConfigDTO).getData();
+ return iTradeConfigServiceApi.selectTradeConfigByCondition(tradeConfigDTO).getData();
}
@Override
public Boolean isExistBusinessLicence(Long pkMember, Integer pkCountry, Integer businessModule) {
- Boolean result = true;
+ boolean result = true;
//查询配置白名单
BdTradeWhiteConfig bdTradeWhiteConfig = selectConfigWhite(pkMember, pkCountry, businessModule);
if (null == bdTradeWhiteConfig) {
@@ -382,7 +353,7 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
if (null != bdTradeConfig) {
//查询是否完成经销商认证
CuMember cuMember = iCuMemberService.queryMember(pkMember);
- result = null != cuMember && cuMember.getIsDealer().equals(EYesNo.YES.getIntValue()) ? true : false;
+ result = null != cuMember && cuMember.getIsDealer().equals(EYesNo.YES.getIntValue());
}
}
return result;
@@ -390,7 +361,7 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
@Override
public Boolean isExistRealName(Long pkMember, Integer pkCountry, Integer businessModule) {
- Boolean result = true;
+ boolean result = true;
//查询配置实名认证白名证
BdTradeWhiteConfig bdTradeWhiteConfig = selectConfigWhite(pkMember, pkCountry, businessModule);
if (null == bdTradeWhiteConfig) {
@@ -399,25 +370,23 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
//配置后才进行验证
if (null != bdTradeConfig) {
//查询是否已实名认证
- CuMemberAuthenticationVO authenticationVO = authenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build());
- result = null == authenticationVO ? false : true;
+ CuMemberAuthenticationVO authenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build());
+ result = null != authenticationVO;
}
}
return result;
}
-
@Override
public void operationLogMQ(List businessLogDTOList) {
rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, businessLogDTOList);
}
-
@Override
public Boolean restPeriodMemberUserWallet(Long pkMember, Integer expireStatus, Integer accountValue) {
if (accountValue.equals(EAccount.BONUS.getValue())) {
//查询配置是否休止期可以使用钱包
- Integer num = cuMemberAgreementWhiteApi.selectAgreementWhiteByPkMember(pkMember).getData();
+ Integer num = iCuMemberAgreementWhiteApi.selectAgreementWhiteByPkMember(pkMember).getData();
//休止期而且不在白名单内不允许使用钱包
if (expireStatus.equals(EExpireStatus.REST.getValue()) && num == 0) {
return Boolean.TRUE;
@@ -426,13 +395,11 @@ public class CuMemberBaseServiceImpl implements ICuMemberBaseService {
return Boolean.FALSE;
}
-
@Override
public void memberContinueMQ(List memberContinueDTOList) {
rabbitTemplate.convertAndSend(RabbitMqConstants.MEMBER_CONTINUE_EXCHANGE, RabbitMqConstants.MEMBER_CONTINUE_KEY, memberContinueDTOList);
}
-
@Override
public String getMemberName(CuMember cuMember) {
return CommonUtil.getMemberCode(cuMember.getMemberCode(), cuMember.getServiceCode());
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java
index 4e773aa6..63665a0d 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/service/impl/CuMemberWithdrawServiceImpl.java
@@ -51,9 +51,6 @@ import java.util.stream.Collectors;
/**
* 会员提现表 服务实现类
- *
- * @author hzs
- * @since 2022-09-06
*/
@Service
@Slf4j
@@ -124,7 +121,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl 0 && balance.compareTo(upperBound) < 0) {
- log.info("----------提现开始");
int times = withdrawTimes.get(pkMember) == null ? 0 : withdrawTimes.get(pkMember);
//比较正在提现次数与配置的最大提现次数
if (times <= withdrawalNumber) {
@@ -400,7 +390,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl checkWithdrawPetitionByState(List pkIds, Integer approveState) {
return BeanUtil.copyToList(baseMapper.showMemberWithdrawPetition(pkIds, approveState), CuMemberWithdrawVO.class);
@@ -734,4 +721,5 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl selectWithdrawMember(Integer pkCountry, Long pkMember) {
return baseMapper.selectWithdrawMember(pkCountry, pkMember);
}
+
}
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberBankMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberBankMapper.xml
index e2dfc1ee..f1cd1df2 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberBankMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberBankMapper.xml
@@ -2,27 +2,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
update cu_member_bank b
set b.del_flag = 1, b.modified_time = sysdate, b.pk_modified = #{updatePkMember}
@@ -33,23 +12,22 @@
-
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/controller/BaseController.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/controller/BaseController.java
index 9f8e19b4..9e8df437 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/controller/BaseController.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/web/controller/BaseController.java
@@ -16,8 +16,6 @@ import com.hzs.common.core.web.page.TableDataInfo;
/**
* web层通用数据处理
- *
- * @author hzs
*/
@Slf4j
public class BaseController {