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-26 11:39:07 +08:00
parent 2c3b7887e7
commit 03d5f2592b
20 changed files with 91 additions and 805 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-api/bd-api-member/src/main/java/com/hzs/member/self/ICuSelfServiceServiceApi.java
View File

@ -6,12 +6,6 @@ import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
/**
* 自助服务
*
* @Description:
* @Author: ljc
* @Time: 2023/4/19 16:09
* @Classname: ICuSelfServiceServiceApi
* @Package_name: com.hzs.member.self
*/
public interface ICuSelfServiceServiceApi {

6
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java
View File

@ -1,7 +1,6 @@
package com.hzs.member.base.service;
import com.hzs.common.domain.activity.draw.ext.AcDrawRewardNumExt;
import com.hzs.common.domain.member.account.CuMemberAccount;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.ext.CuMemberAccountExt;
import com.hzs.common.domain.sale.ext.SaOrderExt;
@ -147,11 +146,6 @@ public interface ICuMemberBusinessService {
*/
String orderSelfDeliver(Long pkMember, Integer pkRate, Integer pkCountry, BigDecimal postage, Long userId);
/**
* 自助服务(修改收货地址)-生成订单
**/
void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount);
/*
* 会员编号，账户类型，抽奖金额
**/

7
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
View File

@ -685,13 +685,6 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService {
return true;
}
@Transactional(rollbackFor = Exception.class)
@Override
public void selfInsertMemberTrade(SaOrder saOrder, CuMemberAccount cuMemberAccount) {
CuMemberAccountExt ext = BeanUtil.copyProperties(cuMemberAccount, CuMemberAccountExt.class);
insertMemberTrade(saOrder, ext);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean updateCuMemberAccountByDraw(Long pkMember, Integer pkCountry, Integer accountValue, BigDecimal rewardMoney) {

50
bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiSelfModifyAddressController.java
View File

@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.hzs.activity.pick.IAcPickServiceApi;
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.domain.R;
@ -42,11 +42,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* @description: 自助服务-修改收货地址
* @author: zhang jing
* @date: 2023/4/17 11:57
* @param:
* @return:
* 自助服务-修改收货地址
**/
@Slf4j
@RequestMapping("/api/self-modify-address")
@ -54,7 +50,7 @@ import java.util.stream.Collectors;
public class ApiSelfModifyAddressController extends BaseController {
@Autowired
private ICuSelfServiceLogService serviceLogService;
private ICuSelfServiceLogService iCuSelfServiceLogService;
@DubboReference
IAreaServiceApi iAreaServiceApi;
@ -63,17 +59,13 @@ public class ApiSelfModifyAddressController extends BaseController {
@DubboReference
ISaOrderItemsServiceApi iSaOrderItemsServiceApi;
@DubboReference
IAcPickServiceApi acPickServiceApi;
IAcPickServiceApi iAcPickServiceApi;
@DubboReference
ICurrencyServiceApi iCurrencyServiceApi;
/**
* @description: 自助服务-查询已申请修改收货地址
* @author: zhang jing
* @date: 2023/4/17 14:40
* @param: [cuSelfServiceLogVO]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 自助服务-查询已申请修改收货地址
**/
@GetMapping("/list")
public TableDataInfo list(SelfModifyAddressVO selfModifyAddressVO) {
@ -83,14 +75,14 @@ public class ApiSelfModifyAddressController extends BaseController {
selfModifyAddressVO.setPkCountry(pkCountry);
selfModifyAddressVO.setEditType(EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue());
startPage();
List<SelfModifyAddressVO> slList = serviceLogService.querySelfModifyAddressList(selfModifyAddressVO);
List<SelfModifyAddressVO> slList = iCuSelfServiceLogService.querySelfModifyAddressList(selfModifyAddressVO);
if (CollectionUtil.isNotEmpty(slList)) {
// 调用system服务，获取地址
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData();
// 获取订单ID列表
List<Long> orderIdList = slList.parallelStream().map(SelfModifyAddressVO::getPkOrder).collect(Collectors.toList());
// 查询到的订单对应的订单明细列表
List<MyOrderItemsVO> orderItemsList = serviceLogService.queryListByOrderId(orderIdList);
List<MyOrderItemsVO> orderItemsList = iCuSelfServiceLogService.queryListByOrderId(orderIdList);
if (CollectionUtil.isNotEmpty(orderItemsList)) {
for (SelfModifyAddressVO sa : slList) {
List<MyOrderItemsVO> itemList = new ArrayList<>();
@ -121,23 +113,19 @@ public class ApiSelfModifyAddressController extends BaseController {
/**
* @description: 自助服务-申请修改收货地址-发起签呈申请
* @author: zhang jing DATA_SOURCES
* @date: 2023/4/17 14:48
* @param: [cuSelfServiceLogVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
* 自助服务-申请修改收货地址-发起申请
**/
@PostMapping("/putin")
public AjaxResult putin(@RequestBody SelfModifyAddressVO selVO) throws Exception {
public AjaxResult putin(@RequestBody SelfModifyAddressVO selVO) {
//校验是否重复提交记录
QueryWrapper<CuSelfServiceLog> queryWrapper = new QueryWrapper<>();
queryWrapper.select("ORDER_CODE", "APPROVE_STATUS")
.eq("ORDER_CODE", selVO.getOrderCode())
.eq("EDIT_TYPE", EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue())
.and(i -> i.eq("APPROVE_STATUS", EApproveRechargeStatus.WAIT.getValue())
LambdaQueryWrapper<CuSelfServiceLog> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.select(CuSelfServiceLog::getOrderCode, CuSelfServiceLog::getApproveStatus)
.eq(CuSelfServiceLog::getOrderCode, selVO.getOrderCode())
.eq(CuSelfServiceLog::getEditType, EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue())
.and(i -> i.eq(CuSelfServiceLog::getApproveStatus, EApproveRechargeStatus.WAIT.getValue())
.or()
.eq("APPROVE_STATUS", EApproveRechargeStatus.SUBMIT.getValue()));
List<CuSelfServiceLog> serviceLogList = serviceLogService.list(queryWrapper);
.eq(CuSelfServiceLog::getApproveStatus, EApproveRechargeStatus.SUBMIT.getValue()));
List<CuSelfServiceLog> serviceLogList = iCuSelfServiceLogService.list(queryWrapper);
if (CollectionUtil.isNotEmpty(serviceLogList)) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
}
@ -238,7 +226,7 @@ public class ApiSelfModifyAddressController extends BaseController {
//提货订单邮费
if (orderParam.getSpecialArea() == EOrderType.PICK_ORDER.getValue()) {
BigDecimal differ;
R<BigDecimal> postagenew = acPickServiceApi.queryOrderPostage(orderParam.getOrderCode(), orderParam.getRecProvince(),
R<BigDecimal> postagenew = iAcPickServiceApi.queryOrderPostage(orderParam.getOrderCode(), orderParam.getRecProvince(),
orderParam.getRecCity(), orderParam.getPkCountry());
if (postagenew.getData() != null) {
//新邮费大于旧邮费则不能变更地址
@ -268,10 +256,10 @@ public class ApiSelfModifyAddressController extends BaseController {
cuSelfServiceLog.setEditType(EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue());
cuSelfServiceLog.setPkMember(selVO.getPkMember());
//当前最大次数
Integer approveNumber = serviceLogService.selectByMaxApproveNumber(cuSelfServiceLog);
Integer approveNumber = iCuSelfServiceLogService.selectByMaxApproveNumber(cuSelfServiceLog);
selVO.setApproveNumber(approveNumber + 1);
return AjaxResult.success(serviceLogService.putin(selVO));
return AjaxResult.success(iCuSelfServiceLogService.putin(selVO));
}
/**

232
bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/manage/SelfModifyAddressController.java
View File

@ -1,48 +1,25 @@
package com.hzs.member.self.controller.manage;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hzs.common.core.annotation.Log;
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.core.web.controller.BaseController;
import com.hzs.common.core.web.domain.AjaxResult;
import com.hzs.common.core.web.page.TableDataInfo;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.self.CuSelfServiceLog;
import com.hzs.common.security.service.UserTokenService;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.common.util.TransactionUtils;
import com.hzs.member.account.dto.BusinessCommissionDTO;
import com.hzs.member.account.dto.MemberAmountDTO;
import com.hzs.member.account.dto.MemberBalanceDTO;
import com.hzs.member.account.service.ICuMemberBaseService;
import com.hzs.member.account.service.ICuMemberTradeService;
import com.hzs.member.base.service.ICuMemberService;
import com.hzs.member.self.service.ICuSelfServiceLogService;
import com.hzs.member.self.vo.SelfModifyAddressVO;
import com.hzs.system.base.IAreaServiceApi;
import com.hzs.system.config.IServiceChargeServiceApi;
import com.hzs.system.config.dto.ServiceChargeDTO;
import com.hzs.system.sys.dto.LoginUser;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.util.*;
/**
* @description: 自助服务-修改收货地址
* @author: zhang jing
* @date: 2023/4/17 11:57
* @param:
* @return:
* 自助服务-修改收货地址
**/
@Slf4j
@RequestMapping("/manage/self-modify-address")
@ -51,27 +28,13 @@ public class SelfModifyAddressController extends BaseController {
@Autowired
private ICuSelfServiceLogService serviceLogService;
@Autowired
private ICuMemberTradeService cuMemberTradeService;
@Autowired
private ICuMemberBaseService cuMemberBaseService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private ICuMemberService cuMemberService;
@DubboReference
IAreaServiceApi iAreaServiceApi;
@DubboReference
IServiceChargeServiceApi serviceChargeServiceApi;
/**
* @description: 自助服务-查询已申请修改收货地址
* @author: zhang jing
* @date: 2023/4/17 14:40
* @param: [cuSelfServiceLogVO]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 自助服务-查询已申请修改收货地址
**/
@Log(module = EOperationModule.MODIFY_ADDRESS, business = EOperationBusiness.MODIFY_ADDRESS, method = EOperationMethod.SELECT)
@GetMapping("/list")
@ -113,195 +76,4 @@ public class SelfModifyAddressController extends BaseController {
return tableDataInfo;
}
/**
* @description: 同意前查询
* @author: zhang jing
* @date: 2023/6/29 10:50
* @param: [selVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@PostMapping("/queryPass")
@Log(module = EOperationModule.MODIFY_ADDRESS, business = EOperationBusiness.MODIFY_ADDRESS, method = EOperationMethod.SELECT)
public AjaxResult queryPass(@RequestBody SelfModifyAddressVO selVO) {
Integer pkCountry = SecurityUtils.getPkCountry();
if (CollectionUtil.isEmpty(selVO.getBusinessNoList())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
}
if (null == selVO.getApproveOperation()) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.APPROVE_OPERATION_NOT_NULL));
}
List<SelfModifyAddressVO> selList = new ArrayList<>();
// 调用system服务，获取地址
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(pkCountry).getData();
for (String businessNo : selVO.getBusinessNoList()) {
if (StringUtils.isEmpty(businessNo)) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.WORK_NO_NOT_NULL));
}
QueryWrapper<CuSelfServiceLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("BUSINESS_NO", businessNo);
CuSelfServiceLog serviceLog = serviceLogService.getOne(queryWrapper);
QueryWrapper<CuSelfServiceLog> check = new QueryWrapper<>();
check.eq("ORDER_CODE", serviceLog.getOrderCode());
check.eq("EDIT_TYPE", EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue());
check.eq("APPROVE_STATUS", EApproveRechargeStatus.WAIT.getValue());
List<CuSelfServiceLog> serviceLogList = serviceLogService.list(check);
if (CollectionUtil.isNotEmpty(serviceLogList)) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT));
}
SelfModifyAddressVO nselVO = JSONObject.parseObject(serviceLog.getNewValue(), SelfModifyAddressVO.class);
nselVO.setPkMember(serviceLog.getPkMember());
nselVO.setBusinessNo(businessNo);
CuMember member = cuMemberService.getMember(serviceLog.getPkMember());
nselVO.setMemberCode(member.getMemberCode());
nselVO.setMemberName(member.getMemberName());
nselVO.setOrderCode(serviceLog.getOrderCode());
SelfModifyAddressVO oselVO = JSONObject.parseObject(serviceLog.getOldValue(), SelfModifyAddressVO.class);
nselVO.setRecName(oselVO.getRecName());
nselVO.setRecPhone(oselVO.getRecPhone());
nselVO.setRecProvinceVal(areaMap.get(oselVO.getRecProvince()));
nselVO.setNewRecProvinceVal(areaMap.get(nselVO.getNewRecProvince()));
nselVO.setRecCityVal(areaMap.get(oselVO.getRecCity()));
nselVO.setNewRecCityVal(areaMap.get(nselVO.getNewRecCity()));
if (null != oselVO.getRecCounty()) {
nselVO.setRecCountyVal(areaMap.get(oselVO.getRecCounty()));
}
if (null != nselVO.getNewRecCounty()) {
nselVO.setNewRecCountyVal(areaMap.get(nselVO.getNewRecCounty()));
}
nselVO.setRecAddress(oselVO.getRecAddress());
selList.add(nselVO);
}
return AjaxResult.success(selList);
}
/**
* @description: 自助服务-申请修改收货地址-管理员初审
* @author: zhang jing
* @date: 2023/4/17 14:48
* @param: [cuSelfServiceLogVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@PostMapping("/pass")
@Log(module = EOperationModule.MODIFY_ADDRESS, business = EOperationBusiness.MODIFY_ADDRESS, method = EOperationMethod.AGREE)
public AjaxResult pass(@RequestBody SelfModifyAddressVO selVO) {
if (CollectionUtil.isEmpty(selVO.getBusinessNoList())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
}
if (CollectionUtil.isEmpty(selVO.getUserIdList())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.EXAMINE_AND_APPROVE_NOT_NULL));
}
selVO.setApproveOperation(EApproveOperation.AGREE.getValue());
Date date = new Date();
Integer pkCountry = SecurityUtils.getPkCountry();
selVO.setPkCountry(pkCountry);
selVO.setModifiedTime(date);
selVO.setPkModified(SecurityUtils.getUserId());
List<SelfModifyAddressVO> selList = new ArrayList<>();
if (selVO.getApproveOperation() == EApproveOperation.AGREE.getValue()) {
for (String businessNo : selVO.getBusinessNoList()) {
QueryWrapper<CuSelfServiceLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("BUSINESS_NO", businessNo);
CuSelfServiceLog serviceLog = serviceLogService.getOne(queryWrapper);
selVO.setPkId(serviceLog.getPkId());
selVO.setPkMember(serviceLog.getPkMember());
selVO.setBusinessNo(businessNo);
SelfModifyAddressVO nselVO = JSONObject.parseObject(serviceLog.getNewValue(), SelfModifyAddressVO.class);
SelfModifyAddressVO oselVO = JSONObject.parseObject(serviceLog.getOldValue(), SelfModifyAddressVO.class);
BigDecimal differ = nselVO.getNewPostage().subtract(oselVO.getPostage());
List<SelfModifyAddressVO> errorList = new ArrayList<>();
// Map<Integer, ApprovalInfoDTO> approvalInfoMap =
// iApprovalServiceApi.queryApprovalInfo(Collections.singletonList(EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue()), pkCountry).getData();
// // 根据审批业务类型判断是否配置审批流程
// ApprovalInfoDTO approvalInfo = approvalInfoMap.get(EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue());
// if (null == approvalInfo || CollectionUtil.isEmpty(approvalInfo.getItemList())) {
// // 审批 或者 审批流程 没有配置，则不允许进行申请
// log.error("{} 提交自助服务修改收货地址申请失败，未配置审批流程", EApprovalBusiness.SELF_MODIFY_ADDRESS.getLabel());
// return AjaxResult.error(ConfigMsgConstants.SELF_MODIFY_ADDRESS_PETITION_NOT_NULL);
// }
// 当前登录用户
LoginUser loginUser = userTokenService.getLoginUser();
selVO.setLoginUser(loginUser);
CuSelfServiceLog cuSelfServiceLog = new CuSelfServiceLog();
cuSelfServiceLog.setPkCountry(pkCountry);
cuSelfServiceLog.setApproveStatus(EApproveRechargeStatus.AGREE.getValue());
cuSelfServiceLog.setEditType(EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue());
cuSelfServiceLog.setPkMember(selVO.getPkMember());
//当前最大次数
Integer approveNumber = serviceLogService.selectByMaxApproveNumber(cuSelfServiceLog);
selVO.setApproveNumber(approveNumber + 1);
//查询扣费金额，账户信息
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue());
serviceChargeDTO.setPkCountry(pkCountry);
serviceChargeDTO.setQuantity(approveNumber + 1);
R<ServiceChargeDTO> serviceChargeDTOR = serviceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
List<MemberAmountDTO> memberAmountDTOList = new ArrayList<>();
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
MemberAmountDTO memberAmountDTO = new MemberAmountDTO();
memberAmountDTO.setPkMember(selVO.getPkMember());
if (differ.compareTo(new BigDecimal(0)) > 0) {
memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost().add(differ));
} else {
memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost());
}
selVO.setSingleAmount(serviceChargeDTOR.getData().getCost());
selVO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
selVO.setPkAccountKey(cuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
memberAmountDTOList.add(memberAmountDTO);
selVO.setMemberAmountDTOList(memberAmountDTOList);
businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList);
businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
businessCommissionDTO.setPkCountry(pkCountry);
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
//接口查询金额是否足够
List<MemberBalanceDTO> memberBalanceList = cuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) {
memberBalanceList.forEach(item -> {
SelfModifyAddressVO error = BeanUtil.copyProperties(item, SelfModifyAddressVO.class);
error.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT));
errorList.add(error);
});
}
}
selList.add(selVO);
}
}
return AjaxResult.success(serviceLogService.firstInstance(selList));
}
/**
* @description: 修改地址-驳回
* @author: zhang jing
* @date: 2023/6/7 14:40
* @param: [selVO]
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@PostMapping("/reject")
@Log(module = EOperationModule.MODIFY_ADDRESS, business = EOperationBusiness.MODIFY_ADDRESS, method = EOperationMethod.REJECT)
public AjaxResult reject(@RequestBody SelfModifyAddressVO selVO) {
if (CollectionUtil.isEmpty(selVO.getBusinessNoList())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));
}
if (StringUtils.isEmpty(selVO.getRejectMsg())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.REJECT_MSG_NOT_NULL));
}
selVO.setApproveOperation(EApproveOperation.REJECT.getValue());
List<SelfModifyAddressVO> selList = new ArrayList<>();
Date date = new Date();
Integer pkCountry = SecurityUtils.getPkCountry();
selVO.setPkCountry(pkCountry);
selVO.setModifiedTime(date);
selVO.setPkModified(SecurityUtils.getUserId());
for (String businessNo : selVO.getBusinessNoList()) {
QueryWrapper<CuSelfServiceLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("BUSINESS_NO", businessNo);
CuSelfServiceLog serviceLog = serviceLogService.getOne(queryWrapper);
selVO.setPkId(serviceLog.getPkId());
selList.add(selVO);
}
return AjaxResult.success(serviceLogService.firstInstance(selList));
}
}

33
bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java
View File

@ -1,10 +1,8 @@
package com.hzs.member.self.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hzs.common.domain.member.self.CuSelfServiceLog;
import com.hzs.common.domain.member.self.CuSelfServiceLogExt;
import com.hzs.common.domain.sale.ext.SaOrderItemsExt;
import com.hzs.member.self.vo.MyOrderItemsVO;
import com.hzs.member.self.vo.SelfModifyAddressVO;
import com.hzs.member.self.vo.DomicileChangeVO;
@ -13,48 +11,27 @@ import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 自助服务日志表 Mapper 接口
* </p>
*
* @author hzs
* @since 2023-04-17
*/
public interface CuSelfServiceLogMapper extends BaseMapper<CuSelfServiceLog> {
/**
* @description: 自助服务-查询已申请修改收货地址
* @author: zhang jing
* @date: 2023/4/17 14:36
* @param: [selfModifyAddressVO]
* @return: java.util.List<com.hzs.member.self.vo.SelfModifyAddressVO>
* 自助服务-查询已申请修改收货地址
**/
List<SelfModifyAddressVO> querySelfModifyAddressList(SelfModifyAddressVO selfModifyAddressVO);
/**
* @description: 自助服务-查询已申请修改收货地址（管理端）
* @author: zhang jing
* @date: 2023/7/24 11:43
* @param: [selfModifyAddressVO]
* @return: java.util.List<com.hzs.member.self.vo.SelfModifyAddressVO>
* 自助服务-查询已申请修改收货地址（管理端）
**/
List<SelfModifyAddressVO> querySelfModifyAddressManageList(SelfModifyAddressVO selfModifyAddressVO);
/**
* @description: 自助服务-校验是否存在重复审核
* @author: zhang jing
* @date: 2023/4/17 16:40
* @param: [selfModifyAddressVO]
* @return: java.lang.Integer
* 自助服务-校验是否存在重复审核
**/
Integer checkSelfService(CuSelfServiceLog cuSelfServiceLog);
/**
* @description: 自助服务-查询申请的最大次数
* @author: zhang jing
* @date: 2023/4/17 17:08
* @param: [selfModifyAddressVO]
* @return: java.lang.Integer
* 自助服务-查询申请的最大次数
**/
Integer selectByMaxApproveNumber(CuSelfServiceLog cuSelfServiceLog);

91
bd-business/bd-business-member/src/main/java/com/hzs/member/self/provider/ICuSelfServiceServiceProvider.java
View File

@ -1,53 +1,31 @@
package com.hzs.member.self.provider;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.EApprovalBusiness;
import com.hzs.common.core.enums.EModifyRecordStatus;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.domain.member.base.CuMember;
import com.hzs.common.domain.member.self.CuSelfServiceLog;
import com.hzs.member.base.service.ICuMemberService;
import com.hzs.member.self.ICuSelfServiceServiceApi;
import com.hzs.member.self.dto.SelfServiceDataDTO;
import com.hzs.member.self.service.ICuSelfServiceLogService;
import com.hzs.member.self.vo.DomicileChangeVO;
import com.hzs.member.self.vo.SelfModifyAddressVO;
import com.hzs.system.base.IAreaServiceApi;
import com.hzs.system.sys.dto.ApprovalBusinessResultDTO;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.config.annotation.DubboService;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
import java.util.Map;
/**
* 自助服务Dubbo 服务
*
* @Description:
* @Author: ljc
* @Time: 2023/4/19 16:24
* @Classname: ICuSelfServiceServiceProvider
* @Package_name: com.hzs.member.self.provider
*/
@Slf4j
@DubboService
public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi {
@Autowired
ICuSelfServiceLogService cuSelfServiceLogService;
@Autowired
private ICuSelfServiceLogService serviceLogService;
@Autowired
private ICuMemberService cuMemberService;
@DubboReference
IAreaServiceApi iAreaServiceApi;
private ICuSelfServiceLogService iCuSelfServiceLogService;
@Override
public R<?> analysisSelfServiceData(SelfServiceDataDTO selfServiceDataDTO) {
@ -56,9 +34,6 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi {
case DOMICILE_CHANGE:
//户籍变更数据
return R.ok(getDomicileChangeData(selfServiceDataDTO));
case SELF_MODIFY_ADDRESS:
//修改地址
return R.ok(getSelfModifyAddress(selfServiceDataDTO));
default:
return R.fail();
}
@ -74,61 +49,9 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi {
DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().editType(selfServiceDataDTO.getEditType())
.pkCountry(selfServiceDataDTO.getPkCountry())
.businessNo(selfServiceDataDTO.getBusinessNo()).build();
return (List<DomicileChangeVO>) cuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1];
return (List<DomicileChangeVO>) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1];
}
/**
* @description: 自助服务-修改收货地址
* @author: zhang jing
* @date: 2023/4/20 16:18
* @param: [selfServiceDataDTO]
* @return: java.util.List<com.hzs.member.self.vo.SelfModifyAddressVO>
**/
private SelfModifyAddressVO getSelfModifyAddress(SelfServiceDataDTO selfServiceDataDTO) {
SelfModifyAddressVO selMad = SelfModifyAddressVO.builder()
.businessNo(selfServiceDataDTO.getBusinessNo())
.pkCountry(selfServiceDataDTO.getPkCountry())
.editType(selfServiceDataDTO.getEditType())
.build();
LambdaQueryWrapper<CuSelfServiceLog> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CuSelfServiceLog::getBusinessNo, selfServiceDataDTO.getBusinessNo());
CuSelfServiceLog serviceLog = serviceLogService.getOne(queryWrapper);
if (null != serviceLog) {
// 调用system服务，获取地址
Map<Integer, String> areaMap = iAreaServiceApi.getAreaMap(selfServiceDataDTO.getPkCountry()).getData();
SelfModifyAddressVO sad = JSONObject.parseObject(serviceLog.getNewValue(), SelfModifyAddressVO.class);
SelfModifyAddressVO oldsad = JSONObject.parseObject(serviceLog.getOldValue(), SelfModifyAddressVO.class);
//旧值
String recCountyVal = "";
sad.setOrderCode(serviceLog.getOrderCode());
CuMember member = cuMemberService.getMember(serviceLog.getPkMember());
sad.setMemberName(member.getMemberName());
sad.setMemberCode(member.getMemberCode());
sad.setRecName(oldsad.getRecName());
sad.setRecPhone(oldsad.getRecPhone());
if (StringUtils.isNotNull(oldsad.getRecCounty())) {
recCountyVal = areaMap.get(oldsad.getRecCounty());
}
sad.setRecAddress(areaMap.get(oldsad.getRecProvince())
+ areaMap.get(oldsad.getRecCity())
+ recCountyVal
+ oldsad.getRecAddress());
//新值
if (StringUtils.isNotNull(sad.getRecCounty())) {
recCountyVal = areaMap.get(sad.getNewRecCounty());
}
sad.setNewRecAddress(areaMap.get(sad.getNewRecProvince())
+ areaMap.get(sad.getNewRecCity())
+ recCountyVal
+ sad.getNewRecAddress());
selMad = BeanUtil.copyProperties(sad, SelfModifyAddressVO.class);
}
return selMad;
}
@Override
public R<?> onlineApproval(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
//通过/驳回（EApproveOperation）
@ -138,7 +61,7 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi {
if (StringUtils.isEmpty(businessCode) || null == approveOperation || null == eApprovalBusiness) {
return R.fail("提交审核缺少参数！");
}
CuSelfServiceLog selfServiceLog = cuSelfServiceLogService.selectSelfServiceByBusinessNo(eApprovalBusiness.getValue(), businessCode);
CuSelfServiceLog selfServiceLog = iCuSelfServiceLogService.selectSelfServiceByBusinessNo(eApprovalBusiness.getValue(), businessCode);
if (null == selfServiceLog) {
return R.fail("审批记录不存在！");
}
@ -148,20 +71,16 @@ public class ICuSelfServiceServiceProvider implements ICuSelfServiceServiceApi {
case DOMICILE_CHANGE:
//审批通过
if (approveOperation.equals(EModifyRecordStatus.APPROVE.getValue())) {
return R.ok(cuSelfServiceLogService.domicileChangeApproved(approvalBusinessResultDTO, selfServiceLog));
return R.ok(iCuSelfServiceLogService.domicileChangeApproved(approvalBusinessResultDTO, selfServiceLog));
}
//审批驳回
if (approveOperation.equals(EModifyRecordStatus.REJECT.getValue())) {
//横冲手续费
return R.ok(cuSelfServiceLogService.domicileChangeReject(approvalBusinessResultDTO, selfServiceLog));
return R.ok(iCuSelfServiceLogService.domicileChangeReject(approvalBusinessResultDTO, selfServiceLog));
}
case SELF_MODIFY_ADDRESS:
//修改地址
return R.ok(cuSelfServiceLogService.selfExamine(approvalBusinessResultDTO));
default:
return R.fail();
}
} catch (Exception e) {
log.error("审核状态为： {} 的审核出错", approveOperation, e);
return R.fail("审批自助服务流程出错！");

74
bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java
View File

@ -11,54 +11,28 @@ import java.util.List;
/**
* 自助服务日志表 服务类
*
* @author hzs
* @since 2023-04-17
*/
public interface ICuSelfServiceLogService extends IService<CuSelfServiceLog> {
/**
* @description: 自助服务-查询已申请修改收货地址
* @author: zhang jing
* @date: 2023/4/17 14:36
* @param: [selfModifyAddressVO]
* @return: java.util.List<com.hzs.member.self.vo.SelfModifyAddressVO>
* 自助服务-查询已申请修改收货地址
**/
List<SelfModifyAddressVO> querySelfModifyAddressList(SelfModifyAddressVO selfModifyAddressVO);
/**
* @description:自助服务-查询已申请修改收货地址(管理端)
* @author: zhang jing
* @date: 2023/7/24 11:42
* @param: [selfModifyAddressVO]
* @return: java.util.List<com.hzs.member.self.vo.SelfModifyAddressVO>
* 自助服务-查询已申请修改收货地址(管理端)
**/
List<SelfModifyAddressVO> querySelfModifyAddressManageList(SelfModifyAddressVO selfModifyAddressVO);
/**
* @description: 自助服务-校验是否存在重复审核
* @author: zhang jing
* @date: 2023/4/17 16:41
* @param: [selfModifyAddressVO]
* @return: java.lang.Integer
* 自助服务-校验是否存在重复审核
**/
Integer checkSelfService(CuSelfServiceLog cuSelfServiceLog);
/**
* @description:
* @author: zhang jing
* @date: 2023/4/17 17:09
* @param: [selfModifyAddressVO]
* @return: java.lang.Integer
**/
Integer selectByMaxApproveNumber(CuSelfServiceLog cuSelfServiceLog);
/**
* @description:自助服务-申请修改收货地址
* @author: zhang jing
* @date: 2023/4/17 17:48
* @param: [selfModifyAddressVO]
* @return: boolean
* 自助服务-申请修改收货地址
**/
boolean putin(SelfModifyAddressVO selfModifyAddressVO);
@ -70,16 +44,6 @@ public interface ICuSelfServiceLogService extends IService<CuSelfServiceLog> {
*/
Boolean saveChangeDomicile(DomicileChangeVO domicileChangeVO);
/**
* @description: 自助服务-审批修改收货地址
* @author: zhang jing
* @date: 2023/4/18 15:14
* @param: [approvalBusinessResultDTO]
* @return: boolean
**/
boolean selfExamine(ApprovalBusinessResultDTO approvalBusinessResultDTO);
/**
* 根据业务类型、用户ID查询自助服务
*
@ -160,39 +124,11 @@ public interface ICuSelfServiceLogService extends IService<CuSelfServiceLog> {
*/
Integer domicileChangeAgree(DomicileChangeVO domicileChangeVO);
/**
* @description:
* @author: zhang jing
* @date: 2023/4/20 14:11
* @param: [orderIdList]
* @return: java.util.List<com.hzs.common.domain.sale.ext.SaOrderItemsExt>
**/
List<MyOrderItemsVO> queryListByOrderId(List<Long> orderIdList);
/**
* @description: 自助服务-申请修改收货地址-管理员初审
* @author: zhang jing
* @date: 2023/5/12 13:52
* @param: [selVO]
* @return: boolean
**/
boolean firstInstance(List<SelfModifyAddressVO> selList);
/**
* @description: 校验自助服务-修改地址、订单自提页签是否显示 0 显示 1 隐藏
* @author: zhang jing
* @date: 2023/7/1 16:21
* @param: [pkMember, pkCountry]
* @return: java.lang.Integer
* 校验自助服务-修改地址、订单自提页签是否显示 0 显示 1 隐藏
**/
Integer showHiddenAddress(Long pkMember, Integer pkCountry);
/**
* 批量删除营业热量
*
* @param pkMembers 会员IDs
* @param updatePkMember 更新人
* @return Boolean
*/
Boolean deleteChangeDomicileByIds(List<Long> pkMembers, Long updatePkMember);
}

205
bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java
View File

@ -1,8 +1,6 @@
package com.hzs.member.self.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -11,24 +9,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hzs.common.core.constant.MagicNumberConstants;
import com.hzs.common.core.constant.RabbitMqConstants;
import com.hzs.common.core.constant.SystemFieldConstants;
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
import com.hzs.common.core.domain.R;
import com.hzs.common.core.enums.*;
import com.hzs.common.core.exception.ServiceException;
import com.hzs.common.core.utils.CommonUtil;
import com.hzs.common.core.utils.StringUtils;
import com.hzs.common.domain.member.account.CuMemberAccount;
import com.hzs.common.domain.member.ext.CuMemberExt;
import com.hzs.common.domain.member.self.CuSelfServiceLog;
import com.hzs.common.domain.member.self.CuSelfServiceLogExt;
import com.hzs.common.domain.sale.ext.SaOrderExt;
import com.hzs.common.domain.sale.order.SaOrder;
import com.hzs.common.security.utils.SecurityUtils;
import com.hzs.member.account.dto.BusinessCommissionDTO;
import com.hzs.member.account.dto.MemberAmountDTO;
import com.hzs.member.account.service.*;
import com.hzs.member.base.dto.MemberContinueDTO;
import com.hzs.member.base.service.ICuMemberBusinessService;
import com.hzs.member.base.service.ICuMemberService;
import com.hzs.member.handlebusiness.vo.BusinessMemberVO;
import com.hzs.member.self.mapper.CuSelfServiceLogMapper;
@ -54,98 +47,50 @@ import java.util.List;
/**
* 自助服务日志表 服务实现类
*
* @author hzs
* @since 2023-04-17
*/
@Service
public class CuSelfServiceLogServiceImpl extends ServiceImpl<CuSelfServiceLogMapper, CuSelfServiceLog> implements ICuSelfServiceLogService {
@DubboReference
IApprovalServiceApi approvalServiceApi;
@DubboReference
private ISaOrderServiceApi iSaOrderServiceApi;
@Autowired
private ICuMemberBusinessService iCuMemberBusinessService;
@Autowired
private ICuMemberAccountService iCuMemberAccountService;
ISaOrderServiceApi iSaOrderServiceApi;
@Autowired
private ICuMemberTradeService cuMemberTradeService;
@Autowired
private ICuMemberBaseService cuMemberBaseService;
@Autowired
ICuMemberAuthenticationService cuMemberAuthenticationService;
private ICuMemberAuthenticationService cuMemberAuthenticationService;
@Autowired
private ICuMemberBusinessLicenseService cuMemberBusinessLicenseService;
@Autowired
ICuMemberService cuMemberService;
private ICuMemberService cuMemberService;
@Autowired
private ICuMemberBankService cuMemberBankService;
@Autowired
private RabbitTemplate rabbitTemplate;
/**
* @description: 自助服务-查询已申请修改收货地址
* @author: zhang jing
* @date: 2023/4/17 14:35
* @param: [selfModifyAddressVO]
* @return: java.util.List<com.hzs.member.self.vo.SelfModifyAddressVO>
**/
@Override
public List<SelfModifyAddressVO> querySelfModifyAddressList(SelfModifyAddressVO selfModifyAddressVO) {
return baseMapper.querySelfModifyAddressList(selfModifyAddressVO);
}
/**
* @description: 自助服务-查询已申请修改收货地址(管理端)
* @author: zhang jing
* @date: 2023/7/24 11:43
* @param: [selfModifyAddressVO]
* @return: java.util.List<com.hzs.member.self.vo.SelfModifyAddressVO>
**/
@Override
public List<SelfModifyAddressVO> querySelfModifyAddressManageList(SelfModifyAddressVO selfModifyAddressVO) {
return baseMapper.querySelfModifyAddressManageList(selfModifyAddressVO);
}
/**
* @description: 自助服务-校验是否存在重复审核
* @author: zhang jing
* @date: 2023/4/17 16:41
* @param: [selfModifyAddressVO]
* @return: java.lang.Integer
**/
@Override
public Integer checkSelfService(CuSelfServiceLog cuSelfServiceLog) {
return baseMapper.checkSelfService(cuSelfServiceLog);
}
/**
* @description: 自助服务-查询申请的最大次数
* @author: zhang jing
* @date: 2023/4/17 17:10
* @param: [selfModifyAddressVO]
* @return: java.lang.Integer
**/
@Override
public Integer selectByMaxApproveNumber(CuSelfServiceLog cuSelfServiceLog) {
return baseMapper.selectByMaxApproveNumber(cuSelfServiceLog);
}
/**
* @description: 自助服务-申请修改收货地址
* @author: zhang jing
* @date: 2023/4/17 17:48
* @param: [selfModifyAddressVO]
* @return: boolean
**/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean putin(SelfModifyAddressVO selfModifyAddressVO) {
@ -489,140 +434,11 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl<CuSelfServiceLogMap
return baseMapper.updateSelfServiceByBusinessNo(domicileChange);
}
/**
* @description: 自助服务-修改收货地址-审核通过或驳回
* @author: zhang jing
* @date: 2023/4/17 19:25
* @param: [selfModifyAddressVO]
* @return: boolean
**/
@Transactional(rollbackFor = Exception.class)
@Override
public boolean selfExamine(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry();
Date date = new Date();
Long userID = approvalBusinessResultDTO.getLoginUser().getUserId();
SelfModifyAddressVO csv = SelfModifyAddressVO.builder()
.businessNo(approvalBusinessResultDTO.getBusinessCode())
.approveStatus(EApproveRechargeStatus.WAIT.getValue())
.pkCountry(pkCountry)
.build();
List<SelfModifyAddressVO> slList = querySelfModifyAddressList(csv);
SelfModifyAddressVO csso = JSONObject.parseObject(slList.get(0).getNewValue(), SelfModifyAddressVO.class);
UpdateWrapper<CuSelfServiceLog> updateWrapper = new UpdateWrapper<>();
//审核通过
if (approvalBusinessResultDTO.getApproveOperation() == EApproveOperation.AGREE.getValue()) {
List<Long> orderIdList = new ArrayList<>();
orderIdList.add(slList.get(0).getPkId());
SaOrder so = new SaOrder();
R<List<SaOrderExt>> saOrder = iSaOrderServiceApi.queryOrderListByIdList(orderIdList, pkCountry);
if (CollectionUtil.isNotEmpty(saOrder.getData())) {
so = BeanUtil.copyProperties(saOrder.getData().get(0), SaOrder.class);
}
CuMemberAccount cma = iCuMemberAccountService.queryCuMemberAccountByPkMember(slList.get(0).getPkMember());
// if (StringUtils.isNotNull(so) && StringUtils.isNotNull(cma)) {
// //撤销订单，回退给创建人金额
// iCuMemberBusinessService.selfCancelAnOrder(approvalBusinessResultDTO.getSysUser().getUserId(), so, cma);
// }
//修改订单相关信息
so.setPostage(csso.getNewPostage());
so.setRecName(csso.getNewRecName());
so.setRecPhone(csso.getNewRecPhone());
so.setRecProvince(csso.getNewRecProvince());
so.setRecCity(csso.getNewRecCity());
so.setRecCounty(csso.getNewRecCounty());
so.setRecAddress(csso.getNewRecAddress());
//订单扣费
iCuMemberBusinessService.selfInsertMemberTrade(so, cma);
//修改订单的收货地址
iSaOrderServiceApi.updateOrder(so);
updateWrapper.set("APPROVE_STATUS", EApproveRechargeStatus.AGREE.getValue());
}
//审核驳回
if (approvalBusinessResultDTO.getApproveOperation() == EApproveOperation.REJECT.getValue()) {
//退款
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
businessCommissionDTO.setPkCountry(pkCountry);
businessCommissionDTO.setTradeCode(approvalBusinessResultDTO.getBusinessCode());
businessCommissionDTO.setPkAccount(csso.getPkAccount());
businessCommissionDTO.setMemberAmountDTOList(csso.getMemberAmountDTOList());
businessCommissionDTO.setTradeType(EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue());
Boolean b = cuMemberTradeService.businessCommissionReject(businessCommissionDTO);
if (!b) {
throw new ServiceException(ConfigMsgConstants.MEMBER_UPDATE_CODE_MONEY);
}
updateWrapper.set("APPROVE_STATUS", EApproveRechargeStatus.REJECT.getValue());
}
//修改日志状态
updateWrapper.set("MODIFIED_TIME", date);
updateWrapper.set("PK_MODIFIED", userID);
updateWrapper.eq("BUSINESS_NO", slList.get(0).getBusinessNo());
baseMapper.update(null, updateWrapper);
return true;
}
@Override
public List<MyOrderItemsVO> queryListByOrderId(List<Long> orderIdList) {
return baseMapper.queryListByOrderId(orderIdList);
}
/**
* @description: 自助服务-修改收货地址-管理员初审
* @author: zhang jing
* @date: 2023/5/12 12:05
* @param: [selVO]
* @return: boolean
**/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean firstInstance(List<SelfModifyAddressVO> selList) {
for (SelfModifyAddressVO selVO : selList) {
CuSelfServiceLog serviceLog = BeanUtil.copyProperties(selVO, CuSelfServiceLog.class);
if (selVO.getApproveOperation() == EApproveOperation.AGREE.getValue()) {
serviceLog.setApproveStatus(EApproveRechargeStatus.WAIT.getValue());
//生成签呈
ApprovalSubmitDTO approvalSubmitDTO = ApprovalSubmitDTO.builder().eApprovalBusiness(EApprovalBusiness.SELF_MODIFY_ADDRESS)
.businessCode(serviceLog.getBusinessNo())
.remark(selVO.getRemark())
.signType(ESignType.getEnumByValue(selVO.getSignType()))
.userIdList(selVO.getUserIdList())
.signSource(ESignSource.MEMBER)
.sendIdList(selVO.getSendIdList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, selVO.getLoginUser());
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.SELF_MODIFY_ADDRESS);
}
//扣钱
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
businessCommissionDTO.setPkCountry(selVO.getPkCountry());
businessCommissionDTO.setTradeCode(selVO.getBusinessNo());
businessCommissionDTO.setPkAccount(selVO.getPkAccount());
businessCommissionDTO.setMemberAmountDTOList(selVO.getMemberAmountDTOList());
businessCommissionDTO.setTradeType(EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue());
Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO);
if (!b) {
throw new ServiceException(ConfigMsgConstants.SELF_MODIFY_ADDRESS);
}
} else if (selVO.getApproveOperation() == EApproveOperation.REJECT.getValue()) {
serviceLog.setApproveStatus(EApproveRechargeStatus.REJECT.getValue());
serviceLog.setRejectMsg(selVO.getRejectMsg());
}
baseMapper.updateById(serviceLog);
}
return true;
}
/**
* @description: 校验自助服务-修改地址、订单自提页签是否显示 0 显示 1 隐藏
* @author: zhang jing
* @date: 2023/7/1 16:04
* @param: [Integer]
* @return:
**/
@Override
public Integer showHiddenAddress(Long pkMember, Integer pkCountry) {
Integer count = baseMapper.showHiddenAddressList(pkMember, pkCountry);
@ -633,17 +449,4 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl<CuSelfServiceLogMap
}
}
@Override
public Boolean deleteChangeDomicileByIds(List<Long> pkMembers, Long updatePkMember) {
UpdateWrapper<CuSelfServiceLog> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("PK_MEMBER", pkMembers);
updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue());
updateWrapper.set("EDIT_TYPE", EApprovalBusiness.BUSINESS_LICENSE.getValue());
updateWrapper.set("PK_MODIFIED", updatePkMember);
updateWrapper.set("MODIFIED_TIME", new Date());
return this.update(updateWrapper);
}
}

14
bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/DomicileChangeVO.java
View File

@ -1,16 +1,11 @@
package com.hzs.member.self.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hzs.common.core.annotation.Transaction;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.web.domain.BaseApprovalEntity;
import com.hzs.member.base.dto.LoginMember;
import com.hzs.system.sys.dto.LoginUser;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import java.io.Serializable;
import java.math.BigDecimal;
@ -18,13 +13,8 @@ import java.util.Date;
/**
* 户籍变更VO
*
* @Description:
* @Author: ljc
* @Time: 2023/4/18 10:17
* @Classname: DomicileChangeVO
* @Package_name: com.hzs.member.self.vo
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Builder
@AllArgsConstructor

7
bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/MyOrderItemsVO.java
View File

@ -5,16 +5,11 @@ import lombok.Data;
import java.math.BigDecimal;
/**
* @Description: 我的订单明细返回VO
* @Author: jiang chao
* @Time: 2023/1/13 16:13
* @Classname: MyOrderItemsVO
* @PackageName: com.hzs.sale.order.vo
* 我的订单明细返回VO
*/
@Data
public class MyOrderItemsVO {
/**
* 订单ID
*/

16
bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/SelfModifyAddressVO.java
View File

@ -5,27 +5,18 @@ import com.hzs.common.core.annotation.Transaction;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.web.domain.BaseApprovalEntity;
import com.hzs.member.account.dto.MemberAmountDTO;
import com.hzs.member.base.dto.LoginMember;
import com.hzs.system.sys.dto.LoginUser;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.*;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Set;
/**
* <p>
* 自助服务日志表VO
* </p>
*
* @author hzs
* @since 2023-04-17
*/
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
@ -242,7 +233,7 @@ public class SelfModifyAddressVO extends BaseApprovalEntity {
/**
* 新邮费
*/
private BigDecimal newPostage=BigDecimal.ZERO;
private BigDecimal newPostage = BigDecimal.ZERO;
/**
* 备注
*/
@ -291,7 +282,6 @@ public class SelfModifyAddressVO extends BaseApprovalEntity {
private String memberName;
/**
* 订单状态（EOrderStatus）
*/

6
bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/WaresItemsParam.java
View File

@ -8,11 +8,7 @@ import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description: 商品明细参数
* @Author: sui q
* @Time: 2022/9/15 17:00
* @Classname: WaresItemsParam
* @PackageName: com.hzs.sale.order.param
* 商品明细参数
*/
@Data
@Builder

19
bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml
View File

@ -72,18 +72,6 @@
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
DEL_FLAG,
CREATION_TIME,
MODIFIED_TIME,
PK_COUNTRY,
PK_CREATOR,
PK_MODIFIED,
PK_ID, PK_MEMBER, EDIT_TYPE, OLD_VALUE, NEW_VALUE, BUSINESS_NO, APPROVE_STATUS, APPROVE_NUMBER, EDIT_TYPE_PAY, SINGLE_AMOUNT
</sql>
<!-- 自助服务-查询已申请修改收货地址-->
<select id="querySelfModifyAddressList" parameterType="com.hzs.member.self.vo.SelfModifyAddressVO"
resultMap="SelfModifyAddress">
@ -234,7 +222,7 @@
where so.del_flag = 0
and order_status in (1)
and so.pk_creator = #{memberId}
AND TO_CHAR(so.PAY_TIME,'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
AND TO_CHAR(so.PAY_TIME, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD')
</select>
<!-- 根据订单ID查询订单明细列表 -->
@ -337,10 +325,11 @@
<select id="selectByMaxApproveNumber" parameterType="com.hzs.common.domain.member.self.CuSelfServiceLog"
resultType="integer">
select nvl(max(APPROVE_NUMBER),0) from CU_SELF_SERVICE_LOG
select nvl(max(APPROVE_NUMBER), 0)
from CU_SELF_SERVICE_LOG
where EDIT_TYPE = #{editType}
and PK_MEMBER = #{pkMember}
and APPROVE_STATUS=#{approveStatus}
and APPROVE_STATUS = #{approveStatus}
</select>
<update id="updateSelfServiceByBusinessNo">

24
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java
View File

@ -45,11 +45,7 @@ import java.math.BigDecimal;
import java.util.*;
/**
* @Description: 我的订单控制器
* @Author: jiang chao
* @Time: 2023/1/13 15:53
* @Classname: ApiOrderController
* @PackageName: com.hzs.sale.order.controller.api
* 我的订单控制器
*/
@Slf4j
@RestController
@ -405,11 +401,7 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助服务-修改地址订单列表
* @author: zhang jing
* @date: 2023/5/11 16:03
* @param: [param]
* @return: com.hzs.common.core.web.page.TableDataInfo
* 自助服务-修改地址订单列表
**/
@GetMapping("/selflist")
public TableDataInfo selflist(MyOrderParam param) {
@ -491,7 +483,8 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助业务-订单自提订单列表
* 自助业务-订单自提订单列表
*
* @author: zhang jing
* @date: 2023/5/29 9:10
* @param: [selfPickUpParam]
@ -650,7 +643,8 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助撤单列表(24点内)
* 自助撤单列表(24点内)
*
* @author: zhang jing
* @date: 2023/11/21 10:33
* @param: [param]
@ -786,7 +780,8 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自动撤单参数校验
* 自动撤单参数校验
*
* @author: zhang jing
* @date: 2023/11/21 14:49
* @param: [orderQueryParam]
@ -812,7 +807,8 @@ public class ApiOrderController extends BaseController {
}
/**
* @description: 自助撤单
* 自助撤单
*
* @author: zhang jing
* @date: 2023/11/21 15:19
* @param: [orderCancelParam]

9
bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java
View File

@ -58,11 +58,7 @@ import java.util.*;
import java.util.stream.Collectors;
/**
* Description: 审批业务处理
* Author: jiang chao
* Time: 2022/9/21 15:05
* Classname: SysApprovalBusinessController
* PackageName: com.hzs.system.sys.controller.manage
* 审批业务处理
*/
@RestController
@RequestMapping("/manage/approval-business")
@ -205,8 +201,7 @@ public class SysApprovalBusinessController extends BaseController {
approvalBusinessVO.setBusinessData(JSONUtil.toJsonStr(controlList.getData()));
}
}
} else if (approvalBusinessExt.getApprovalBusiness() == EApprovalBusiness.DOMICILE_CHANGE.getValue() ||
approvalBusinessExt.getApprovalBusiness() == EApprovalBusiness.SELF_MODIFY_ADDRESS.getValue()) {
} else if (approvalBusinessExt.getApprovalBusiness() == EApprovalBusiness.DOMICILE_CHANGE.getValue()) {
//自助服务
SelfServiceDataDTO serviceDataDTO = SelfServiceDataDTO.builder().businessNo(approvalBusinessExt.getBusinessCode())
.editType(approvalBusinessExt.getApprovalBusiness())

3
bd-business/bd-business-system/src/main/java/com/hzs/system/sys/service/impl/ApprovalServiceImpl.java
View File

@ -514,8 +514,7 @@ public class ApprovalServiceImpl implements IApprovalService {
* @return R
*/
private R<?> getMemberBusiness(ApprovalBusinessResultDTO approvalBusinessResultDTO) {
if (approvalBusinessResultDTO.getEApprovalBusiness() == EApprovalBusiness.DOMICILE_CHANGE ||
approvalBusinessResultDTO.getEApprovalBusiness() == EApprovalBusiness.SELF_MODIFY_ADDRESS) {
if (approvalBusinessResultDTO.getEApprovalBusiness() == EApprovalBusiness.DOMICILE_CHANGE) {
// 前台自助服务
return cuSelfServiceServiceApi.onlineApproval(approvalBusinessResultDTO);
} else if (approvalBusinessResultDTO.getEApprovalBusiness() == EApprovalBusiness.BUSINESS_LICENSE ||

29
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java
View File

@ -160,10 +160,6 @@ public class ConfigMsgConstants {
* 所属专区不能为空 -- 所属专区不能为空
*/
public static final String SPECIAL_AREA_NOT_NULL = "所属专区不能为空";
/**
* 校验会员是否存在三方订单 -- 校验会员是否存在三方订单
*/
public static final String CHECK_THREE_ORDER = "存在三方订单";
/**
* 账户类型不能为空 -- 账户类型不能为空
*/
@ -189,10 +185,6 @@ public class ConfigMsgConstants {
* 扣款比例不能大于 -- 扣款比例不能大于
*/
public static final String DEDUCT_RATIO_NOT_MORE_THAN = "扣款比例不能大于";
/**
* 配置扣款比例不足 -- 扣款比例不足
*/
public static final String DEDUCT_RATIO_NOT_ENOUGH = "扣款比例不足";
/**
* 扣款比例不能为空 -- 扣款比例不能为空
*/
@ -228,10 +220,6 @@ public class ConfigMsgConstants {
*/
public static final String MEMBER_CODE_NOT_EQUAL = "会员编号前两位编号不能修改";
/**
* 请选择注水业绩 -- 请选择注水业绩
*/
public static final String ACHIEVE_NOT_NULL = "请选择注水业绩";
/**
* 会员信息不存在 -- 会员信息不存在
*/
@ -355,10 +343,6 @@ public class ConfigMsgConstants {
*/
public static final String RANGE_VALUE_REPEAT = "极差值不能重复";
/**
* 审核状态不能为空 -- 审核状态不能为空
*/
public static final String APPROVE_OPERATION_NOT_NULL = "审核状态不能为空";
/**
* 等级或奖衔不能为空 -- 等级或奖衔不能为空
*/
@ -1221,14 +1205,6 @@ public class ConfigMsgConstants {
* 请选择政策币业务 -- 请选择政策币业务
*/
public static final String POLICY_CURRENCY_NOT_NULL = "请选择政策币业务";
/**
* 领用用途重复 -- 领用用途重复
*/
public static final String BD_PURPOSE_REPEAT = "领用用途重复";
/**
* 领用用途不能为空 -- 领用用途不能为空
*/
public static final String BD_PURPOSE_NOT_NULL = "领用用途不能为空";
/**
* 变更前有效期休止期不能为空 -- 变更前有效期休止期不能为空
*/
@ -1247,11 +1223,6 @@ public class ConfigMsgConstants {
*/
public static final String COMMUNITY_CHECK_END_NOT_NULL = "小区考核止不能为空";
/**
* 关联编码已经关联过其它发起人，是否继续
*/
public static final String CABIN_MEMBER_CODE_REPEAT = "关联编码已经关联过其它发起人,是否继续";
/**
* 会员已存在 -- 会员已存在
*/

6
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java
View File

@ -5,11 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* Description: 审批业务类型
* Author: jiang chao
* Time: 2022/9/20 10:33
* Classname: EApprovalBusiness
* PackageName: com.hzs.common.core.enums
* 审批业务类型
*/
@AllArgsConstructor
@Getter

7
bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/self/CuSelfServiceLog.java
View File

@ -12,12 +12,7 @@ import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
* 自助服务日志表
* </p>
*
* @author hzs
* @since 2023-04-17
*/
@Data
@Builder
@ -137,6 +132,4 @@ public class CuSelfServiceLog extends BaseEntity {
private String dataSources;
}