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

## 注水处理只保留左右区业绩和结余处理；部分枚举去掉国际化；

This commit is contained in:
cabbage 2025-06-26 13:56:47 +08:00
parent 6ea13e9387
commit 9de0bc4690
14 changed files with 253 additions and 632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/base/vo/CuMemberAchieveLogVO.java
View File

@ -7,6 +7,7 @@ import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.web.domain.BaseApprovalEntity;
import com.hzs.member.account.dto.MemberAmountDTO;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
@ -14,13 +15,9 @@ import java.util.List;
import java.util.Set;
/**
* <p>
* 注水业绩记录表VO
* </p>
*
* @author hzs
* @since 2022-08-22
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class CuMemberAchieveLogVO extends BaseApprovalEntity {
@ -56,7 +53,6 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
/**
* 注水方式 EInfusingWaterType 1 增加 2减少 3 最终
*/
@Transaction(transactionKey = EnumsPrefixConstants.INFUSING_WATER_TYPE)
private Integer infusingWaterType;
@Excel(name = "注水方式")
private String infusingWaterTypeVal;
@ -190,7 +186,6 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
/**
* 注水状态 EActivityStatus 0 未开始 1 进行中 2 已结束
*/
@Transaction(transactionKey = EnumsPrefixConstants.ACTIVITY_STATUS)
private Integer waterStatus;
@Excel(name = "注水状态")
private String waterStatusVal;
@ -324,7 +319,6 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
private Date endDueDate;
/**
* 修改时间
*/
@ -347,8 +341,4 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
private String tableName;
}

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

@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.hzs.common.core.annotation.AccessPermissions;
import com.hzs.common.core.annotation.Log;
import com.hzs.common.core.constant.CountryConstants;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.constant.TableNameConstants;
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
@ -31,8 +30,6 @@ import com.hzs.member.base.service.ICuMemberService;
import com.hzs.member.base.vo.CuMemberAchieveLogImportVO;
import com.hzs.member.base.vo.CuMemberAchieveLogVO;
import com.hzs.member.base.vo.UpdateCodeVO;
import com.hzs.system.base.ICurrencyServiceApi;
import com.hzs.system.base.dto.CurrencyDTO;
import com.hzs.system.config.IServiceChargeServiceApi;
import com.hzs.system.config.dto.ServiceChargeDTO;
import org.apache.dubbo.config.annotation.DubboReference;
@ -67,8 +64,6 @@ public class CuMemberAchieveLogController extends BaseController {
@DubboReference
IServiceChargeServiceApi iServiceChargeServiceApi;
@DubboReference
ICurrencyServiceApi iCurrencyServiceApi;
/**
* 特殊业务-注水业绩记录查询
@ -77,74 +72,12 @@ public class CuMemberAchieveLogController extends BaseController {
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT)
@GetMapping("/list")
public TableDataInfo achieveLogList(CuMemberAchieveLogVO cuMemberAchieveLogVO) {
startPage();
cuMemberAchieveLogVO.setPkCountry(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
startPage();
List<CuMemberAchieveLogVO> list = iCuMemberAchieveLogService.queryMemberAchieveLogList(cuMemberAchieveLogVO);
if (CollectionUtil.isNotEmpty(list)) {
for (CuMemberAchieveLogVO cma : list) {
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
if (cma.getAsumRealModifyPv() != null) {
cma.setAsumRealModifyPv(cma.getAsumRealModifyPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBsumRealModifyPv() != null) {
cma.setBsumRealModifyPv(cma.getBsumRealModifyPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getAfirstModifyPv() != null) {
cma.setAfirstModifyPv(cma.getAfirstModifyPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBfirstModifyPv() != null) {
cma.setBfirstModifyPv(cma.getBfirstModifyPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepAFirstModifyBalance() != null) {
cma.setRepAFirstModifyBalance(cma.getRepAFirstModifyBalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBFirstModifyBalance() != null) {
cma.setRepBFirstModifyBalance(cma.getRepBFirstModifyBalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepAModifySumPv() != null) {
cma.setRepAModifySumPv(cma.getRepAModifySumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBModifySumPv() != null) {
cma.setRepBModifySumPv(cma.getRepBModifySumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepAModifyBalance() != null) {
cma.setRepAModifyBalance(cma.getRepAModifyBalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBModifyBalance() != null) {
cma.setRepBModifyBalance(cma.getRepBModifyBalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getAsumRealPv() != null) {
cma.setAsumRealPv(cma.getAsumRealPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBsumRealPv() != null) {
cma.setBsumRealPv(cma.getBsumRealPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getAsumPv() != null) {
cma.setAsumPv(cma.getAsumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBsumPv() != null) {
cma.setBsumPv(cma.getBsumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getAbalance() != null) {
cma.setAbalance(cma.getAbalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBbalance() != null) {
cma.setBbalance(cma.getBbalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepASumPv() != null) {
cma.setRepASumPv(cma.getRepASumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBSumPv() != null) {
cma.setRepBSumPv(cma.getRepBSumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepABalance() != null) {
cma.setRepABalance(cma.getRepABalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBBalance() != null) {
cma.setRepBBalance(cma.getRepBBalance().multiply(currency.getData().getInExchangeRate()));
}
}
cma.setInfusingWaterTypeVal(EInfusingWaterType.getLabelByValue(cma.getInfusingWaterType()));
// 判断注水状态
// 开始时间
long startTime = cma.getSettleDate().getTime();
@ -174,79 +107,14 @@ public class CuMemberAchieveLogController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, CuMemberAchieveLogVO cuMemberAchieveLogVO) {
startPage();
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
List<CuMemberAchieveLogVO> list = iCuMemberAchieveLogService.queryMemberAchieveLogList(cuMemberAchieveLogVO);
if (CollectionUtil.isNotEmpty(list)) {
//枚举翻译
Map<String, String> transactionMap = iTransactionCommonService.exportEnumTransaction(EInfusingWaterType.values());
Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(
EnumsPrefixConstants.KEY_AWARD);
Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_AWARD);
for (CuMemberAchieveLogVO cma : list) {
//中国把美元转成人民币
if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
if (cma.getAsumRealModifyPv() != null) {
cma.setAsumRealModifyPv(cma.getAsumRealModifyPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBsumRealModifyPv() != null) {
cma.setBsumRealModifyPv(cma.getBsumRealModifyPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getAfirstModifyPv() != null) {
cma.setAfirstModifyPv(cma.getAfirstModifyPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBfirstModifyPv() != null) {
cma.setBfirstModifyPv(cma.getBfirstModifyPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepAFirstModifyBalance() != null) {
cma.setRepAFirstModifyBalance(cma.getRepAFirstModifyBalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBFirstModifyBalance() != null) {
cma.setRepBFirstModifyBalance(cma.getRepBFirstModifyBalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepAModifySumPv() != null) {
cma.setRepAModifySumPv(cma.getRepAModifySumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBModifySumPv() != null) {
cma.setRepBModifySumPv(cma.getRepBModifySumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepAModifyBalance() != null) {
cma.setRepAModifyBalance(cma.getRepAModifyBalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBModifyBalance() != null) {
cma.setRepBModifyBalance(cma.getRepBModifyBalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getAsumRealPv() != null) {
cma.setAsumRealPv(cma.getAsumRealPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBsumRealPv() != null) {
cma.setBsumRealPv(cma.getBsumRealPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getAsumPv() != null) {
cma.setAsumPv(cma.getAsumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBsumPv() != null) {
cma.setBsumPv(cma.getBsumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getAbalance() != null) {
cma.setAbalance(cma.getAbalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getBbalance() != null) {
cma.setBbalance(cma.getBbalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepASumPv() != null) {
cma.setRepASumPv(cma.getRepASumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBSumPv() != null) {
cma.setRepBSumPv(cma.getRepBSumPv().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepABalance() != null) {
cma.setRepABalance(cma.getRepABalance().multiply(currency.getData().getInExchangeRate()));
}
if (cma.getRepBBalance() != null) {
cma.setRepBBalance(cma.getRepBBalance().multiply(currency.getData().getInExchangeRate()));
}
}
cma.setInfusingWaterTypeVal(transactionMap.get(EnumsPrefixConstants.INFUSING_WATER_TYPE + cma.getInfusingWaterType()));
cma.setInfusingWaterTypeVal(EInfusingWaterType.getLabelByValue(cma.getInfusingWaterType()));
cma.setAwardsVal(transactionMap1.get(cma.getAwards()));
// 判断注水状态
// 开始时间
long startTime = cma.getSettleDate().getTime();
@ -268,7 +136,6 @@ public class CuMemberAchieveLogController extends BaseController {
}
ExcelUtil<CuMemberAchieveLogVO> util = new ExcelUtil<>(CuMemberAchieveLogVO.class);
util.exportExcel(response, list, "注水业绩");
}
/**
@ -280,13 +147,11 @@ public class CuMemberAchieveLogController extends BaseController {
List<CuMemberAchieveLogImportVO> list = new ArrayList<>();
ExcelUtil<CuMemberAchieveLogImportVO> util = new ExcelUtil<>(CuMemberAchieveLogImportVO.class);
util.exportExcel(response, list, "注水业绩");
}
/**
* 查询会员当期业绩
**/
@Log(module = EOperationModule.SPECIAL_BUSINESS, business = EOperationBusiness.MODIFY_ACHIEVEMENT, method = EOperationMethod.SELECT)
@GetMapping("/searchList")
public AjaxResult searchList(CuMemberAchieveLogVO cuMemberAchieveLogVO) {
if (StringUtils.isEmpty(cuMemberAchieveLogVO.getMemberCode())) {
@ -295,16 +160,18 @@ public class CuMemberAchieveLogController extends BaseController {
UpdateCodeVO updateCodeVO = BeanUtil.copyProperties(cuMemberAchieveLogVO, UpdateCodeVO.class);
updateCodeVO = iCuMemberService.specialBusinessQuery(updateCodeVO);
Integer pkCountry = SecurityUtils.getPkCountry();
Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(updateCodeVO.getPkId(), EApproveStatus.FINISH.getValue());
//查询扣费金额，账户信息
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
serviceChargeDTO.setQuantity(maxSecond + 1);
serviceChargeDTO.setQuantity(1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
updateCodeVO.setCost(serviceChargeDTOR.getData().getCost());
updateCodeVO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
updateCodeVO.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
cuMemberAchieveLogVO = BeanUtil.copyProperties(updateCodeVO, CuMemberAchieveLogVO.class);
cuMemberAchieveLogVO.setPkMember(updateCodeVO.getPkId());
List<CuMemberAchieveLogVO> list = new ArrayList<>();
@ -331,8 +198,7 @@ public class CuMemberAchieveLogController extends BaseController {
tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month;
}
//查询最新期数
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(datestr)).getPkId();
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(datestr)).getPkId();
cuMemberAchieveLogVO.setTableName(tableName);
cuMemberAchieveLogVO.setPeriod(period);
List<CuMemberAchieveLogVO> calList = new ArrayList<>();
@ -414,16 +280,14 @@ public class CuMemberAchieveLogController extends BaseController {
if (StringUtils.isNull(cuMemberAchieveLogVO.getInfusingWaterType())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.INFUSING_WATER_TYPE_NOT_NULL));
}
if (StringUtils.isNull(cuMemberAchieveLogVO.getProcessType())) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PROCESS_TYPE_NOT_NULL));
}
List<CuMemberAchieveLogVO> errorList = new ArrayList<>();
// 返回VO
CuMemberAchieveLogVO memberAchieveLogVONew;
Integer pkCountry = SecurityUtils.getPkCountry();
List<MemberAmountDTO> memberAmountDTOList = new ArrayList<>();
List<CuMemberAchieveLogVO> errorList = new ArrayList<>();
Set<Long> pkMemberList = new HashSet<>();
if (CollectionUtil.isNotEmpty(cuMemberAchieveLogVO.getCmalvList())) {
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
for (CuMemberAchieveLogVO cmal : cuMemberAchieveLogVO.getCmalvList()) {
if (StringUtils.isNull(cmal.getSettleDate())) {
cmal.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.SETTLEDATE_NOT_VALID));
@ -469,16 +333,12 @@ public class CuMemberAchieveLogController extends BaseController {
}
cmal.setSettleDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cmal.getSettleDate()));
cmal.setDueDateStr(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cmal.getDueDate()));
if (StringUtils.isNull(cmal.getAsumRealModifyPv())
&& StringUtils.isNull(cmal.getBsumRealModifyPv())
&& StringUtils.isNull(cmal.getAfirstModifyPv())
if (StringUtils.isNull(cmal.getAfirstModifyPv())
&& StringUtils.isNull(cmal.getBfirstModifyPv())
&& StringUtils.isNull(cmal.getRepAFirstModifyBalance())
&& StringUtils.isNull(cmal.getRepBFirstModifyBalance())
&& StringUtils.isNull(cmal.getRepAModifyBalance())
&& StringUtils.isNull(cmal.getRepBModifyBalance())
&& StringUtils.isNull(cmal.getRepAModifySumPv())
&& StringUtils.isNull(cmal.getRepBModifySumPv())) {
) {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.INFUSING_WATER_PV_NOT_NULL));
}
@ -495,50 +355,18 @@ public class CuMemberAchieveLogController extends BaseController {
continue;
}
Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue());
cmal.setApproveNumber(maxSecond + 1);
if (cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() ||
cuMemberAchieveLogVO.getProcessType() == EProcessType.DOUBLEPAY.getValue()) {
//查询扣费金额，账户信息
ServiceChargeDTO serviceChargeDTO = new ServiceChargeDTO();
serviceChargeDTO.setType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
serviceChargeDTO.setQuantity(maxSecond + 1);
serviceChargeDTO.setPkCountry(pkCountry);
R<ServiceChargeDTO> serviceChargeDTOR = iServiceChargeServiceApi.getServiceChargeByType(serviceChargeDTO);
//接口查询金额是否足够
businessCommissionDTO.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
businessCommissionDTO.setPkCountry(pkCountry);
MemberAmountDTO memberAmountDTO = new MemberAmountDTO();
memberAmountDTO.setPkMember(cmal.getPkMember());
memberAmountDTO.setTradeAmount(serviceChargeDTOR.getData().getCost());
cmal.setCost(serviceChargeDTOR.getData().getCost());
cmal.setPkAccount(serviceChargeDTOR.getData().getPkAccount());
cmal.setPkAccountKey(iCuMemberBaseService.translateAccountValue(serviceChargeDTOR.getData().getPkAccount()));
memberAmountDTOList.add(memberAmountDTO);
}
pkMemberList.add(cmal.getPkMember());
}
if (CollectionUtil.isNotEmpty(errorList)) {
return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, errorList);
}
cuMemberAchieveLogVO.setPkMemberList(pkMemberList);
List<CuMemberAchieveLogVO> achieveList = iCuMemberAchieveLogService.checkAchieveList(cuMemberAchieveLogVO);
if (CollectionUtil.isNotEmpty(achieveList)) {
achieveList.forEach(itm -> itm.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_UPDATE_CODE_REPEAT)));
return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, achieveList);
}
if (CollectionUtil.isNotEmpty(memberAmountDTOList)) {
businessCommissionDTO.setMemberAmountDTOList(memberAmountDTOList);
cuMemberAchieveLogVO.setMemberAmountDTOList(memberAmountDTOList);
cuMemberAchieveLogVO.setPkCountry(pkCountry);
//接口查询金额是否足够
List<MemberBalanceDTO> memberBalanceList = iCuMemberTradeService.selectBalanceNotEnoughMember(businessCommissionDTO);
if (CollectionUtil.isNotEmpty(memberBalanceList)) {
memberBalanceList.forEach(item -> errorList.add(BeanUtil.copyProperties(item, CuMemberAchieveLogVO.class)));
errorList.forEach(itm2 -> itm2.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_BALANCE_INSUFFICIENT)));
return AjaxResult.error(504, ConfigMsgConstants.MEMBER_DATA_ERROR, errorList);
}
}
memberAchieveLogVONew = iCuMemberAchieveLogService.infusingWater(cuMemberAchieveLogVO);
} else {
return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_DATA_NOT_NULL));

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

@ -47,20 +47,20 @@ import java.util.*;
public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLogMapper, CuMemberAchieveLog> implements ICuMemberAchieveLogService {
@Autowired
private ICuMemberSettlePeriodService cuMemberSettlePeriodService;
private ICuMemberSettlePeriodService iCuMemberSettlePeriodService;
@Autowired
private ICuMemberTradeService cuMemberTradeService;
private ICuMemberTradeService iCuMemberTradeService;
@Autowired
private UserTokenService userTokenService;
@Autowired
private RabbitTemplate rabbitTemplate;
@Autowired
private ICuMemberAchieveLogService cuMemberAchieveLogService;
private ICuMemberAchieveLogService iCuMemberAchieveLogService;
@DubboReference
IApprovalServiceApi approvalServiceApi;
IApprovalServiceApi iApprovalServiceApi;
@DubboReference
ICurrencyServiceApi currencyServiceApi;
ICurrencyServiceApi iCurrencyServiceApi;
@Override
public List<CuMemberAchieveLogVO> queryMemberAchieveLogList(CuMemberAchieveLogVO cuMemberAchieveLogVO) {
@ -77,7 +77,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
@Override
public List<CuMemberAchieveLogVO> queryMemberAchieveHistoryList(List<CuMemberAchieveLogVO> calList) {
List<CuMemberAchieveLogVO> list = baseMapper.queryMemberAchieveHistoryList(calList);
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
BigDecimal exchangeRate = SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY) ? currency.getData().getInExchangeRate() : BigDecimal.ONE;
List<CuMemberAchieveLogVO> listnew = new ArrayList<>();
if (CollectionUtil.isNotEmpty(list)) {
@ -114,75 +114,36 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
Date date = new Date();
Long userID = SecurityUtils.getUserId();
Integer pkCountry = SecurityUtils.getPkCountry();
// 封装修改会员编号业务日志
List<BusinessLogDTO> dtoList = new ArrayList<>();
R<CurrencyDTO> currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
// 业务单号
String code = CommonUtil.createSerialNumber(EOrderPrefix.MEMBER_ACHIEVE.getValue());
cuMemberAchieveLogVO.setPkAccount(cuMemberAchieveLogVO.getCmalvList().get(0).getPkAccount());
for (CuMemberAchieveLogVO cmal : cuMemberAchieveLogVO.getCmalvList()) {
//中国区人民币转为美元
if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) {
if (cmal.getAsumRealModifyPv() != null && cmal.getAsumRealModifyPv().compareTo(BigDecimal.ZERO) > 0) {
cmal.setAsumRealModifyPv(cmal.getAsumRealModifyPv().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getBsumRealModifyPv() != null && cmal.getBsumRealModifyPv().compareTo(BigDecimal.ZERO) > 0) {
cmal.setBsumRealModifyPv(cmal.getBsumRealModifyPv().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getAfirstModifyPv() != null && cmal.getAfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) {
cmal.setAfirstModifyPv(cmal.getAfirstModifyPv().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getBfirstModifyPv() != null && cmal.getBfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) {
cmal.setBfirstModifyPv(cmal.getBfirstModifyPv().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getRepAFirstModifyBalance() != null && cmal.getRepAFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) {
cmal.setRepAFirstModifyBalance(cmal.getRepAFirstModifyBalance().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getRepBFirstModifyBalance() != null && cmal.getRepBFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) {
cmal.setRepBFirstModifyBalance(cmal.getRepBFirstModifyBalance().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getRepAModifySumPv() != null && cmal.getRepAModifySumPv().compareTo(BigDecimal.ZERO) > 0) {
cmal.setRepAModifySumPv(cmal.getRepAModifySumPv().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getRepBModifySumPv() != null && cmal.getRepBModifySumPv().compareTo(BigDecimal.ZERO) > 0) {
cmal.setRepBModifySumPv(cmal.getRepBModifySumPv().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getRepAModifyBalance() != null && cmal.getRepAModifyBalance().compareTo(BigDecimal.ZERO) > 0) {
cmal.setRepAModifyBalance(cmal.getRepAModifyBalance().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
if (cmal.getRepBModifyBalance() != null && cmal.getRepBModifyBalance().compareTo(BigDecimal.ZERO) > 0) {
cmal.setRepBModifyBalance(cmal.getRepBModifyBalance().divide(currency.getData().getInExchangeRate(), 6, RoundingMode.HALF_UP));
}
}
// 历史期业绩
String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, cmal.getSettleDate());
String month = DateUtils.getMonth(datestr);
String tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month;
//查询最新期数
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(datestr)).getPkId();
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(datestr)).getPkId();
cuMemberAchieveLogVO.setTableName(tableName);
cuMemberAchieveLogVO.setPeriod(period);
cuMemberAchieveLogVO.setPkMember(cmal.getPkMember());
List<CuMemberAchieveLogVO> calList = new ArrayList<>();
calList.add(cuMemberAchieveLogVO);
calList = cuMemberAchieveLogService.queryMemberAchieveHistoryList(calList);
List<CuMemberAchieveLogVO> calList = iCuMemberAchieveLogService.queryMemberAchieveHistoryList(Collections.singletonList(cuMemberAchieveLogVO));
//免签呈 或 免签呈+免支付
if (cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue() ||
cuMemberAchieveLogVO.getProcessType() == EProcessType.DOUBLEAVOID.getValue()) {
CuMemberAchieveLog memberAchieveLog = BeanUtil.copyProperties(cmal, CuMemberAchieveLog.class);
memberAchieveLog.setASumRealModifyPv(cmal.getAsumRealModifyPv());
memberAchieveLog.setBSumRealModifyPv(cmal.getBsumRealModifyPv());
// 2025.06.26 同步北大修改，不要复购业绩等
memberAchieveLog.setASumRealModifyPv(cmal.getAfirstModifyPv());
memberAchieveLog.setBSumRealModifyPv(cmal.getBfirstModifyPv());
memberAchieveLog.setAFirstModifyPv(cmal.getAfirstModifyPv());
memberAchieveLog.setBFirstModifyPv(cmal.getBfirstModifyPv());
memberAchieveLog.setRepAFirstModifyBalance(cmal.getRepAFirstModifyBalance());
memberAchieveLog.setRepBFirstModifyBalance(cmal.getRepBFirstModifyBalance());
memberAchieveLog.setRepAModifySumPv(cmal.getRepAModifySumPv());
memberAchieveLog.setRepBModifySumPv(cmal.getRepBModifySumPv());
memberAchieveLog.setRepAModifyBalance(cmal.getRepAModifyBalance());
memberAchieveLog.setRepBModifyBalance(cmal.getRepBModifyBalance());
// memberAchieveLog.setRepAModifySumPv(cmal.getRepAModifySumPv());
// memberAchieveLog.setRepBModifySumPv(cmal.getRepBModifySumPv());
// memberAchieveLog.setRepAModifyBalance(cmal.getRepAModifyBalance());
// memberAchieveLog.setRepBModifyBalance(cmal.getRepBModifyBalance());
memberAchieveLog.setPkCountry(pkCountry);
memberAchieveLog.setInfusingWaterType(cuMemberAchieveLogVO.getInfusingWaterType());
memberAchieveLog.setProcessType(cuMemberAchieveLogVO.getProcessType());
@ -203,12 +164,13 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
memberAchieveLog.setBsumPv(calList.get(0).getBsumPv());
memberAchieveLog.setAbalance(calList.get(0).getAbalance());
memberAchieveLog.setBbalance(calList.get(0).getBbalance());
memberAchieveLog.setRepASumPv(calList.get(0).getRepASumPv());
memberAchieveLog.setRepBSumPv(calList.get(0).getRepBSumPv());
memberAchieveLog.setRepABalance(calList.get(0).getRepABalance());
memberAchieveLog.setRepBBalance(calList.get(0).getRepBBalance());
// memberAchieveLog.setRepASumPv(calList.get(0).getRepASumPv());
// memberAchieveLog.setRepBSumPv(calList.get(0).getRepBSumPv());
// memberAchieveLog.setRepABalance(calList.get(0).getRepABalance());
// memberAchieveLog.setRepBBalance(calList.get(0).getRepBBalance());
}
baseMapper.insert(memberAchieveLog);
String content = EApprovalBusiness.MEMBER_ACHIEVE.getLabel();
String waterType = "";
if (cuMemberAchieveLogVO.getInfusingWaterType() == EInfusingWaterType.ADD.getValue()) {
@ -218,35 +180,17 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
} else if (cuMemberAchieveLogVO.getInfusingWaterType() == EInfusingWaterType.FULL_PV.getValue()) {
waterType = EInfusingWaterType.FULL_PV.getLabel();
}
if (cmal.getAsumRealModifyPv().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 左区真实业绩" + waterType + ": " + cmal.getAsumRealModifyPv();
}
if (cmal.getBsumRealModifyPv().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 右区真实业绩" + waterType + ": " + cmal.getBsumRealModifyPv();
}
if (cmal.getAfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 左区首购业绩" + waterType + ": " + cmal.getAfirstModifyPv();
content = content + " 左区业绩" + waterType + ": " + cmal.getAfirstModifyPv();
}
if (cmal.getBfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 右区首购业绩" + waterType + ": " + cmal.getBfirstModifyPv();
content = content + " 右区业绩" + waterType + ": " + cmal.getBfirstModifyPv();
}
if (cmal.getRepAFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 左区首购结余" + waterType + ": " + cmal.getRepAFirstModifyBalance();
content = content + " 左区结余" + waterType + ": " + cmal.getRepAFirstModifyBalance();
}
if (cmal.getRepBFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 右区首购结余" + waterType + ": " + cmal.getRepBFirstModifyBalance();
}
if (cmal.getRepAModifySumPv().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 左区复购业绩累计业绩" + waterType + ": " + cmal.getRepAModifySumPv();
}
if (cmal.getRepBModifySumPv().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 右区复购业绩累计业绩" + waterType + ": " + cmal.getRepBModifySumPv();
}
if (cmal.getRepAModifyBalance().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 左区复购结余" + waterType + ": " + cmal.getRepAModifyBalance();
}
if (cmal.getRepBModifyBalance().compareTo(BigDecimal.ZERO) > 0) {
content = content + " 右区复购结余" + waterType + ": " + cmal.getRepBModifyBalance();
content = content + " 右区结余" + waterType + ": " + cmal.getRepBFirstModifyBalance();
}
//组装日志数据
@ -260,22 +204,8 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
.freeSignFlag(true).build();
dtoList.add(businessLog);
}
}
//扣钱
if (cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDSIGNING.getValue()) {
BusinessCommissionDTO businessCommissionDTO = new BusinessCommissionDTO();
businessCommissionDTO.setPkCountry(pkCountry);
businessCommissionDTO.setPkAccount(cuMemberAchieveLogVO.getPkAccount());
businessCommissionDTO.setMemberAmountDTOList(cuMemberAchieveLogVO.getMemberAmountDTOList());
businessCommissionDTO.setTradeType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO);
if (!b) {
throw new ServiceException(ConfigMsgConstants.MEMBER_ACHIEVE_DEDUCT_MONEY);
}
}
//发送MQ到操作日志
rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY,
dtoList);
rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, dtoList);
return cuMemberAchieveLogVO;
}
@ -299,14 +229,14 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
String month = DateUtils.getMonth(datestr);
String tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month;
//查询最新期数
int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
int period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(
DateUtils.parseDateToStr(datestr)).getPkId();
cuMemberAchieveLogVO.setTableName(tableName);
cuMemberAchieveLogVO.setPeriod(period);
cuMemberAchieveLogVO.setPkMember(cmal.getPkMember());
List<CuMemberAchieveLogVO> calList = new ArrayList<>();
calList.add(cuMemberAchieveLogVO);
calList = cuMemberAchieveLogService.queryMemberAchieveHistoryList(calList);
calList = iCuMemberAchieveLogService.queryMemberAchieveHistoryList(calList);
//免支付 或 需签呈+支付
if (cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDPAY.getValue() ||
@ -413,7 +343,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
.userIdList(cuMemberAchieveLogVO.getUserIdList())
.sendIdList(cuMemberAchieveLogVO.getSendIdList())
.build();
R<String> submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser);
R<String> submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser);
if (!submit.isSuccess()) {
log.error("====" + submit.getData());
throw new RuntimeException(ConfigMsgConstants.MEMBER_ACHIEVE_DEDUCT_PETITION);
@ -427,7 +357,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
businessCommissionDTO.setPkAccount(cuMemberAchieveLogVO.getPkAccount());
businessCommissionDTO.setMemberAmountDTOList(cuMemberAchieveLogVO.getMemberAmountDTOList());
businessCommissionDTO.setTradeType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
Boolean b = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO);
Boolean b = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO);
if (!b) {
throw new ServiceException(ConfigMsgConstants.MEMBER_ACHIEVE_DEDUCT_MONEY);
}
@ -495,7 +425,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl<CuMemberAchieveLo
businessCommissionDTO.setTradeType(EApprovalBusiness.MEMBER_ACHIEVE.getValue());
businessCommissionDTO.setTradeCode(approvalBusinessResultDTO.getBusinessCode());
businessCommissionDTO.setPkCreator(approvalBusinessResultDTO.getLoginUser().getUserId());
Boolean result = cuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED);
Boolean result = iCuMemberTradeService.businessCommissionSubmit(businessCommissionDTO, EApproveStatus.REJECTED);
if (!result) {
throw new ServiceException(ConfigMsgConstants.MEMBER_ACHIEVE_IS_REFUND);
}

29
bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java
View File

@ -6,18 +6,15 @@ import com.hzs.common.core.annotation.Transaction;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import com.hzs.common.core.web.domain.BaseApprovalEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.Date;
/**
* <p>
* 注水业绩记录表下载模板VO
* </p>
*
* @author hzs
* @since 2022-08-22
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class CuMemberAchieveLogImportVO extends BaseApprovalEntity {
@ -43,61 +40,60 @@ public class CuMemberAchieveLogImportVO extends BaseApprovalEntity {
/**
* 变更后A左区累计 变更后左区真实业绩
*/
@Excel(name = "变更后左区真实业绩(PV)" )
// @Excel(name = "变更后左区真实业绩(PV)")
private BigDecimal asumRealModifyPv;
/**
* 变更后B右区累计 更后右区真实业绩
*/
@Excel(name = "变更后右区真实业绩(PV)" )
// @Excel(name = "变更后右区真实业绩(PV)")
private BigDecimal bsumRealModifyPv;
/**
* 变更后A左区 变更后左区首购业绩
*/
@Excel(name = "变更后左区首购业绩(PV)" )
@Excel(name = "变更后左区业绩(PV)")
private BigDecimal afirstModifyPv;
/**
* 变更后B右区 变更后右区首购业绩
*/
@Excel(name = "变更后右区首购业绩(PV)" )
@Excel(name = "变更后右区业绩(PV)")
private BigDecimal bfirstModifyPv;
/**
* 变更后A左区复购业绩累计业绩
*/
@Excel(name = "变更后左区复购业绩(PV)" )
// @Excel(name = "变更后左区复购业绩(PV)")
private BigDecimal repAModifySumPv;
/**
* 变更后B右区复购业绩累计业绩
*/
@Excel(name = "变更后右区复购业绩(PV)" )
// @Excel(name = "变更后右区复购业绩(PV)")
private BigDecimal repBModifySumPv;
/**
* 变更后A左区首购结余
*/
@Excel(name = "变更后左区首购结余" )
@Excel(name = "变更后左区结余")
private BigDecimal repAFirstModifyBalance;
/**
* 变更后B右区首购结余
*/
@Excel(name = "变更后右区首购结余" )
@Excel(name = "变更后右区结余")
private BigDecimal repBFirstModifyBalance;
/**
* 变更后A左区复购结余
*/
@Excel(name = "变更后左区复购结余" )
// @Excel(name = "变更后左区复购结余")
private BigDecimal repAModifyBalance;
/**
* 变更后B右区复购结余
*/
@Excel(name = "变更后右区复购结余" )
// @Excel(name = "变更后右区复购结余")
private BigDecimal repBModifyBalance;
/**
@ -134,5 +130,4 @@ public class CuMemberAchieveLogImportVO extends BaseApprovalEntity {
private String pkAccountKeyVal;
}

80
bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java
View File

@ -1,6 +1,7 @@
package com.hzs.member.base.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hzs.common.core.annotation.BigDecimalFormat;
import com.hzs.common.core.annotation.Excel;
import com.hzs.common.core.annotation.Transaction;
import com.hzs.common.core.constant.EnumsPrefixConstants;
@ -69,125 +70,139 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
@Excel(name = "隶属团队")
private String teamName;
/**
* 注水方式 EInfusingWaterType 1 增加 2减少 3 最终
*/
@Transaction(transactionKey = EnumsPrefixConstants.INFUSING_WATER_TYPE)
private Integer infusingWaterType;
@Excel(name = "注水方式")
private String infusingWaterTypeVal;
/**
* 变更后左区真实业绩
*/
@Excel(name = "变更后左区真实业绩(PV)")
@BigDecimalFormat
// @Excel(name = "变更后左区真实业绩(PV)")
private BigDecimal asumRealModifyPv = BigDecimal.ZERO;
/**
* 变更后右区真实业绩
*/
@Excel(name = "变更后右区真实业绩(PV)")
@BigDecimalFormat
// @Excel(name = "变更后右区真实业绩(PV)")
private BigDecimal bsumRealModifyPv = BigDecimal.ZERO;
/**
* 变更后左区首购业绩
*/
@Excel(name = "变更后左区首购业绩(PV)")
@BigDecimalFormat
@Excel(name = "变更后左区业绩(PV)")
private BigDecimal afirstModifyPv = BigDecimal.ZERO;
/**
* 变更后右区首购业绩
*/
@Excel(name = "变更后右区首购业绩(PV)")
@BigDecimalFormat
@Excel(name = "变更后右区业绩(PV)")
private BigDecimal bfirstModifyPv = BigDecimal.ZERO;
/**
* 变更后左区首购结余
*/
@Excel(name = "变更后左区首购结余")
@BigDecimalFormat
@Excel(name = "变更后左区结余")
private BigDecimal repAFirstModifyBalance = BigDecimal.ZERO;
/**
* 变更后右区首购结余
*/
@Excel(name = "变更后右区首购结余")
@BigDecimalFormat
@Excel(name = "变更后右区结余")
private BigDecimal repBFirstModifyBalance = BigDecimal.ZERO;
/**
* 变更后左区复购业绩
*/
@Excel(name = "变更后左区复购业绩(PV)")
// @Excel(name = "变更后左区复购业绩(PV)")
private BigDecimal repAModifySumPv = BigDecimal.ZERO;
/**
* 变更后右区复购业绩
*/
@Excel(name = "变更后右区复购业绩(PV)")
// @Excel(name = "变更后右区复购业绩(PV)")
private BigDecimal repBModifySumPv = BigDecimal.ZERO;
/**
* 变更后左区复购结余
*/
@Excel(name = "变更后左区复购结余")
// @Excel(name = "变更后左区复购结余")
private BigDecimal repAModifyBalance = BigDecimal.ZERO;
/**
* 变更后右区复购结余
*/
@Excel(name = "变更后右区复购结余")
// @Excel(name = "变更后右区复购结余")
private BigDecimal repBModifyBalance = BigDecimal.ZERO;
/**
* 变更前左区真实业绩
*/
@Excel(name = "变更前左区真实业绩(PV)")
@BigDecimalFormat
// @Excel(name = "变更前左区真实业绩(PV)")
private BigDecimal asumRealPv;
/**
* 变更前右区真实业绩
*/
@Excel(name = "变更前右区真实业绩(PV)")
@BigDecimalFormat
// @Excel(name = "变更前右区真实业绩(PV)")
private BigDecimal bsumRealPv;
/**
* 变更前左区首购业绩
*/
@Excel(name = "变更前左区首购业绩(PV)")
@BigDecimalFormat
// @Excel(name = "变更前左区首购业绩(PV)")
private BigDecimal asumPv;
/**
* 变更前右区首购业绩
*/
@Excel(name = "变更前右区首购业绩(PV)")
@BigDecimalFormat
// @Excel(name = "变更前右区首购业绩(PV)")
private BigDecimal bsumPv;
/**
* 变更前左区首购结余
*/
@Excel(name = "变更前左区首购结余")
@BigDecimalFormat
// @Excel(name = "变更前左区首购结余")
private BigDecimal abalance;
/**
* 变更前右区首购结余
*/
@Excel(name = "变更前右区首购结余")
@BigDecimalFormat
// @Excel(name = "变更前右区首购结余")
private BigDecimal bbalance;
/**
* 变更前左区复购业绩
*/
@Excel(name = "变更前左区复购业绩(PV)")
// @Excel(name = "变更前左区复购业绩(PV)")
private BigDecimal repASumPv;
/**
* 变更前右区复购业绩
*/
@Excel(name = "变更前右区复购业绩(PV)")
// @Excel(name = "变更前右区复购业绩(PV)")
private BigDecimal repBSumPv;
/**
* 变更前左区复购结余
*/
@Excel(name = "变更前左区复购结余")
// @Excel(name = "变更前左区复购结余")
private BigDecimal repABalance;
/**
* 变更前右区复购结余
*/
@Excel(name = "变更前右区复购结余")
// @Excel(name = "变更前右区复购结余")
private BigDecimal repBBalance;
/**
* 注水方式 EInfusingWaterType 1 增加 2减少 3 最终
*/
private Integer infusingWaterType;
@Excel(name = "注水方式")
private String infusingWaterTypeVal;
/**
* 结算日期 注水日期（年-月-日）
*/
@ -203,10 +218,10 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date dueDate;
private String dueDateStr;
/**
* 注水状态 EActivityStatus 0 未开始 1 进行中 2 已结束
*/
@Transaction(transactionKey = EnumsPrefixConstants.ACTIVITY_STATUS)
private Integer waterStatus;
@Excel(name = "注水状态")
private String waterStatusVal;
@ -237,13 +252,11 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
*/
private Long pkCreator;
/**
* 注水业绩记录
*/
private List<CuMemberAchieveLogVO> cmalvList;
/**
* 注水备注
*/
@ -322,7 +335,6 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDueDate;
/**
* 修改时间
*/

11
bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml
View File

@ -234,13 +234,15 @@
</select>
<!-- 校验是否存在未审核数据-->
<select id="checkAchieveList" resultMap="CuMemberAchieveLogVO"
parameterType="com.hzs.member.base.vo.CuMemberAchieveLogVO">
select b.MEMBER_CODE as memberCode,
<select id="checkAchieveList" resultMap="CuMemberAchieveLogVO" parameterType="com.hzs.member.base.vo.CuMemberAchieveLogVO">
select
b.MEMBER_CODE as memberCode,
b.MEMBER_NAME as memberName
from CU_MEMBER_ACHIEVE_LOG a
LEFT JOIN CU_MEMBER b on a.PK_MEMBER = b.PK_ID
where a.DEL_FLAG=0 and b.DEL_FLAG=0
where
a.DEL_FLAG = 0
and b.DEL_FLAG = 0
and (a.APPROVE_STATUS = 1 or a.APPROVE_STATUS = 2)
<if test="pkMemberList != null and pkMemberList != ''">
and a.PK_MEMBER in
@ -253,5 +255,4 @@
</if>
</select>
</mapper>

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

@ -358,7 +358,7 @@ public class EnumsController extends BaseController {
public AjaxResult batchType() {
List<EnumEntity> enumEntityList = new ArrayList<>();
for (EBatchType value : EBatchType.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.BATCH_TYPE));
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
return AjaxResult.success(enumEntityList);
}
@ -497,45 +497,32 @@ public class EnumsController extends BaseController {
/**
* 注水业绩枚举
*
* @author: zhang jing
* @date: 2023/3/28 17:52
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@GetMapping("/member-achieve")
public AjaxResult memberAchieve() {
List<EnumEntity> enumEntityList = new ArrayList<>();
for (EMemberAchieve value : EMemberAchieve.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), value.getProp(), EnumsPrefixConstants.MEMBER_ACHIEVE));
if (EYesNo.YES.getIntValue() == value.getEnable()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), value.getProp()));
}
}
return AjaxResult.success(enumEntityList);
}
/**
* 注水方式枚举
*
* @author: zhang jing
* @date: 2023/4/11 14:52
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@GetMapping("/member-watertype")
public AjaxResult watertype() {
List<EnumEntity> enumEntityList = new ArrayList<>();
for (EInfusingWaterType value : EInfusingWaterType.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.INFUSING_WATER_TYPE));
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
return AjaxResult.success(enumEntityList);
}
/**
* 统计值枚举
*
* @author: zhang jing
* @date: 2022/9/30 14:30
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult STATISTICAL_VALUE
**/
@GetMapping("/statistical-value")
public AjaxResult statisticalValue() {
@ -548,11 +535,6 @@ public class EnumsController extends BaseController {
/**
* 注册权限
*
* @author: zhang jing
* @date: 2022/9/30 14:57
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@GetMapping("/registration-authority")
public AjaxResult registrationAuthority() {
@ -565,11 +547,6 @@ public class EnumsController extends BaseController {
/**
* 关系类型
*
* @author: zhang jing
* @date: 2022/9/30 14:59
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@GetMapping("/relation-type")
public AjaxResult relationType() {
@ -582,11 +559,6 @@ public class EnumsController extends BaseController {
/**
* 极差类型
*
* @author: zhang jing
* @date: 2022/9/30 15:18
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@GetMapping("/range-type")
public AjaxResult rangeType() {
@ -600,11 +572,6 @@ public class EnumsController extends BaseController {
/**
* 计算类型
*
* @author: zhang jing
* @date: 2022/9/30 15:24
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@GetMapping("/cal-type")
public AjaxResult calType() {
@ -617,11 +584,6 @@ public class EnumsController extends BaseController {
/**
* 货币种类
*
* @author: zhang jing
* @date: 2022/9/30 15:34
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@GetMapping("/account")
public AjaxResult account() {
@ -634,11 +596,6 @@ public class EnumsController extends BaseController {
/**
* 账户状态（会员登录账户）
*
* @author: zhang jing
* @date: 2022/9/30 15:38
* @param: []
* @return: com.hzs.common.core.web.domain.AjaxResult
**/
@GetMapping("/account-status")
public AjaxResult accountStatus() {
@ -2362,7 +2319,7 @@ public class EnumsController extends BaseController {
public AjaxResult getActivityStatus() {
List<EnumEntity> enumEntityList = new ArrayList<>();
for (EActivityStatus value : EActivityStatus.values()) {
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.ACTIVITY_STATUS));
enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
return AjaxResult.success(enumEntityList);
}

18
bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java
View File

@ -15,11 +15,7 @@ import java.util.ArrayList;
import java.util.List;
/**
* @Description: 枚举初始化控制器
* @Author: jiang chao
* @Time: 2022/10/20 14:56
* @Classname: EnumsInitController
* @PackageName: com.hzs.system.enums.controller
* 枚举初始化控制器
*/
@Slf4j
@RestController
@ -59,10 +55,6 @@ public class EnumsInitController {
for (ECategory value : ECategory.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
// 注水方式枚举
for (EInfusingWaterType value : EInfusingWaterType.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
// 奖衔级别枚举
for (EAwardsLevel value : EAwardsLevel.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
@ -132,10 +124,6 @@ public class EnumsInitController {
for (EFreeAssessmentState value : EFreeAssessmentState.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
// 注水业绩枚举
for (EMemberAchieve value : EMemberAchieve.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
// 重置密码
for (EResetPassword value : EResetPassword.values()) {
@ -606,10 +594,6 @@ public class EnumsInitController {
initList.add(this.createData(incomeStatus.getKey(), incomeStatus.getLabel()));
}
// 活动状态
for (EActivityStatus value : EActivityStatus.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
// 比率类型
for (ERatioType value : ERatioType.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));

78
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java
View File

@ -79,23 +79,10 @@ public class EnumsPrefixConstants {
*/
public static final String ACHIEVEMENT_TYPE = "ENU_ACHIEVEMENT_TYPE_";
/**
* 设备状态(枚举)
*/
public static final String MACHINE_STATE = "ENU_MACHINE_STATE_";
/**
* 设备运行状态(枚举)
*/
public static final String RUN_STATE = "ENU_RUN_STATE_";
/**
* 销售状态
*/
public static final String SALES_STATE = "ENU_SALES_STATE_";
/**
* 设备定时操作状态(枚举)
*/
public static final String OPERATE_FLAG = "ENU_OPERATE_FLAG_";
/**
* 列表显示隐藏控制枚举
@ -135,10 +122,6 @@ public class EnumsPrefixConstants {
*/
public static final String ACT_TYPE = "ENU_ACT_T_";
/**
* 代理等级
*/
public static final String AGENT_GRADE = "ENU_AGENT_G_";
/**
* 发布位置
*/
@ -172,10 +155,6 @@ public class EnumsPrefixConstants {
* 审批状态
*/
public static final String APPROVE_STATUS = "ENU_APPROVE_S_";
/**
* 注水业绩
*/
public static final String MEMBER_ACHIEVE = "ENU_MEMBER_ACHIEVE_";
/**
* 审批状态
@ -299,11 +278,6 @@ public class EnumsPrefixConstants {
*/
public static final String LOGINTYPE = "ENU_LOGIN_T_";
/**
* 邮件发送类型
*/
public static final String MAIL_TYPE = "ENU_MALL_T_";
/**
* 会员更名、密码修改类型
*/
@ -319,11 +293,6 @@ public class EnumsPrefixConstants {
*/
public static final String ORDER_STATUS = "ENU_ORDER_S_";
/**
* 订单状态
*/
public static final String SUB_STATUS = "ENU_SUB_S_";
/**
* 供应链订单状态
*/
@ -339,11 +308,6 @@ public class EnumsPrefixConstants {
*/
public static final String ORDER_SOURCE = "ENU_ORD_SO_";
/**
* 达标状态
*/
public static final String REACH_STATE = "ENU_REA_S_";
/**
* 考核状态
*/
@ -412,10 +376,6 @@ public class EnumsPrefixConstants {
* 支付状态
*/
public static final String PAY_STATUS = "ENU_PAY_STU_";
/**
* 售后状态
*/
public static final String AFTER_SALE_STATUS = "ENU_AFT_SALE_";
/**
* 退款状态
*/
@ -502,11 +462,6 @@ public class EnumsPrefixConstants {
*/
public static final String STATUS = "ENU_STATUS_";
/**
* 仓库类型枚举
*/
public static final String STOREHOUSE_TYPE = "ENU_STOREHOUSE_";
/**
* 交易分类
@ -522,10 +477,6 @@ public class EnumsPrefixConstants {
* 交易类型
*/
public static final String TRADE_TYPE = "ENU_TRADE_T_";
/**
* 批量单个枚举
*/
public static final String BATCH_TYPE = "ENU_BATCH_TY_";
/**
* 转账特殊设置枚举
@ -687,15 +638,6 @@ public class EnumsPrefixConstants {
*/
public static final String ENU_WITHDRAW_STATUS = "ENU_WITHDRAW_S_";
/**
* 极差枚举
*/
public static final String RANGE = "ENU_RANGE_";
/**
* 店铺枚举（配送中心等级）
*/
public static final String SHOP = "ENU_SHOP_";
/**
* 服务类型枚举
*/
@ -865,32 +807,23 @@ public class EnumsPrefixConstants {
*/
public static final String NOTICE_GRADE = "ENU_NOTICE_GRADE_";
/**
* 注水方式
*/
public static final String INFUSING_WATER_TYPE = "ENU_INFUSING_WATER_TYPE_";
/**
* 单位类
*/
public static final String KEY_UNIT = "ENU_INOT_T_";
/**
* 读取状态
*/
public static final String READ_STATE = "ENU_R_S_";
/**
* 证件类型
*/
public static final String ID_TYPE = "ENU_I_T_";
/**
* 活动条件
*/
public static final String CONDITION = "ENU_C_D_";
/**
@ -908,7 +841,6 @@ public class EnumsPrefixConstants {
*/
public static final String ELEVEL_VALUE = "ELEVEL_VALUE_";
/**
* 站内信状态
*/
@ -931,16 +863,6 @@ public class EnumsPrefixConstants {
*/
public static final String RECOMMEND_DADA_TYPE = "ENU_R_D_T_";
/**
* 目标类型
*/
public static final String GOALS_TYPE = "ENU_G_T_";
/**
* 目标分类
*/
public static final String GOALS_CLASSIFY = "ENU_G_C_";
/**
* 交易配置 业务类型

21
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActivityStatus.java
View File

@ -1,6 +1,5 @@
package com.hzs.common.core.enums;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor;
import lombok.Getter;
@ -14,17 +13,17 @@ public enum EActivityStatus {
/**
* 未开始
*/
NOT_STARTED(0, "即将开始", 0, EnumsPrefixConstants.ACTIVITY_STATUS + "0"),
NOT_STARTED(0, "即将开始", 0),
/**
* 进行中
*/
IN_PROGRESS(1, "进行中", 0, EnumsPrefixConstants.ACTIVITY_STATUS + "1"),
IN_PROGRESS(1, "进行中", 0),
/**
* 已失效
*/
EXPIRED(2, "已结束", 0, EnumsPrefixConstants.ACTIVITY_STATUS + "2");
EXPIRED(2, "已结束", 0);
private final int value;
@ -36,18 +35,18 @@ public enum EActivityStatus {
* 是否启用（0=是,1=否） -- 来源EYesNo
*/
private final int enable;
/**
* 国际化翻译key值
*/
private final String key;
public static EActivityStatus getEActivityStatus(Integer value) {
public static String getLabelByValue(Integer value) {
if (null == value) {
return "";
}
for (EActivityStatus as : EActivityStatus.values()) {
if (as.value == value) {
return as;
return as.getLabel();
}
}
return null;
return "";
}
}

9
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBatchType.java
View File

@ -14,12 +14,12 @@ public enum EBatchType {
/**
* 单个
*/
SINGLE(1, "单个", 0, EnumsPrefixConstants.BATCH_TYPE + "1"),
SINGLE(1, "单个", 0),
/**
* 批量
*/
BATCH(2, "批量", 0, EnumsPrefixConstants.BATCH_TYPE + "2"),
BATCH(2, "批量", 0),
;
@ -35,8 +35,5 @@ public enum EBatchType {
* 是否启用（0=是,1=否） -- 来源EYesNo
*/
private final int enable;
/**
* 国际化翻译key值
*/
private final String key;
}

33
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java
View File

@ -1,15 +1,10 @@
package com.hzs.common.core.enums;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 注水方式
* @Author: zhangjing
* @Time: 2022/9/13 14:02
* @Classname: ERechargeType
* @Package_name: com.hzs.common.core.enums
* 注水方式
*/
@AllArgsConstructor
@Getter
@ -17,17 +12,17 @@ public enum EInfusingWaterType {
/**
* 增加
*/
ADD(1, "增加", 0, EnumsPrefixConstants.INFUSING_WATER_TYPE + "1"),
ADD(1, "增加", 0),
/**
* 减少
*/
BANK_TRANSFER(2, "减少", 0, EnumsPrefixConstants.INFUSING_WATER_TYPE + "2"),
BANK_TRANSFER(2, "减少", 0),
/**
* 最终业绩
*/
FULL_PV(3, "最终业绩", 0, EnumsPrefixConstants.INFUSING_WATER_TYPE + "3"),
FULL_PV(3, "最终业绩", 0),
;
/**
@ -42,8 +37,24 @@ public enum EInfusingWaterType {
* 是否启用（0=是,1=否） -- 来源EYesNo
*/
private final int enable;
/**
* 国际化翻译key值
* 根据值获取标签显示
*
* @param value
* @return
*/
private final String key;
public static String getLabelByValue(Integer value) {
if (null == value) {
return null;
}
for (EInfusingWaterType enums : EInfusingWaterType.values()) {
if (enums.getValue() == value) {
return enums.getLabel();
}
}
return "";
}
}

51
bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAchieve.java
View File

@ -1,6 +1,5 @@
package com.hzs.common.core.enums;
import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor;
import lombok.Getter;
@ -12,47 +11,47 @@ import lombok.Getter;
public enum EMemberAchieve {
/**
* 变更后左区区真实业绩
* 变更后左区真实业绩
*/
ASUMREALMODIFY_PV(1, "变更后左区区真实业绩", "asumRealModifyPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "1"),
ASUMREALMODIFY_PV(1, "变更后左区真实业绩", "asumRealModifyPv", 1),
/**
* 变更后右区真实业绩
*/
BSUMREALMODIFY_PV(2, "变更后右区真实业绩", "bsumRealModifyPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "2"),
BSUMREALMODIFY_PV(2, "变更后右区真实业绩", "bsumRealModifyPv", 1),
/**
* 变更后左区首购业绩
*/
AFIRSTMODIFY_PV(3, "变更后左区首购业绩", "afirstModifyPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "3"),
AFIRSTMODIFY_PV(3, "变更后左区业绩", "afirstModifyPv", 0),
/**
* 变更后右区首购业绩
*/
BFIRSTMODIFY_PV(4, "变更后右区首购业绩", "bfirstModifyPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "4"),
/**
* 变更后左区复购业绩
*/
REPAMODIFYSUM_PV(9, "变更后左区复购业绩", "repAModifySumPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "9"),
/**
* 变更后右区复购业绩
*/
REPBMODIFYSUM_PV(10, "变更后右区复购业绩", "repBModifySumPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "10"),
BFIRSTMODIFY_PV(4, "变更后右区业绩", "bfirstModifyPv", 0),
// /**
// * 变更后左区复购业绩
// */
// REPAMODIFYSUM_PV(9, "变更后左区复购业绩", "repAModifySumPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "9"),
// /**
// * 变更后右区复购业绩
// */
// REPBMODIFYSUM_PV(10, "变更后右区复购业绩", "repBModifySumPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "10"),
/**
* 变更后左区首购结余
*/
REPAFIRSTMODIFY_BALANCE(5, "变更后左区首购结余", "repAFirstModifyBalance", EnumsPrefixConstants.MEMBER_ACHIEVE + "5"),
REPAFIRSTMODIFY_BALANCE(5, "变更后左区结余", "repAFirstModifyBalance", 0),
/**
* 变更后右区首购结余
*/
REPBFIRSTMODIFY_BALANCE(6, "变更后右区首购结余", "repBFirstModifyBalance", EnumsPrefixConstants.MEMBER_ACHIEVE + "6"),
/**
* 变更后左区复购结余
*/
REPAMODIFY_BALANCE(7, "变更后左区复购结余", "repAModifyBalance", EnumsPrefixConstants.MEMBER_ACHIEVE + "7"),
/**
* 变更后右区复购结余
*/
REPBMODIFY_BALANCE(8, "变更后右区复购结余", "repBModifyBalance", EnumsPrefixConstants.MEMBER_ACHIEVE + "8"),
REPBFIRSTMODIFY_BALANCE(6, "变更后右区结余", "repBFirstModifyBalance", 0),
// /**
// * 变更后左区复购结余
// */
// REPAMODIFY_BALANCE(7, "变更后左区复购结余", "repAModifyBalance", EnumsPrefixConstants.MEMBER_ACHIEVE + "7"),
// /**
// * 变更后右区复购结余
// */
// REPBMODIFY_BALANCE(8, "变更后右区复购结余", "repBModifyBalance", EnumsPrefixConstants.MEMBER_ACHIEVE + "8"),
;
@ -69,9 +68,9 @@ public enum EMemberAchieve {
*/
private final String prop;
/**
* 国际化翻译key值
* 是否启用（0=是,1=否） -- 来源EYesNo
*/
private final String key;
private final int enable;
/**

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

@ -5,11 +5,7 @@ import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description: 签呈流程类型
* @Author: jiang chao
* @Time: 2022/11/10 17:35
* @Classname: ESignType
* @PackageName: com.hzs.common.core.enums
* 签呈流程类型
*/
@AllArgsConstructor
@Getter