## 优化部门绑定银行卡写法；
This commit is contained in:
parent
80fb1966ac
commit
d0ecbe4901
|
|
@ -32,9 +32,6 @@ import java.util.List;
|
|||
|
||||
/**
|
||||
* 会员银行卡 前端控制器
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-09-06
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/api/bank")
|
||||
|
|
|
|||
|
|
@ -1,17 +1,11 @@
|
|||
package com.hzs.member.account.dto;
|
||||
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员信息-银行卡信息
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-08-31
|
||||
*/
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
|
|
|
|||
|
|
@ -8,14 +8,13 @@ import org.apache.ibatis.annotations.Param;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员信息-银行卡信息 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-08-31
|
||||
*/
|
||||
public interface CuMemberBankMapper extends BaseMapper<CuMemberBank> {
|
||||
|
||||
/**
|
||||
* 根据会员批量重置银行卡
|
||||
*
|
||||
|
|
|
|||
|
|
@ -9,14 +9,10 @@ import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
|
|||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员信息-银行卡信息 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-08-31
|
||||
*/
|
||||
public interface ICuMemberBankService extends IService<CuMemberBank> {
|
||||
|
||||
/**
|
||||
* 根据主键查询银行卡信息
|
||||
*
|
||||
|
|
@ -36,8 +32,8 @@ public interface ICuMemberBankService extends IService<CuMemberBank> {
|
|||
/**
|
||||
* 解绑银行卡
|
||||
*
|
||||
* @param pkId 银行卡ID
|
||||
* @param pkMember 会员ID
|
||||
* @param pkId 银行卡ID
|
||||
* @param pkMember 会员ID
|
||||
* @return Boolean
|
||||
*/
|
||||
Boolean unbindBank(Long pkId, Long pkMember);
|
||||
|
|
|
|||
|
|
@ -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<BdAccount> getAccountByCountry(Integer accountType, Integer pkCountry);
|
||||
|
||||
|
||||
/**
|
||||
* 根据国家ID查询账户类型
|
||||
*
|
||||
|
|
@ -69,7 +60,6 @@ public interface ICuMemberBaseService {
|
|||
*/
|
||||
List<BdAccount> getAccountByCountryId(Integer pkCountry);
|
||||
|
||||
|
||||
/**
|
||||
* 查询翻译的KEY值
|
||||
*
|
||||
|
|
@ -78,7 +68,6 @@ public interface ICuMemberBaseService {
|
|||
*/
|
||||
Integer translateAccountValue(Integer pkAccount);
|
||||
|
||||
|
||||
/**
|
||||
* 根据币种ID查询币种对应的值
|
||||
*
|
||||
|
|
@ -95,7 +84,6 @@ public interface ICuMemberBaseService {
|
|||
*/
|
||||
List<Integer> 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<CuMemberAccountRechargeExt> 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<MemberContinueDTO> memberContinueDTOList);
|
||||
|
||||
|
||||
/**
|
||||
* 如果有服务编号优先使用，没有则使用会员编号
|
||||
*
|
||||
|
|
|
|||
|
|
@ -13,11 +13,9 @@ import java.util.List;
|
|||
|
||||
/**
|
||||
* 会员提现表 服务类
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-09-06
|
||||
*/
|
||||
public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
|
||||
|
||||
/**
|
||||
* 根据用户ID查询用户的提现次数
|
||||
*
|
||||
|
|
@ -34,7 +32,6 @@ public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
|
|||
*/
|
||||
List<CuMemberWithdraw> selectWithdrawByBatch(String batchNO);
|
||||
|
||||
|
||||
/**
|
||||
* 保存提现
|
||||
*
|
||||
|
|
@ -51,7 +48,6 @@ public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
|
|||
*/
|
||||
Integer updateWithdrawByCode(MemberAccountAudit memberAccountAudit);
|
||||
|
||||
|
||||
/**
|
||||
* 查询列表信息
|
||||
*
|
||||
|
|
@ -60,7 +56,6 @@ public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
|
|||
*/
|
||||
Object[] selectMemberWithdrawList(CuMemberWithdrawVO cuMemberWithdrawVO);
|
||||
|
||||
|
||||
/**
|
||||
* 查询提现信息详情
|
||||
*
|
||||
|
|
@ -85,7 +80,6 @@ public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
|
|||
*/
|
||||
Integer withdrawPaymentPositiveByPkId(CuMemberWithdrawVO memberWithdrawVO);
|
||||
|
||||
|
||||
/**
|
||||
* 获取余额
|
||||
*
|
||||
|
|
@ -138,7 +132,6 @@ public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
|
|||
*/
|
||||
BigDecimal getAccountBalance(Integer accountsType, CuMemberAccount cuMemberAccount);
|
||||
|
||||
|
||||
/**
|
||||
* @param pkIds 主键集合
|
||||
* @param approveState 审核状态
|
||||
|
|
@ -190,7 +183,6 @@ public interface ICuMemberWithdrawService extends IService<CuMemberWithdraw> {
|
|||
*/
|
||||
Integer updateWithdrawStatusByPkId(Long pkId, Long pkModified);
|
||||
|
||||
|
||||
/**
|
||||
* 查询会员是否存在提现记录
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 会员信息-银行卡信息 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author hzs
|
||||
* @since 2022-08-31
|
||||
*/
|
||||
@Service
|
||||
public class CuMemberBankServiceImpl extends ServiceImpl<CuMemberBankMapper, CuMemberBank> implements ICuMemberBankService {
|
||||
|
||||
|
||||
@Override
|
||||
public CuMemberBankVO selectCuMemberBankById(Long pkId) {
|
||||
QueryWrapper<CuMemberBank> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("PK_ID", pkId);
|
||||
queryWrapper.eq("DEFAULT_CARD", EDefault.YES.getValue());
|
||||
LambdaQueryWrapper<CuMemberBank> 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<CuMemberBank> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("PK_COUNTRY", pkCountry);
|
||||
queryWrapper.eq("PK_MEMBER", pkMember);
|
||||
queryWrapper.eq("DEFAULT_CARD", EDefault.YES.getValue());
|
||||
LambdaQueryWrapper<CuMemberBank> 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<CuMemberBank> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue())
|
||||
.set("MODIFIED_TIME", new Date())
|
||||
.set("PK_MODIFIED", pkMember)
|
||||
.eq("PK_ID", pkId);
|
||||
LambdaUpdateWrapper<CuMemberBank> 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<CuMemberBankMapper, CuM
|
|||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean updateDefault(Long pkId, Long pkMember, Integer pkCountry) {
|
||||
updateMemberBankCardToDefault(pkMember, pkCountry);
|
||||
UpdateWrapper<CuMemberBank> updateWrapper = new UpdateWrapper<>();
|
||||
updateWrapper.set("DEFAULT_CARD", EBankCardStatus.YES.getValue()).eq("PK_ID", pkId);
|
||||
LambdaUpdateWrapper<CuMemberBank> 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<CuMemberBankMapper, CuM
|
|||
* @return Boolean
|
||||
*/
|
||||
public Boolean updateMemberBankCardToDefault(Long pkMember, Integer pkCountry) {
|
||||
UpdateWrapper<CuMemberBank> 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<CuMemberBank> 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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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<CurrencyDTO> currency = currencyServiceApi.getCurrency(pkCountry);
|
||||
R<CurrencyDTO> 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<BdAccount> 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<BdAccount> 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<CuMemberAccount> memberAccountList, String sourceCode, Map<Long, Long> idsMap, Integer module) {
|
||||
//查询充值奖金币的交易流水
|
||||
List<CuMemberTrade> cuMemberTradesList = cuMemberTradeService.selectMemberTradeBySourceCode(sourceCode);
|
||||
List<CuMemberTrade> cuMemberTradesList = iCuMemberTradeService.selectMemberTradeBySourceCode(sourceCode);
|
||||
Map<Long, CuMemberTrade> 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<CuMemberAccountRechargeExt> 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<CuMemberTradeDetail> cuMemberTradeDetails = cuMemberTradeDetailService.selectMemberTradeDetailByPkMember(pkMember);
|
||||
List<CuMemberTradeDetail> 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<CuMemberTradeDetail> cuMemberTradeDetails = cuMemberTradeDetailService.selectMemberTradeDetailByPkMember(pkMember);
|
||||
List<CuMemberTradeDetail> 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<BusinessLogDTO> 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<MemberContinueDTO> 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());
|
||||
|
|
|
|||
|
|
@ -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<CuMemberWithdrawMap
|
|||
Integer row = baseMapper.insert(cuMemberWithdraw);
|
||||
this.updateTradeAndBalancd(cuMemberWithdraw, EOperationMethod.INSERT);
|
||||
return row;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -197,7 +193,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
return baseMapper.updateWithdrawByCode(cuMemberWithdraw);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Object[] selectMemberWithdrawList(CuMemberWithdrawVO memberWithdrawVO) {
|
||||
CuMemberWithdrawVO cuMemberWithdrawVO;
|
||||
|
|
@ -215,10 +210,8 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
cuMemberWithdrawVoS.add(BeanUtil.copyProperties(cuMemberWithdrawExt, CuMemberWithdrawVO.class));
|
||||
}
|
||||
return new Object[]{cuMemberWithdrawExts, cuMemberWithdrawVoS};
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 页面显示公用参数
|
||||
*
|
||||
|
|
@ -276,7 +269,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
cuMemberWithdrawVO.setPkAccount(iCuMemberBaseService.translateAccountValue(pkAccount));
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public CuMemberWithdrawVO queryCuMemberWithdrawDetail(Long pkId) {
|
||||
CuMemberWithdrawVO memberRechargeDetailVo = new CuMemberWithdrawVO();
|
||||
|
|
@ -293,7 +285,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
return baseMapper.withdrawPaymentByPkId(cuMemberWithdraw);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Integer withdrawPaymentPositiveByPkId(CuMemberWithdrawVO memberWithdrawVO) {
|
||||
|
|
@ -369,7 +360,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
balance = computeRounding(withdrawal, balance);
|
||||
// 提现金额在配置金额之间
|
||||
if (balance.compareTo(lowerBound) > 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<CuMemberWithdrawMap
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 获取余额
|
||||
*
|
||||
|
|
@ -461,7 +450,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
if (dayOfWeekNum.equals(withdrawalCycle)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -566,7 +554,6 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
return memberPetitionVo;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<CuMemberWithdrawVO> checkWithdrawPetitionByState(List<Long> pkIds, Integer approveState) {
|
||||
return BeanUtil.copyToList(baseMapper.showMemberWithdrawPetition(pkIds, approveState), CuMemberWithdrawVO.class);
|
||||
|
|
@ -734,4 +721,5 @@ public class CuMemberWithdrawServiceImpl extends ServiceImpl<CuMemberWithdrawMap
|
|||
public List<Long> selectWithdrawMember(Integer pkCountry, Long pkMember) {
|
||||
return baseMapper.selectWithdrawMember(pkCountry, pkMember);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,27 +2,6 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.hzs.member.account.mapper.CuMemberBankMapper">
|
||||
|
||||
<!-- 通用查询映射结果 -->
|
||||
<resultMap id="BaseResultMap" type="com.hzs.common.domain.member.account.CuMemberBank">
|
||||
<id column="PK_ID" property="pkId" />
|
||||
<result column="DEL_FLAG" property="delFlag" />
|
||||
<result column="PK_CREATOR" property="pkCreator" />
|
||||
<result column="CREATION_TIME" property="creationTime" />
|
||||
<result column="PK_MODIFIED" property="pkModified" />
|
||||
<result column="MODIFIED_TIME" property="modifiedTime" />
|
||||
<result column="PK_COUNTRY" property="pkCountry" />
|
||||
<result column="PK_MEMBER" property="pkMember"/>
|
||||
<result column="BANK_NAME" property="bankName" />
|
||||
<result column="SUB_BANK_NAME" property="subBankName" />
|
||||
<result column="ACCOUNT_NAME" property="accountName" />
|
||||
<result column="CARD_NUMBER" property="cardNumber" />
|
||||
<result column="ID_CARD" property="idCard" />
|
||||
<result column="PHONE" property="phone" />
|
||||
<result column="PK_BANK" property="pkBank" />
|
||||
<result column="DEFAULT_CARD" property="defaultCard" />
|
||||
|
||||
</resultMap>
|
||||
|
||||
<update id="batchUpdateBankBypkMembers">
|
||||
update cu_member_bank b
|
||||
set b.del_flag = 1, b.modified_time = sysdate, b.pk_modified = #{updatePkMember}
|
||||
|
|
@ -33,23 +12,22 @@
|
|||
</update>
|
||||
|
||||
<select id="selectBankCardByPkMember" resultType="com.hzs.common.domain.member.account.CuMemberBankExt">
|
||||
select mb.pk_id pkId,
|
||||
select mb.pk_id pkId,
|
||||
mb.card_number cardNumber,
|
||||
mb.default_card defaultCard,
|
||||
b.pk_transaction pkBank,
|
||||
b.background_img backgroundImg,
|
||||
b.bank_name bankName,
|
||||
b.bank_name bankName,
|
||||
b.logo
|
||||
from cu_member_bank mb
|
||||
left join bd_bank b
|
||||
on mb.pk_bank = b.pk_id
|
||||
and b.del_flag = 0
|
||||
and b.enable_state = 0
|
||||
where mb.del_flag = 0
|
||||
and mb.pk_country = #{pkCountry}
|
||||
and mb.pk_member = #{pkMember}
|
||||
order by mb.default_card desc
|
||||
from cu_member_bank mb
|
||||
left join bd_bank b
|
||||
on mb.pk_bank = b.pk_id
|
||||
and b.del_flag = 0
|
||||
and b.enable_state = 0
|
||||
where mb.del_flag = 0
|
||||
and mb.pk_country = #{pkCountry}
|
||||
and mb.pk_member = #{pkMember}
|
||||
order by mb.default_card desc
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ import com.hzs.common.core.web.page.TableDataInfo;
|
|||
|
||||
/**
|
||||
* web层通用数据处理
|
||||
*
|
||||
* @author hzs
|
||||
*/
|
||||
@Slf4j
|
||||
public class BaseController {
|
||||
|
|
|
|||
Loading…
Reference in New Issue