angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 政策币支持血缘下可用；

This commit is contained in:
cabbage 2025-05-07 11:06:26 +08:00
parent da8601faa4
commit f82bc64e4c
18 changed files with 377 additions and 856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bd-api/bd-api-member/src/main/java/com/hzs/member/detail/ICuMemberServiceLogServiceApi.java
View File

@ -1,18 +1,11 @@
package com.hzs.member.detail;
import com.hzs.common.core.domain.R;
import com.hzs.common.domain.member.business.UpPolicyCurrency;
import com.hzs.common.domain.member.detail.CuMemberServiceLog;
import com.hzs.common.domain.member.detail.CuMemberServiceLogExt;
import java.util.List;
/**
* @Description:
* @Author: sui q
* @Time: 2023/3/13 19:02
* @Classname: ICuMemberServiceLogServiceApi
* @PackageName: com.hzs.member.detail
*/
public interface ICuMemberServiceLogServiceApi {
/**
@ -21,11 +14,8 @@ public interface ICuMemberServiceLogServiceApi {
* @param pkMember 会员编号
* @param editTypeList 查询类型
* @return: List<CuMemberServiceLog>
* @Author: sui q
* @Date: 2023/3/13 18:51
*/
List<CuMemberServiceLog> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> editTypeList);
R<UpPolicyCurrency> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> editTypeList);
/**
* 查询最大审核次数
@ -59,31 +49,6 @@ public interface ICuMemberServiceLogServiceApi {
*/
R<Boolean> updateByBusinessNo(CuMemberServiceLog memberLog);
/**
* @description: 根据业务单号查询业务日志
* @author: zhang jing
* @date: 2023/7/29 11:15
* @param: [businessNo]
* @return: com.hzs.common.core.domain.R<java.util.List < com.hzs.common.domain.member.detail.CuMemberServiceLog>>
**/
R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo);
/**
* 查询指定会员政策币信息
*
* @param pkMember 会员ID
* @return
*/
R<CuMemberServiceLogExt> queryPolicy(Long pkMember);
/**
* @param pkMember 会员主键 pkMember
* @param approvalBusiness 类型 EApprovalBusiness
* @param approveStatus 提交签呈状态 EApproveStatus
* @return
*/
R<Integer> queryCount(Long pkMember, Integer approvalBusiness, Integer approveStatus);
/**
* 查询最新一条变动记录
*

17
bd-api/bd-api-system/src/main/java/com/hzs/system/config/IServiceChargeServiceApi.java
View File

@ -6,21 +6,16 @@ import com.hzs.system.config.dto.ServiceChargeDTO;
import java.util.List;
/**
* @Description: 办理业务手续费api
* @Author: zhangjing
* @Time: 2022/9/9 14:07
* @Classname: IGradeServiceApi
* @PackageName: com.hzs.system.config
* 办理业务手续费api
*/
public interface IServiceChargeServiceApi {
/**
* @description: 根据业务类型查询扣款
* @author: zhang jing
* @date: 2023/1/7 15:01
* @param: [type, quantity]
* @return: com.hzs.common.core.domain.R<com.hzs.system.config.dto.ServiceChargeDTO>
**/
* 根据业务类型查询扣款
*
* @param serviceChargeDTO
* @return
*/
R<ServiceChargeDTO> getServiceChargeByType(ServiceChargeDTO serviceChargeDTO);
/**

74
bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberTransferController.java
View File

@ -51,33 +51,28 @@ import java.util.stream.Collectors;
/**
* 会员提现表 前端控制器
*
* @author hzs
* @since 2022-09-06
*/
@RestController
@RequestMapping("/api/transfer")
public class ApiCuMemberTransferController extends BaseController {
@Autowired
ICuMemberService cuMemberService;
ICuMemberService iCuMemberService;
@Autowired
ICuMemberTransferService cuMemberTransferService;
ICuMemberTransferService iCuMemberTransferService;
@Autowired
ICuMemberBaseService cuMemberBaseService;
ICuMemberBaseService iCuMemberBaseService;
@Autowired
ICuMemberAccountService cuMemberAccountService;
ICuMemberAccountService iCuMemberAccountService;
@Autowired
ICuMemberBaseService memberBaseService;
@Autowired
ICuMemberServiceLogService memberServiceLogService;
ICuMemberServiceLogService iCuMemberServiceLogService;
@DubboReference
IAccountServiceApi accountServiceApi;
IAccountServiceApi iAccountServiceApi;
@DubboReference
IGradeServiceApi gradeServiceApi;
IGradeServiceApi iGradeServiceApi;
@DubboReference
ITradeConfigServiceApi tradeConfigServiceApi;
ITradeConfigServiceApi iTradeConfigServiceApi;
/**
@ -91,7 +86,7 @@ public class ApiCuMemberTransferController extends BaseController {
return AjaxResult.error("编号不能为空");
}
CuMember member = cuMemberService.getMemberByCode(memberCode);
CuMember member = iCuMemberService.getMemberByCode(memberCode);
if (member != null) {
//转出账户会员
Long pk_member = SecurityUtils.getUserId();
@ -99,7 +94,7 @@ public class ApiCuMemberTransferController extends BaseController {
String memberName = member.getMemberName();
//如果是转入会员显示昵称
if (!pk_member.equals(member.getPkId())) {
memberName = cuMemberBaseService.getMemberNameByVertex(member);
memberName = iCuMemberBaseService.getMemberNameByVertex(member);
} else {
memberName = DesensitizedUtil.chineseName(memberName);
}
@ -116,7 +111,7 @@ public class ApiCuMemberTransferController extends BaseController {
public AjaxResult getAccount() {
Integer pkCountry = SecurityUtils.getPkCountry();
Long pkMember = SecurityUtils.getUserId();
List<BdAccount> accountList = cuMemberBaseService.getAccountByCountry(EAccountProperty.IS_TRANSFER.getValue(), pkCountry);
List<BdAccount> accountList = iCuMemberBaseService.getAccountByCountry(EAccountProperty.IS_TRANSFER.getValue(), pkCountry);
//查询用户、体系是否开通政策币
List<CuMemberServiceLog> logList = getServiceLogValue(pkCountry, pkMember);
if (CollUtil.isNotEmpty(logList)) {
@ -131,12 +126,11 @@ public class ApiCuMemberTransferController extends BaseController {
Integer transfer = upPolicyCurrencyVO.getTransfer();
if (null != enableStatus && null != transfer) {
if (enableStatus.equals(EnableStatus.ENABLE.getValue()) && transfer.equals(EPopupType.ALLOW.getValue())) {
BdAccount bdAccount = accountServiceApi.getBdAccountByFieldValue(pkCountry, EAccount.POLICY.getValue()).getData();
BdAccount bdAccount = iAccountServiceApi.getBdAccountByFieldValue(pkCountry, EAccount.POLICY.getValue()).getData();
accountList.add(bdAccount);
}
}
}
//根据配置的账户白名单增加可转账的账户
this.getAccountByTransferWhite(pkMember, pkCountry, accountList);
return AjaxResult.success(BeanUtil.copyToList(accountList, BdAccountVO.class));
@ -151,9 +145,9 @@ public class ApiCuMemberTransferController extends BaseController {
*/
private void getAccountByTransferWhite(Long pkMember, Integer pkCountry, List<BdAccount> accountList) {
//查询转账账户白名单配置
List<Integer> transferWhiteList = tradeConfigServiceApi.selectTransferWhiteByPkMember(pkMember, pkCountry).getData();
List<Integer> transferWhiteList = iTradeConfigServiceApi.selectTransferWhiteByPkMember(pkMember, pkCountry).getData();
if (CollUtil.isNotEmpty(transferWhiteList)) {
List<BdAccount> allAccounts = cuMemberBaseService.getAccountByCountryId(pkCountry);
List<BdAccount> allAccounts = iCuMemberBaseService.getAccountByCountryId(pkCountry);
Map<Integer, BdAccount> map = allAccounts.stream().collect(Collectors.toMap(BdAccount::getPkId, o -> o));
transferWhiteList.forEach(pkAccount -> {
BdAccount bdAccount = map.get(pkAccount);
@ -171,10 +165,9 @@ public class ApiCuMemberTransferController extends BaseController {
* @param pkMember 会员ID
* @return List<CuMemberServiceLog>
*/
private List<CuMemberServiceLog> getServiceLogValue(Integer pkCountry, Long pkMember) {
//查询体系
CuMember cuMember = cuMemberService.queryMember(pkMember);
CuMember cuMember = iCuMemberService.queryMember(pkMember);
Long pkVertex = cuMember.getPkVertex();
List<Integer> editTypeList = Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
@ -183,10 +176,9 @@ public class ApiCuMemberTransferController extends BaseController {
log.setPkVertex(pkVertex);
log.setPkCountry(pkCountry);
log.setEditTypeList(editTypeList);
return memberServiceLogService.selectServiceValue(log);
return iCuMemberServiceLogService.selectServiceValue(log);
}
/**
* 用户转账
*
@ -201,7 +193,7 @@ public class ApiCuMemberTransferController extends BaseController {
Long pkMember = SecurityUtils.getUserId();
String memberCode = SecurityUtils.getMemberCode();
CuMemberExt member = cuMemberService.getMemberByCode(memberCode);
CuMemberExt member = iCuMemberService.getMemberByCode(memberCode);
Assert.notNull(member, TransactionUtils.getContent(FinanceMsgConstants.TRANSFER_OUT_USER_NOT_EXIST));
//币种ID
@ -219,13 +211,13 @@ public class ApiCuMemberTransferController extends BaseController {
//接收方
String toMemberCode = cuMemberTransferParam.getToMemberCode();
BdAccount bdAccount = accountServiceApi.getAccount(pkAccount).getData();
BdAccount bdAccount = iAccountServiceApi.getAccount(pkAccount).getData();
Integer accountsType = bdAccount.getFieldValue();
//中国区校验
if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
Integer expireStatus = member.getExpireStatus();
//休止期的会员不允许转账
Boolean restPeriodStatus = memberBaseService.restPeriodMemberUserWallet(pkMember, expireStatus, accountsType);
Boolean restPeriodStatus = iCuMemberBaseService.restPeriodMemberUserWallet(pkMember, expireStatus, accountsType);
if (restPeriodStatus) {
return AjaxResult.error(FinanceMsgConstants.REST_PERIOD_NOT_TRANSFER);
}
@ -235,12 +227,12 @@ public class ApiCuMemberTransferController extends BaseController {
}
//校验是否实名
Boolean existRealName = memberBaseService.isExistRealName(pkMember, pkCountry, EBusinessModule.TRANSFER_ACCOUNTS.getValue());
Boolean existRealName = iCuMemberBaseService.isExistRealName(pkMember, pkCountry, EBusinessModule.TRANSFER_ACCOUNTS.getValue());
if (!existRealName) {
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.REAL_NAME_NOT_EXIST));
}
//校验是否经销商认证
Boolean existBusinessLicence = memberBaseService.isExistBusinessLicence(pkMember, pkCountry, EBusinessModule.TRANSFER_ACCOUNTS.getValue());
Boolean existBusinessLicence = iCuMemberBaseService.isExistBusinessLicence(pkMember, pkCountry, EBusinessModule.TRANSFER_ACCOUNTS.getValue());
if (!existBusinessLicence) {
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.LICENSE_NOT_EXIST));
}
@ -251,7 +243,7 @@ public class ApiCuMemberTransferController extends BaseController {
}
//配置信息
BdTransfer bdTransfer = cuMemberTransferService.getBdTransfer(pkCountry);
BdTransfer bdTransfer = iCuMemberTransferService.getBdTransfer(pkCountry);
if (null == bdTransfer) {
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.CONFIGURE_TRANSFER_CONFIGURATION));
}
@ -278,7 +270,7 @@ public class ApiCuMemberTransferController extends BaseController {
}
//查询账户信息
CuMemberAccount cuMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
CuMemberAccount cuMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(pkMember);
//是否转账
Integer isTransfer = cuMemberAccount.getIsTransfer();
//是否允许转账
@ -286,8 +278,7 @@ public class ApiCuMemberTransferController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.NOT_ALLOWED_TRANSFER));
}
CuMember toMember = cuMemberService.getMemberByCode(toMemberCode);
CuMember toMember = iCuMemberService.getMemberByCode(toMemberCode);
Assert.notNull(toMember, TransactionUtils.getContent(FinanceMsgConstants.TRANSFER_IN_USER_NOT_EXIST));
Long toPkMember = toMember.getPkId();
//禁止登录的用户无法接受转账
@ -296,7 +287,7 @@ public class ApiCuMemberTransferController extends BaseController {
}
//中国区校验
if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
GradeDTO gradeDTO = gradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), pkCountry).getData();
GradeDTO gradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.START_UP.getValue(), pkCountry).getData();
//结算等级为1 (目前是会员)不允许转账 转入方
if (member.getPkSettleGrade().equals(gradeDTO.getPkId())) {
return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.MEMBER_IN_NOT_ALLOWED_TRANSFER));
@ -326,7 +317,7 @@ public class ApiCuMemberTransferController extends BaseController {
}
//币种value值
Integer pkAccountValue = memberBaseService.getAccountValueById(pkAccount);
Integer pkAccountValue = iCuMemberBaseService.getAccountValueById(pkAccount);
//查询余额
BigDecimal balance = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.ACCOUNT + pkAccountValue);
BigDecimal lockAccount = ReflectUtils.invokeGetter(cuMemberAccount, MemberFieldConstants.LOCK_TRANSFER_ACCOUNT + pkAccountValue);
@ -346,9 +337,9 @@ public class ApiCuMemberTransferController extends BaseController {
//单号
String code = CommonUtil.createSerialNumber(EOrderPrefix.TRANSFER_CODE.getValue());
//汇率
CurrencyDTO currencyDTO = memberBaseService.getCurrency(pkCountry);
CurrencyDTO currencyDTO = iCuMemberBaseService.getCurrency(pkCountry);
//转入币种ID（从配置中获取）
Integer toPkAccount = accountServiceApi.getPkAccount(pkAccount).getData();
Integer toPkAccount = iAccountServiceApi.getPkAccount(pkAccount).getData();
CuMemberTransfer cuMemberTransfer = CuMemberTransfer.builder().pkMember(pkMember)
.pkAccount(pkAccount).transferCode(code).toPkMember(toPkMember)
@ -358,9 +349,8 @@ public class ApiCuMemberTransferController extends BaseController {
.build();
cuMemberTransfer.setPkCountry(pkCountry);
cuMemberTransfer.setPkCreator(pkMember);
CuMemberAccount toMemberAccount = cuMemberAccountService.queryCuMemberAccountByPkMember(cuMemberTransfer.getToPkMember());
return toAjax(cuMemberTransferService.saveMemberTransferInfo(cuMemberTransfer, cuMemberAccount, toMemberAccount));
CuMemberAccount toMemberAccount = iCuMemberAccountService.queryCuMemberAccountByPkMember(cuMemberTransfer.getToPkMember());
return toAjax(iCuMemberTransferService.saveMemberTransferInfo(cuMemberTransfer, cuMemberAccount, toMemberAccount));
}
@ -374,7 +364,7 @@ public class ApiCuMemberTransferController extends BaseController {
* @return Boolean
*/
private Boolean isReference(Integer transferStatus, Integer reference, Long pkMember, Long toPkMember) {
return (reference.equals(EYesNo.YES.getIntValue()) || transferStatus.equals(EYesNo.YES.getIntValue())) && !cuMemberTransferService.isBloodLine(pkMember, toPkMember);
return (reference.equals(EYesNo.YES.getIntValue()) || transferStatus.equals(EYesNo.YES.getIntValue())) && !iCuMemberTransferService.isBloodLine(pkMember, toPkMember);
}
/**
@ -427,7 +417,7 @@ public class ApiCuMemberTransferController extends BaseController {
@GetMapping("/member-balance")
public AjaxResult findMemberBalance(Integer pkAccount) {
Long pkMember = SecurityUtils.getUserId();
CuMemberRechargeAccountParam cuMemberBalance = cuMemberAccountService.findMemberBalanceById(cuMemberBaseService.getAccountValueById(pkAccount), pkMember);
CuMemberRechargeAccountParam cuMemberBalance = iCuMemberAccountService.findMemberBalanceById(iCuMemberBaseService.getAccountValueById(pkAccount), pkMember);
return AjaxResult.success(cuMemberBalance.getAvailableBalance());
}

261
bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/UpPolicyCurrencyController.java
View File

@ -39,60 +39,54 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @description: 特殊配置-修改政策币
* @author: zhang jing
* @date: 2022/12/29 11:39
* @param:
* @return:
* 特殊配置-修改政策币
**/
@RequestMapping("/manage/update-policy-currency")
@RestController
public class UpPolicyCurrencyController extends BaseController {
private ICuMemberService cuMemberService;
@Autowired
public void setCuMemberService(ICuMemberService cuMemberService) {
this.cuMemberService = cuMemberService;
}
private ICuMemberService iCuMemberService;
@Autowired
private ICuMemberServiceLogService memberServiceLogService;
private ICuMemberServiceLogService iCuMemberServiceLogService;
@Autowired
private ICuMemberTradeService cuMemberTradeService;
private ICuMemberTradeService iCuMemberTradeService;
@Autowired
private ICuMemberBaseService cuMemberBaseService;
private ICuMemberBaseService iCuMemberBaseService;
@Autowired
private ITransactionCommonService iTransactionCommonService;
@DubboReference
IServiceChargeServiceApi serviceChargeServiceApi;
IServiceChargeServiceApi iServiceChargeServiceApi;
/**
* @description: 特殊业务-修改政策币列表
* @author: zhang jing
* @date: 2022/11/17 15:39
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
* 特殊业务-修改政策币列表
*
* @param upPolicyVO
* @return
*/
@AccessPermissions("PolicyMoney")
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.UPDATE_POLICY_CURRENCY, method = EOperationMethod.SELECT)
@GetMapping("/list")
public TableDataInfo upsePolicyCurrencyList(UpPolicyCurrencyVO upPolicyVO) {
startPage();
Integer pkCountry = SecurityUtils.getPkCountry();
upPolicyVO.setPkCountry(pkCountry);
upPolicyVO.setApproveStatus(EApproveStatus.FINISH.getValue());
List<UpPolicyCurrencyVO> list = cuMemberService.upPolicyCurrencyList(upPolicyVO);
startPage();
List<UpPolicyCurrencyVO> list = iCuMemberService.upPolicyCurrencyList(upPolicyVO);
list.forEach(itm -> {
UpPolicyCurrencyVO upc = JSONObject.parseObject(itm.getNewValue(), UpPolicyCurrencyVO.class);
itm.setDeductMoney(upc.getDeductMoney());
itm.setEnableStatus(upc.getEnableStatus());
itm.setTransfer(upc.getTransfer());
if (itm.getBusinessScope() != null &&
itm.getBusinessScope() == EBusinessScope.VERTEX.getValue()) {
if (itm.getBusinessScope() != null
&& itm.getBusinessScope() == EBusinessScope.VERTEX.getValue()) {
itm.setBusinessScopeVal(EBusinessScope.VERTEX.getLabel());
} else if (itm.getBusinessScope() != null
&& itm.getBusinessScope() == EBusinessScope.BLOOD.getValue()) {
itm.setBusinessScopeVal(EBusinessScope.BLOOD.getLabel());
} else {
itm.setBusinessScopeVal(EBusinessScope.MEMBER.getLabel());
}
@ -111,16 +105,14 @@ public class UpPolicyCurrencyController extends BaseController {
public void export(HttpServletResponse response, UpPolicyCurrencyVO upPolicyVO) {
Integer pkCountry = SecurityUtils.getPkCountry();
upPolicyVO.setPkCountry(pkCountry);
List<UpPolicyCurrencyVO> list = cuMemberService.upPolicyCurrencyList(upPolicyVO);
List<UpPolicyCurrencyVO> list = iCuMemberService.upPolicyCurrencyList(upPolicyVO);
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EnableStatus.values(),
EPopupType.values());
Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(
EnumsPrefixConstants.KEY_AWARD);
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EnableStatus.values());
Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_AWARD);
list.forEach(itm -> {
UpPolicyCurrencyVO upc = JSONObject.parseObject(itm.getNewValue(), UpPolicyCurrencyVO.class);
itm.setEnableStatusVal(transactionMap.get(EnumsPrefixConstants.ENABLE_STATUS + upc.getEnableStatus()));
itm.setTransferVal(transactionMap.get(EnumsPrefixConstants.POPUP_TYPE + upc.getTransfer()));
itm.setTransferVal(EPopupType.getLableByValue(upc.getTransfer()));
itm.setDeductMoney(upc.getDeductMoney());
itm.setPkAwardsVal(transactionMap1.get(itm.getPkAwards()));
});
@ -143,12 +135,11 @@ public class UpPolicyCurrencyController extends BaseController {
}
/**
* @description: 查询会员信息
* @author: zhang jing
* @date: 2023/3/30 11:19
* @param: [upPolicyVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
* 查询会员信息
*
* @param upPolicyVO
* @return
*/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.UPDATE_POLICY_CURRENCY, method = EOperationMethod.SELECT)
@PostMapping("/selected")
public AjaxResult selected(@RequestBody UpPolicyCurrencyVO upPolicyVO) {
@ -159,7 +150,7 @@ public class UpPolicyCurrencyController extends BaseController {
List<UpPolicyCurrencyVO> newlist = new ArrayList<>();
CuMemberVO memberParam = BeanUtil.copyProperties(upPolicyVO, CuMemberVO.class);
memberParam.setPkCountry(pkCountry);
CuMember member = cuMemberService.getMember(memberParam.getMemberCode());
CuMember member = iCuMemberService.getMember(memberParam.getMemberCode());
if (StringUtils.isNotNull(member)) {
UpPolicyCurrencyVO upc = BeanUtil.copyProperties(member, UpPolicyCurrencyVO.class);
newlist.add(upc);
@ -167,7 +158,7 @@ public class UpPolicyCurrencyController extends BaseController {
for (UpPolicyCurrencyVO pc : newlist) {
pc.setPkMember(pc.getPkId());
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(pc.getPkId(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(pc.getPkId(),
EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue(), EApproveStatus.FINISH.getValue());
pc.setChangeNumber(approveNumber + 1);
//查询扣费金额，账户信息
@ -175,26 +166,26 @@ public class UpPolicyCurrencyController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData()
|| null == serviceChargeDTOR.getData().getPkAccount()) {
return AjaxResult.error(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
}
//接口查询金额是否足够
pc.setPkAccount(serviceChargeDTOR.getData().getPkCountry());
pc.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
pc.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
pc.setCost(serviceChargeDTOR.getData().getCost());
}
return AjaxResult.success(newlist);
}
/**
* @description: 导入会员信息
* @author: zhang jing
* @date: 2023/1/11 10:27
* @param: [file, updateSupport]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
* 导入会员信息
*
* @param file
* @return
* @throws Exception
*/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.UPDATE_POLICY_CURRENCY, method = EOperationMethod.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
@ -209,7 +200,7 @@ public class UpPolicyCurrencyController extends BaseController {
return AjaxResult.error(ConfigMsgConstants.MEMBER_CODE_NOT_NULL);
}
CuMember cuMember = cuMemberService.getMember(ucv.getMemberCode());
CuMember cuMember = iCuMemberService.getMember(ucv.getMemberCode());
if (StringUtils.isNull(cuMember)) {
UpPolicyCurrencyVO countryVO = BeanUtil.copyProperties(ucv, UpPolicyCurrencyVO.class);
countryVO.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
@ -218,7 +209,7 @@ public class UpPolicyCurrencyController extends BaseController {
UpPolicyCurrencyVO countryVO = BeanUtil.copyProperties(cuMember, UpPolicyCurrencyVO.class);
countryVO.setPkMember(countryVO.getPkId());
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(countryVO.getPkId(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(countryVO.getPkId(),
EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue(), EApproveStatus.FINISH.getValue());
countryVO.setChangeNumber(approveNumber + 1);
//查询扣费金额，账户信息
@ -226,14 +217,14 @@ public class UpPolicyCurrencyController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData()
|| null == serviceChargeDTOR.getData().getPkAccount()) {
return AjaxResult.error(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
}
//接口查询金额是否足够
countryVO.setPkAccount(serviceChargeDTOR.getData().getPkCountry());
countryVO.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
countryVO.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
countryVO.setCost(serviceChargeDTOR.getData().getCost());
newlist.add(countryVO);
}
@ -246,32 +237,29 @@ public class UpPolicyCurrencyController extends BaseController {
}
/**
* @description: 修改政策币
* @author: zhang jing
* @date: 2022/12/30 10:22
* @param: [postageParams]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
* 修改政策币
*
* @param upPolicyVO
* @return
*/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.UPDATE_POLICY_CURRENCY, method = EOperationMethod.SUBMIT)
@PostMapping("/upPolicyCurrency")
public AjaxResult upPolicyCurrency(@RequestBody UpPolicyCurrencyVO upPolicyVO) {
if (StringUtils.isNull(upPolicyVO.getProcessType())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PROCESS_TYPE_NOT_NULL));
}
if (upPolicyVO.getBusinessScope() == null) {
if (null == upPolicyVO.getBusinessScope()) {
upPolicyVO.setBusinessScope(EBusinessScope.MEMBER.getValue());
}
List<UpPolicyCurrencyVO> errorlist = new ArrayList<>();
if (CollectionUtil.isNotEmpty(upPolicyVO.getPlculist())) {
Date date = new Date();
Integer pkCountry = SecurityUtils.getPkCountry();
upPolicyVO.setCreationTime(date);
upPolicyVO.setCreationTime(new Date());
upPolicyVO.setPkCreator(SecurityUtils.getUserId());
upPolicyVO.setPkCountry(pkCountry);
Set<Long> pkMemberIds = new HashSet<>();
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EnableStatus.values(),
EPopupType.values());
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EnableStatus.values());
// 查询国家
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
List<MemberAmountDTO> memberAmountDTOList = new ArrayList<>();
@ -297,15 +285,19 @@ public class UpPolicyCurrencyController extends BaseController {
plc.setTransfer(EPopupType.STOP.getValue());
}
plc.setEnableStatusVal(transactionMap.get(EnumsPrefixConstants.ENABLE_STATUS + plc.getEnableStatus()));
plc.setTransferVal(transactionMap.get(EnumsPrefixConstants.POPUP_TYPE + plc.getTransfer()));
plc.setTransferVal(EPopupType.getLableByValue(plc.getTransfer()));
if (plc.getBusinessScope() != null && plc.getBusinessScope() == EBusinessScope.MEMBER.getValue()) {
plc.setBusinessScopeVal(EBusinessScope.MEMBER.getLabel());
}
if (plc.getBusinessScope() != null && plc.getBusinessScope() == EBusinessScope.VERTEX.getValue()) {
plc.setBusinessScopeVal(EBusinessScope.VERTEX.getLabel());
}
if (plc.getBusinessScope() != null && plc.getBusinessScope() == EBusinessScope.BLOOD.getValue()) {
plc.setBusinessScopeVal(EBusinessScope.BLOOD.getLabel());
}
Integer count = cuMemberService.checkmsLogCount(plc.getPkMember(), EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
Integer count = iCuMemberService.checkmsLogCount(plc.getPkMember(), EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
if (StringUtils.isNotNull(count) && count > 0) {
UpPolicyCurrencyVO erplc = BeanUtil.copyProperties(plc, UpPolicyCurrencyVO.class);
erplc.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
@ -315,7 +307,7 @@ public class UpPolicyCurrencyController extends BaseController {
pkMemberIds.add(plc.getPkMember());
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(plc.getPkMember(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(plc.getPkMember(),
EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue(), EApproveStatus.FINISH.getValue());
plc.setChangeNumber(approveNumber + 1);
if (upPolicyVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() ||
@ -325,9 +317,9 @@ public class UpPolicyCurrencyController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData()
|| null == serviceChargeDTOR.getData().getPkAccount()) {
return AjaxResult.error(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
}
//接口查询金额是否足够
@ -352,7 +344,7 @@ public class UpPolicyCurrencyController extends BaseController {
upPolicyVO.setPkAccount(upPolicyVO.getPlculist().get(0).getPkAccount());
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
//接口查询金额是否足够
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) {
memberBalanceList.forEach(itm -> {
UpPolicyCurrencyVO plc = BeanUtil.copyProperties(itm, UpPolicyCurrencyVO.class);
@ -364,7 +356,7 @@ public class UpPolicyCurrencyController extends BaseController {
if (CollectionUtil.isNotEmpty(errorlist)) {
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_ERROR), errorlist);
}
upPolicyVO = cuMemberService.upPolicyCurrency(upPolicyVO);
upPolicyVO = iCuMemberService.upPolicyCurrency(upPolicyVO);
} else {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
}
@ -372,12 +364,11 @@ public class UpPolicyCurrencyController extends BaseController {
}
/**
* @description: 发起签呈
* @author: zhang jing
* @date: 2023/3/22 17:20
* @param: [upPolicyVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
* 发起签呈
*
* @param upPolicyVO
* @return
*/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.UPDATE_POLICY_CURRENCY, method = EOperationMethod.SUBMIT)
@PostMapping("/petition")
public AjaxResult petition(@RequestBody UpPolicyCurrencyVO upPolicyVO) {
@ -391,23 +382,19 @@ public class UpPolicyCurrencyController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EXAMINE_AND_APPROVE_NOT_NULL));
}
//会员业务范围
if (upPolicyVO.getBusinessScope() == null) {
if (null == upPolicyVO.getBusinessScope()) {
upPolicyVO.setBusinessScope(EBusinessScope.MEMBER.getValue());
}
List<UpPolicyCurrencyVO> errorlist = new ArrayList<>();
if (CollectionUtil.isNotEmpty(upPolicyVO.getPlculist())) {
Date date = new Date();
Integer pkCountry = SecurityUtils.getPkCountry();
upPolicyVO.setCreationTime(date);
upPolicyVO.setCreationTime(new Date());
upPolicyVO.setPkCreator(SecurityUtils.getUserId());
upPolicyVO.setPkCountry(pkCountry);
/**
* 修改政策币集合签呈页面
*/
Set<Long> pkMemberIds = new HashSet<>();
// 获取需要翻译的枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EnableStatus.values(),
EPopupType.values());
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EnableStatus.values());
// 查询国家
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
List<MemberAmountDTO> memberAmountDTOList = new ArrayList<>();
@ -432,7 +419,7 @@ public class UpPolicyCurrencyController extends BaseController {
if (StringUtils.isNull(plc.getTransfer())) {
plc.setTransfer(EPopupType.STOP.getValue());
}
Integer count = cuMemberService.checkmsLogCount(plc.getPkMember(), EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
Integer count = iCuMemberService.checkmsLogCount(plc.getPkMember(), EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
if (StringUtils.isNotNull(count) && count > 0) {
UpPolicyCurrencyVO erplc = BeanUtil.copyProperties(plc, UpPolicyCurrencyVO.class);
erplc.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
@ -441,26 +428,29 @@ public class UpPolicyCurrencyController extends BaseController {
}
pkMemberIds.add(plc.getPkMember());
plc.setEnableStatusVal(transactionMap.get(EnumsPrefixConstants.ENABLE_STATUS + plc.getEnableStatus()));
plc.setTransferVal(transactionMap.get(EnumsPrefixConstants.POPUP_TYPE + plc.getTransfer()));
plc.setTransferVal(EPopupType.getLableByValue(plc.getTransfer()));
if (plc.getBusinessScope() != null && plc.getBusinessScope() == EBusinessScope.MEMBER.getValue()) {
plc.setBusinessScopeVal(EBusinessScope.MEMBER.getLabel());
}
if (plc.getBusinessScope() != null && plc.getBusinessScope() == EBusinessScope.VERTEX.getValue()) {
plc.setBusinessScopeVal(EBusinessScope.VERTEX.getLabel());
}
if (plc.getBusinessScope() != null && plc.getBusinessScope() == EBusinessScope.BLOOD.getValue()) {
plc.setBusinessScopeVal(EBusinessScope.BLOOD.getLabel());
}
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(plc.getPkMember(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(plc.getPkMember(),
EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue(), EApproveStatus.FINISH.getValue());
plc.setChangeNumber(approveNumber + 1);
if (upPolicyVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() ||
upPolicyVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
if (upPolicyVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue()
|| upPolicyVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
//查询扣费金额，账户信息
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
return AjaxResult.error(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
@ -484,7 +474,7 @@ public class UpPolicyCurrencyController extends BaseController {
upPolicyVO.setPkAccount(upPolicyVO.getPlculist().get(0).getPkAccount());
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
//接口查询金额是否足够
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) {
memberBalanceList.forEach(itm -> {
UpPolicyCurrencyVO plc = BeanUtil.copyProperties(itm, UpPolicyCurrencyVO.class);
@ -496,21 +486,19 @@ public class UpPolicyCurrencyController extends BaseController {
if (CollectionUtil.isNotEmpty(errorlist)) {
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_ERROR), errorlist);
}
upPolicyVO = cuMemberService.petition(upPolicyVO);
upPolicyVO = iCuMemberService.petition(upPolicyVO);
} else {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
}
return AjaxResult.success(upPolicyVO);
}
/**
* @description: 删除政策币确认
* @author: zhang jing
* @date: 2024/4/23 14:42
* @param: [upPolicyVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
* 删除政策币确认
*
* @param upPolicyVO
* @return
*/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.UPDATE_POLICY_CURRENCY, method = EOperationMethod.SUBMIT)
@PostMapping("/delConfirm")
public AjaxResult delConfirm(@RequestBody UpPolicyCurrencyVO upPolicyVO) {
@ -524,15 +512,18 @@ public class UpPolicyCurrencyController extends BaseController {
Integer pkCountry = SecurityUtils.getPkCountry();
upPolicyVO.setPkCountry(pkCountry);
upPolicyVO.setApproveStatus(EApproveStatus.FINISH.getValue());
List<UpPolicyCurrencyVO> list = cuMemberService.upPolicyCurrencyList(upPolicyVO);
List<UpPolicyCurrencyVO> list = iCuMemberService.upPolicyCurrencyList(upPolicyVO);
list.forEach(itm -> {
UpPolicyCurrencyVO upc = JSONObject.parseObject(itm.getNewValue(), UpPolicyCurrencyVO.class);
itm.setDeductMoney(upc.getDeductMoney());
itm.setEnableStatus(upc.getEnableStatus());
itm.setTransfer(upc.getTransfer());
if (itm.getBusinessScope() != null &&
itm.getBusinessScope() == EBusinessScope.VERTEX.getValue()) {
if (null != itm.getBusinessScope()
&& itm.getBusinessScope() == EBusinessScope.VERTEX.getValue()) {
itm.setBusinessScopeVal(EBusinessScope.VERTEX.getLabel());
} else if (null != itm.getBusinessScope()
&& itm.getBusinessScope() == EBusinessScope.BLOOD.getValue()) {
itm.setBusinessScopeVal(EBusinessScope.BLOOD.getLabel());
} else {
itm.setBusinessScopeVal(EBusinessScope.MEMBER.getLabel());
}
@ -540,13 +531,12 @@ public class UpPolicyCurrencyController extends BaseController {
List<UpPolicyCurrencyVO> errorlist = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list)) {
Date date = new Date();
upPolicyVO.setCreationTime(date);
upPolicyVO.setCreationTime(new Date());
upPolicyVO.setPkCreator(SecurityUtils.getUserId());
upPolicyVO.setPkCountry(pkCountry);
// 查询国家
for (UpPolicyCurrencyVO plc : list) {
Integer count = cuMemberService.checkmsLogCount(plc.getPkMember(), EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue());
Integer count = iCuMemberService.checkmsLogCount(plc.getPkMember(), EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue());
if (StringUtils.isNotNull(count) && count > 0) {
UpPolicyCurrencyVO erplc = BeanUtil.copyProperties(plc, UpPolicyCurrencyVO.class);
erplc.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
@ -554,7 +544,7 @@ public class UpPolicyCurrencyController extends BaseController {
continue;
}
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(plc.getPkMember(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(plc.getPkMember(),
EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue(), EApproveStatus.FINISH.getValue());
plc.setChangeNumber(approveNumber + 1);
//查询扣费金额，账户信息
@ -562,14 +552,14 @@ public class UpPolicyCurrencyController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData()
|| null == serviceChargeDTOR.getData().getPkAccount()) {
return AjaxResult.error(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
}
//接口查询金额是否足够
plc.setPkAccount(serviceChargeDTOR.getData().getPkCountry());
plc.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
plc.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
plc.setCost(serviceChargeDTOR.getData().getCost());
}
if (CollectionUtil.isNotEmpty(errorlist)) {
@ -581,14 +571,12 @@ public class UpPolicyCurrencyController extends BaseController {
return AjaxResult.success(list);
}
/**
* @description: 删除政策币发起签呈
* @author: zhang jing
* @date: 2024/4/23 14:40
* @param: [upPolicyVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
* 删除政策币发起签呈
*
* @param upPolicyVO
* @return
*/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.UPDATE_POLICY_CURRENCY, method = EOperationMethod.SUBMIT)
@PostMapping("/delPetition")
public AjaxResult delPetition(@RequestBody UpPolicyCurrencyVO upPolicyVO) {
@ -602,15 +590,18 @@ public class UpPolicyCurrencyController extends BaseController {
Integer pkCountry = SecurityUtils.getPkCountry();
upPolicyVO.setPkCountry(pkCountry);
upPolicyVO.setApproveStatus(EApproveStatus.FINISH.getValue());
List<UpPolicyCurrencyVO> list = cuMemberService.upPolicyCurrencyList(upPolicyVO);
List<UpPolicyCurrencyVO> list = iCuMemberService.upPolicyCurrencyList(upPolicyVO);
list.forEach(itm -> {
UpPolicyCurrencyVO upc = JSONObject.parseObject(itm.getNewValue(), UpPolicyCurrencyVO.class);
itm.setDeductMoney(upc.getDeductMoney());
itm.setEnableStatus(upc.getEnableStatus());
itm.setTransfer(upc.getTransfer());
if (itm.getBusinessScope() != null &&
itm.getBusinessScope() == EBusinessScope.VERTEX.getValue()) {
if (null != itm.getBusinessScope()
&& itm.getBusinessScope() == EBusinessScope.VERTEX.getValue()) {
itm.setBusinessScopeVal(EBusinessScope.VERTEX.getLabel());
} else if (null != itm.getBusinessScope()
&& itm.getBusinessScope() == EBusinessScope.BLOOD.getValue()) {
itm.setBusinessScopeVal(EBusinessScope.BLOOD.getLabel());
} else {
itm.setBusinessScopeVal(EBusinessScope.MEMBER.getLabel());
}
@ -618,8 +609,7 @@ public class UpPolicyCurrencyController extends BaseController {
List<UpPolicyCurrencyVO> errorlist = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list)) {
Date date = new Date();
upPolicyVO.setCreationTime(date);
upPolicyVO.setCreationTime(new Date());
upPolicyVO.setPkCreator(SecurityUtils.getUserId());
upPolicyVO.setPkCountry(pkCountry);
Set<Long> pkMemberIds = new HashSet<>();
@ -628,8 +618,7 @@ public class UpPolicyCurrencyController extends BaseController {
List<MemberAmountDTO> memberAmountDTOList = new ArrayList<>();
for (UpPolicyCurrencyVO plc : list) {
Integer count = cuMemberService.checkmsLogCount(plc.getPkMember(), EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue());
Integer count = iCuMemberService.checkmsLogCount(plc.getPkMember(), EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue());
if (StringUtils.isNotNull(count) && count > 0) {
UpPolicyCurrencyVO erplc = BeanUtil.copyProperties(plc, UpPolicyCurrencyVO.class);
erplc.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
@ -639,19 +628,19 @@ public class UpPolicyCurrencyController extends BaseController {
pkMemberIds.add(plc.getPkMember());
//当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(plc.getPkMember(),
Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(plc.getPkMember(),
EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue(), EApproveStatus.FINISH.getValue());
plc.setChangeNumber(approveNumber + 1);
if (upPolicyVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() ||
upPolicyVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
if (upPolicyVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue()
|| upPolicyVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
//查询扣费金额，账户信息
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.DEL_POLICY_CURRENCY_YES_NO.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData() ||
null == serviceChargeDTOR.getData().getPkAccount()) {
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
if (null == serviceChargeDTOR.getData()
|| null == serviceChargeDTOR.getData().getPkAccount()) {
return AjaxResult.error(ConfigMsgConstants.BUSINESS_ACCOUNT_IS_NULL);
}
//接口查询金额是否足够
@ -679,7 +668,7 @@ public class UpPolicyCurrencyController extends BaseController {
upPolicyVO.setPkAccount(upPolicyVO.getPlculist().get(0).getPkAccount());
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
//接口查询金额是否足够
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) {
memberBalanceList.forEach(itm -> {
UpPolicyCurrencyVO plc = BeanUtil.copyProperties(itm, UpPolicyCurrencyVO.class);
@ -691,7 +680,7 @@ public class UpPolicyCurrencyController extends BaseController {
if (CollectionUtil.isNotEmpty(errorlist)) {
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_ERROR), errorlist);
}
upPolicyVO = cuMemberService.delPolicyCurrency(upPolicyVO);
upPolicyVO = iCuMemberService.delPolicyCurrency(upPolicyVO);
} else {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
}

57
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/mapper/CuMemberServiceLogMapper.java
View File

@ -11,9 +11,6 @@ import java.util.List;
/**
* 会员更名、密码修改表 Mapper 接口
*
* @author hzs
* @since 2022-08-22
*/
public interface CuMemberServiceLogMapper extends BaseMapper<CuMemberServiceLog> {
@ -21,8 +18,6 @@ public interface CuMemberServiceLogMapper extends BaseMapper<CuMemberServiceLog>
/**
* @description: 查询会员办理业务日志最新数据
* @author: zhang jing
* @date: 2023/3/24 9:08
* @param: [pkMember, editType, approveStatus]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
@ -32,8 +27,6 @@ public interface CuMemberServiceLogMapper extends BaseMapper<CuMemberServiceLog>
/**
* @description: 查询用户是否已经存在未审核业务
* @author: zhang jing
* @date: 2023/1/29 17:26
* @param: [cuMemberServiceLogVO]
* @return: java.util.List<com.hzs.common.domain.member.detail.CuMemberServiceLog>
**/
@ -47,25 +40,13 @@ public interface CuMemberServiceLogMapper extends BaseMapper<CuMemberServiceLog>
*/
List<CuMemberServiceLogExt> selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog);
/**
* @description: 查询审核通过的最新数据
* @author: zhang jing
* @date: 2023/1/30 10:02
* @param: [cuMemberServiceLogVO]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO);
/**
* @description: 查询会员原值
* @author: zhang jing
* @date: 2023/1/30 14:20
* @param: [cuMemberOldValueVO]
* @return: java.util.List<com.hzs.member.handleBusiness.vo.CuMemberOldValueVO>
**/
List<BusinessMemberVO> selectOldValue(BusinessMemberVO businessMemberVO);
/**
* 根据用户、业务类型查询业务办理仩
*
@ -75,13 +56,23 @@ public interface CuMemberServiceLogMapper extends BaseMapper<CuMemberServiceLog>
List<CuMemberServiceLog> selectServiceValue(CuMemberServiceLogExt cuMemberServiceLog);
/**
* 查询pk_id最大的业务办理
* 查询 pkId 最大的业务办理
*
* @param pkMember 服务log
* @param pkMember 会员ID
* @param editTypeList 业务办理类型
*/
List<CuMemberServiceLog> queryMaxCuMemberServiceLog(@Param("pkMember") Long pkMember,
@Param("editTypeList") List<Integer> editTypeList);
List<CuMemberServiceLog> listMaxMemberServiceLog(@Param("pkMember") Long pkMember,
@Param("editTypeList") List<Integer> editTypeList);
/**
* 获取最新业务办理
*
* @param pkMember 会员ID
* @param editType 业务办理类型
* @return
*/
CuMemberServiceLog getBloodMemberServiceLog(@Param("pkMember") Long pkMember,
@Param("editType") Integer editType);
/**
* 查询列表信息
@ -100,24 +91,4 @@ public interface CuMemberServiceLogMapper extends BaseMapper<CuMemberServiceLog>
*/
List<CuMemberServiceLog> selectByList(CuMemberServiceLogExt memberServiceLogExt);
/**
* 查询指定会员政策币信息
*
* @param pkMember 会员ID
* @return
*/
CuMemberServiceLogExt queryPolicy(@Param("pkMember") Long pkMember);
/**
* @description: 查询会员办理业务日志表最新数据
* @author: zhang jing
* @date: 2024/11/21 9:56
* @param: [pkMember, editTypeList, approveStatus]
* @return: java.util.List<com.hzs.common.domain.member.detail.CuMemberServiceLog>
**/
List<CuMemberServiceLog> selectTopDataList(@Param("pkMember") Long pkMember,
@Param("editTypeList") List<Integer> editTypeList,
@Param("approveStatus") int approveStatus,
@Param("actEndDateStr") String actEndDateStr);
}

120
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java
View File

@ -1,117 +1,83 @@
package com.hzs.member.detail.provider;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONUtil;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.EApprovalBusiness;
import com.hzs.common.core.utils.ComputeUtil;
import com.hzs.common.domain.member.business.UpPolicyCurrency;
import com.hzs.common.domain.member.detail.CuMemberServiceLog;
import com.hzs.common.domain.member.detail.CuMemberServiceLogExt;
import com.hzs.member.detail.ICuMemberServiceLogServiceApi;
import com.hzs.member.detail.service.ICuMemberServiceLogService;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Description:
* @Author: sui q
* @Time: 2023/3/13 19:04
* @Classname: CuMemberServiceLogProvider
* @PackageName: com.hzs.member.detail.provider
*/
@Slf4j
@DubboService
public class CuMemberServiceLogProvider implements ICuMemberServiceLogServiceApi {
private ICuMemberServiceLogService cuMemberServiceLogService;
@Autowired
public void setCuMemberServiceLogService(ICuMemberServiceLogService cuMemberServiceLogService) {
this.cuMemberServiceLogService = cuMemberServiceLogService;
}
private ICuMemberServiceLogService iCuMemberServiceLogService;
@Override
public List<CuMemberServiceLog> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> editTypeList) {
return cuMemberServiceLogService.queryMaxCuMemberServiceLog(pkMember, editTypeList);
public R<UpPolicyCurrency> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> editTypeList) {
UpPolicyCurrency upPolicyCurrency = null;
// 个人政策币配置
List<CuMemberServiceLog> cuMemberServiceLogs = iCuMemberServiceLogService.listMaxMemberServiceLog(pkMember, editTypeList);
if (CollectionUtil.isNotEmpty(cuMemberServiceLogs)) {
Map<Integer, CuMemberServiceLog> cuMemberServiceLogMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberServiceLogs.size()));
cuMemberServiceLogs.forEach(serviceLog -> cuMemberServiceLogMap.put(serviceLog.getEditType(), serviceLog));
try {
upPolicyCurrency = JSONUtil.toBean(cuMemberServiceLogMap.get(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()).getNewValue(), UpPolicyCurrency.class);
} catch (Exception e) {
log.error("政策币转换异常1， upPolicyCurrency: {}", upPolicyCurrency, e);
}
}
if (null == upPolicyCurrency) {
// 血缘上政策币
CuMemberServiceLog cuMemberServiceLog = iCuMemberServiceLogService.getBloodMemberServiceLog(pkMember, 1);
if (null != cuMemberServiceLog) {
try {
upPolicyCurrency = JSONUtil.toBean(cuMemberServiceLog.getNewValue(), UpPolicyCurrency.class);
} catch (Exception e) {
log.error("政策币转换异常2， upPolicyCurrency: {}", upPolicyCurrency, e);
}
}
}
return R.ok(upPolicyCurrency);
}
/**
* 查询最大审核次数
*
* @param pkMember
* @param editType
* @return
*/
@Override
public Integer selectByMaxApproveNumber(Long pkMember, Integer editType, Integer approveStatus) {
return cuMemberServiceLogService.selectByMaxApproveNumber(pkMember, editType, approveStatus);
return iCuMemberServiceLogService.selectByMaxApproveNumber(pkMember, editType, approveStatus);
}
/**
* 新增
*
* @param memberLog
* @return
*/
@Override
public R<Boolean> insert(CuMemberServiceLog memberLog) {
return R.ok(cuMemberServiceLogService.save(memberLog));
return R.ok(iCuMemberServiceLogService.save(memberLog));
}
/**
* 根据业务单号查询
*
* @return
*/
@Override
public R<CuMemberServiceLog> selectByBusinessNo(String businessNo) {
return cuMemberServiceLogService.selectByBusinessNo(businessNo);
return iCuMemberServiceLogService.selectByBusinessNo(businessNo);
}
/**
* 根据业务单号修改信息
*
* @param memberLog
* @return
*/
@Override
public R<Boolean> updateByBusinessNo(CuMemberServiceLog memberLog) {
return cuMemberServiceLogService.updateByBusinessNo(memberLog);
}
/**
* @description: 根据业务单号查询业务日志
* @author: zhang jing
* @date: 2023/7/29 11:16
* @param: [businessNo]
* @return: com.hzs.common.core.domain.R<java.util.List < com.hzs.common.domain.member.detail.CuMemberServiceLog>>
**/
@Override
public R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo) {
return cuMemberServiceLogService.selectCuMemberServiceLog(businessNo);
}
@Override
public R<CuMemberServiceLogExt> queryPolicy(Long pkMember) {
return R.ok(cuMemberServiceLogService.queryPolicy(pkMember));
}
/**
* @param pkMember 会员主键 pkMember
* @param approvalBusiness 类型 EApprovalBusiness
* @param approveStatus 提交签呈状态 EApproveStatus
* @return
*/
@Override
public R<Integer> queryCount(Long pkMember, Integer approvalBusiness, Integer approveStatus) {
QueryWrapper<CuMemberServiceLog> query = new QueryWrapper<>();
query.eq("APPROVE_STATUS", approveStatus);
query.eq("EDIT_TYPE", approvalBusiness);
query.eq("PK_MEMBER", pkMember);
return R.ok(cuMemberServiceLogService.count(query));
return iCuMemberServiceLogService.updateByBusinessNo(memberLog);
}
@Override
public R<CuMemberServiceLog> selectTopData(Long pkMember, int editType, int approveStatus) {
return R.ok(cuMemberServiceLogService.selectTopData(pkMember, editType, approveStatus));
return R.ok(iCuMemberServiceLogService.selectTopData(pkMember, editType, approveStatus));
}
}

61
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java
View File

@ -11,9 +11,6 @@ import java.util.List;
/**
* 会员更名、密码修改表 服务类
*
* @author hzs
* @since 2022-08-22
*/
public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog> {
@ -28,8 +25,6 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
/**
* @description: 查询会员办理业务日志最新数据
* @author: zhang jing
* @date: 2023/3/24 9:07
* @param: [pkMember, editType, approveStatus]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
@ -37,8 +32,6 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
/**
* @description: 查询用户是否已经存在未审核业务
* @author: zhang jing
* @date: 2023/1/29 17:25
* @param: [cuMemberServiceLogVO]
* @return: java.util.List<com.hzs.common.domain.member.detail.CuMemberServiceLog>
**/
@ -52,19 +45,8 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
*/
List<CuMemberServiceLogExt> selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog);
/**
* @description: 查询审核通过的最新数据
* @author: zhang jing
* @date: 2023/1/30 10:02
* @param: [cuMemberServiceLogVO]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO);
/**
* @description: 查询会员原值
* @author: zhang jing
* @date: 2023/1/30 14:20
* @param: [cuMemberOldValueVO]
* @return: java.util.List<com.hzs.member.handleBusiness.vo.CuMemberOldValueVO>
**/
@ -72,8 +54,6 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
/**
* @description: 再次发起签呈
* @author: zhang jing
* @date: 2023/2/2 11:15
* @param: [cmslList, cuMemberServiceLogVO]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
@ -88,12 +68,21 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
List<CuMemberServiceLog> selectServiceValue(CuMemberServiceLogExt cuMemberServiceLog);
/**
* 查询pk_id最大的业务办理
* 查询 pkId 最大的业务办理
*
* @param pkMember 服务log
* @param pkMember 会员ID
* @param editTypeList 业务办理类型
*/
List<CuMemberServiceLog> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> editTypeList);
List<CuMemberServiceLog> listMaxMemberServiceLog(Long pkMember, List<Integer> editTypeList);
/**
* 获取最新业务办理
*
* @param pkMember 会员ID
* @param editType 业务办理类型
* @return
*/
CuMemberServiceLog getBloodMemberServiceLog(Long pkMember, Integer editType);
/**
* 根据业务单号查询
@ -122,15 +111,6 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
*/
List<CuMemberServiceLog> queryList(Integer editType, String memberCode, String memberName, Integer pkCountry, Integer approveStatus);
/**
* @description: 根据业务单号查询业务日志
* @author: zhang jing
* @date: 2023/7/29 11:16
* @param: [businessNo]
* @return: com.hzs.common.core.domain.R<java.util.List < com.hzs.common.domain.member.detail.CuMemberServiceLog>>
**/
R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo);
/**
* 查询展示列表
*
@ -138,21 +118,4 @@ public interface ICuMemberServiceLogService extends IService<CuMemberServiceLog>
*/
List<CuMemberServiceLog> selectByList(CuMemberServiceLogExt memberServiceLogExt);
/**
* 查询指定会员政策币信息
*
* @param pkMember 会员ID
* @return
*/
CuMemberServiceLogExt queryPolicy(Long pkMember);
/**
* @description: 查询会员多个办理业务的日志最新数据
* @author: zhang jing
* @date: 2023/3/24 9:07
* @param: [pkMember, editType, approveStatus]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
CuMemberServiceLogVO selectTopDataList(Long pkMember, List<Integer> editType, int approveStatus,String actEndDateStr);
}

161
bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/impl/CuMemberServiceLogServiceImpl.java
View File

@ -1,13 +1,11 @@
package com.hzs.member.detail.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONUtil;
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.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.EApprovalBusiness;
import com.hzs.common.core.enums.EApproveStatus;
import com.hzs.common.core.enums.EOrderPrefix;
import com.hzs.common.core.exception.ServiceException;
@ -19,103 +17,44 @@ import com.hzs.member.detail.mapper.CuMemberServiceLogMapper;
import com.hzs.member.detail.service.ICuMemberServiceLogService;
import com.hzs.member.detail.vo.CuMemberServiceLogVO;
import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
import com.hzs.member.self.vo.DomicileChangeVO;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/**
* 会员更名、密码修改表 服务实现类
*
* @author hzs
* @since 2022-08-22
*/
@Service
public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLogMapper, CuMemberServiceLog> implements ICuMemberServiceLogService {
/**
* 查询最大审核次数
*
* @param pkMember
* @param editType
* @return
*/
@Override
public Integer selectByMaxApproveNumber(Long pkMember, Integer editType, Integer approveStatus) {
return baseMapper.selectByMaxApproveNumber(pkMember, editType, approveStatus);
}
/**
* @description: 查询会员办理业务日志最新数据
* @author: zhang jing
* @date: 2023/3/24 9:08
* @param: [pkMember, editType, approveStatus]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
@Override
public CuMemberServiceLog selectTopData(Long pkMember, int editType, int approveStatus) {
return baseMapper.selectTopData(pkMember, editType, approveStatus);
}
/**
* @description: 查询用户是否已经存在未审核业务
* @author: zhang jing
* @date: 2023/1/29 17:26
* @param: [cuMemberServiceLogVO]
* @return: java.util.List<com.hzs.common.domain.member.detail.CuMemberServiceLog>
**/
@Override
public List<CuMemberServiceLogVO> selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO) {
return baseMapper.selectServiceLogList(cuMemberServiceLogVO);
}
/**
* 查询
*
* @param cuMemberServiceLog
* @return
*/
@Override
public List<CuMemberServiceLogExt> selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog) {
return baseMapper.selectByServiceLogList(cuMemberServiceLog);
}
/**
* @description: 查询审核通过的最新数据
* @author: zhang jing
* @date: 2023/1/30 10:02
* @param: [cuMemberServiceLogVO]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
@Override
public CuMemberServiceLogVO selectNewestServiceLog(CuMemberServiceLogVO cuMemberServiceLogVO) {
return baseMapper.selectNewestServiceLog(cuMemberServiceLogVO);
}
/**
* @description: 查询会员原值
* @author: zhang jing
* @date: 2023/1/30 14:20
* @param: [cuMemberOldValueVO]
* @return: java.util.List<com.hzs.member.handleBusiness.vo.CuMemberOldValueVO>
**/
@Override
public List<BusinessMemberVO> selectOldValue(BusinessMemberVO businessMemberVO) {
return baseMapper.selectOldValue(businessMemberVO);
}
/**
* @description: 再次发起签呈
* @author: zhang jing
* @date: 2023/2/2 9:09
* @param: [cmslList]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class)
@Override
public CuMemberServiceLogVO againBusiness(List<CuMemberServiceLog> cmslList, CuMemberServiceLogVO cuMemberServiceLogVO) {
@ -147,69 +86,34 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLo
}
@Override
public List<CuMemberServiceLog> queryMaxCuMemberServiceLog(Long pkMember, List<Integer> editTypeList) {
return baseMapper.queryMaxCuMemberServiceLog(pkMember, editTypeList);
public List<CuMemberServiceLog> listMaxMemberServiceLog(Long pkMember, List<Integer> editTypeList) {
return baseMapper.listMaxMemberServiceLog(pkMember, editTypeList);
}
@Override
public CuMemberServiceLog getBloodMemberServiceLog(Long pkMember, Integer editType) {
return baseMapper.getBloodMemberServiceLog(pkMember, editType);
}
/**
* 根据业务单号查询
*
* @return
*/
@Override
public R<CuMemberServiceLog> selectByBusinessNo(String businessNo) {
QueryWrapper<CuMemberServiceLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("BUSINESS_NO", businessNo);
LambdaQueryWrapper<CuMemberServiceLog> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CuMemberServiceLog::getBusinessNo, businessNo);
return R.ok(baseMapper.selectOne(queryWrapper));
}
/**
* 根据业务单号修改信息
*
* @param memberLog
* @return
*/
@Override
public R<Boolean> updateByBusinessNo(CuMemberServiceLog memberLog) {
UpdateWrapper<CuMemberServiceLog> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("BUSINESS_NO", memberLog.getBusinessNo());
LambdaUpdateWrapper<CuMemberServiceLog> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(CuMemberServiceLog::getBusinessNo, memberLog.getBusinessNo());
return R.ok(baseMapper.update(memberLog, updateWrapper) == 1);
}
/**
* 查询列表信息
*
* @param editType
* @param memberCode
* @param memberName
* @param pkCountry
* @param approveStatus
* @return
*/
@Override
public List<CuMemberServiceLog> queryList(Integer editType, String memberCode, String memberName, Integer pkCountry, Integer approveStatus) {
return baseMapper.queryList(editType, memberCode, memberName, pkCountry, approveStatus);
}
/**
* @description: 根据业务单号查询业务日志
* @author: zhang jing
* @date: 2023/7/29 11:16
* @param: [cuMemberServiceLog]
* @return: java.util.List<com.hzs.common.domain.member.detail.CuMemberServiceLog>
**/
@Override
public R<List<CuMemberServiceLog>> selectCuMemberServiceLog(String businessNo) {
QueryWrapper<CuMemberServiceLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("BUSINESS_NO", businessNo);
return R.ok(baseMapper.selectList(queryWrapper));
}
/**
* 查询展示列表
*
* @return
*/
@Override
public List<CuMemberServiceLog> selectByList(CuMemberServiceLogExt memberServiceLogExt) {
return baseMapper.selectByList(memberServiceLogExt);
@ -220,41 +124,4 @@ public class CuMemberServiceLogServiceImpl extends ServiceImpl<CuMemberServiceLo
return baseMapper.selectServiceValue(cuMemberServiceLog);
}
@Override
public CuMemberServiceLogExt queryPolicy(Long pkMember) {
return baseMapper.queryPolicy(pkMember);
}
/**
* @description: 查询会员办理业务日志最新数据
* @author: zhang jing
* @date: 2023/3/24 9:08
* @param: [pkMember, editType, approveStatus]
* @return: com.hzs.member.detail.vo.CuMemberServiceLogVO
**/
@Override
public CuMemberServiceLogVO selectTopDataList(Long pkMember, List<Integer> editType, int approveStatus,String actEndDateStr) {
CuMemberServiceLogVO cmvo=new CuMemberServiceLogVO();
List<CuMemberServiceLog> cmsList=baseMapper.selectTopDataList(pkMember, editType, approveStatus,actEndDateStr);
if(CollectionUtil.isNotEmpty(cmsList)){
List<CuMemberServiceLog> sortedCmsList = cmsList.stream()
.sorted(Comparator.comparing(CuMemberServiceLog::getCreationTime))
.collect(Collectors.toList());
for(CuMemberServiceLog cms: sortedCmsList){
cms.setPkMember(pkMember);
if(cms.getEditType()== EApprovalBusiness.CHANGE_NAME.getValue()){
cmvo.setOldName(cms.getOldValue());
}if(cms.getEditType()== EApprovalBusiness.CHANGE_PHONE.getValue()){
cmvo.setOldPhone(cms.getOldValue());
}if(cms.getEditType()== EApprovalBusiness.DOMICILE_CHANGE.getValue()){
DomicileChangeVO oldValue = JSONUtil.toBean(cms.getOldValue(), DomicileChangeVO.class);
cmvo.setOldPhone(oldValue.getPhone());
cmvo.setOldName(oldValue.getMemberName());
}
}
}
return cmvo;
}
}

135
bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml
View File

@ -78,7 +78,6 @@
<result column="TRANSFER_STATUS" property="transferStatus"/>
</resultMap>
<select id="selectByMaxApproveNumber" resultType="integer">
select nvl(max(APPROVE_NUMBER),0) from CU_MEMBER_SERVICE_LOG
where EDIT_TYPE = #{editType}
@ -149,27 +148,8 @@
</if>
</select>
<!--查询审核通过的最新数据-->
<select id="selectNewestServiceLog" resultMap="CuMemberServiceLogVO"
parameterType="com.hzs.member.detail.vo.CuMemberServiceLogVO">
select *
from (select b.PK_ID,
b.pk_member,
b.OLD_VALUE,
b.NEW_VALUE,
b.APPROVE_NUMBER,
ROW_NUMBER() OVER(PARTITION BY b.pk_member ORDER BY b.APPROVE_NUMBER DESC) rw
from CU_MEMBER_SERVICE_LOG b
where b.EDIT_TYPE = #{editType}
and b.APPROVE_STATUS = 5) a
where a.rw = 1
and a.pk_member = #{pkMember}
</select>
<!--查询会员原值-->
<select id="selectOldValue"
resultMap="BusinessMemberVO"
<select id="selectOldValue" resultMap="BusinessMemberVO"
parameterType="com.hzs.member.handlebusiness.vo.BusinessMemberVO">
SELECT
a.PK_ID pk_member,
@ -217,36 +197,72 @@
</if>
</select>
<select id="queryMaxCuMemberServiceLog" resultMap="CuMemberServiceLog">
select to_number(ml.pk_member) pk_member,ml.edit_type,ml.old_value,ml.new_value from CU_MEMBER_SERVICE_LOG ml
inner join(
select pk_member,edit_type,max(pk_id) pk_id from CU_MEMBER_SERVICE_LOG where del_flag = 0
and pk_member = #{pkMember} and BUSINESS_SCOPE = 1 and edit_type in
<foreach collection="editTypeList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
group by pk_member,edit_type) b
on ml.pk_id = b.pk_id
union
select cm.pk_id pk_member,a.edit_type,a.old_value,a.new_value from bd_vertex bv
inner join(
select ml.pk_member,ml.edit_type,ml.old_value,ml.new_value from CU_MEMBER_SERVICE_LOG ml
inner join(
select pk_member,edit_type,max(pk_id) pk_id from CU_MEMBER_SERVICE_LOG where del_flag = 0
<!-- 查询 pkId 最大的业务办理 -->
<select id="listMaxMemberServiceLog" resultMap="CuMemberServiceLog">
select to_number(ml.pk_member) pk_member,ml.edit_type,ml.old_value,ml.new_value
from CU_MEMBER_SERVICE_LOG ml
inner join (
select pk_member, edit_type, max(pk_id) pk_id
from CU_MEMBER_SERVICE_LOG
where del_flag = 0
and pk_member = #{pkMember}
and business_scope = 1
and approve_status = 5
and edit_type in
<foreach collection="editTypeList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
and BUSINESS_SCOPE=2
group by pk_member,edit_type
group by pk_member, edit_type
) b
on ml.pk_id = b.pk_id) a
on bv.pk_member=a.pk_member
on ml.pk_id = b.pk_id
union
select cm.pk_id pk_member,a.edit_type,a.old_value,a.new_value
from bd_vertex bv
inner join (
select ml.pk_member,ml.edit_type,ml.old_value,ml.new_value
from CU_MEMBER_SERVICE_LOG ml
inner join (
select pk_member, edit_type, max(pk_id) pk_id
from CU_MEMBER_SERVICE_LOG
where del_flag = 0
and business_scope = 2
and approve_status = 5
and edit_type in
<foreach collection="editTypeList" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
group by pk_member, edit_type
) b
on ml.pk_id = b.pk_id
) a
on bv.pk_member = a.pk_member
inner join cu_member cm
on cm.pk_vertex=bv.pk_id
on cm.pk_vertex = bv.pk_id
where cm.pk_id = #{pkMember} and cm.del_flag=0
</select>
<!-- 获取最新业务办理 -->
<select id="getBloodMemberServiceLog" resultMap="CuMemberServiceLog">
select *
from (select cm.le, cmsl.*
from (select level le, cm.pk_id
from cu_member cm
where cm.del_flag = 0
start
with cm.pk_id = #{pkMember}
connect by cm.pk_id = prior cm.pk_parent
order by level) cm
inner join (select cmsl.*
from CU_MEMBER_SERVICE_LOG cmsl
where cmsl.del_flag = 0
and cmsl.approve_status = 5
and cmsl.business_scope = 3
and cmsl.edit_type = #{editType}
order by cmsl.creation_time desc) cmsl
on cm.pk_id = cmsl.pk_member
order by cm.le) t
where rownum = 1
</select>
<select id="selectServiceValue" resultMap="resultMap">
select *
@ -331,39 +347,4 @@
order by cms.CREATION_TIME desc
</select>
<!-- 查询指定会员政策币信息 -->
<select id="queryPolicy" resultType="com.hzs.common.domain.member.detail.CuMemberServiceLogExt">
select *
from (select *
from CU_MEMBER_SERVICE_LOG
where EDIT_TYPE = 125
and PK_MEMBER = #{pkMember}
and APPROVE_STATUS = 5
order by CREATION_TIME desc)
where rownum = 1
</select>
<!--查询会员办理业务日志表最新数据-->
<select id="selectTopDataList" resultMap="CuMemberServiceLog">
select *
from (
select *
from CU_MEMBER_SERVICE_LOG
where 1=1
<if test="editTypeList != null and editTypeList != ''">
and EDIT_TYPE in
<foreach item="editType" collection="editTypeList" open="(" separator="," close=")">
#{editType}
</foreach>
</if>
and PK_MEMBER = #{pkMember}
and APPROVE_STATUS = #{approveStatus}
and del_flag = 0
<if test="actEndDateStr != null and actEndDateStr != '' ">
and CREATION_TIME &lt;= to_date(#{actEndDateStr} || ' 23:59:59', 'yyyy-mm-dd hh24:mi:ss')
</if>
order by CREATION_TIME desc)
where rownum &lt;= 2
</select>
</mapper>

130
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -338,13 +338,13 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
}
}
BigDecimal postage = saOrder.getPostage();
// 处理乐学易考代金券
payMoney = handleLeXueYiKaoCoupon(cuMemberAccount, saOrder, payMoney, orderItemList);
if (!ComputeUtil.compareValue(payMoney)) {
cuMemberAccount.setIsPayment(Boolean.TRUE);
}
// 个人政策币配置，政策币个人配置优先特殊配置
UpPolicyCurrency upPolicyCurrency = iCuMemberServiceLogServiceApi.queryMaxCuMemberServiceLog(cuMemberAccount.getPkMember(), Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue())).getData();
// 验证商品是否存在特殊消费配置
if (CollectionUtil.isNotEmpty(orderItemList)) {
for (SaOrderItems saOrderItems : orderItemList) {
@ -353,14 +353,14 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
payMoney = ComputeUtil.computeSubtract(payMoney, orderItemPayMoney);
List<AreaCurrencyDTO> areaCurrencyDtoList = areaCurrencyServiceApi.queryAreaCurrencyByCondition(saOrderItems.getPkSpecialCurrency()).getData();
if (!handleSaOrderAmount(saOrder, orderItemList, cuMemberAccount, orderItemPayMoney, BigDecimal.ZERO, areaCurrencyDtoList)) {
if (!handleSaOrderAmount(upPolicyCurrency, cuMemberAccount, orderItemPayMoney, BigDecimal.ZERO, areaCurrencyDtoList)) {
return null;
}
}
}
}
handleSaOrderAmount(saOrder, orderItemList, cuMemberAccount, payMoney, postage, areaCurrencyDTOList);
handleSaOrderAmount(upPolicyCurrency, cuMemberAccount, payMoney, saOrder.getPostage(), areaCurrencyDTOList);
if (null != cuMemberAccount.getPayAccount5() && cuMemberAccount.getPayAccount5().compareTo(BigDecimal.ZERO) > 0) {
// 2024.09.24 重消专区可以使用其它币种，此处只记录重消币，其它币种需要单独计算统计
@ -375,8 +375,8 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
return memberAccountServiceApi.queryMemberAccountByCondition(cuMemberAccount).getData();
}
private Boolean handleSaOrderAmount(SaOrder saOrder, List<SaOrderItems> orderItemList,
CuMemberAccountExt cuMemberAccount, BigDecimal payMoney, BigDecimal postage,
private Boolean handleSaOrderAmount(UpPolicyCurrency upPolicyCurrency, CuMemberAccountExt cuMemberAccount,
BigDecimal payMoney, BigDecimal postage,
List<AreaCurrencyDTO> areaCurrencyDTOList) {
boolean flag = Boolean.TRUE;
if (!ComputeUtil.compareValue(ComputeUtil.computeAdd(payMoney, postage))) {
@ -386,28 +386,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 原始支付金额（订单金额 + 邮费）
BigDecimal original = payMoney;
// 2024.05.30 与业务确认，政策币个人配置优先特殊配置
// 默认情况下，注册、升级专区才能使用政策币，其它专区都是走特殊业务处理
// 个人政策币配置
UpPolicyCurrency upPolicyCurrency = null;
if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType()
|| EOrderType.UPGRADE_ORDER.getValue() == saOrder.getOrderType()) {
if (cuMemberAccount.getPayAccount3Flag()) {
// 验证是否有政策币权限
List<CuMemberServiceLog> cuMemberServiceLogs = iCuMemberServiceLogServiceApi.queryMaxCuMemberServiceLog(cuMemberAccount.getPkMember(), Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()));
if (CollectionUtil.isNotEmpty(cuMemberServiceLogs)) {
Map<Integer, CuMemberServiceLog> cuMemberServiceLogMap = new HashMap<>(ComputeUtil.mapInitCapacity(cuMemberServiceLogs.size()));
cuMemberServiceLogs.forEach(serviceLog -> cuMemberServiceLogMap.put(serviceLog.getEditType(), serviceLog));
try {
upPolicyCurrency = JSONUtil.toBean(cuMemberServiceLogMap.get(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()).getNewValue(), UpPolicyCurrency.class);
} catch (Exception e) {
e.printStackTrace();
}
}
}
}
for (AreaCurrencyDTO areaCurrencyDTO : areaCurrencyDTOList) {
// 开始扣款
// 待支付金额>0进行扣减
@ -489,100 +467,6 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
return flag;
}
/**
* 处理乐学易考代金券
*
* @param cuMemberAccount
* @param saOrder
* @param payMoney
* @param saOrderItemsList
* @return
*/
private BigDecimal handleLeXueYiKaoCoupon(CuMemberAccountExt cuMemberAccount, SaOrder saOrder, BigDecimal payMoney, List<SaOrderItems> saOrderItemsList) {
// 乐学易考，特殊复购订单查询有没有代金券，有代金券的扣除一张券
if (EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == saOrder.getOrderType()
&& CollectionUtil.isNotEmpty(saOrderItemsList)) {
// 注意同一个商品只能用一次
Map<Integer, List<SaOrderItems>> orderItemMap = new HashMap<>();
Set<Integer> productIdSet = new HashSet<>();
for (SaOrderItems saOrderItems : saOrderItemsList) {
Integer key = saOrderItems.getPkWares();
if (orderItemMap.containsKey(key)) {
orderItemMap.get(key).add(saOrderItems);
} else {
List<SaOrderItems> orderItems = new ArrayList<>();
orderItems.add(saOrderItems);
orderItemMap.put(key, orderItems);
}
productIdSet.add(saOrderItems.getPkProduct());
}
List<AcPickExt> acPickExtList = iAcPickService.queryList(AcPickQueryParam.builder().pkMember(saOrder.getPkMember()).pickType(EPickType.COUPON.getValue()).build(), saOrder.getPkCountry());
// 查询提货专区是否有代金券
if (CollectionUtil.isNotEmpty(acPickExtList)) {
// 可用法宝券数据
int pickQuantity = acPickExtList.get(0).getUsableQuantity();
Map<BigDecimal, AcPickExt> pickExtMap = new HashMap<>(ComputeUtil.mapInitCapacity(acPickExtList.size()));
acPickExtList.forEach(acPickExt -> {
if (acPickExt.getUsableQuantity() > 0) {
pickExtMap.put(acPickExt.getRetailPrice(), acPickExt);
}
});
// 查询产品，查看销售的产品中是否存在需要消耗代金券的商品
List<BdProductExt> productExtList = iBdProductService.queryProductById(productIdSet, saOrder.getPkCountry(), ERepurchaseType.LE_XUE_REPURCHASE.getValue());
if (productExtList.size() > 0) {
// 这些是可以消耗的代金券
Map<Integer, BdProductExt> productDtoMap = new HashMap<>();
// 验证拥有的代金券消费金额是否跟买的商品的需要消费的代金券一样
productExtList.forEach(productExt -> {
if (pickExtMap.containsKey(productExt.getRetailPrice())) {
productDtoMap.put(productExt.getPkId(), productExt);
}
});
List<AcPickExt> pickExtList = new ArrayList<>();
for (Integer pkWares : orderItemMap.keySet()) {
for (SaOrderItems saOrderItems : orderItemMap.get(pkWares)) {
if (productDtoMap.containsKey(saOrderItems.getPkProduct())) {
BdProductExt productExt = productDtoMap.get(saOrderItems.getPkProduct());
// 当前明细使用法宝券数量
int useQuantity;
// TODO new 实际能抵扣多少，需要判断是否有足够的法宝券
BigDecimal payAccount12 = cuMemberAccount.getPayAccount12() == null ? BigDecimal.ZERO : cuMemberAccount.getPayAccount12();
if (pickQuantity >= saOrderItems.getWaresQuantity()) {
// 法宝券 >= 商品数量，直接使用商品数量
payMoney = ComputeUtil.computeSubtract(payMoney, ComputeUtil.computeMultiply(productExt.getRetailPrice(), saOrderItems.getWaresQuantity()));
cuMemberAccount.setPayAccount12(ComputeUtil.computeAdd(payAccount12, ComputeUtil.computeMultiply(productExt.getRetailPrice(), saOrderItems.getWaresQuantity())));
useQuantity = saOrderItems.getWaresQuantity();
pickQuantity -= saOrderItems.getWaresQuantity();
} else {
// 法宝券 < 商品数量，直接使用法宝券数量
payMoney = ComputeUtil.computeSubtract(payMoney, ComputeUtil.computeMultiply(productExt.getRetailPrice(), pickQuantity));
cuMemberAccount.setPayAccount12(ComputeUtil.computeAdd(payAccount12, ComputeUtil.computeMultiply(productExt.getRetailPrice(), pickQuantity)));
useQuantity = pickQuantity;
pickQuantity = 0;
}
saOrderItems.setUsePick(useQuantity);
for (int i = 0; i < useQuantity; i++) {
pickExtList.add(pickExtMap.get(productExt.getRetailPrice()));
}
break;
}
}
}
if (pickExtList.size() > 0) {
cuMemberAccount.setPickExtList(pickExtList);
}
}
}
}
return payMoney;
}
/**
* 点击确认订单按钮
* 将会员端传递过来的保单信息封装为订单信息,待支付时直接入库，直接保存时先放入redis暂存，待支付时在保存入库

15
bd-business/bd-business-system/src/main/java/com/hzs/system/config/provider/ServiceChargeServiceProvider.java
View File

@ -12,25 +12,14 @@ import java.util.ArrayList;
import java.util.List;
/**
* @description: 业务办理手续费dubbo服务类
* @author: zhang jing
* @date: 2023/1/7 15:04
* @param:
* @return:
**/
* 业务办理手续费dubbo服务类
*/
@DubboService
public class ServiceChargeServiceProvider implements IServiceChargeServiceApi {
@Autowired
private IBdServiceChargeService iBdServiceChargeService;
/**
* @description: 根据业务类型查询扣款
* @author: zhang jing
* @date: 2023/1/7 15:13
* @param: [serviceChargeDTO]
* @return: com.hzs.common.core.domain.R<com.hzs.system.config.dto.ServiceChargeDTO>
**/
@Override
public R<ServiceChargeDTO> getServiceChargeByType(ServiceChargeDTO serviceChargeDTO) {
ServiceChargeDTO dto = iBdServiceChargeService.getServiceChargeByType(serviceChargeDTO);

15
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdServiceChargeService.java
View File

@ -8,14 +8,13 @@ import com.hzs.system.config.vo.ServiceChargeVo;
import java.util.List;
/**
* <p>
* 办理业务手续费配置主表 服务类
* </p>
*
* @author hzs
* @since 2023-01-03
*/
public interface IBdServiceChargeService extends IService<BdServiceCharge> {
/**
* 新增
*
@ -46,16 +45,16 @@ public interface IBdServiceChargeService extends IService<BdServiceCharge> {
ServiceChargeVo getServiceCharge(Long pkServiceCharge);
/**
* @description: 根据业务类型查询扣款
* @author: zhang jing
* @date: 2023/1/7 14:44
* @param: [serviceChargeVo]
* @return: com.hzs.system.config.vo.ServiceChargeVo
**/
* 根据业务类型查询扣款
*
* @param serviceChargeDTO
* @return
*/
ServiceChargeDTO getServiceChargeByType(ServiceChargeDTO serviceChargeDTO);
/**
* 查询列表
*
* @param serviceCharge
* @return
*/

103
bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdServiceChargeServiceImpl.java
View File

@ -1,12 +1,9 @@
package com.hzs.system.config.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.constant.CacheConstants;
import com.hzs.common.core.enums.EDelFlag;
import com.hzs.common.core.service.RedisService;
import com.hzs.common.domain.serviceCharge.BdServiceCharge;
import com.hzs.common.domain.serviceCharge.BdServiceChargeDetail;
import com.hzs.common.security.utils.SecurityUtils;
@ -24,28 +21,16 @@ import java.util.Date;
import java.util.List;
/**
* <p>
* 办理业务手续费配置主表 服务实现类
* </p>
*
* @author hzs
* @since 2023-01-03
*/
@Service
public class BdServiceChargeServiceImpl extends ServiceImpl<BdServiceChargeMapper, BdServiceCharge> implements IBdServiceChargeService {
@Autowired
private IBdServiceChargeService serviceChargeService;
@Autowired
private IBdServiceChargeDetailService serviceChargeDetailService;
@Autowired
private RedisService redisService;
/**
* 新增
*
* @param serviceChargeVo
* @return
*/
@Autowired
private IBdServiceChargeService iBdServiceChargeService;
@Autowired
private IBdServiceChargeDetailService iBdServiceChargeDetailService;
@Override
@Transactional(rollbackFor = Exception.class)
public void saveServiceCharge(ServiceChargeVo serviceChargeVo) {
@ -53,91 +38,61 @@ public class BdServiceChargeServiceImpl extends ServiceImpl<BdServiceChargeMappe
bdServiceCharge.setPkCreator(SecurityUtils.getUserId());
bdServiceCharge.setCreationTime(new Date());
bdServiceCharge.setPkCountry(serviceChargeVo.getPkCountry());
serviceChargeService.save(bdServiceCharge);
iBdServiceChargeService.save(bdServiceCharge);
for (BdServiceChargeDetail bdServiceChargeDetail : serviceChargeVo.getServiceChargeDetailsList()) {
bdServiceChargeDetail.setPkServiceCharge(bdServiceCharge.getPkId());
bdServiceChargeDetail.setPkCountry(serviceChargeVo.getPkCountry());
}
serviceChargeDetailService.saveBatch(serviceChargeVo.getServiceChargeDetailsList());
iBdServiceChargeDetailService.saveBatch(serviceChargeVo.getServiceChargeDetailsList());
}
/**
* 修改
*
* @param serviceChargeVo
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void updateServiceCharge(ServiceChargeVo serviceChargeVo) {
BdServiceCharge bdServiceCharge = BeanUtil.copyProperties(serviceChargeVo, BdServiceCharge.class);
bdServiceCharge.setPkModified(SecurityUtils.getUserId());
bdServiceCharge.setModifiedTime(new Date());
serviceChargeService.updateById(bdServiceCharge);
UpdateWrapper<BdServiceChargeDetail> updateWrapper =new UpdateWrapper<>();
updateWrapper.eq("PK_SERVICE_CHARGE",bdServiceCharge.getPkId());
serviceChargeDetailService.remove(updateWrapper);
iBdServiceChargeService.updateById(bdServiceCharge);
LambdaUpdateWrapper<BdServiceChargeDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(BdServiceChargeDetail::getPkServiceCharge, bdServiceCharge.getPkId());
iBdServiceChargeDetailService.remove(updateWrapper);
for (BdServiceChargeDetail bdServiceChargeDetail : serviceChargeVo.getServiceChargeDetailsList()) {
bdServiceChargeDetail.setPkServiceCharge(bdServiceCharge.getPkId());
}
serviceChargeDetailService.saveBatch(serviceChargeVo.getServiceChargeDetailsList());
iBdServiceChargeDetailService.saveBatch(serviceChargeVo.getServiceChargeDetailsList());
}
/**
* 删除
*
* @param pkServiceCharge
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void deleteServiceCharge(Long pkServiceCharge) {
iBdServiceChargeService.removeById(pkServiceCharge);
serviceChargeService.removeById(pkServiceCharge);
UpdateWrapper<BdServiceChargeDetail> updateWrapper =new UpdateWrapper<>();
updateWrapper.eq("PK_SERVICE_CHARGE",pkServiceCharge);
serviceChargeDetailService.remove(updateWrapper);
LambdaUpdateWrapper<BdServiceChargeDetail> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(BdServiceChargeDetail::getPkServiceCharge, pkServiceCharge);
iBdServiceChargeDetailService.remove(updateWrapper);
}
/**
* 查询详情
*
* @param pkServiceCharge
* @return
*/
@Override
public ServiceChargeVo getServiceCharge(Long pkServiceCharge) {
// String redisKey = CacheConstants.BD_AREA_CLASSIFY + pkServiceCharge;
// ServiceChargeVo sv = redisService.getCacheObject(redisKey);
//if (sv == null) {
BdServiceCharge serviceCharge = serviceChargeService.getById(pkServiceCharge);
ServiceChargeVo serviceChargeVo = BeanUtil.copyProperties(serviceCharge, ServiceChargeVo.class);
serviceChargeVo.setPkServiceCharge(serviceCharge.getPkId());
QueryWrapper<BdServiceChargeDetail> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("PK_SERVICE_CHARGE", serviceCharge.getPkId());
List<BdServiceChargeDetail> serviceChargeDetailsList = serviceChargeDetailService.list(queryWrapper);
serviceChargeVo.setServiceChargeDetailsList(serviceChargeDetailsList);
// sv = serviceChargeVo;
// }
BdServiceCharge serviceCharge = iBdServiceChargeService.getById(pkServiceCharge);
LambdaQueryWrapper<BdServiceChargeDetail> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(BdServiceChargeDetail::getPkServiceCharge, serviceCharge.getPkId());
List<BdServiceChargeDetail> serviceChargeDetailsList = iBdServiceChargeDetailService.list(queryWrapper);
ServiceChargeVo serviceChargeVo = BeanUtil.copyProperties(serviceCharge, ServiceChargeVo.class);
serviceChargeVo.setPkServiceCharge(serviceCharge.getPkId());
serviceChargeVo.setServiceChargeDetailsList(serviceChargeDetailsList);
return serviceChargeVo;
}
/**
* @description: 根据业务类型查询扣费
* @author: zhang jing
* @date: 2023/1/7 14:50
* @param: [serviceChargeVo]
* @return: com.hzs.system.config.vo.ServiceChargeVo
**/
@Override
public ServiceChargeDTO getServiceChargeByType(ServiceChargeDTO serviceChargeDTO) {
return baseMapper.getServiceChargeByType(serviceChargeDTO);
}
/**
* 查询列表
* @param serviceCharge
* @return
*/
@Override
public List<ServiceChargeVo> selectByList(BdServiceCharge serviceCharge) {
return baseMapper.selectByList(serviceCharge);

4
bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java
View File

@ -2868,7 +2868,9 @@ public class EnumsController extends BaseController {
public AjaxResult businessScope() {
List<EnumEntity> enumEntityList = new ArrayList<>();
for (EBusinessScope value : EBusinessScope.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
if (value.getEnable() == EYesNo.YES.getIntValue()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
}
return AjaxResult.success(enumEntityList);
}

12
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessScope.java
View File

@ -4,11 +4,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 会员业务范围
* @Author: jiang chao
* @Time: 2023/11/9 11:41
* @Classname: EBusinessScope
* @PackageName: com.hzs.common.core.enums
* 会员业务范围
*/
@AllArgsConstructor
@Getter
@ -21,7 +17,11 @@ public enum EBusinessScope {
/**
* 体系
*/
VERTEX(2, "体系", 0),
VERTEX(2, "体系", 1),
/**
* 血缘
*/
BLOOD(3, "血缘", 0),
;

22
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EPopupType.java
View File

@ -6,12 +6,6 @@ import lombok.Getter;
/**
* 弹窗类型
*
* @Description:
* @Author: ljc
* @Time: 2023/2/2 11:35
* @Classname: ENoticeType
* @Package_name: com.hzs.common.core.enums
*/
@AllArgsConstructor
@Getter
@ -43,4 +37,20 @@ public enum EPopupType {
* 国际化翻译key值
*/
private final String key;
/**
* 根据枚举值获取枚举显示
*
* @param value
* @return
*/
public static String getLableByValue(int value) {
for (EPopupType ePopupType : EPopupType.values()) {
if (ePopupType.getValue() == value) {
return ePopupType.getLabel();
}
}
return "";
}
}

2
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java
View File

@ -108,7 +108,7 @@ public class CuMemberServiceLog extends BaseEntity {
private String orderNumber;
/**
* 业务范围（1=会员，2=体系）
* 业务范围（1=会员，2=体系，3=血缘）
*/
@TableField("BUSINESS_SCOPE")
private Integer businessScope;

5
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuMemberAccountExt.java
View File

@ -180,9 +180,4 @@ public class CuMemberAccountExt extends CuMemberAccount {
*/
private BigDecimal tradeAmount;
/**
* 政策币使用标记（如果为false则不能使用）
*/
private Boolean payAccount3Flag = Boolean.TRUE;
}