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

## 安置架构业绩显示2位小数；

This commit is contained in:
cabbage 2025-04-24 15:01:51 +08:00
parent 52815239e4
commit c77f9a90ad
5 changed files with 143 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/controller/manage/UpdatePlaceParentController.java
View File

@ -4,12 +4,10 @@ import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.AccessPermissions;
import com.hzs.common.core.annotation.Log; import com.hzs.common.core.annotation.Log;
import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.constant.HttpStatus; import com.hzs.common.core.constant.HttpStatus;
import com.hzs.common.core.constant.MemberConstants;
import com.hzs.common.core.constant.msg.ConfigMsgConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*; import com.hzs.common.core.enums.*;
@ -58,36 +56,32 @@ import java.util.stream.Collectors;
/** /**
* @Description: 修改安置关系控制器 * @Description: 修改安置关系控制器
* @Author: yuhui
* @Time: 2023/1/4 15:40
* @Classname: UpdatePlaceParentController
* @PackageName: com.hzs.member.base.controller.manager
*/ */
@RequestMapping("/manage/update-place-parent") @RequestMapping("/manage/update-place-parent")
@RestController @RestController
public class UpdatePlaceParentController extends BaseController { public class UpdatePlaceParentController extends BaseController {
@Autowired @Autowired
private ICuMemberTradeService cuMemberTradeService; private ICuMemberTradeService iCuMemberTradeService;
@Autowired @Autowired
private ICuMemberServiceLogService memberServiceLogService; private ICuMemberServiceLogService iCuMemberServiceLogService;
@Autowired @Autowired
private ICuMemberService cuMemberService; private ICuMemberService iCuMemberService;
@Autowired @Autowired
private ITransactionCommonService iTransactionCommonService; private ITransactionCommonService iTransactionCommonService;
@DubboReference @DubboReference
IServiceChargeServiceApi serviceChargeServiceApi; IServiceChargeServiceApi iServiceChargeServiceApi;
@DubboReference @DubboReference
IAccountServiceApi accountServiceApi; IAccountServiceApi iAccountServiceApi;
@DubboReference @DubboReference
IAwardsServiceApi awardsServiceApi; IAwardsServiceApi iAwardsServiceApi;
@DubboReference @DubboReference
IVertexServiceApi vertexServiceApi; IVertexServiceApi iVertexServiceApi;
@DubboReference @DubboReference
ISaOrderServiceApi orderServiceApi; ISaOrderServiceApi iSaOrderServiceApi;
@DubboReference @DubboReference
IBusinessCommission businessCommission; IBusinessCommission iBusinessCommission;
/** /**
* 安置关系记录列表 * 安置关系记录列表
@ -96,7 +90,7 @@ public class UpdatePlaceParentController extends BaseController {
*/ */
@AccessPermissions("ModifyPlacement") @AccessPermissions("ModifyPlacement")
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_RESETTLE, method = EOperationMethod.SELECT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_RESETTLE, method = EOperationMethod.SELECT)
@GetMapping("list") @GetMapping("/list")
public TableDataInfo list(String memberCode, String memberName, Integer approveStatus) { public TableDataInfo list(String memberCode, String memberName, Integer approveStatus) {
CuMemberServiceLogExt memberServiceLogExt = new CuMemberServiceLogExt(); CuMemberServiceLogExt memberServiceLogExt = new CuMemberServiceLogExt();
memberServiceLogExt.setEditType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); memberServiceLogExt.setEditType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
@ -106,20 +100,20 @@ public class UpdatePlaceParentController extends BaseController {
memberServiceLogExt.setApproveStatus(approveStatus); memberServiceLogExt.setApproveStatus(approveStatus);
startPage(); startPage();
List<CuMemberServiceLog> list = memberServiceLogService.selectByList(memberServiceLogExt); List<CuMemberServiceLog> list = iCuMemberServiceLogService.selectByList(memberServiceLogExt);
List<UpdatePlaceParentVo> resultList = new ArrayList<>(); List<UpdatePlaceParentVo> resultList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values()); Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values());
// 奖衔 // 奖衔
R<List<BdAwards>> awardsData = awardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); R<List<BdAwards>> awardsData = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry());
Map<Integer, BdAwards> awardsMap = awardsData.getData().stream().collect(Collectors.toMap(BdAwards::getPkId, Function.identity())); Map<Integer, BdAwards> awardsMap = awardsData.getData().stream().collect(Collectors.toMap(BdAwards::getPkId, Function.identity()));
// 体系 // 体系
R<List<VertexDTO>> vertexDto = vertexServiceApi.findAll(); R<List<VertexDTO>> vertexDto = iVertexServiceApi.findAll();
Map<Long, VertexDTO> vertexMap = vertexDto.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity())); Map<Long, VertexDTO> vertexMap = vertexDto.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity()));
List<CuMember> pkIdMemberList = cuMemberService.listByIds(list.stream().map(CuMemberServiceLog::getPkMember).collect(Collectors.toSet())); List<CuMember> pkIdMemberList = iCuMemberService.listByIds(list.stream().map(CuMemberServiceLog::getPkMember).collect(Collectors.toSet()));
Map<Long, CuMember> pkMemberMap = pkIdMemberList.stream().collect(Collectors.toMap(CuMember::getPkId, val -> val)); Map<Long, CuMember> pkMemberMap = pkIdMemberList.stream().collect(Collectors.toMap(CuMember::getPkId, val -> val));
for (CuMemberServiceLog cuMemberServiceLog : list) { for (CuMemberServiceLog cuMemberServiceLog : list) {
@ -149,7 +143,7 @@ public class UpdatePlaceParentController extends BaseController {
if (StringUtils.isNotBlank(cuMemberServiceLog.getOldValue()) && JSONUtil.isJson(cuMemberServiceLog.getOldValue())) { if (StringUtils.isNotBlank(cuMemberServiceLog.getOldValue()) && JSONUtil.isJson(cuMemberServiceLog.getOldValue())) {
JSONObject jsonObject = JSONObject.parseObject(cuMemberServiceLog.getOldValue()); JSONObject jsonObject = JSONObject.parseObject(cuMemberServiceLog.getOldValue());
String placeMemberCode = jsonObject.getString("placeMemberCode"); String placeMemberCode = jsonObject.getString("placeMemberCode");
CuMemberExt memberByCode = cuMemberService.getMemberByCode(placeMemberCode); CuMemberExt memberByCode = iCuMemberService.getMemberByCode(placeMemberCode);
if (memberByCode != null) { if (memberByCode != null) {
updatePlaceParentVo.setParMemberCode(memberByCode.getMemberCode()); updatePlaceParentVo.setParMemberCode(memberByCode.getMemberCode());
if (member.getPlaceDept() != null) { if (member.getPlaceDept() != null) {
@ -163,7 +157,7 @@ public class UpdatePlaceParentController extends BaseController {
String placeMemberCode = jsonObject.getString("placeMemberCode"); String placeMemberCode = jsonObject.getString("placeMemberCode");
Integer placeDept = jsonObject.getInteger("placeDept"); Integer placeDept = jsonObject.getInteger("placeDept");
updatePlaceParentVo.setEditNewPlaceMemberCode(placeMemberCode); updatePlaceParentVo.setEditNewPlaceMemberCode(placeMemberCode);
CuMember newMember = cuMemberService.getMember(placeMemberCode); CuMember newMember = iCuMemberService.getMember(placeMemberCode);
if (newMember != null) { if (newMember != null) {
updatePlaceParentVo.setEditNewPlaceMemberName(newMember.getMemberName()); updatePlaceParentVo.setEditNewPlaceMemberName(newMember.getMemberName());
if (placeDept != null) { if (placeDept != null) {
@ -191,7 +185,7 @@ public class UpdatePlaceParentController extends BaseController {
* @param * @param
* @return * @return
*/ */
@PostMapping("export") @PostMapping("/export")
public void export(String memberCode, String memberName, Integer approveStatus, HttpServletResponse response) { public void export(String memberCode, String memberName, Integer approveStatus, HttpServletResponse response) {
CuMemberServiceLogExt memberServiceLogExt = new CuMemberServiceLogExt(); CuMemberServiceLogExt memberServiceLogExt = new CuMemberServiceLogExt();
@ -201,20 +195,20 @@ public class UpdatePlaceParentController extends BaseController {
memberServiceLogExt.setMemberName(memberName); memberServiceLogExt.setMemberName(memberName);
memberServiceLogExt.setApproveStatus(approveStatus); memberServiceLogExt.setApproveStatus(approveStatus);
List<CuMemberServiceLog> list = memberServiceLogService.selectByList(memberServiceLogExt); List<CuMemberServiceLog> list = iCuMemberServiceLogService.selectByList(memberServiceLogExt);
List<UpdatePlaceParentVo> resultList = new ArrayList<>(); List<UpdatePlaceParentVo> resultList = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values()); Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EApproveStatus.values());
// 奖衔 // 奖衔
R<List<BdAwards>> awardsData = awardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); R<List<BdAwards>> awardsData = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry());
Map<Integer, BdAwards> awardsMap = awardsData.getData().stream().collect(Collectors.toMap(BdAwards::getPkId, Function.identity())); Map<Integer, BdAwards> awardsMap = awardsData.getData().stream().collect(Collectors.toMap(BdAwards::getPkId, Function.identity()));
// 体系 // 体系
R<List<VertexDTO>> vertexDto = vertexServiceApi.findAll(); R<List<VertexDTO>> vertexDto = iVertexServiceApi.findAll();
Map<Long, VertexDTO> vertexMap = vertexDto.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity())); Map<Long, VertexDTO> vertexMap = vertexDto.getData().stream().collect(Collectors.toMap(VertexDTO::getPkId, Function.identity()));
List<CuMember> pkIdMemberList = cuMemberService.listByIds(list.stream().map(CuMemberServiceLog::getPkMember).collect(Collectors.toSet())); List<CuMember> pkIdMemberList = iCuMemberService.listByIds(list.stream().map(CuMemberServiceLog::getPkMember).collect(Collectors.toSet()));
Map<Long, CuMember> pkMemberMap = pkIdMemberList.stream().collect(Collectors.toMap(CuMember::getPkId, val -> val)); Map<Long, CuMember> pkMemberMap = pkIdMemberList.stream().collect(Collectors.toMap(CuMember::getPkId, val -> val));
for (CuMemberServiceLog cuMemberServiceLog : list) { for (CuMemberServiceLog cuMemberServiceLog : list) {
@ -240,7 +234,7 @@ public class UpdatePlaceParentController extends BaseController {
if (StringUtils.isNotBlank(cuMemberServiceLog.getOldValue()) && JSONUtil.isJson(cuMemberServiceLog.getOldValue())) { if (StringUtils.isNotBlank(cuMemberServiceLog.getOldValue()) && JSONUtil.isJson(cuMemberServiceLog.getOldValue())) {
JSONObject jsonObject = JSONObject.parseObject(cuMemberServiceLog.getOldValue()); JSONObject jsonObject = JSONObject.parseObject(cuMemberServiceLog.getOldValue());
String placeMemberCode = jsonObject.getString("placeMemberCode"); String placeMemberCode = jsonObject.getString("placeMemberCode");
CuMemberExt memberByCode = cuMemberService.getMemberByCode(placeMemberCode); CuMemberExt memberByCode = iCuMemberService.getMemberByCode(placeMemberCode);
if (memberByCode != null) { if (memberByCode != null) {
updatePlaceParentVo.setParMemberCode(memberByCode.getMemberCode()); updatePlaceParentVo.setParMemberCode(memberByCode.getMemberCode());
if (member.getPlaceDept() != null) { if (member.getPlaceDept() != null) {
@ -254,7 +248,7 @@ public class UpdatePlaceParentController extends BaseController {
String placeMemberCode = jsonObject.getString("placeMemberCode"); String placeMemberCode = jsonObject.getString("placeMemberCode");
Integer placeDept = jsonObject.getInteger("placeDept"); Integer placeDept = jsonObject.getInteger("placeDept");
updatePlaceParentVo.setEditNewPlaceMemberCode(placeMemberCode); updatePlaceParentVo.setEditNewPlaceMemberCode(placeMemberCode);
CuMember newMember = cuMemberService.getMember(placeMemberCode); CuMember newMember = iCuMemberService.getMember(placeMemberCode);
if (newMember != null) { if (newMember != null) {
updatePlaceParentVo.setEditNewPlaceMemberName(newMember.getMemberName()); updatePlaceParentVo.setEditNewPlaceMemberName(newMember.getMemberName());
if (placeDept != null) { if (placeDept != null) {
@ -287,11 +281,11 @@ public class UpdatePlaceParentController extends BaseController {
// 校验编号是否存在 // 校验编号是否存在
for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) { for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) {
CuMember member = cuMemberService.getMemberByCode(updateParentParam.getMemberCode()); CuMember member = iCuMemberService.getMemberByCode(updateParentParam.getMemberCode());
if (member == null) { if (member == null) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
} }
CuMember parentMember = cuMemberService.getMemberByCode(updateParentParam.getEditNewPlaceMemberCode()); CuMember parentMember = iCuMemberService.getMemberByCode(updateParentParam.getEditNewPlaceMemberCode());
if (parentMember == null) { if (parentMember == null) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
} }
@ -303,7 +297,7 @@ public class UpdatePlaceParentController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL));
} }
//校验新安置部门和安置编号下是否已存在节点 //校验新安置部门和安置编号下是否已存在节点
Long placeDeptCount = cuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); Long placeDeptCount = iCuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept);
if (placeDeptCount > 0) { if (placeDeptCount > 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY));
} }
@ -312,12 +306,12 @@ public class UpdatePlaceParentController extends BaseController {
query.eq("APPROVE_STATUS", EApproveStatus.ALREADY_SUBMIT.getValue()); query.eq("APPROVE_STATUS", EApproveStatus.ALREADY_SUBMIT.getValue());
query.eq("EDIT_TYPE", EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); query.eq("EDIT_TYPE", EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
query.eq("PK_MEMBER", member.getPkId()); query.eq("PK_MEMBER", member.getPkId());
int ct = memberServiceLogService.count(query); int ct = iCuMemberServiceLogService.count(query);
if (ct > 0) { if (ct > 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PARENT_UPDATE)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PARENT_UPDATE));
} }
//当前最大次数 //当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(member.getPkId(), Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(member.getPkId(),
EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue()); EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue());
updateParentParam.setChangeNumber(approveNumber + 1); updateParentParam.setChangeNumber(approveNumber + 1);
//查询扣费金额，账户信息 //查询扣费金额，账户信息
@ -325,7 +319,7 @@ public class UpdatePlaceParentController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1); serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
updateParentParam.setCost(serviceChargeDTOR.getData().getCost()); updateParentParam.setCost(serviceChargeDTOR.getData().getCost());
updateParentParam.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); updateParentParam.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
if (placeParentParam.getProcessType() == EProcessType.AVOIDSIGNING.getValue() || placeParentParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { if (placeParentParam.getProcessType() == EProcessType.AVOIDSIGNING.getValue() || placeParentParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
@ -343,14 +337,14 @@ public class UpdatePlaceParentController extends BaseController {
businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList); businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList);
placeParentParam.setMemberAmountDTOList(memberAmountDTOList); placeParentParam.setMemberAmountDTOList(memberAmountDTOList);
//接口查询金额是否足够 //接口查询金额是否足够
R<List<MemberBalanceDTO>> memberBalanceList = businessCommission.selectBalanceNotEnoughMember(businessCommissionDTO); R<List<MemberBalanceDTO>> memberBalanceList = iBusinessCommission.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList.getData())) { if (CollectionUtil.isNotEmpty(memberBalanceList.getData())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList.getData()); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList.getData());
} }
} }
} }
cuMemberService.updatePlaceParent(placeParentParam); iCuMemberService.updatePlaceParent(placeParentParam);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -359,14 +353,14 @@ public class UpdatePlaceParentController extends BaseController {
* *
* @return * @return
*/ */
@PostMapping("get-member-charging-detail") @PostMapping("/get-member-charging-detail")
public AjaxResult getMemberChargingDetail(@RequestBody MemberChargingDetailParam memberChargingDetailParam) { public AjaxResult getMemberChargingDetail(@RequestBody MemberChargingDetailParam memberChargingDetailParam) {
Integer pkCountry = SecurityUtils.getPkCountry(); Integer pkCountry = SecurityUtils.getPkCountry();
List<UpdatePlaceParentVo> resultList = new ArrayList<>(); List<UpdatePlaceParentVo> resultList = new ArrayList<>();
for (MemberChargingDetailVo memberChargingDetailVo : memberChargingDetailParam.getMemberChargingDetailList()) { for (MemberChargingDetailVo memberChargingDetailVo : memberChargingDetailParam.getMemberChargingDetailList()) {
CuMember member = cuMemberService.getMember(memberChargingDetailVo.getPkMember()); CuMember member = iCuMemberService.getMember(memberChargingDetailVo.getPkMember());
// 安置 // 安置
CuMember placeParentMember = cuMemberService.getMember(member.getPkPlaceParent()); CuMember placeParentMember = iCuMemberService.getMember(member.getPkPlaceParent());
UpdatePlaceParentVo updatePlaceParentVo = new UpdatePlaceParentVo(); UpdatePlaceParentVo updatePlaceParentVo = new UpdatePlaceParentVo();
updatePlaceParentVo.setMemberCode(member.getMemberCode()); updatePlaceParentVo.setMemberCode(member.getMemberCode());
updatePlaceParentVo.setMemberName(member.getMemberName()); updatePlaceParentVo.setMemberName(member.getMemberName());
@ -375,19 +369,19 @@ public class UpdatePlaceParentController extends BaseController {
updatePlaceParentVo.setPlaceDept(placeParentMember.getPlaceDept()); updatePlaceParentVo.setPlaceDept(placeParentMember.getPlaceDept());
updatePlaceParentVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(placeParentMember.getPlaceDept())); updatePlaceParentVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(placeParentMember.getPlaceDept()));
// 变更后 // 变更后
CuMember newPlaceParentMember = cuMemberService.getMember(memberChargingDetailVo.getEditNewPlaceMemberCode()); CuMember newPlaceParentMember = iCuMemberService.getMember(memberChargingDetailVo.getEditNewPlaceMemberCode());
updatePlaceParentVo.setEditNewPlaceMemberCode(newPlaceParentMember.getMemberCode()); updatePlaceParentVo.setEditNewPlaceMemberCode(newPlaceParentMember.getMemberCode());
updatePlaceParentVo.setEditNewPlaceMemberName(newPlaceParentMember.getMemberName()); updatePlaceParentVo.setEditNewPlaceMemberName(newPlaceParentMember.getMemberName());
updatePlaceParentVo.setEditNewPlaceDept(newPlaceParentMember.getPlaceDept()); updatePlaceParentVo.setEditNewPlaceDept(newPlaceParentMember.getPlaceDept());
updatePlaceParentVo.setEditNewPlaceDeptStr(EPlaceDept.getEPlaceDept(newPlaceParentMember.getPlaceDept())); updatePlaceParentVo.setEditNewPlaceDeptStr(EPlaceDept.getEPlaceDept(newPlaceParentMember.getPlaceDept()));
// TODO 扣款 // TODO 扣款
Integer quantity = memberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue()); Integer quantity = iCuMemberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue());
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
serviceChargeDTO.setQuantity(quantity + 1); serviceChargeDTO.setQuantity(quantity + 1);
R<ServiceChargeDTO> serviceCharge = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceCharge = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<BdAccount> account = accountServiceApi.getAccount(serviceCharge.getData().getPkAccount()); R<BdAccount> account = iAccountServiceApi.getAccount(serviceCharge.getData().getPkAccount());
updatePlaceParentVo.setPkAccount(serviceCharge.getData().getPkAccount()); updatePlaceParentVo.setPkAccount(serviceCharge.getData().getPkAccount());
updatePlaceParentVo.setAccountName(account.getData().getAccountName()); updatePlaceParentVo.setAccountName(account.getData().getAccountName());
@ -408,24 +402,24 @@ public class UpdatePlaceParentController extends BaseController {
List<MemberPlaceParentServiceLogVo> resultList = new ArrayList<>(); List<MemberPlaceParentServiceLogVo> resultList = new ArrayList<>();
for (MemberPlaceParentServiceLogVo memberServiceLogVo : list) { for (MemberPlaceParentServiceLogVo memberServiceLogVo : list) {
if (StringUtils.isNotBlank(memberServiceLogVo.getMemberCode())) { if (StringUtils.isNotBlank(memberServiceLogVo.getMemberCode())) {
CuMember member = cuMemberService.getMember(memberServiceLogVo.getMemberCode()); CuMember member = iCuMemberService.getMember(memberServiceLogVo.getMemberCode());
memberServiceLogVo.setMemberName(member.getMemberName()); memberServiceLogVo.setMemberName(member.getMemberName());
// 变更前安置编号 // 变更前安置编号
CuMember changeMember = cuMemberService.getMember(member.getPkPlaceParent()); CuMember changeMember = iCuMemberService.getMember(member.getPkPlaceParent());
memberServiceLogVo.setPlaceMemberName(changeMember.getMemberName()); memberServiceLogVo.setPlaceMemberName(changeMember.getMemberName());
memberServiceLogVo.setPlaceMemberCode(changeMember.getMemberCode()); memberServiceLogVo.setPlaceMemberCode(changeMember.getMemberCode());
memberServiceLogVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(member.getPlaceDept())); memberServiceLogVo.setPlaceDeptVal(EPlaceDept.getEPlaceDept(member.getPlaceDept()));
Integer quantity = memberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue()); Integer quantity = iCuMemberServiceLogService.selectByMaxApproveNumber(member.getPkId(), EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), EApproveStatus.FINISH.getValue());
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO(); ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
serviceChargeDTO.setQuantity(quantity + 1); serviceChargeDTO.setQuantity(quantity + 1);
R<ServiceChargeDTO> serviceCharge = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceCharge = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
R<BdAccount> account = accountServiceApi.getAccount(serviceCharge.getData().getPkAccount()); R<BdAccount> account = iAccountServiceApi.getAccount(serviceCharge.getData().getPkAccount());
memberServiceLogVo.setPkAccount(serviceCharge.getData().getPkAccount()); memberServiceLogVo.setPkAccount(serviceCharge.getData().getPkAccount());
memberServiceLogVo.setPkAccountKeyVal(account.getData().getAccountName()); memberServiceLogVo.setPkAccountKeyVal(account.getData().getAccountName());
memberServiceLogVo.setCost(serviceCharge.getData().getCost()); memberServiceLogVo.setCost(serviceCharge.getData().getCost());
CuMember newMember = cuMemberService.getMember(memberServiceLogVo.getEditNewPlaceMemberCode()); CuMember newMember = iCuMemberService.getMember(memberServiceLogVo.getEditNewPlaceMemberCode());
memberServiceLogVo.setEditNewPlaceMemberName(newMember.getMemberName()); memberServiceLogVo.setEditNewPlaceMemberName(newMember.getMemberName());
resultList.add(memberServiceLogVo); resultList.add(memberServiceLogVo);
} }
@ -439,15 +433,15 @@ public class UpdatePlaceParentController extends BaseController {
* @param placeParentParam * @param placeParentParam
* @return * @return
*/ */
@PostMapping("check-place-member") @PostMapping("/check-place-member")
public AjaxResult checkPlaceMember(@RequestBody PlaceParentParam placeParentParam) { public AjaxResult checkPlaceMember(@RequestBody PlaceParentParam placeParentParam) {
for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) { for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) {
CuMember member = cuMemberService.getMemberByCode(updateParentParam.getMemberCode()); CuMember member = iCuMemberService.getMemberByCode(updateParentParam.getMemberCode());
if (member == null) { if (member == null) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
} }
//查询修改后编号是否在安置人伞下 //查询修改后编号是否在安置人伞下
Long count = cuMemberService.checkPlaceMemberList(member.getPkParent(), updateParentParam.getEditNewPlaceMemberCode()); Long count = iCuMemberService.checkPlaceMemberList(member.getPkParent(), updateParentParam.getEditNewPlaceMemberCode());
// 查询推荐人安置伞下 // 查询推荐人安置伞下
if (count == 0) { if (count == 0) {
// TODO 让前端弹窗展示返回信息 // TODO 让前端弹窗展示返回信息
@ -460,7 +454,7 @@ public class UpdatePlaceParentController extends BaseController {
/** /**
* 首单校验变为弹窗展示 * 首单校验变为弹窗展示
*/ */
@PostMapping("check-member-first-order") @PostMapping("/check-member-first-order")
public AjaxResult checkMemberFirstOrder(@RequestBody PlaceParentParam placeParentParam) { public AjaxResult checkMemberFirstOrder(@RequestBody PlaceParentParam placeParentParam) {
// 校验编号是否存在 // 校验编号是否存在
List<String> editNewMemberCodeList = new ArrayList<>(); List<String> editNewMemberCodeList = new ArrayList<>();
@ -472,7 +466,7 @@ public class UpdatePlaceParentController extends BaseController {
} }
if (editNewMemberCodeList.size() > 0) { if (editNewMemberCodeList.size() > 0) {
// 如果是安置到右区 校验是否首单 // 如果是安置到右区 校验是否首单
List<MemberFirstOrderDTO> memberFirstOrderDTOList = orderServiceApi.checkMemberIsFirstOrder(editNewMemberCodeList); List<MemberFirstOrderDTO> memberFirstOrderDTOList = iSaOrderServiceApi.checkMemberIsFirstOrder(editNewMemberCodeList);
for (MemberFirstOrderDTO memberFirstOrderDTO : memberFirstOrderDTOList) { for (MemberFirstOrderDTO memberFirstOrderDTO : memberFirstOrderDTOList) {
if (memberFirstOrderDTO.getOrderCount() == 0) { if (memberFirstOrderDTO.getOrderCount() == 0) {
// 没有首单 校验 // 没有首单 校验
@ -489,17 +483,17 @@ public class UpdatePlaceParentController extends BaseController {
* @param placeParentParam * @param placeParentParam
* @return * @return
*/ */
@PostMapping("check-member-place-parent") @PostMapping("/check-member-place-parent")
public AjaxResult checkMemberPlaceParent(@RequestBody PlaceParentParam placeParentParam) { public AjaxResult checkMemberPlaceParent(@RequestBody PlaceParentParam placeParentParam) {
// 校验编号是否存在 // 校验编号是否存在
// List<String> editNewMemberCodeList = new ArrayList<>(); // List<String> editNewMemberCodeList = new ArrayList<>();
for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) { for (UpdatePlaceParentParam updateParentParam : placeParentParam.getUpdatePlaceParentList()) {
CuMember member = cuMemberService.getMemberByCode(updateParentParam.getMemberCode()); CuMember member = iCuMemberService.getMemberByCode(updateParentParam.getMemberCode());
if (member == null) { if (member == null) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
} }
CuMember parentMember = cuMemberService.getMember(updateParentParam.getEditNewPlaceMemberCode()); CuMember parentMember = iCuMemberService.getMember(updateParentParam.getEditNewPlaceMemberCode());
if (parentMember == null) { if (parentMember == null) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
} }
@ -515,13 +509,13 @@ public class UpdatePlaceParentController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL));
} }
//校验新安置部门和安置编号下是否已存在节点 //校验新安置部门和安置编号下是否已存在节点
Long placeDeptCount = cuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); Long placeDeptCount = iCuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept);
if (placeDeptCount > 0) { if (placeDeptCount > 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY));
} }
// 不能是自己的安置伞下 // 不能是自己的安置伞下
Long checkCount = cuMemberService.checkPlaceMemberList(member.getPkId(), updateParentParam.getEditNewPlaceMemberCode()); Long checkCount = iCuMemberService.checkPlaceMemberList(member.getPkId(), updateParentParam.getEditNewPlaceMemberCode());
if (checkCount >= 1) { if (checkCount >= 1) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CAN_ONLY_BE_PLACE_PARENT)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CAN_ONLY_BE_PLACE_PARENT));
} }
@ -534,7 +528,7 @@ public class UpdatePlaceParentController extends BaseController {
query.eq("APPROVE_STATUS", EApproveStatus.ALREADY_SUBMIT.getValue()); query.eq("APPROVE_STATUS", EApproveStatus.ALREADY_SUBMIT.getValue());
query.eq("EDIT_TYPE", EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); query.eq("EDIT_TYPE", EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
query.eq("PK_MEMBER", member.getPkId()); query.eq("PK_MEMBER", member.getPkId());
int ct = memberServiceLogService.count(query); int ct = iCuMemberServiceLogService.count(query);
if (ct > 0) { if (ct > 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PARENT_UPDATE)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PARENT_UPDATE));
} }
@ -543,7 +537,7 @@ public class UpdatePlaceParentController extends BaseController {
//安置右区 是否存在首个注册单校验 //安置右区 是否存在首个注册单校验
// if (editNewMemberCodeList.size() > 0){ // if (editNewMemberCodeList.size() > 0){
// // 如果是安置到右区 校验是否首单 // // 如果是安置到右区 校验是否首单
// List<MemberFirstOrderDTO> memberFirstOrderDTOList = orderServiceApi.checkMemberIsFirstOrder(editNewMemberCodeList); // List<MemberFirstOrderDTO> memberFirstOrderDTOList = iSaOrderServiceApi.checkMemberIsFirstOrder(editNewMemberCodeList);
// for (MemberFirstOrderDTO memberFirstOrderDTO : memberFirstOrderDTOList) { // for (MemberFirstOrderDTO memberFirstOrderDTO : memberFirstOrderDTOList) {
// if (memberFirstOrderDTO.getOrderCount() == 0){ // if (memberFirstOrderDTO.getOrderCount() == 0){
// // 没有首单 校验 // // 没有首单 校验
@ -568,24 +562,24 @@ public class UpdatePlaceParentController extends BaseController {
String businessNo = CommonUtil.createSerialNumber(EOrderPrefix.UPDATE_PLACE_PARENT.getValue()); String businessNo = CommonUtil.createSerialNumber(EOrderPrefix.UPDATE_PLACE_PARENT.getValue());
String memberCode = memberService.getMemberCode(); String memberCode = memberService.getMemberCode();
CuMember member = cuMemberService.getMember(memberCode); CuMember member = iCuMemberService.getMember(memberCode);
CuMemberServiceLog cuMemberServiceLog = new CuMemberServiceLog(); CuMemberServiceLog cuMemberServiceLog = new CuMemberServiceLog();
cuMemberServiceLog.setPkMember(member.getPkId()); cuMemberServiceLog.setPkMember(member.getPkId());
cuMemberServiceLog.setEditType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); cuMemberServiceLog.setEditType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
JSONObject oldJson = new JSONObject(); JSONObject oldJson = new JSONObject();
oldJson.put("changeMemberCode", memberService.getEditOldPlaceMemberCode()); oldJson.put("changeMemberCode", memberService.getEditOldPlaceMemberCode());
if (MemberConstants.LEFT_DEPT.equals(memberService.getEditOldPlaceDeptStr())) { if (EPlaceDept.LEFT_DEPT.getLabel().equals(memberService.getEditOldPlaceDeptStr())) {
oldJson.put("placeDept", EPlaceDept.LEFT_DEPT.getValue()); oldJson.put("placeDept", EPlaceDept.LEFT_DEPT.getValue());
} else if (MemberConstants.RIGHT_DEPT.equals(memberService.getEditOldPlaceDeptStr())) { } else if (EPlaceDept.RIGHT_DEPT.getLabel().equals(memberService.getEditOldPlaceDeptStr())) {
oldJson.put("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); oldJson.put("placeDept", EPlaceDept.RIGHT_DEPT.getValue());
} }
cuMemberServiceLog.setOldValue(oldJson.toJSONString()); cuMemberServiceLog.setOldValue(oldJson.toJSONString());
JSONObject newJson = new JSONObject(); JSONObject newJson = new JSONObject();
newJson.put("newChangeMemberCode", memberService.getEditNewPlaceMemberCode()); newJson.put("newChangeMemberCode", memberService.getEditNewPlaceMemberCode());
if (MemberConstants.LEFT_DEPT.equals(memberService.getEditNewPlaceDeptStr())) { if (EPlaceDept.LEFT_DEPT.getLabel().equals(memberService.getEditNewPlaceDeptStr())) {
newJson.put("newPlaceDept", EPlaceDept.LEFT_DEPT.getValue()); newJson.put("newPlaceDept", EPlaceDept.LEFT_DEPT.getValue());
} else if (MemberConstants.RIGHT_DEPT.equals(memberService.getEditNewPlaceDeptStr())) { } else if (EPlaceDept.RIGHT_DEPT.getLabel().equals(memberService.getEditNewPlaceDeptStr())) {
newJson.put("newPlaceDept", EPlaceDept.RIGHT_DEPT.getValue()); newJson.put("newPlaceDept", EPlaceDept.RIGHT_DEPT.getValue());
} }
// newJson.put("newPlaceDept",memberService.getNewPlaceDept()); // newJson.put("newPlaceDept",memberService.getNewPlaceDept());
@ -598,7 +592,7 @@ public class UpdatePlaceParentController extends BaseController {
resultList.add(cuMemberServiceLog); resultList.add(cuMemberServiceLog);
} }
memberServiceLogService.saveBatch(resultList); iCuMemberServiceLogService.saveBatch(resultList);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -608,7 +602,7 @@ public class UpdatePlaceParentController extends BaseController {
* *
* @param response * @param response
*/ */
@PostMapping("get-service-export") @PostMapping("/get-service-export")
public void getOrderListExport(HttpServletResponse response) { public void getOrderListExport(HttpServletResponse response) {
ExcelUtil<UpdatePlaceImport> util = new ExcelUtil<>(UpdatePlaceImport.class); ExcelUtil<UpdatePlaceImport> util = new ExcelUtil<>(UpdatePlaceImport.class);
util.exportExcel(response, new ArrayList<>(), "修改安置导出"); util.exportExcel(response, new ArrayList<>(), "修改安置导出");
@ -616,10 +610,6 @@ public class UpdatePlaceParentController extends BaseController {
/** /**
* @description: 发起签呈 免付，需要签呈需要付费 * @description: 发起签呈 免付，需要签呈需要付费
* @author: yh
* @date: 2023/3/4 11:06
* @param: [updateCodeVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/ **/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_RESETTLE, method = EOperationMethod.SUBMIT) @Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_RESETTLE, method = EOperationMethod.SUBMIT)
@PostMapping("/petition") @PostMapping("/petition")
@ -647,11 +637,11 @@ public class UpdatePlaceParentController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_CODE_NOT_NULL));
} }
// 修改会员 // 修改会员
CuMember member = cuMemberService.getMemberByCode(uc.getMemberCode()); CuMember member = iCuMemberService.getMemberByCode(uc.getMemberCode());
if (member == null) { if (member == null) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
} }
CuMember parentMember = cuMemberService.getMemberByCode(uc.getEditNewPlaceMemberCode()); CuMember parentMember = iCuMemberService.getMemberByCode(uc.getEditNewPlaceMemberCode());
if (parentMember == null) { if (parentMember == null) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID));
} }
@ -662,14 +652,14 @@ public class UpdatePlaceParentController extends BaseController {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PLACE_DEPT_NOT_NULL));
} }
//校验新安置部门和安置编号下是否已存在节点 //校验新安置部门和安置编号下是否已存在节点
Long placeDeptCount = cuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept); Long placeDeptCount = iCuMemberService.checkPlaceDeptAndMemberCode(editNewPlaceMemberCode, editNewPlaceDept);
if (placeDeptCount > 0) { if (placeDeptCount > 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_PLACE_PARENT_OCCUPY));
} }
// 添加 修改安置编号不能是安置伞下校验 // 添加 修改安置编号不能是安置伞下校验
// List<CuMemberExt> cuMemberExts = cuMemberService.queryPlaceSponsorUnderUmbrella(member.getPkId()); // List<CuMemberExt> cuMemberExts = iCuMemberService.queryPlaceSponsorUnderUmbrella(member.getPkId());
// Map<String, CuMemberExt> memberMap = cuMemberExts.stream().collect(Collectors.toMap(CuMemberExt::getMemberCode, Function.identity())); // Map<String, CuMemberExt> memberMap = cuMemberExts.stream().collect(Collectors.toMap(CuMemberExt::getMemberCode, Function.identity()));
// CuMemberExt cuMemberExt = memberMap.get(uc.getEditNewPlaceMemberCode()); // CuMemberExt cuMemberExt = memberMap.get(uc.getEditNewPlaceMemberCode());
// if (cuMemberExt != null){ // if (cuMemberExt != null){
@ -681,7 +671,7 @@ public class UpdatePlaceParentController extends BaseController {
} }
// 会员安置编号信息 // 会员安置编号信息
CuMember placeParentMember = cuMemberService.getMemberById(member.getPkPlaceParent()); CuMember placeParentMember = iCuMemberService.getMemberById(member.getPkPlaceParent());
uc.setPkMember(member.getPkId()); uc.setPkMember(member.getPkId());
JSONObject oldJson = new JSONObject(); JSONObject oldJson = new JSONObject();
oldJson.put("placeDept", member.getPlaceDept()); oldJson.put("placeDept", member.getPlaceDept());
@ -689,9 +679,9 @@ public class UpdatePlaceParentController extends BaseController {
oldJson.put("placeMemberCode", placeParentMember.getMemberCode()); oldJson.put("placeMemberCode", placeParentMember.getMemberCode());
} }
uc.setOldValue(oldJson.toJSONString()); uc.setOldValue(oldJson.toJSONString());
if (MemberConstants.LEFT_DEPT.equals(uc.getEditNewPlaceDeptStr())) { if (EPlaceDept.LEFT_DEPT.getLabel().equals(uc.getEditNewPlaceDeptStr())) {
uc.setEditNewPlaceDept(EPlaceDept.LEFT_DEPT.getValue()); uc.setEditNewPlaceDept(EPlaceDept.LEFT_DEPT.getValue());
} else if (MemberConstants.RIGHT_DEPT.equals(uc.getEditNewPlaceDeptStr())) { } else if (EPlaceDept.RIGHT_DEPT.getLabel().equals(uc.getEditNewPlaceDeptStr())) {
uc.setEditNewPlaceDept(EPlaceDept.RIGHT_DEPT.getValue()); uc.setEditNewPlaceDept(EPlaceDept.RIGHT_DEPT.getValue());
} }
JSONObject newJson = new JSONObject(); JSONObject newJson = new JSONObject();
@ -704,12 +694,12 @@ public class UpdatePlaceParentController extends BaseController {
} }
uc.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue()); uc.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue());
Integer count = cuMemberService.checkmsLogCount(uc.getPkMember(), EApproveStatus.ALREADY_SUBMIT.getValue()); Integer count = iCuMemberService.checkmsLogCount(uc.getPkMember(), EApproveStatus.ALREADY_SUBMIT.getValue());
if (count > 0) { if (count > 0) {
return AjaxResult.error(uc.getMemberCode(), TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)); return AjaxResult.error(uc.getMemberCode(), TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
} }
//当前最大次数 //当前最大次数
Integer approveNumber = memberServiceLogService.selectByMaxApproveNumber(uc.getPkMember(), Integer approveNumber = iCuMemberServiceLogService.selectByMaxApproveNumber(uc.getPkMember(),
EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), null); EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue(), null);
uc.setChangeNumber(approveNumber + 1); uc.setChangeNumber(approveNumber + 1);
if (updatePlaceParentPetitionParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { if (updatePlaceParentPetitionParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
@ -718,7 +708,7 @@ public class UpdatePlaceParentController extends BaseController {
serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue()); serviceChargeDTO.setType(EApprovalBusiness.CU_MEMBER_PLACE_PARENT.getValue());
serviceChargeDTO.setQuantity(approveNumber + 1); serviceChargeDTO.setQuantity(approveNumber + 1);
serviceChargeDTO.setPkCountry(pkCountry); serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO); R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
//接口查询金额是否足够 //接口查询金额是否足够
businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount()); businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
businessCommissionDTO.setPkCountry(pkCountry); businessCommissionDTO.setPkCountry(pkCountry);
@ -736,13 +726,13 @@ public class UpdatePlaceParentController extends BaseController {
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) { if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
//接口查询金额是否足够 //接口查询金额是否足够
if (updatePlaceParentPetitionParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) { if (updatePlaceParentPetitionParam.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO); List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) { if (CollectionUtil.isNotEmpty(memberBalanceList)) {
return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList); return AjaxResult.error(504, TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT), memberBalanceList);
} }
} }
} }
cuMemberService.petitionUpdatePlaceParent(updatePlaceParentPetitionParam); iCuMemberService.petitionUpdatePlaceParent(updatePlaceParentPetitionParam);
return AjaxResult.success(); return AjaxResult.success();
} }

2
hzs-business/hzs-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -2405,7 +2405,7 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
if (pkCountry != null) { if (pkCountry != null) {
if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
return num.multiply(inExchangeRate).setScale(0, BigDecimal.ROUND_DOWN); return num.multiply(inExchangeRate).setScale(2, BigDecimal.ROUND_DOWN);
} }
} }

142
hzs-business/hzs-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
View File

@ -50,10 +50,6 @@ import java.util.*;
/** /**
* @Description: 架构管理 * @Description: 架构管理
* @Author: yuhui
* @Time: 2023/2/2 11:32
* @Classname: MemberStructureController
* @PackageName: com.hzs.member.memberStructure
*/ */
@RestController @RestController
@RequestMapping("/manage/member-structure") @RequestMapping("/manage/member-structure")
@ -62,18 +58,18 @@ public class MemberStructureController extends BaseController {
@Autowired @Autowired
private UserTokenService userTokenService; private UserTokenService userTokenService;
@Autowired @Autowired
private ICuMemberSettlePeriodService memberSettlePeriodService; private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired @Autowired
private ICuMemberTreeService memberTreeService; private ICuMemberTreeService iCuMemberTreeService;
@Autowired @Autowired
private ICuMemberService memberService; private ICuMemberService iCuMemberService;
@DubboReference @DubboReference
ICountryServiceApi countryServiceApi; ICountryServiceApi iCountryServiceApi;
@DubboReference @DubboReference
IUserServiceApi iUserServiceApi; IUserServiceApi iUserServiceApi;
@DubboReference @DubboReference
IGradeServiceApi gradeServiceApi; IGradeServiceApi iGradeServiceApi;
/** /**
* 默认层数 * 默认层数
@ -98,22 +94,22 @@ public class MemberStructureController extends BaseController {
Long pkMember = null; Long pkMember = null;
if (StringUtils.isNotBlank(memberCode)) { if (StringUtils.isNotBlank(memberCode)) {
CuMember member = memberService.getMemberByCode(memberCode); CuMember member = iCuMemberService.getMemberByCode(memberCode);
if (member == null) { if (member == null) {
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS));
} }
pkMember = member.getPkId(); pkMember = member.getPkId();
} else { } else {
if (userVertexList != null && userVertexList.size() > 0) { if (userVertexList != null && userVertexList.size() > 0) {
CuMember member = memberService.getMemberById(userVertexList.get(0)); CuMember member = iCuMemberService.getMemberById(userVertexList.get(0));
pkMember = member.getPkId(); pkMember = member.getPkId();
memberCode = member.getMemberCode(); memberCode = member.getMemberCode();
} else { } else {
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) { for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) {
if (be.getKey().equals(SecurityUtils.getPkCountry())) { if (be.getKey().equals(SecurityUtils.getPkCountry())) {
memberCode = be.getValue().getCode() + "30720201"; memberCode = be.getValue().getCode() + "30720201";
CuMember member = memberService.getMemberByCode(memberCode); CuMember member = iCuMemberService.getMemberByCode(memberCode);
pkMember = member.getPkId(); pkMember = member.getPkId();
} }
} }
@ -122,7 +118,7 @@ public class MemberStructureController extends BaseController {
if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) {
// 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的
List<CuMemberExt> memberExtList = memberService.checkMemberVertex(vertexIdList, memberCode); List<CuMemberExt> memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode);
if (memberExtList.size() == 0) { if (memberExtList.size() == 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE));
} }
@ -131,11 +127,11 @@ public class MemberStructureController extends BaseController {
Integer period = null; Integer period = null;
Date settleDate = null; Date settleDate = null;
if (memberSettlePeriodId != null) { if (memberSettlePeriodId != null) {
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getById(memberSettlePeriodId); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
} else { } else {
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
@ -148,37 +144,37 @@ public class MemberStructureController extends BaseController {
String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period;
// 查询所有用户表数据 id // 查询所有用户表数据 id
// 查询秒结 表 如果 秒结表 没有则去 历史表 // 查询秒结 表 如果 秒结表 没有则去 历史表
Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber != null && tableNumber == 1) { if (tableNumber != null && tableNumber == 1) {
List<CuMemberSettleExt> cuMemberSettleExts = null; List<CuMemberSettleExt> cuMemberSettleExts = null;
// 查询今日会员表是否有值 // 查询今日会员表是否有值
Long treeMemberCount = memberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember);
if (treeMemberCount > 0) { if (treeMemberCount > 0) {
//表格存在 //表格存在
cuMemberSettleExts = memberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList);
} else { } else {
DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1);
time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime);
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
} }
settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
cuMemberSettleExts = memberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberList(pkMember, settleTableName, level, vertexIdList);
} }
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
// 添加自身 // 添加自身
cuMemberSettleExts.add(memberSettleExt); cuMemberSettleExts.add(memberSettleExt);
List<Tree<String>> build = memberService.systemAzSetListTree(cuMemberSettleExts, memberSettleExt); List<Tree<String>> build = iCuMemberService.systemAzSetListTree(cuMemberSettleExts, memberSettleExt);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
// if (type != EStructureType.JG4.getIntValue()){ // if (type != EStructureType.JG4.getIntValue()){
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
List<Tree<String>> trees = setTreeList(build, level, allCountryData); List<Tree<String>> trees = setTreeList(build, level, allCountryData);
return AjaxResult.success(trees); return AjaxResult.success(trees);
@ -187,24 +183,24 @@ public class MemberStructureController extends BaseController {
// } // }
} else { } else {
// 查询表格是否存在 // 查询表格是否存在
tableNumber = memberTreeService.queryExistOracleTable(settleTableName); tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber == null) { if (tableNumber == null) {
settleTableName = null; settleTableName = null;
} }
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(), level); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(), level);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
List<Tree<String>> build = memberService.systemAzSetListTree(list, memberSettleExt); List<Tree<String>> build = iCuMemberService.systemAzSetListTree(list, memberSettleExt);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
// if (type != EStructureType.JG4.getIntValue()){ // if (type != EStructureType.JG4.getIntValue()){
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
return AjaxResult.success(setTreeList(build, level, allCountryData)); return AjaxResult.success(setTreeList(build, level, allCountryData));
// }else { // }else {
@ -214,23 +210,23 @@ public class MemberStructureController extends BaseController {
} else { } else {
// 查询 历史 // 查询 历史
String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber != null && tableNumber == 1) { if (tableNumber != null && tableNumber == 1) {
// 表示表格存在 // 表示表格存在
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
// List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(),level); // List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryTable(settleTableName, pkMember, new ArrayList<>(),level);
List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreePlaceParentHistoryFramework(settleTableName, pkMember, new ArrayList<>(), level);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
List<Tree<String>> build = memberService.systemAzSetListTree(list, memberSettleExt); List<Tree<String>> build = iCuMemberService.systemAzSetListTree(list, memberSettleExt);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
return AjaxResult.success(setTreeList(build, level, allCountryData)); return AjaxResult.success(setTreeList(build, level, allCountryData));
} }
@ -251,7 +247,6 @@ public class MemberStructureController extends BaseController {
String nationalFlag2 = allCountryData.get(pkCountry).getNationalFlag2(); String nationalFlag2 = allCountryData.get(pkCountry).getNationalFlag2();
for (Tree<String> stringTree : build) { for (Tree<String> stringTree : build) {
Integer level = (Integer) stringTree.get("level"); Integer level = (Integer) stringTree.get("level");
Integer placeDept = (Integer) stringTree.get("placeDept");
if (level < (numberOfPlies - 1)) { if (level < (numberOfPlies - 1)) {
if (stringTree.getChildren() != null) { if (stringTree.getChildren() != null) {
if (stringTree.getChildren().size() == 0) { if (stringTree.getChildren().size() == 0) {
@ -345,7 +340,6 @@ public class MemberStructureController extends BaseController {
} else { } else {
// 等于空 // 等于空
List<Tree<String>> children = new ArrayList<>(); List<Tree<String>> children = new ArrayList<>();
children = new ArrayList<>();
Tree<String> emptyNode1 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); Tree<String> emptyNode1 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5));
emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue()); emptyNode1.putExtra("placeDept", EPlaceDept.LEFT_DEPT.getValue());
emptyNode1.putExtra("level", level + 1); emptyNode1.putExtra("level", level + 1);
@ -361,7 +355,6 @@ public class MemberStructureController extends BaseController {
// emptyNode1.setChildren(setChildren(level+1,emptyNode1.getId())); // emptyNode1.setChildren(setChildren(level+1,emptyNode1.getId()));
children.add(emptyNode1); children.add(emptyNode1);
Tree<String> emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5)); Tree<String> emptyNode2 = TreeUtil.createEmptyNode(RandomUtil.randomNumbers(5));
emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue()); emptyNode2.putExtra("placeDept", EPlaceDept.RIGHT_DEPT.getValue());
emptyNode2.putExtra("level", level + 1); emptyNode2.putExtra("level", level + 1);
@ -391,7 +384,7 @@ public class MemberStructureController extends BaseController {
* 推荐架构网体 * 推荐架构网体
*/ */
@AccessPermissions("Recommend") @AccessPermissions("Recommend")
@GetMapping("tj-framework") @GetMapping("/tj-framework")
public AjaxResult tjFramework(Long memberSettlePeriodId, String memberCode, Integer level) { public AjaxResult tjFramework(Long memberSettlePeriodId, String memberCode, Integer level) {
Date date = new Date(); Date date = new Date();
String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date);
@ -401,7 +394,7 @@ public class MemberStructureController extends BaseController {
List<Long> userVertexList = userAuthorityDTO.getUserVertexList(); List<Long> userVertexList = userAuthorityDTO.getUserVertexList();
Long pkMember = null; Long pkMember = null;
if (StringUtils.isNotBlank(memberCode)) { if (StringUtils.isNotBlank(memberCode)) {
CuMember member = memberService.getMember(memberCode); CuMember member = iCuMemberService.getMember(memberCode);
if (member == null) { if (member == null) {
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS));
} }
@ -409,29 +402,28 @@ public class MemberStructureController extends BaseController {
} else { } else {
if (userVertexList != null && userVertexList.size() > 0) { if (userVertexList != null && userVertexList.size() > 0) {
CuMember member = memberService.getMember(userVertexList.get(0)); CuMember member = iCuMemberService.getMember(userVertexList.get(0));
pkMember = member.getPkId(); pkMember = member.getPkId();
} else { } else {
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) { for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) {
if (be.getKey().equals(SecurityUtils.getPkCountry())) { if (be.getKey().equals(SecurityUtils.getPkCountry())) {
memberCode = be.getValue().getCode() + "30720201"; memberCode = be.getValue().getCode() + "30720201";
CuMember member = memberService.getMember(memberCode); CuMember member = iCuMemberService.getMember(memberCode);
pkMember = member.getPkId(); pkMember = member.getPkId();
} }
} }
} }
} }
Integer period = null; Integer period = null;
Date settleDate = null; Date settleDate = null;
if (memberSettlePeriodId != null) { if (memberSettlePeriodId != null) {
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getById(memberSettlePeriodId); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getById(memberSettlePeriodId);
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
} else { } else {
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
@ -444,7 +436,7 @@ public class MemberStructureController extends BaseController {
// 会员结算秒结表 // 会员结算秒结表
String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period; String settleTableName = TableNameConstants.CU_MEMBER_SECOND + period;
Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber != null && tableNumber == 1) { if (tableNumber != null && tableNumber == 1) {
//表格存在 //表格存在
if (level == null) { if (level == null) {
@ -452,23 +444,23 @@ public class MemberStructureController extends BaseController {
} }
List<CuMemberSettleExt> cuMemberSettleExts = null; List<CuMemberSettleExt> cuMemberSettleExts = null;
// 查询今日会员表是否有值 // 查询今日会员表是否有值
Long treeMemberCount = memberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember); Long treeMemberCount = iCuMemberTreeService.selectByselectByTreeMemberCount(settleTableName, pkMember);
if (treeMemberCount > 0) { if (treeMemberCount > 0) {
//表格存在 //表格存在
cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
} else { } else {
DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1);
time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime);
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
settleDate = csPeriod.getSettleDate(); settleDate = csPeriod.getSettleDate();
} }
settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
cuMemberSettleExts = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); cuMemberSettleExts = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
} }
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
@ -476,7 +468,7 @@ public class MemberStructureController extends BaseController {
// 添加自身 // 添加自身
cuMemberSettleExts.add(memberSettleExt); cuMemberSettleExts.add(memberSettleExt);
List<Tree<String>> build = memberService.systemTjSetListTree(cuMemberSettleExts, memberSettleExt, settleTableName, true); List<Tree<String>> build = iCuMemberService.systemTjSetListTree(cuMemberSettleExts, memberSettleExt, settleTableName, true);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
return AjaxResult.success(build); return AjaxResult.success(build);
} else { } else {
@ -489,16 +481,16 @@ public class MemberStructureController extends BaseController {
settleTableName = null; settleTableName = null;
} }
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
List<Tree<String>> build = memberService.systemTjSetListTree(list, memberSettleExt, settleTableName, true); List<Tree<String>> build = iCuMemberService.systemTjSetListTree(list, memberSettleExt, settleTableName, true);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
return AjaxResult.success(build); return AjaxResult.success(build);
} }
@ -509,31 +501,31 @@ public class MemberStructureController extends BaseController {
} }
DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1); DateTime dateTime = DateUtil.offsetDay(DateUtils.currentDate(), -1);
time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime); time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, dateTime);
CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time);
if (csPeriod != null) { if (csPeriod != null) {
period = csPeriod.getPkId(); period = csPeriod.getPkId();
} }
// 查询 历史 // 查询 历史
String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period; String settleTableName = TableNameConstants.CU_MEMBER_SETTLE + period;
Integer tableNumber = memberTreeService.queryExistOracleTable(settleTableName); Integer tableNumber = iCuMemberTreeService.queryExistOracleTable(settleTableName);
if (tableNumber == null) { if (tableNumber == null) {
// 表示表格存在 // 表示表格存在
settleTableName = null; settleTableName = null;
} }
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPlacePkMemberTable(settleTableName, pkMember);
if (StringUtils.isNotBlank(memberSettleExt.getParentMemberCode()) && MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (StringUtils.isNotBlank(memberSettleExt.getParentMemberCode()) && MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
//查询下级 //查询下级
// List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember,level); // List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember,level);
List<CuMemberSettleExt> list = memberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList); List<CuMemberSettleExt> list = iCuMemberTreeService.queryCuMemberTreeParentTable(settleTableName, pkMember, level, vertexIdList);
// 无法查询到自身 所有单独查询自身并且添加 // 无法查询到自身 所有单独查询自身并且添加
list.add(memberSettleExt); list.add(memberSettleExt);
List<Tree<String>> build = memberService.systemTjSetListTree(list, memberSettleExt, settleTableName, false); List<Tree<String>> build = iCuMemberService.systemTjSetListTree(list, memberSettleExt, settleTableName, false);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
return AjaxResult.success(build); return AjaxResult.success(build);
} }
@ -545,7 +537,7 @@ public class MemberStructureController extends BaseController {
* *
* @return * @return
*/ */
@GetMapping("az-framework-five") @GetMapping("/az-framework-five")
public AjaxResult azFrameWorkFive(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) { public AjaxResult azFrameWorkFive(Long memberSettlePeriodId, String memberCode, Integer level, Integer type) {
if (level == null) { if (level == null) {
level = 10; level = 10;
@ -556,22 +548,22 @@ public class MemberStructureController extends BaseController {
List<Long> userVertexList = userAuthorityDTO.getUserVertexList(); List<Long> userVertexList = userAuthorityDTO.getUserVertexList();
Long pkMember = null; Long pkMember = null;
if (StringUtils.isNotBlank(memberCode)) { if (StringUtils.isNotBlank(memberCode)) {
CuMember member = memberService.getMemberByCode(memberCode); CuMember member = iCuMemberService.getMemberByCode(memberCode);
if (member == null) { if (member == null) {
return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS));
} }
pkMember = member.getPkId(); pkMember = member.getPkId();
} else { } else {
if (userVertexList != null && userVertexList.size() > 0) { if (userVertexList != null && userVertexList.size() > 0) {
CuMember member = memberService.getMemberById(userVertexList.get(0)); CuMember member = iCuMemberService.getMemberById(userVertexList.get(0));
pkMember = member.getPkId(); pkMember = member.getPkId();
memberCode = member.getMemberCode(); memberCode = member.getMemberCode();
} else { } else {
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) { for (Map.Entry<Integer, BdCountry> be : allCountryMap.getData().entrySet()) {
if (be.getKey().equals(SecurityUtils.getPkCountry())) { if (be.getKey().equals(SecurityUtils.getPkCountry())) {
memberCode = be.getValue().getCode() + "30720201"; memberCode = be.getValue().getCode() + "30720201";
CuMember member = memberService.getMemberByCode(memberCode); CuMember member = iCuMemberService.getMemberByCode(memberCode);
pkMember = member.getPkId(); pkMember = member.getPkId();
} }
} }
@ -580,7 +572,7 @@ public class MemberStructureController extends BaseController {
if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) { if (vertexIdList != null && StringUtils.isNotBlank(memberCode)) {
// 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的 // 体系不为空 并且会员编号不为空 只能查询自己伞下以及自己的
List<CuMemberExt> memberExtList = memberService.checkMemberVertex(vertexIdList, memberCode); List<CuMemberExt> memberExtList = iCuMemberService.checkMemberVertex(vertexIdList, memberCode);
if (memberExtList.size() == 0) { if (memberExtList.size() == 0) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE)); return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.QUERY_VERTEX_CODE));
} }
@ -588,18 +580,18 @@ public class MemberStructureController extends BaseController {
// 查询当天 (秒结) // 查询当天 (秒结)
// 会员结算秒结表 // 会员结算秒结表
List<CuMemberSettleExt> cuMemberSettleExts = memberTreeService.selectByTreeMemberListFive(pkMember, level, vertexIdList); List<CuMemberSettleExt> cuMemberSettleExts = iCuMemberTreeService.selectByTreeMemberListFive(pkMember, level, vertexIdList);
// 查询顶点 // 查询顶点
CuMemberSettleExt memberSettleExt = memberTreeService.queryCuMemberTreeByPkMemberTable(null, pkMember); CuMemberSettleExt memberSettleExt = iCuMemberTreeService.queryCuMemberTreeByPkMemberTable(null, pkMember);
if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) { if (MemberConstants.GJ30720200CODE.equals(memberSettleExt.getParentMemberCode())) {
memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode()); memberSettleExt.setParentMemberCode(memberSettleExt.getMemberCode());
} }
memberSettleExt.setLevel(0); memberSettleExt.setLevel(0);
// 添加自身 // 添加自身
cuMemberSettleExts.add(memberSettleExt); cuMemberSettleExts.add(memberSettleExt);
List<Tree<String>> build = memberService.systemAzSetListTreeFive(cuMemberSettleExts, memberSettleExt); List<Tree<String>> build = iCuMemberService.systemAzSetListTreeFive(cuMemberSettleExts, memberSettleExt);
// 安置架构 无点位 追加空点位 // 安置架构 无点位 追加空点位
R<Map<Integer, BdCountry>> allCountryMap = countryServiceApi.getAllCountryMap(); R<Map<Integer, BdCountry>> allCountryMap = iCountryServiceApi.getAllCountryMap();
Map<Integer, BdCountry> allCountryData = allCountryMap.getData(); Map<Integer, BdCountry> allCountryData = allCountryMap.getData();
List<Tree<String>> trees = setTreeList(build, level, allCountryData); List<Tree<String>> trees = setTreeList(build, level, allCountryData);
return AjaxResult.success(trees); return AjaxResult.success(trees);
@ -617,7 +609,7 @@ public class MemberStructureController extends BaseController {
LambdaQueryWrapper<CuMemberSettlePeriod> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<CuMemberSettlePeriod> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.orderByDesc(CuMemberSettlePeriod::getSettleDate); queryWrapper.orderByDesc(CuMemberSettlePeriod::getSettleDate);
queryWrapper.between(CuMemberSettlePeriod::getSettleDate, dateTime, new Date()); queryWrapper.between(CuMemberSettlePeriod::getSettleDate, dateTime, new Date());
List<CuMemberSettlePeriod> list = memberSettlePeriodService.list(queryWrapper); List<CuMemberSettlePeriod> list = iCuMemberSettlePeriodService.list(queryWrapper);
List<CuMemberSettlePeriodVo> resultList = new ArrayList<>(); List<CuMemberSettlePeriodVo> resultList = new ArrayList<>();
for (CuMemberSettlePeriod cuMemberSettlePeriod : list) { for (CuMemberSettlePeriod cuMemberSettlePeriod : list) {
CuMemberSettlePeriodVo cuMemberSettlePeriodVo = BeanUtil.copyProperties(cuMemberSettlePeriod, CuMemberSettlePeriodVo.class); CuMemberSettlePeriodVo cuMemberSettlePeriodVo = BeanUtil.copyProperties(cuMemberSettlePeriod, CuMemberSettlePeriodVo.class);
@ -640,7 +632,7 @@ public class MemberStructureController extends BaseController {
@GetMapping("get-avatar-info") @GetMapping("get-avatar-info")
public AjaxResult getAvatarUrl() { public AjaxResult getAvatarUrl() {
LoginUser user = userTokenService.getLoginUser(); LoginUser user = userTokenService.getLoginUser();
//R<List<GradeDTO>> list = gradeServiceApi.queryGradeConfigByCondition(user.getDataCountry()); //R<List<GradeDTO>> list = iGradeServiceApi.queryGradeConfigByCondition(user.getDataCountry());
JSONArray array = new JSONArray(); JSONArray array = new JSONArray();
// 虚拟 // 虚拟
JSONObject other = new JSONObject(); JSONObject other = new JSONObject();
@ -659,7 +651,7 @@ public class MemberStructureController extends BaseController {
djhOther.put("value", MemberFrameworkConstants.toBeActivated); djhOther.put("value", MemberFrameworkConstants.toBeActivated);
array.add(djhOther); array.add(djhOther);
} }
R<List<GradeDTO>> list = gradeServiceApi.selectGradeAll(SecurityUtils.getPkCountry()); R<List<GradeDTO>> list = iGradeServiceApi.selectGradeAll(SecurityUtils.getPkCountry());
for (GradeDTO date : list.getData()) { for (GradeDTO date : list.getData()) {
JSONObject js = new JSONObject(); JSONObject js = new JSONObject();

10
hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/constant/MemberConstants.java
View File

@ -7,14 +7,4 @@ public class MemberConstants {
*/ */
public static final String GJ30720200CODE = "GJ30720200"; public static final String GJ30720200CODE = "GJ30720200";
/**
* 安置左区
*/
public static final String LEFT_DEPT = "安置左区";
/**
* 安置右区
*/
public static final String RIGHT_DEPT = "安置右区";
} }

4
hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/EPlaceDept.java
View File

@ -6,10 +6,6 @@ import lombok.Getter;
/** /**
* @Description: 安置部门 * @Description: 安置部门
* @Author: sui q
* @Time: 2022/8/31 11:50
* @Classname: EPlaceDept
* @PackageName: com.hzs.common.core.enums
*/ */
@AllArgsConstructor @AllArgsConstructor
@Getter @Getter