diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java index 0de6c5d2..e2b9c09d 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/ICuHandleBusinessServiceApi.java @@ -5,11 +5,7 @@ import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; /** - * @Description: - * @Author: yuhui - * @Time: 2023/1/30 14:23 - * @Classname: CuHandleBusinessServiceApi - * @PackageName: com.hzs.member.handleBusiness + * 会员业务处理 */ public interface ICuHandleBusinessServiceApi { @@ -30,11 +26,7 @@ public interface ICuHandleBusinessServiceApi { R signForApproval(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * @description: 特殊业务审批处理 - * @author: zhang jing - * @date: 2023/5/16 20:07 - * @param: [approvalBusinessResultDTO] - * @return: com.hzs.common.core.domain.R + * 特殊业务审批处理 **/ String auditProcess(ApprovalBusinessResultDTO approvalBusinessResultDTO); diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MakerSpaceCabinAccordDTO.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MakerSpaceCabinAccordDTO.java deleted file mode 100644 index 299df05a..00000000 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/handlebusiness/dto/MakerSpaceCabinAccordDTO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hzs.member.handlebusiness.dto; - -import lombok.Builder; -import lombok.Data; - -import java.io.Serializable; - -/** - * @description: 创客空间有舱,创客空间新协议DTO - * @author: zhang jing - * @date: 2024/6/14 11:52 - * @param: - * @return: - **/ -@Builder -@Data -public class MakerSpaceCabinAccordDTO implements Serializable { - - private static final long serialVersionUID = -1486998523005023755L; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 会员姓名 - */ - private String memberName; - - /** - * 是否有舱（0=是，1=否）EStoreType 转 EDealerYesNo - */ - private Integer cabinStatus; - private String cabinStatusVal; - - /** - * 是否新协议（0=是，1=否） EDealerYesNo - */ - private Integer protocolStatus; - private String protocolStatusVal; - - /** - * 店铺编号 - */ - private String storeCode; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/ICuHandleBusinessServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/ICuHandleBusinessServiceProvider.java index e781e3fd..6a996f75 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/ICuHandleBusinessServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/ICuHandleBusinessServiceProvider.java @@ -1,7 +1,6 @@ package com.hzs.member.account.provider; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.constant.EnumsPrefixConstants; import com.hzs.common.core.constant.msg.ConfigMsgConstants; @@ -21,7 +20,6 @@ import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; import com.hzs.member.attest.service.ICuMakerSpaceService; -import com.hzs.member.base.dto.CuMakerSpaceDTO; import com.hzs.member.base.service.ICuMemberAchieveLogService; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.detail.service.ICuMemberServiceLogService; @@ -31,7 +29,6 @@ import com.hzs.member.empty.service.IMemberEmptyService; import com.hzs.member.handlebusiness.ICuHandleBusinessServiceApi; import com.hzs.member.handlebusiness.dto.AnalysisBusinessAppealParam; import com.hzs.member.handlebusiness.dto.AttestationDTO; -import com.hzs.member.handlebusiness.dto.MakerSpaceCabinAccordDTO; import com.hzs.member.handlebusiness.dto.MemberEmptyDTO; import com.hzs.member.handlebusiness.service.ICuHandleBusinessService; import com.hzs.sale.order.ISaOrderServiceApi; @@ -52,11 +49,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 会员业务处理 - * @Author: yuhui - * @Time: 2023/1/30 14:33 - * @Classname: CuHandleBusinessServiceProvider - * @PackageName: com.hzs.member.account.provider + * 会员业务处理 */ @Slf4j @DubboService @@ -111,26 +104,11 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic || editType.equals(EApprovalBusiness.DEALER_ATTEST.getValue()))) { // 创客空间认证、超级工作室认证、经销商认证（会员端提交认证数据处理） return R.ok(this.handleMakerSpace(param, pkCountry)); - } else if (editType.equals(EApprovalBusiness.MAKER_SPACE_RECOMMEND.getValue()) - || editType.equals(EApprovalBusiness.MAKER_SPACE_RECOMMEND_CANCEL.getValue())) { - // 创客空间认证、超级工作室认证、经销商认证（会员端提交认证数据处理） - return R.ok(this.handleMakerSpace(param, pkCountry)); - } else if ((editType.equals(EApprovalBusiness.MAKER_SPACE_CABIN.getValue()) - || editType.equals(EApprovalBusiness.MAKER_SPACE_ACCORD.getValue()))) { - // 创客空间有舱 创客空间新协议 - return R.ok(this.makerSpaceCabinAccord(param, pkCountry)); } else if (editType.equals(EApprovalBusiness.EMPTY_ORDER.getValue())) { // 空单注册处理 return R.ok(this.handMemberEmpty(param, pkCountry)); } - if (editType.equals(EApprovalBusiness.MAKER_SPACE_ATTEST_UPLOAD.getValue()) - || editType.equals(EApprovalBusiness.SUPER_STUDIO_ATTEST_UPLOAD.getValue()) - || editType.equals(EApprovalBusiness.DEALER_ATTEST_UPLOAD.getValue())) { - // 创客空间上传资料、超级工作室上传资料、经销商上传资料 - return R.ok(this.handleMakerSpaceUpload(param, pkCountry)); - } - List resultList = new ArrayList<>(); CuMemberServiceLog cuMemberServiceLog = new CuMemberServiceLog(); @@ -445,38 +423,6 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic return handleBusinessService.signForApprovalExamine(resultDTO); } break; - case MAKER_SPACE_ATTEST_UPLOAD: - case SUPER_STUDIO_ATTEST_UPLOAD: - case DEALER_ATTEST_UPLOAD: - // 创客发起人上传资料、超级工作室上传资料、经销商上传资料 - if (EApproveOperation.AGREE.getValue() == resultDTO.getApproveOperation()) { - // 通过 - str = iCuMakerSpaceService.uploadDataAgree(resultDTO); - } else { - // 驳回 - str = iCuMakerSpaceService.uploadDataReject(resultDTO); - } - break; - case MAKER_SPACE_RECOMMEND: - // 推荐创客空间 - if (EApproveOperation.AGREE.getValue() == resultDTO.getApproveOperation()) { - // 通过 - str = iCuMakerSpaceService.recommendMakerSpaceAgree(resultDTO); - } else { - // 驳回 - str = iCuMakerSpaceService.recommendMakerSpaceReject(resultDTO); - } - break; - case MAKER_SPACE_RECOMMEND_CANCEL: - // 取消推荐创客空间 - if (EApproveOperation.AGREE.getValue() == resultDTO.getApproveOperation()) { - // 通过 - str = iCuMakerSpaceService.recommendMakerSpaceCancelAgree(resultDTO); - } else { - // 驳回 - str = iCuMakerSpaceService.recommendMakerSpaceCancelReject(resultDTO); - } - break; case CHANGE_MEMBER_CODE: case MEMBER_ACHIEVE: case POLICY_CURRENCY_YES_NO: @@ -501,17 +447,6 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic str = iMemberEmptyService.approvalReject(resultDTO); } break; - case MAKER_SPACE_CABIN: - case MAKER_SPACE_ACCORD: - //创客空间有舱，创客空间新协议审核通过驳回 - if (EApproveOperation.AGREE.getValue() == resultDTO.getApproveOperation()) { - // 通过 - str = iCuMakerSpaceService.uploadCabinAccord(resultDTO); - } else { - // 驳回 - str = iCuMakerSpaceService.uploadCabinAccordReject(resultDTO); - } - break; default: return handleBusinessService.signForApprovalExamine(resultDTO); } @@ -528,11 +463,7 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic /** - * @description: 特殊业务处理 - * @author: zhang jing - * @date: 2023/5/16 20:06 - * @param: [resultDTO] - * @return: com.hzs.common.core.domain.R + * 特殊业务处理 **/ @Override @Transactional(rollbackFor = Exception.class) @@ -677,33 +608,6 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic .build(); } - /** - * @description:创客空间有舱,创客空间新协议 - * @author: zhang jing - * @date: 2024/6/14 11:37 - * @param: [param, pkCountry] - * @return: com.hzs.member.handlebusiness.dto.AttestationDTO - **/ - private MakerSpaceCabinAccordDTO makerSpaceCabinAccord(AnalysisBusinessAppealParam param, Integer pkCountry) { - // 创客空间认证、超级工作室认证、经销商认证（会员端提交认证数据处理） - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CuMemberServiceLog::getEditType, param.getEditType()); - queryWrapper.eq(CuMemberServiceLog::getBusinessNo, param.getBusinessNo()); - queryWrapper.eq(CuMemberServiceLog::getPkCountry, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - // 查询数据 - MakerSpaceCabinAccordDTO mssc = JSONObject.parseObject(memberServiceLog.getNewValue(), MakerSpaceCabinAccordDTO.class); - // 查询翻译数据 - Map map = iTransactionCommonService.exportEnumTransactionToTag(param.getToLanguageTag(), EDealerYesNo.values(), EStoreType.values()); - if (mssc.getCabinStatus() != null) { - mssc.setCabinStatusVal(map.get(EnumsPrefixConstants.DEALER_YES_NO + mssc.getCabinStatus())); - } - if (mssc.getProtocolStatus() != null) { - mssc.setProtocolStatusVal(map.get(EnumsPrefixConstants.DEALER_YES_NO + mssc.getProtocolStatus())); - } - return mssc; - } - /** * 处理空单注册数据 * @@ -727,26 +631,5 @@ public class ICuHandleBusinessServiceProvider implements ICuHandleBusinessServic .build(); } - /** - * 处理创客空间上传资料 - * - * @param param 处理参数 - * @param pkCountry 所属国家 - * @return - */ - private CuMakerSpaceDTO handleMakerSpaceUpload(AnalysisBusinessAppealParam param, Integer pkCountry) { - // 查询日志 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CuMemberServiceLog::getEditType, param.getEditType()); - queryWrapper.eq(CuMemberServiceLog::getBusinessNo, param.getBusinessNo()); - queryWrapper.eq(CuMemberServiceLog::getPkCountry, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - CuMakerSpaceDTO cuMakerSpaceDTO = JSONUtil.toBean(memberServiceLog.getNewValue(), CuMakerSpaceDTO.class); - - CuMember cuMember = cuMemberService.queryMember(cuMakerSpaceDTO.getPkMember()); - cuMakerSpaceDTO.setMemberCode(cuMember.getMemberCode()); - cuMakerSpaceDTO.setMemberName(cuMember.getMemberName()); - return cuMakerSpaceDTO; - } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java index 9bb83096..3256516f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/api/ApiMakerSpaceController.java @@ -22,11 +22,7 @@ import com.hzs.member.attest.param.MakerSpaceSaveParam; import com.hzs.member.attest.service.ICuMakerSpaceFileService; import com.hzs.member.attest.service.ICuMakerSpaceService; import com.hzs.member.attest.vo.MakerSpaceDetailVO; -import com.hzs.member.attest.vo.MakerSpaceRecommendVO; -import com.hzs.member.base.service.ICuMemberService; -import com.hzs.system.base.IAreaServiceApi; 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 org.springframework.web.multipart.MultipartFile; @@ -34,15 +30,9 @@ import org.springframework.web.multipart.MultipartFile; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** - * @Description: 创客空间、超级工作室控制器 - * @Author: jiang chao - * @Time: 2023/4/12 11:50 - * @Classname: ApiMakerSpaceController - * @PackageName: com.hzs.member.attest.controller.api + * 创客空间、超级工作室控制器 */ @Slf4j @RequestMapping("/api/maker-space") @@ -53,11 +43,6 @@ public class ApiMakerSpaceController extends BaseController { private ICuMakerSpaceService iCuMakerSpaceService; @Autowired private ICuMakerSpaceFileService iCuMakerSpaceFileService; - @Autowired - private ICuMemberService iCuMemberService; - - @DubboReference - private IAreaServiceApi iAreaServiceApi; /** * 获取详情 @@ -348,54 +333,6 @@ public class ApiMakerSpaceController extends BaseController { return toAjax(iCuMakerSpaceService.saveOrUpdate(cuMakerSpace)); } - /** - * 推荐创客空间列表 - * - * @return - */ - @GetMapping("/list") - public TableDataInfo list() { - List resultList = new ArrayList<>(); - - startPage(); - List recommendList = iCuMakerSpaceService.queryRecommendList(SecurityUtils.getPkCountry()); - if (CollectionUtil.isNotEmpty(recommendList)) { - List pkMakerSpaceList = recommendList.stream().map(CuMakerSpaceExt::getPkId).collect(Collectors.toList()); - // 附件map - Map> fileMap = iCuMakerSpaceFileService.queryMap(pkMakerSpaceList); - - // 获取行政区划map - Map areaMap = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); - - for (CuMakerSpaceExt cuMakerSpaceExt : recommendList) { - MakerSpaceRecommendVO makerSpaceRecommendVO = BeanUtil.copyProperties(cuMakerSpaceExt, MakerSpaceRecommendVO.class); - - String recProvince = areaMap.get(makerSpaceRecommendVO.getStoreProvince()); - if (StringUtils.isNotEmpty(recProvince)) { - makerSpaceRecommendVO.setStoreProvinceVal(recProvince); - } - String recCity = areaMap.get(makerSpaceRecommendVO.getStoreCity()); - if (StringUtils.isNotEmpty(recCity)) { - makerSpaceRecommendVO.setStoreCityVal(recCity); - } - String recCounty = areaMap.get(makerSpaceRecommendVO.getStoreCounty()); - if (StringUtils.isNotEmpty(recCounty)) { - makerSpaceRecommendVO.setStoreCountyVal(recCounty); - } - - List fileList = fileMap.get(cuMakerSpaceExt.getPkId()); - if (CollectionUtil.isNotEmpty(fileList)) { - makerSpaceRecommendVO.setFileList(fileList.stream().map(CuMakerSpaceFile::getPath).collect(Collectors.toList())); - } - resultList.add(makerSpaceRecommendVO); - } - } - - TableDataInfo tableDataInfo = getDataTable(recommendList); - tableDataInfo.setRows(resultList); - return tableDataInfo; - } - /* * @description: 展示创客空间，用于购买次数选择创客空间 * @author: sui q diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuDealerController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuDealerController.java index c40f1529..99581a2a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuDealerController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuDealerController.java @@ -26,7 +26,6 @@ import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; import com.hzs.member.attest.param.AttestationQueryParam; import com.hzs.member.attest.param.MakerSpaceRejectParam; -import com.hzs.member.attest.param.MakerSpaceSaveParam; import com.hzs.member.attest.param.MakerSpaceSubmitParam; import com.hzs.member.attest.service.ICuMakerSpaceFileService; import com.hzs.member.attest.service.ICuMakerSpaceService; @@ -45,11 +44,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; /** - * @Description: 经销商室控制器 - * @Author: jiang chao - * @Time: 2023/4/12 11:50 - * @Classname: ApiMakerSpaceController - * @PackageName: com.hzs.member.attest.controller.api + * 经销商室控制器 */ @Slf4j @RequestMapping("/manage/dealer") @@ -328,37 +323,4 @@ public class CuDealerController extends BaseController { return toAjax(bool); } - - /** - * 上传补充资料 - * - * @param param - * @return - */ - @Log(module = EOperationModule.MAKER_SPACE, business = EOperationBusiness.MAKER_SPACE, method = EOperationMethod.SUBMIT, remark = "上传补充资料") - @PostMapping("/upload-data-submit") - public AjaxResult uploadDataSubmit(@RequestBody MakerSpaceSaveParam param) { - if (null == param.getSignType() || CollectionUtil.isEmpty(param.getUserIdList()) || null == param.getStoreCode()) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - if (StringUtils.isAllEmpty(param.getLegalCardFront(), param.getLegalCardBack(), param.getLicense()) - && CollectionUtil.isEmpty(param.getStoreAgreementList())) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - - CuMakerSpace cuMakerSpace = iCuMakerSpaceService.queryOne(EStoreType.DEALER, param.getStoreCode(), null, SecurityUtils.getPkCountry()); - if (null == cuMakerSpace) { - // 数据不存在 - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - - String str = iCuMakerSpaceService.uploadDataSubmit(param, cuMakerSpace, userTokenService.getLoginUser(), EApprovalBusiness.DEALER_ATTEST_UPLOAD); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuMakerSpaceController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuMakerSpaceController.java index 5dcb1621..4aab5b58 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuMakerSpaceController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuMakerSpaceController.java @@ -2,7 +2,6 @@ package com.hzs.member.attest.controller.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.hzs.common.core.annotation.AccessPermissions; import com.hzs.common.core.annotation.Log; @@ -22,7 +21,6 @@ import com.hzs.common.domain.member.attest.CuMakerSpace; import com.hzs.common.domain.member.attest.CuMakerSpaceFile; import com.hzs.common.domain.member.attest.ext.CuMakerSpaceExt; import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.detail.CuMemberServiceLog; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.security.service.UserTokenService; @@ -31,15 +29,12 @@ import com.hzs.common.service.ITransactionCommonService; import com.hzs.common.util.TransactionUtils; import com.hzs.member.attest.param.AttestationQueryParam; import com.hzs.member.attest.param.MakerSpaceRejectParam; -import com.hzs.member.attest.param.MakerSpaceSaveParam; import com.hzs.member.attest.param.MakerSpaceSubmitParam; import com.hzs.member.attest.service.ICuMakerSpaceFileService; import com.hzs.member.attest.service.ICuMakerSpaceService; import com.hzs.member.attest.vo.CuMakerSpaceQueryVO; import com.hzs.member.attest.vo.MakerSpaceDetailVO; -import com.hzs.member.attest.vo.MakerSpaceSubmitCabinAccordVO; import com.hzs.member.base.service.ICuMemberService; -import com.hzs.member.detail.service.ICuMemberServiceLogService; import com.hzs.system.base.IAreaServiceApi; import com.hzs.system.config.IAwardsServiceApi; import com.hzs.system.sys.dto.BusinessLogDTO; @@ -53,11 +48,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; /** - * @Description: 创客空间控制器 - * @Author: jiang chao - * @Time: 2023/4/12 11:50 - * @Classname: ApiMakerSpaceController - * @PackageName: com.hzs.member.attest.controller.api + * 创客空间控制器 */ @Slf4j @RequestMapping("/manage/maker-space") @@ -69,8 +60,6 @@ public class CuMakerSpaceController extends BaseController { @Autowired private ICuMakerSpaceFileService iCuMakerSpaceFileService; @Autowired - private ICuMemberServiceLogService iCuMemberServiceLogService; - @Autowired private UserTokenService userTokenService; @Autowired private ITransactionCommonService iTransactionCommonService; @@ -425,121 +414,6 @@ public class CuMakerSpaceController extends BaseController { return toAjax(bool); } - /** - * 推荐创客空间 - * - * @param param - * @return - */ - @Log(module = EOperationModule.MAKER_SPACE, business = EOperationBusiness.MAKER_SPACE, method = EOperationMethod.UPDATE_STATUS, remark = "推荐") - @PutMapping("/recommend") - public AjaxResult recommend(@RequestBody MakerSpaceSubmitParam param) { - if (null == param.getSignType() || CollectionUtil.isEmpty(param.getUserIdList()) || StringUtils.isEmpty(param.getStoreCode())) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - - CuMakerSpace cuMakerSpace = iCuMakerSpaceService.queryOne(EStoreType.MAKER_SPACE, param.getStoreCode(), null, SecurityUtils.getPkCountry()); - // 校验创客空间审批相关 - String str = this.checkApproval(cuMakerSpace); - if (null != str) { - return AjaxResult.error(str); - } - - str = iCuMakerSpaceService.recommendMakerSpaceSubmit(param, cuMakerSpace, userTokenService.getLoginUser()); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.success(str); - } - - /** - * 取消推荐创客空间 - * - * @param param - * @return - */ - @Log(module = EOperationModule.MAKER_SPACE, business = EOperationBusiness.MAKER_SPACE, method = EOperationMethod.UPDATE_STATUS, remark = "取消推荐") - @PutMapping("/recommend-cancel") - public AjaxResult recommendCancel(@RequestBody MakerSpaceSubmitParam param) { - if (null == param.getSignType() || CollectionUtil.isEmpty(param.getUserIdList()) || StringUtils.isEmpty(param.getStoreCode())) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - - CuMakerSpace cuMakerSpace = iCuMakerSpaceService.queryOne(EStoreType.MAKER_SPACE, param.getStoreCode(), null, SecurityUtils.getPkCountry()); - // 校验创客空间审批相关 - String str = this.checkApproval(cuMakerSpace); - if (null != str) { - return AjaxResult.error(str); - } - - str = iCuMakerSpaceService.recommendMakerSpaceCancelSubmit(param, cuMakerSpace, userTokenService.getLoginUser()); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.success(str); - } - - /** - * 校验创客空间是否审批中 - * - * @param cuMakerSpace 店铺编号 - * @return - */ - private String checkApproval(CuMakerSpace cuMakerSpace) { - if (null == cuMakerSpace) { - // 数据不存在 - return TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT); - } - if (EApproveStatus.FINISH.getValue() != cuMakerSpace.getApplyStatus()) { - // 创客空间未审核通过，不能推荐 - return "创客空间未审核通过，不能推荐"; - } - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", cuMakerSpace.getPkMember()); - queryWrapper.in("EDIT_TYPE", EApprovalBusiness.MAKER_SPACE_RECOMMEND.getValue(), EApprovalBusiness.MAKER_SPACE_RECOMMEND_CANCEL.getValue()); - queryWrapper.eq("APPROVE_STATUS", EApproveStatus.ALREADY_SUBMIT.getValue()); - if (iCuMemberServiceLogService.count(queryWrapper) > 0) { - // 正在审批中,不能重复提交 - return TransactionUtils.getContent(DocumentMsgConstants.APPROVAL_FLOW_PROGRESS); - } - return null; - } - - /** - * 上传补充资料 - * - * @param param - * @return - */ - @Log(module = EOperationModule.MAKER_SPACE, business = EOperationBusiness.MAKER_SPACE, method = EOperationMethod.SUBMIT, remark = "上传补充资料") - @PostMapping("/upload-data-submit") - public AjaxResult uploadDataSubmit(@RequestBody MakerSpaceSaveParam param) { - if (null == param.getSignType() || CollectionUtil.isEmpty(param.getUserIdList()) || null == param.getStoreCode()) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - if (StringUtils.isAllEmpty(param.getLegalCardFront(), param.getLegalCardBack(), param.getLicense()) - && CollectionUtil.isEmpty(param.getStoreAgreementList())) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - - CuMakerSpace cuMakerSpace = iCuMakerSpaceService.queryOne(EStoreType.MAKER_SPACE, param.getStoreCode(), null, SecurityUtils.getPkCountry()); - if (null == cuMakerSpace) { - // 数据不存在 - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - - String str = iCuMakerSpaceService.uploadDataSubmit(param, cuMakerSpace, userTokenService.getLoginUser(), EApprovalBusiness.MAKER_SPACE_ATTEST_UPLOAD); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - /** * @description: 修改关联编号 @@ -599,75 +473,4 @@ public class CuMakerSpaceController extends BaseController { return AjaxResult.success(iCuMakerSpaceService.update(cs)); } - - /** - * @description: 创客空间有舱发起签呈 - * @author: zhang jing - * @date: 2024/6/14 14:32 - * @param: [param] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.MAKER_SPACE, business = EOperationBusiness.MAKER_SPACE_CABIN, method = EOperationMethod.SUBMIT) - @PostMapping("/cabinSubmit") - public AjaxResult cabinSubmit(@RequestBody MakerSpaceSubmitCabinAccordVO param) { - if (null == param.getSignType() || CollectionUtil.isEmpty(param.getUserIdList()) - || StringUtils.isNull(param.getPkMember()) || StringUtils.isNull(param.getCabinStatus()) - || StringUtils.isEmpty(param.getStoreCode())) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - CuMakerSpace cuMakerSpace = iCuMakerSpaceService.queryOne(EStoreType.MAKER_SPACE, param.getStoreCode(), null, SecurityUtils.getPkCountry()); - if (null == cuMakerSpace) { - // 数据不存在 - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - Integer count = iCuMemberService.checkmsLogCount(param.getPkMember(), EApprovalBusiness.MAKER_SPACE_CABIN.getValue()); - if (StringUtils.isNotNull(count) && count > 0) { - // 正在审批中,不能重复提交 - return AjaxResult.error(TransactionUtils.getContent(DocumentMsgConstants.APPROVAL_FLOW_PROGRESS)); - } - param.setEApprovalBusiness(EApprovalBusiness.MAKER_SPACE_CABIN); - - String str = iCuMakerSpaceService.cabinSubmit(param, cuMakerSpace, userTokenService.getLoginUser()); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - - /** - * @description: 创客空间新协议发起签呈 - * @author: zhang jing - * @date: 2024/6/14 14:33 - * @param: [param] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.MAKER_SPACE, business = EOperationBusiness.MAKER_SPACE_ACCORD, method = EOperationMethod.SUBMIT) - @PostMapping("/accordSubmit") - public AjaxResult accordSubmit(@RequestBody MakerSpaceSubmitCabinAccordVO param) { - if (null == param.getSignType() || CollectionUtil.isEmpty(param.getUserIdList()) - || StringUtils.isNull(param.getPkMember()) || StringUtils.isNull(param.getProtocolStatus()) - || StringUtils.isEmpty(param.getStoreCode())) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - CuMakerSpace cuMakerSpace = iCuMakerSpaceService.queryOne(EStoreType.MAKER_SPACE, param.getStoreCode(), null, SecurityUtils.getPkCountry()); - if (null == cuMakerSpace) { - // 数据不存在 - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - Integer count = iCuMemberService.checkmsLogCount(param.getPkMember(), EApprovalBusiness.MAKER_SPACE_ACCORD.getValue()); - if (StringUtils.isNotNull(count) && count > 0) { - // 正在审批中,不能重复提交 - return AjaxResult.error(TransactionUtils.getContent(DocumentMsgConstants.APPROVAL_FLOW_PROGRESS)); - } - param.setEApprovalBusiness(EApprovalBusiness.MAKER_SPACE_ACCORD); - - String str = iCuMakerSpaceService.cabinSubmit(param, cuMakerSpace, userTokenService.getLoginUser()); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuSuperStudioController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuSuperStudioController.java index e2f72242..a9a583e4 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuSuperStudioController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/controller/manage/CuSuperStudioController.java @@ -45,11 +45,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.*; /** - * @Description: 超级工作室控制器 - * @Author: jiang chao - * @Time: 2023/4/12 11:50 - * @Classname: ApiMakerSpaceController - * @PackageName: com.hzs.member.attest.controller.api + * 超级工作室控制器 */ @Slf4j @RequestMapping("/manage/super-studio") @@ -329,37 +325,4 @@ public class CuSuperStudioController extends BaseController { } - /** - * 上传补充资料 - * - * @param param - * @return - */ - @Log(module = EOperationModule.MAKER_SPACE, business = EOperationBusiness.MAKER_SPACE, method = EOperationMethod.SUBMIT, remark = "上传补充资料") - @PostMapping("/upload-data-submit") - public AjaxResult uploadDataSubmit(@RequestBody MakerSpaceSaveParam param) { - if (null == param.getSignType() || CollectionUtil.isEmpty(param.getUserIdList()) || null == param.getStoreCode()) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - if (StringUtils.isAllEmpty(param.getLegalCardFront(), param.getLegalCardBack(), param.getLicense()) - && CollectionUtil.isEmpty(param.getStoreAgreementList())) { - // 缺少参数 - return AjaxResult.error("缺少参数"); - } - - CuMakerSpace cuMakerSpace = iCuMakerSpaceService.queryOne(EStoreType.SUPER_STUDIO, param.getStoreCode(), null, SecurityUtils.getPkCountry()); - if (null == cuMakerSpace) { - // 数据不存在 - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_OBJECT_NOT_REPEAT)); - } - - String str = iCuMakerSpaceService.uploadDataSubmit(param, cuMakerSpace, userTokenService.getLoginUser(), EApprovalBusiness.SUPER_STUDIO_ATTEST_UPLOAD); - if (null == str) { - return AjaxResult.success(); - } - return AjaxResult.error(str); - } - - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceFileMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceFileMapper.java index 1e807ca4..1e9e5292 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceFileMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceFileMapper.java @@ -8,9 +8,6 @@ import java.util.List; /** * 创客空间超级工作室附件 Mapper 接口 - * - * @author hzs - * @since 2023-04-13 */ public interface CuMakerSpaceFileMapper extends BaseMapper { diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceMapper.java index c2221262..b083ca62 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/mapper/CuMakerSpaceMapper.java @@ -54,14 +54,6 @@ public interface CuMakerSpaceMapper extends BaseMapper { */ CuMakerSpaceExt queryData(@Param("storeType") Integer storeType, @Param("storeCode") String storeCode, @Param("pkCountry") Integer pkCountry); - /** - * 查询推荐创客空间 - * - * @param pkCountry 所属国家 - * @return - */ - List queryRecommendList(@Param("pkCountry") Integer pkCountry); - /** * 根据ID查询创客空间 * @@ -70,11 +62,4 @@ public interface CuMakerSpaceMapper extends BaseMapper { */ CuMakerSpaceExt selectMakerSpaceById(@Param("pkId") Long pkId); - /** - * 更新证件状态 - * - * @param pkId 创客ID - * @return - */ - int updateCertificateStatus(@Param("pkId") Long pkId); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/EnergySiloParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/EnergySiloParam.java deleted file mode 100644 index ad07d131..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/param/EnergySiloParam.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.hzs.member.attest.param; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @Description: 后台增加对赌的param - * @Author: sui q - * @Time: 2023/2/12 10:11 - * @Classname: EnergySiloParam - * @PackageName: com.hzs.web.controller.silo.param - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class EnergySiloParam extends BaseApprovalEntity { - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员主键 - */ - private Long pkMember; - - /** - * 奖衔 - */ - private Integer pkAwards; - - /** - * 所属团队编号 - */ - private Long pkTeamCode; - - /** - * 隶属体系 - */ - private Long pkVertex; - - /** - * 会员编号 - */ - private String memberCode; - - /** - * 订单编号 - */ - private String orderCode; - - /** - * 父级编号 - */ - private String parentMemberCode; - - /** - * 真实姓名 - */ - private String memberName; - - /** - * 联系方式 - */ - private String phone; - - /** - * 启用时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date enableDate; - - /** - * 开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - - /** - * 开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startEndDate; - - /** - * 结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endStartDate; - - /** - * 结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - - /** - * 剩余时间 - */ - private Integer surplusDate; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 创建人 - */ - private Long pkCreator; - - /** - * 租赁数量 - */ - private Integer leasesNumber; - - /** - * 增加时长 - */ - private Integer addTime; - - /** - * 增加方式 EInfusingWaterType 1 增加 2减少 3 最终 - */ - private Integer addType; - - /** - * 是否达标，0=否 1=是 EReachState - */ - private Integer isReach; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceFileService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceFileService.java index 7639c122..6c83cfc3 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceFileService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceFileService.java @@ -4,13 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.attest.CuMakerSpaceFile; import java.util.List; -import java.util.Map; /** * 创客空间超级工作室附件 服务类 - * - * @author hzs - * @since 2023-04-13 */ public interface ICuMakerSpaceFileService extends IService { @@ -22,14 +18,6 @@ public interface ICuMakerSpaceFileService extends IService { */ List queryList(Long pkMakerSpace); - /** - * 查询附件map - * - * @param pkMakerSpaceList - * @return - */ - Map> queryMap(List pkMakerSpaceList); - /** * 根据创客空间ID查询图片 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceService.java index 6d404415..8d285716 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/ICuMakerSpaceService.java @@ -1,7 +1,6 @@ package com.hzs.member.attest.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.core.enums.EApprovalBusiness; import com.hzs.common.core.enums.EStoreFileType; import com.hzs.common.core.enums.EStoreType; import com.hzs.common.domain.member.attest.CuMakerSpace; @@ -9,7 +8,6 @@ import com.hzs.common.domain.member.attest.ext.CuMakerSpaceExt; import com.hzs.member.attest.param.AttestationQueryParam; import com.hzs.member.attest.param.MakerSpaceSaveParam; import com.hzs.member.attest.param.MakerSpaceSubmitParam; -import com.hzs.member.attest.vo.MakerSpaceSubmitCabinAccordVO; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.LoginUser; @@ -17,9 +15,6 @@ import java.util.List; /** * 创客空间超级工作室 服务类 - * - * @author hzs - * @since 2023-04-12 */ public interface ICuMakerSpaceService extends IService { @@ -85,13 +80,6 @@ public interface ICuMakerSpaceService extends IService { */ String submit(MakerSpaceSubmitParam param, CuMakerSpace cuMakerSpace, LoginUser loginUser); - /** - * @description: 创客空间有舱发起签呈 - * @param: [param, cuMakerSpace, loginUser] - * @return: java.lang.String - **/ - String cabinSubmit(MakerSpaceSubmitCabinAccordVO param, CuMakerSpace cuMakerSpace, LoginUser loginUser); - /** * 认证审批通过 * @@ -119,8 +107,6 @@ public interface ICuMakerSpaceService extends IService { /** * @description: 校验关联编号是否绑定 - * @param: [param] - * @return: java.lang.Integer **/ Integer checkCode(AttestationQueryParam param); @@ -145,69 +131,8 @@ public interface ICuMakerSpaceService extends IService { */ CuMakerSpace queryOne(EStoreType eStoreType, String storeCode, Long pkStore, Integer pkCountry); - /** - * 推荐创客空间提交 - * - * @param param 请求参数 - * @param cuMakerSpace 创客空间数据 - * @param loginUser 登录用户 - * @return - */ - String recommendMakerSpaceSubmit(MakerSpaceSubmitParam param, CuMakerSpace cuMakerSpace, LoginUser loginUser); - - /** - * 推荐创客空间审批通过 - * - * @param approvalBusinessResultDTO - * @return - */ - String recommendMakerSpaceAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * 推荐创客空间审批驳回 - * - * @param approvalBusinessResultDTO - * @return - */ - String recommendMakerSpaceReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * 取消推荐创客空间提交 - * - * @param param 请求参数 - * @param cuMakerSpace 创客空间数据 - * @param loginUser 登录用户 - * @return - */ - String recommendMakerSpaceCancelSubmit(MakerSpaceSubmitParam param, CuMakerSpace cuMakerSpace, LoginUser loginUser); - - /** - * 取消推荐创客空间审批通过 - * - * @param approvalBusinessResultDTO - * @return - */ - String recommendMakerSpaceCancelAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * 取消推荐创客空间审批驳回 - * - * @param approvalBusinessResultDTO - * @return - */ - String recommendMakerSpaceCancelReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * 查询推荐创客空间 - * - * @param pkCountry 所属国家 - * @return - */ - List queryRecommendList(Integer pkCountry); - /* * @description: 查询创客空间 - * @param: null null **/ List queryMakerSpace(Integer pkCountry, MakerSpaceSaveParam makerSpaceSaveParam); @@ -219,45 +144,4 @@ public interface ICuMakerSpaceService extends IService { */ CuMakerSpaceExt selectMakerSpaceById(Long pkId); - /** - * 上传补充资料提交签呈 - * - * @param param 请求入参 - * @param cuMakerSpace 创客空间数据 - * @param loginUser 登录用户 - * @param eApprovalBusiness 业务类型 - * @return - */ - String uploadDataSubmit(MakerSpaceSaveParam param, CuMakerSpace cuMakerSpace, LoginUser loginUser, EApprovalBusiness eApprovalBusiness); - - /** - * 上传补充资料审批通过 - * - * @param approvalBusinessResultDTO - * @return - */ - String uploadDataAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * @description: 创客空间有舱, 创客空间新协议审核通过 - * @param: [approvalBusinessResultDTO] - * @return: java.lang.String - **/ - String uploadCabinAccord(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * 上传补充资料审批驳回 - * - * @param approvalBusinessResultDTO - * @return - */ - String uploadDataReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - - /** - * @description: 创客空间有舱, 创客空间新协议审核驳回 - * @param: [approvalBusinessResultDTO] - * @return: java.lang.String - **/ - String uploadCabinAccordReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceFileServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceFileServiceImpl.java index ff998951..67d44e33 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceFileServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceFileServiceImpl.java @@ -1,24 +1,15 @@ package com.hzs.member.attest.service.impl; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.enums.EStoreFileType; import com.hzs.common.domain.member.attest.CuMakerSpaceFile; import com.hzs.member.attest.mapper.CuMakerSpaceFileMapper; import com.hzs.member.attest.service.ICuMakerSpaceFileService; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * 创客空间超级工作室附件 服务实现类 - * - * @author hzs - * @since 2023-04-13 */ @Service public class CuMakerSpaceFileServiceImpl extends ServiceImpl implements ICuMakerSpaceFileService { @@ -28,28 +19,6 @@ public class CuMakerSpaceFileServiceImpl extends ServiceImpl> queryMap(List pkMakerSpaceList) { - Map> resultMap = new HashMap<>(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("PK_MAKER_SPACE", pkMakerSpaceList); - queryWrapper.in("TYPE", - EStoreFileType.IMAGE_DOORHEAD_1.getValue(), EStoreFileType.IMAGE_DOORHEAD_2.getValue(), - EStoreFileType.IMAGE_EXPERIENCE_1.getValue(), EStoreFileType.IMAGE_EXPERIENCE_2.getValue(), - EStoreFileType.IMAGE_MEETING_1.getValue(), EStoreFileType.IMAGE_MEETING_2.getValue(), - EStoreFileType.IMAGE_PRODUCT_1.getValue(), EStoreFileType.IMAGE_PRODUCT_2.getValue(), - EStoreFileType.IMAGE_LOUNGE_1.getValue(), EStoreFileType.IMAGE_LOUNGE_2.getValue() - ); - queryWrapper.orderByAsc("PK_MAKER_SPACE", "TYPE"); - List list = baseMapper.selectList(queryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - resultMap = list.stream().collect(Collectors.groupingBy(CuMakerSpaceFile::getPkMakerSpace)); - } - - return resultMap; - } - @Override public List selectFileBySpaceId(Long pkMakerSpace) { return baseMapper.selectFileBySpaceId(pkMakerSpace); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceServiceImpl.java index 0d09c172..49b1c959 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/service/impl/CuMakerSpaceServiceImpl.java @@ -1,9 +1,5 @@ package com.hzs.member.attest.service.impl; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -29,8 +25,6 @@ import com.hzs.member.attest.param.MakerSpaceSaveParam; import com.hzs.member.attest.param.MakerSpaceSubmitParam; import com.hzs.member.attest.service.ICuMakerSpaceFileService; import com.hzs.member.attest.service.ICuMakerSpaceService; -import com.hzs.member.attest.vo.MakerSpaceSubmitCabinAccordVO; -import com.hzs.member.base.dto.CuMakerSpaceDTO; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.detail.service.ICuMemberServiceLogService; import com.hzs.system.sys.IApprovalServiceApi; @@ -46,9 +40,6 @@ import java.util.*; /** * 创客空间超级工作室 服务实现类 - * - * @author hzs - * @since 2023-04-12 */ @Slf4j @Service @@ -164,9 +155,6 @@ public class CuMakerSpaceServiceImpl extends ServiceImpl OssUtil.deleteFile(filePath)); } @Transactional(rollbackFor = Exception.class) @@ -247,75 +235,6 @@ public class CuMakerSpaceServiceImpl extends ServiceImpl memberSet = new HashSet<>(); - memberSet.add(cuMakerSpace.getPkMember()); - // 提交签呈处理 - R resultR = iApprovalServiceApi.submitOrder( - ApprovalSubmitDTO.builder() - .eApprovalBusiness(param.getEApprovalBusiness()) - .businessCode(businessCode) - .signType(ESignType.getEnumByValue(param.getSignType())) - .userIdList(param.getUserIdList()) - .sendIdList(param.getSendIdList()) - .remark(param.getRemark()) - .fileList(param.getFileList()) - .pkMemberList(memberSet) - .build(), - loginUser, - null); - if (resultR.isSuccess()) { - // 推送业务操作日志 - rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, Collections.singletonList(logDTO)); - return null; - } - throw new BaseException(TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + resultR.getMsg()); - } - return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED); - } - @Transactional(rollbackFor = Exception.class) @Override public String approvalAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { @@ -437,19 +356,11 @@ public class CuMakerSpaceServiceImpl extends ServiceImpl pkMemberList = new HashSet<>(); - pkMemberList.add(cuMakerSpace.getPkMember()); - - // 提交签呈处理 - R resultR = iApprovalServiceApi.submitOrder( - ApprovalSubmitDTO.builder() - .eApprovalBusiness(EApprovalBusiness.MAKER_SPACE_RECOMMEND) - .businessCode(businessCode) - .signType(ESignType.getEnumByValue(param.getSignType())) - .userIdList(param.getUserIdList()) - .sendIdList(param.getSendIdList()) - .remark(param.getRemark()) - .fileList(param.getFileList()) - .pkMemberList(pkMemberList) - .build(), - loginUser, - null - ); - if (resultR.isSuccess()) { - return null; - } - throw new BaseException(TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + resultR.getMsg()); - } - return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String recommendMakerSpaceAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - // 用户ID - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - // 所属国家 - Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("EDIT_TYPE", EApprovalBusiness.MAKER_SPACE_RECOMMEND.getValue()); - queryWrapper.eq("BUSINESS_NO", approvalBusinessResultDTO.getBusinessCode()); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - if (null == memberServiceLog) { - log.error("推荐创客空间通过处理失败: 签呈信息不存在!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_EXIST); - } - if (EApproveStatus.ALREADY_SUBMIT.getValue() != memberServiceLog.getApproveStatus()) { - log.error("推荐创客空间通过处理失败: 签呈审批已完成!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_APPROVAL_AGREE); - } - - if (this.updateServiceLog(memberServiceLog.getPkId(), EApproveStatus.FINISH, userId)) { - // 处理修改记录成功 - - // 当前时间 - Date nowDate = new Date(); - // 更新创客空间推荐信息 - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("RECOMMEND_STATUS", EYesNo.YES.getIntValue()); - updateWrapper.set("RECOMMEND_TIME", nowDate); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, nowDate); - updateWrapper.eq("STORE_TYPE", EStoreType.MAKER_SPACE.getValue()); - updateWrapper.eq("STORE_CODE", memberServiceLog.getNewValue()); - if (this.update(updateWrapper)) { - return null; - } - } - log.error("推荐创客空间通过处理失败: 更新数据失败"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_ERROR); - } - - @Override - public String recommendMakerSpaceReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - // 用户ID - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - // 所属国家 - Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("EDIT_TYPE", EApprovalBusiness.MAKER_SPACE_RECOMMEND.getValue()); - queryWrapper.eq("BUSINESS_NO", approvalBusinessResultDTO.getBusinessCode()); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - if (null == memberServiceLog) { - log.error("推荐创客空间驳回处理失败: 签呈信息不存在!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_EXIST); - } - if (EApproveStatus.ALREADY_SUBMIT.getValue() != memberServiceLog.getApproveStatus()) { - log.error("推荐创客空间驳回处理失败: 签呈审批已完成!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_APPROVAL_AGREE); - } - - if (this.updateServiceLog(memberServiceLog.getPkId(), EApproveStatus.REJECTED, userId)) { - return null; - } - log.error("推荐创客空间驳回处理失败: 更新数据失败"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_ERROR); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String recommendMakerSpaceCancelSubmit(MakerSpaceSubmitParam param, CuMakerSpace cuMakerSpace, LoginUser loginUser) { - String businessCode = CommonUtil.createSerialNumber(EOrderPrefix.HANDLE_BUSINESS); - - CuMemberServiceLog cuMemberServiceLog = new CuMemberServiceLog(); - cuMemberServiceLog.setPkMember(cuMakerSpace.getPkMember()); - cuMemberServiceLog.setEditType(EApprovalBusiness.MAKER_SPACE_RECOMMEND_CANCEL.getValue()); - cuMemberServiceLog.setNewValue(cuMakerSpace.getStoreCode()); - cuMemberServiceLog.setBusinessNo(businessCode); - cuMemberServiceLog.setPkCreator(loginUser.getUserId()); - cuMemberServiceLog.setPkCountry(loginUser.getDataCountry()); - - if (iCuMemberServiceLogService.save(cuMemberServiceLog)) { - // 涉及会员ID列表 - Set pkMemberList = new HashSet<>(); - pkMemberList.add(cuMakerSpace.getPkMember()); - - // 提交签呈处理 - R resultR = iApprovalServiceApi.submitOrder( - ApprovalSubmitDTO.builder() - .eApprovalBusiness(EApprovalBusiness.MAKER_SPACE_RECOMMEND_CANCEL) - .businessCode(businessCode) - .signType(ESignType.getEnumByValue(param.getSignType())) - .userIdList(param.getUserIdList()) - .sendIdList(param.getSendIdList()) - .remark(param.getRemark()) - .fileList(param.getFileList()) - .pkMemberList(pkMemberList) - .build(), - loginUser, - null - ); - if (resultR.isSuccess()) { - return null; - } - throw new BaseException(TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + resultR.getMsg()); - } - return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String recommendMakerSpaceCancelAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - // 用户ID - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - // 所属国家 - Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("EDIT_TYPE", EApprovalBusiness.MAKER_SPACE_RECOMMEND_CANCEL.getValue()); - queryWrapper.eq("BUSINESS_NO", approvalBusinessResultDTO.getBusinessCode()); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - if (null == memberServiceLog) { - log.error("取消推荐创客空间通过处理失败: 签呈信息不存在!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_EXIST); - } - if (EApproveStatus.ALREADY_SUBMIT.getValue() != memberServiceLog.getApproveStatus()) { - log.error("取消推荐创客空间通过处理失败: 签呈审批已完成!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_APPROVAL_AGREE); - } - - if (this.updateServiceLog(memberServiceLog.getPkId(), EApproveStatus.FINISH, userId)) { - // 处理修改记录成功 - - // 当前时间 - Date nowDate = new Date(); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.set("RECOMMEND_STATUS", EYesNo.NO.getIntValue()); - updateWrapper.set("RECOMMEND_TIME", null); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, nowDate); - updateWrapper.eq("STORE_TYPE", EStoreType.MAKER_SPACE.getValue()); - updateWrapper.eq("STORE_CODE", memberServiceLog.getNewValue()); - if (this.update(updateWrapper)) { - return null; - } - } - log.error("取消推荐创客空间通过处理失败: 更新数据失败"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_ERROR); - } - - @Override - public String recommendMakerSpaceCancelReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - // 用户ID - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - // 所属国家 - Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry(); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("EDIT_TYPE", EApprovalBusiness.MAKER_SPACE_RECOMMEND_CANCEL.getValue()); - queryWrapper.eq("BUSINESS_NO", approvalBusinessResultDTO.getBusinessCode()); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - if (null == memberServiceLog) { - log.error("取消推荐创客空间驳回处理失败: 签呈信息不存在!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_EXIST); - } - if (EApproveStatus.ALREADY_SUBMIT.getValue() != memberServiceLog.getApproveStatus()) { - log.error("取消推荐创客空间驳回处理失败: 签呈审批已完成!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_APPROVAL_AGREE); - } - - if (this.updateServiceLog(memberServiceLog.getPkId(), EApproveStatus.REJECTED, userId)) { - return null; - } - log.error("取消推荐创客空间驳回处理失败: 更新数据失败"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_ERROR); - } - - @Override - public List queryRecommendList(Integer pkCountry) { - return baseMapper.queryRecommendList(pkCountry); - } - @Override public List queryMakerSpace(Integer pkCountry, MakerSpaceSaveParam makerSpaceSaveParam) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -743,354 +426,4 @@ public class CuMakerSpaceServiceImpl extends ServiceImpl fileList = iCuMakerSpaceFileService.queryList(cuMakerSpace.getPkId()); - if (CollectionUtil.isEmpty(fileList)) { - // 协议有多条，单独处理 - List storeAgreementList = new ArrayList<>(); - // 新协议 - List storeAgreementNewList = new ArrayList<>(); - - for (CuMakerSpaceFile cuMakerSpaceFile : fileList) { - if (EStoreFileType.LEGAL_CARD_FRONT.getValue() == cuMakerSpaceFile.getType()) { - oldCuMakerSpaceDTO.setLegalCardFront(cuMakerSpaceFile.getPath()); - } else if (EStoreFileType.LEGAL_CARD_BACK.getValue() == cuMakerSpaceFile.getType()) { - oldCuMakerSpaceDTO.setLegalCardBack(cuMakerSpaceFile.getPath()); - } else if (EStoreFileType.LICENSE.getValue() == cuMakerSpaceFile.getType()) { - oldCuMakerSpaceDTO.setLicense(cuMakerSpaceFile.getPath()); - } else if (EStoreFileType.STORE_AGREEMENT.getValue() == cuMakerSpaceFile.getType()) { - storeAgreementList.add(cuMakerSpaceFile.getPath()); - } else if (EStoreFileType.STORE_AGREEMENT_NEW.getValue() == cuMakerSpaceFile.getType()) { - storeAgreementNewList.add(cuMakerSpaceFile.getPath()); - } - } - if (storeAgreementNewList.size() > 0) { - oldCuMakerSpaceDTO.setStoreAgreementList(storeAgreementNewList); - } else { - oldCuMakerSpaceDTO.setStoreAgreementList(storeAgreementList); - } - } - - CuMemberServiceLog cuMemberServiceLog = new CuMemberServiceLog(); - cuMemberServiceLog.setPkMember(cuMakerSpace.getPkMember()); - cuMemberServiceLog.setEditType(eApprovalBusiness.getValue()); - cuMemberServiceLog.setOldValue(JSONUtil.toJsonStr(oldCuMakerSpaceDTO)); - cuMemberServiceLog.setNewValue(JSONUtil.toJsonStr(CuMakerSpaceDTO.builder() - .pkId(cuMakerSpace.getPkId()) - .storeCode(cuMakerSpace.getStoreCode()) - .pkMember(cuMakerSpace.getPkMember()) - .legalCardFront(param.getLegalCardFront()) - .legalCardBack(param.getLegalCardBack()) - .license(param.getLicense()) - .storeAgreementList(param.getStoreAgreementList()) - .build())); - cuMemberServiceLog.setBusinessNo(businessCode); - cuMemberServiceLog.setPkCreator(loginUser.getUserId()); - cuMemberServiceLog.setPkCountry(loginUser.getDataCountry()); - - // 创客空间会员 - CuMember cuMember = iCuMemberService.queryMember(cuMakerSpace.getPkMember()); - // 操作日志内容 - StringBuilder content = new StringBuilder("会员编号：").append(cuMember.getMemberCode()); - if (EApprovalBusiness.MAKER_SPACE_ATTEST.getValue() == eApprovalBusiness.getValue()) { - // 创客空间认证 - content.append("创客空间补全资料。创客空间名称：").append(cuMakerSpace.getStoreName()); - } else if (EApprovalBusiness.SUPER_STUDIO_ATTEST.getValue() == eApprovalBusiness.getValue()) { - // 超级工作室认证 - content.append("超级工作室补全资料。"); - } else if (EApprovalBusiness.DEALER_ATTEST.getValue() == eApprovalBusiness.getValue()) { - // 经销商认证 - content.append("经销商认证补全资料。"); - } - // 封装业务操作日志 - BusinessLogDTO logDTO = BusinessLogDTO.builder() - .businessType(eApprovalBusiness.getValue()) - .businessCode(businessCode) - .pkMember(cuMakerSpace.getPkMember()) - .content(content.toString()) - .pkCreator(loginUser.getUserId()) - .pkCountry(loginUser.getDataCountry()) - .freeSignFlag(false) - .build(); - - if (iCuMemberServiceLogService.save(cuMemberServiceLog)) { - // 业务涉及会员ID列表 - Set memberSet = new HashSet<>(); - memberSet.add(cuMakerSpace.getPkMember()); - - // 提交签呈处理 - R resultR = iApprovalServiceApi.submitOrder( - ApprovalSubmitDTO.builder() - .eApprovalBusiness(eApprovalBusiness) - .businessCode(businessCode) - .signType(ESignType.getEnumByValue(param.getSignType())) - .userIdList(param.getUserIdList()) - .sendIdList(param.getSendIdList()) - .remark(param.getRemark()) - .fileList(param.getFileList()) - .pkMemberList(memberSet) - .build(), - loginUser, - null); - if (resultR.isSuccess()) { - // 推送业务操作日志 - rabbitTemplate.convertAndSend(RabbitMqConstants.BUSINESS_LOG_EXCHANGE, RabbitMqConstants.BUSINESS_LOG_KEY, Collections.singletonList(logDTO)); - return null; - } - throw new BaseException(TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED) + "：" + resultR.getMsg()); - } - return TransactionUtils.getContent(CommonMsgConstants.OPERATION_FAILED); - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String uploadDataAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - // 用户ID - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - // 所属国家 - Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry(); - // 当前时间 - Date nowDate = new Date(); - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CuMemberServiceLog::getEditType, approvalBusinessResultDTO.getEApprovalBusiness().getValue()); - queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - queryWrapper.eq(CuMemberServiceLog::getPkCountry, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - if (null == memberServiceLog) { - log.error("上传资料同意处理失败: 签呈信息不存在!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_EXIST); - } - if (EApproveStatus.ALREADY_SUBMIT.getValue() != memberServiceLog.getApproveStatus()) { - log.error("上传资料同意处理失败: 签呈审批已完成!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_APPROVAL_AGREE); - } - - // 需要清除的原文件数据 - List clearTypeList = new ArrayList<>(); - - // 修改后的数据 - CuMakerSpaceDTO cuMakerSpaceDTO = JSONUtil.toBean(memberServiceLog.getNewValue(), CuMakerSpaceDTO.class); - // 修改后的文件数据列表 - List cuMakerSpaceFileList = new ArrayList<>(); - if (StringUtils.isNotEmpty(cuMakerSpaceDTO.getLegalCardFront())) { - CuMakerSpaceFile tmpFile = new CuMakerSpaceFile(); - tmpFile.setPkMakerSpace(cuMakerSpaceDTO.getPkId()); - tmpFile.setType(EStoreFileType.LEGAL_CARD_FRONT.getValue()); - tmpFile.setPath(cuMakerSpaceDTO.getLegalCardFront()); - tmpFile.setPkCountry(pkCountry); - tmpFile.setPkCreator(userId); - tmpFile.setCreationTime(nowDate); - tmpFile.setPkModified(userId); - tmpFile.setModifiedTime(nowDate); - cuMakerSpaceFileList.add(tmpFile); - clearTypeList.add(EStoreFileType.LEGAL_CARD_FRONT.getValue()); - } - if (StringUtils.isNotEmpty(cuMakerSpaceDTO.getLegalCardBack())) { - CuMakerSpaceFile tmpFile = new CuMakerSpaceFile(); - tmpFile.setPkMakerSpace(cuMakerSpaceDTO.getPkId()); - tmpFile.setType(EStoreFileType.LEGAL_CARD_BACK.getValue()); - tmpFile.setPath(cuMakerSpaceDTO.getLegalCardBack()); - tmpFile.setPkCountry(pkCountry); - tmpFile.setPkCreator(userId); - tmpFile.setCreationTime(nowDate); - tmpFile.setPkModified(userId); - tmpFile.setModifiedTime(nowDate); - cuMakerSpaceFileList.add(tmpFile); - clearTypeList.add(EStoreFileType.LEGAL_CARD_BACK.getValue()); - } - if (StringUtils.isNotEmpty(cuMakerSpaceDTO.getLicense())) { - CuMakerSpaceFile tmpFile = new CuMakerSpaceFile(); - tmpFile.setPkMakerSpace(cuMakerSpaceDTO.getPkId()); - tmpFile.setType(EStoreFileType.LICENSE.getValue()); - tmpFile.setPath(cuMakerSpaceDTO.getLicense()); - tmpFile.setPkCountry(pkCountry); - tmpFile.setPkCreator(userId); - tmpFile.setCreationTime(nowDate); - tmpFile.setPkModified(userId); - tmpFile.setModifiedTime(nowDate); - cuMakerSpaceFileList.add(tmpFile); - clearTypeList.add(EStoreFileType.LICENSE.getValue()); - } - if (CollectionUtil.isNotEmpty(cuMakerSpaceDTO.getStoreAgreementList())) { - for (String path : cuMakerSpaceDTO.getStoreAgreementList()) { - CuMakerSpaceFile tmpFile = new CuMakerSpaceFile(); - tmpFile.setPkMakerSpace(cuMakerSpaceDTO.getPkId()); - // 创客空间使用新协议，其它的继续使用原来的 - if (EApprovalBusiness.MAKER_SPACE_ATTEST_UPLOAD.getValue() == approvalBusinessResultDTO.getEApprovalBusiness().getValue()) { - tmpFile.setType(EStoreFileType.STORE_AGREEMENT_NEW.getValue()); - clearTypeList.add(EStoreFileType.STORE_AGREEMENT_NEW.getValue()); - } else { - tmpFile.setType(EStoreFileType.STORE_AGREEMENT.getValue()); - clearTypeList.add(EStoreFileType.STORE_AGREEMENT.getValue()); - } - tmpFile.setPath(path); - tmpFile.setPkCountry(pkCountry); - tmpFile.setPkCreator(userId); - tmpFile.setCreationTime(nowDate); - tmpFile.setPkModified(userId); - tmpFile.setModifiedTime(nowDate); - cuMakerSpaceFileList.add(tmpFile); - } - } - - if (this.updateServiceLog(memberServiceLog.getPkId(), EApproveStatus.FINISH, userId)) { - if (CollectionUtil.isNotEmpty(clearTypeList)) { - // 清除之前的旧数据 - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(CuMakerSpaceFile::getPkMakerSpace, cuMakerSpaceDTO.getPkId()); - updateWrapper.eq(CuMakerSpaceFile::getDelFlag, EDelFlag.UN_DELETE.getValue()); - updateWrapper.in(CuMakerSpaceFile::getType, clearTypeList); - updateWrapper.set(CuMakerSpaceFile::getDelFlag, EDelFlag.DELETE.getValue()); - iCuMakerSpaceFileService.update(updateWrapper); - } - if (CollectionUtil.isNotEmpty(cuMakerSpaceFileList)) { - // 插入新数据 - iCuMakerSpaceFileService.saveBatch(cuMakerSpaceFileList); - } - // 【法人身份证正反面】【营业执照】【已签字的协议】，更新证件状态为已齐全 - baseMapper.updateCertificateStatus(cuMakerSpaceDTO.getPkId()); - - return null; - } - log.error("上传资料同意处理失败: 更新数据失败"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_ERROR); - } - - /** - * @description: 创客空间有舱，创客空间新协议审核通过 - * @author: zhang jing - * @date: 2024/6/14 13:52 - * @param: [approvalBusinessResultDTO] - * @return: java.lang.String - **/ - @Transactional(rollbackFor = Exception.class) - @Override - public String uploadCabinAccord(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - // 用户ID - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - // 所属国家 - Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry(); - // 当前时间 - Date nowDate = new Date(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CuMemberServiceLog::getEditType, approvalBusinessResultDTO.getEApprovalBusiness().getValue()); - queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - queryWrapper.eq(CuMemberServiceLog::getPkCountry, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - if (null == memberServiceLog) { - log.error("创客空间有舱，创客空间新协议同意处理失败: 签呈信息不存在!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_EXIST); - } - if (EApproveStatus.ALREADY_SUBMIT.getValue() != memberServiceLog.getApproveStatus()) { - log.error("创客空间有舱，创客空间新协议同意处理失败: 签呈审批已完成!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_APPROVAL_AGREE); - } - // 修改后的数据 - MakerSpaceSubmitCabinAccordVO mssc = JSONUtil.toBean(memberServiceLog.getNewValue(), MakerSpaceSubmitCabinAccordVO.class); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("STORE_CODE", mssc.getStoreCode()); - if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.MAKER_SPACE_CABIN.getValue()) { - updateWrapper.set("CABIN_STATUS", mssc.getCabinStatus()); - //查询是否有新协议，存在新协议则修改创客空间等级为科技健康体验中心 - QueryWrapper querCuMakerSpace = new QueryWrapper<>(); - querCuMakerSpace.eq("STORE_CODE", mssc.getStoreCode()); - CuMakerSpace cms = baseMapper.selectOne(querCuMakerSpace); - if (cms != null && cms.getProtocolStatus() == EDealerYesNo.YES.getValue()) { - updateWrapper.set("STORE_LEVEL", EStoreLevel.EXPERIENCE_CENTER_INITIATOR.getValue()); - } - } - if (approvalBusinessResultDTO.getEApprovalBusiness().getValue() == EApprovalBusiness.MAKER_SPACE_ACCORD.getValue()) { - updateWrapper.set("PROTOCOL_STATUS", mssc.getProtocolStatus()); - //查询是否有新协议，存在新协议则修改创客空间等级为科技健康体验中心 - QueryWrapper querCuMakerSpace = new QueryWrapper<>(); - querCuMakerSpace.eq("STORE_CODE", mssc.getStoreCode()); - CuMakerSpace cms = baseMapper.selectOne(querCuMakerSpace); - if (cms != null && cms.getCabinStatus() == EDealerYesNo.YES.getValue()) { - updateWrapper.set("STORE_LEVEL", EStoreLevel.EXPERIENCE_CENTER_INITIATOR.getValue()); - } - } - updateWrapper.set("MODIFIED_TIME", nowDate); - updateWrapper.set("PK_MODIFIED", userId); - baseMapper.update(null, updateWrapper); - //修改日志审核状态 - memberServiceLog.setModifiedTime(nowDate); - memberServiceLog.setPkModified(userId); - memberServiceLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - iCuMemberServiceLogService.updateById(memberServiceLog); - return null; - } - - /** - * @description: 创客空间有舱, 创客空间新协议审核驳回 - * @author: zhang jing - * @date: 2024/6/14 14:18 - * @param: [approvalBusinessResultDTO] - * @return: java.lang.String - **/ - @Transactional(rollbackFor = Exception.class) - @Override - public String uploadCabinAccordReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - // 用户ID - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - // 所属国家 - Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry(); - // 当前时间 - Date nowDate = new Date(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CuMemberServiceLog::getEditType, approvalBusinessResultDTO.getEApprovalBusiness().getValue()); - queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - queryWrapper.eq(CuMemberServiceLog::getPkCountry, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - if (null == memberServiceLog) { - log.error("创客空间有舱，创客空间新协议同意处理失败: 签呈信息不存在!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_EXIST); - } - if (EApproveStatus.ALREADY_SUBMIT.getValue() != memberServiceLog.getApproveStatus()) { - log.error("创客空间有舱，创客空间新协议同意处理失败: 签呈审批已完成!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_APPROVAL_AGREE); - } - //修改日志审核状态 - memberServiceLog.setModifiedTime(nowDate); - memberServiceLog.setPkModified(userId); - memberServiceLog.setApproveStatus(EApproveStatus.REJECTED.getValue()); - iCuMemberServiceLogService.updateById(memberServiceLog); - return null; - } - - @Override - public String uploadDataReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { - // 用户ID - Long userId = approvalBusinessResultDTO.getLoginUser().getUserId(); - // 所属国家 - Integer pkCountry = approvalBusinessResultDTO.getLoginUser().getDataCountry(); - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CuMemberServiceLog::getEditType, approvalBusinessResultDTO.getEApprovalBusiness().getValue()); - queryWrapper.eq(CuMemberServiceLog::getBusinessNo, approvalBusinessResultDTO.getBusinessCode()); - queryWrapper.eq(CuMemberServiceLog::getPkCountry, pkCountry); - CuMemberServiceLog memberServiceLog = iCuMemberServiceLogService.getOne(queryWrapper); - if (null == memberServiceLog) { - log.error("上传资料驳回处理失败: 签呈信息不存在!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_NOT_EXIST); - } - if (EApproveStatus.ALREADY_SUBMIT.getValue() != memberServiceLog.getApproveStatus()) { - log.error("上传资料驳回处理失败: 签呈审批已完成!"); - return TransactionUtils.getContent(DocumentMsgConstants.SIGN_APPROVAL_AGREE); - } - - if (this.updateServiceLog(memberServiceLog.getPkId(), EApproveStatus.REJECTED, userId)) { - // 当前时间 - return null; - } - log.error("上传资料驳回处理失败: 更新数据失败"); - return TransactionUtils.getContent(DocumentMsgConstants.DOCUMENT_ORDER_ERROR); - } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloDetailVO.java deleted file mode 100644 index da21adf4..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloDetailVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.member.attest.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @description: 抗衰能量仓返回到前台的vo - * @author: sui q - * @time: 2023/4/12 17:33 - * @classname: CuEnergySiloVO - * @package_name: com.hzs.member.attest.vo - * version 1.0.0 - */ -@Data -public class CuEnergySiloDetailVO implements Serializable { - /** - * 会员编号 - */ - private String memberCode; - /** - * 会员姓名 - */ - private String memberName; - - /** - * 真实奖衔 - */ - private String awardsName; - - /** - * 结算等级 - */ - private String gradeName; - - /** - * 购买数量 - */ - private Integer buyNum; - - /** - * 礼包数量 - */ - private Integer giftBuyNum; - - /** - * 购买时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date buyDate; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloVO.java deleted file mode 100644 index 28386de8..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/CuEnergySiloVO.java +++ /dev/null @@ -1,120 +0,0 @@ -package com.hzs.member.attest.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; -import com.hzs.common.core.annotation.Transaction; -import com.hzs.common.core.constant.EnumsPrefixConstants; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @description: 抗衰能量仓返回到前台的vo - * @author: sui q - * @time: 2023/4/12 17:33 - * @classname: CuEnergySiloVO - * @package_name: com.hzs.member.attest.vo - * version 1.0.0 - */ -@Data -public class CuEnergySiloVO implements Serializable { - - /** - * 主键 - */ - private Long pkId; - - /** - * 会员编号 - */ - @Excel(name = "会员编号") - private String memberCode; - - /** - * 会员名称 - */ - @Excel(name = "会员姓名") - private String memberName; - - /** - * 联系方式 - */ - @Excel(name = "联系方式") - private String phone; - - /** - * 真实奖衔 - */ - @Excel(name = "真实奖衔") - private String awardsName; - - /** - * 体系名称 - */ - @Excel(name = "隶属体系") - private String vertexName; - - /** - * 团队名称 - */ - @Excel(name = "隶属团队") - private String teamMemberName; - - /** - * 租赁数量 - */ - @Excel(name = "能量仓数量") - private Integer leasesNumber; - - @Excel(name = "创客数量") - private Integer makerNum; - - @Excel(name = "礼包数量") - private Integer giftNum; - - @Excel(name = "考核用时") - private String useDateStr; - - @Excel(name = "考核余时") - private String surplusDateStr; - - /** - * 增加时长 - */ - @Excel(name = "增加时间(天)") - private Integer addTime; - - @Excel(name = "达标状态") - private String reachVal; - - - - /** - * 启用时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "开始日期", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date enableDate; - - /** - * 结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "结束日期", dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date endDate; - - /** - * 剩余时间 - */ - private Long surplusDate; - - /** - * 是否达标，0=已达标 1=未达标 2=进行中 - */ - @Transaction(transactionKey = EnumsPrefixConstants.REACH_STATE) - private Integer isReach; - - private String isReachVal; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceRecommendVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceRecommendVO.java deleted file mode 100644 index 4c22a165..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceRecommendVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.hzs.member.attest.vo; - -import lombok.Data; - -import java.util.List; - -/** - * @Description: 创客空间推荐列表 - * @Author: jiang chao - * @Time: 2023/5/10 14:59 - * @Classname: MakerSpaceRecommendVO - * @PackageName: com.hzs.member.attest.vo - */ -@Data -public class MakerSpaceRecommendVO { - - /** - * 店铺编号 - */ - private String storeCode; - - /** - * 店铺名称 - */ - private String storeName; - - /** - * 店铺联系人 - */ - private String storePerson; - - /** - * 店铺联系方式 - */ - private String storePhone; - - /** - * 店铺省 - */ - private Integer storeProvince; - /** - * 店铺省显示 - */ - private String storeProvinceVal; - - /** - * 店铺市 - */ - private Integer storeCity; - /** - * 店铺市显示 - */ - private String storeCityVal; - - /** - * 店铺县 - */ - private Integer storeCounty; - /** - * 店铺县显示 - */ - private String storeCountyVal; - - /** - * 店铺地址 - */ - private String storeAddress; - - /** - * 文件列表 - */ - private List fileList; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceSubmitCabinAccordVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceSubmitCabinAccordVO.java deleted file mode 100644 index 43116505..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/attest/vo/MakerSpaceSubmitCabinAccordVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.hzs.member.attest.vo; - -import com.hzs.common.core.enums.EApprovalBusiness; -import com.hzs.common.core.web.domain.BaseApprovalEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @Description: 创客空间有舱,新协议VO - * @Author: jiang chao - * @Time: 2023/5/4 9:54 - * @Classname: MakerSpaceSubmitPara - * @PackageName: com.hzs.member.attest.param - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class MakerSpaceSubmitCabinAccordVO extends BaseApprovalEntity { - - private static final long serialVersionUID = 2836163529903714933L; - - - /** - * 店铺编号 - */ - private String storeCode; - /** - * 会员主键 - */ - private Long pkMember; - /** - * 会员编号 - */ - private String memberCode; - /** - * 会员姓名 - */ - private String memberName; - /** - * 是否有舱（0=是，1=否） EDealerYesNo - */ - private Integer cabinStatus; - private String cabinStatusVal; - - /** - * 是否新协议（0=是，1=否） EDealerYesNo - */ - private Integer protocolStatus; - private String protocolStatusVal; - - /** - * 审批业务类型 -- 非传入 - */ - private EApprovalBusiness eApprovalBusiness; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java index 224eed42..67f11408 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberAchieveLogController.java @@ -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,11 @@ 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 currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + startPage(); List 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())); - } - } // 判断注水状态 // 开始时间 long startTime = cma.getSettleDate().getTime(); @@ -174,78 +106,12 @@ public class CuMemberAchieveLogController extends BaseController { @PostMapping("/export") public void export(HttpServletResponse response, CuMemberAchieveLogVO cuMemberAchieveLogVO) { startPage(); - R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); List list = iCuMemberAchieveLogService.queryMemberAchieveLogList(cuMemberAchieveLogVO); if (CollectionUtil.isNotEmpty(list)) { //枚举翻译 - Map transactionMap = iTransactionCommonService.exportEnumTransaction(EInfusingWaterType.values()); - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB( - EnumsPrefixConstants.KEY_AWARD); + Map 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())); // 判断注水状态 // 开始时间 @@ -268,7 +134,6 @@ public class CuMemberAchieveLogController extends BaseController { } ExcelUtil util = new ExcelUtil<>(CuMemberAchieveLogVO.class); util.exportExcel(response, list, "注水业绩"); - } /** @@ -280,13 +145,11 @@ public class CuMemberAchieveLogController extends BaseController { List list = new ArrayList<>(); ExcelUtil 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 +158,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 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 list = new ArrayList<>(); @@ -331,8 +196,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 calList = new ArrayList<>(); @@ -446,18 +310,6 @@ public class CuMemberAchieveLogController extends BaseController { if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.REPBFIRSTMODIFY_BALANCE.getValue()) { cmalnew.setRepBFirstModifyBalance(cma.getRepBFirstModifyBalance()); } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.REPAMODIFY_BALANCE.getValue()) { - cmalnew.setRepABalance(cma.getRepABalance()); - } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.REPBMODIFY_BALANCE.getValue()) { - cmalnew.setRepBBalance(cma.getRepBBalance()); - } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.REPAMODIFYSUM_PV.getValue()) { - cmalnew.setRepASumPv(cma.getRepASumPv()); - } - if (cuMemberAchieveLogVO.getAchieveList().get(i) == EMemberAchieve.REPBMODIFYSUM_PV.getValue()) { - cmalnew.setRepBSumPv(cma.getRepBSumPv()); - } } Integer maxSecond = iCuMemberAchieveLogService.selectByMaxApproveNumber(cmal.getPkMember(), EApproveStatus.FINISH.getValue()); //查询扣费金额，账户信息 @@ -473,7 +325,6 @@ public class CuMemberAchieveLogController extends BaseController { listNew.add(cmalnew); } } - return AjaxResult.success(listNew); } @@ -486,16 +337,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 errorList = new ArrayList<>(); + + // 返回VO CuMemberAchieveLogVO memberAchieveLogVONew; - Integer pkCountry = SecurityUtils.getPkCountry(); - List memberAmountDTOList = new ArrayList<>(); + + List errorList = new ArrayList<>(); Set 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)); @@ -541,16 +390,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)); } @@ -567,50 +412,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 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 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 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)); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java index 4b4935a3..85e73b91 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberAchieveLogMapper.java @@ -1,6 +1,5 @@ package com.hzs.member.base.mapper; - import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hzs.common.domain.member.detail.CuMemberAchieveLog; import com.hzs.member.base.vo.CuMemberAchieveLogVO; @@ -12,115 +11,78 @@ import java.util.List; import java.util.Set; /** - *

* 注水业绩记录表 Mapper 接口 - *

- * - * @author zhangjing - * @since 2023-02-03 */ public interface CuMemberAchieveLogMapper extends BaseMapper { - /** - * @description: 特殊业务-注水业绩记录查询 - * @author: zhang jing - * @date: 2023/2/3 17:15 - * @param: [cuMemberAchieveLogVO] - * @return: java.util.List - **/ - List queryMemberAchieveLogList( @Param("memberCode") String memberCode, - @Param("memberName") String memberName, - @Param("pkCountry") Integer pkCountry, - @Param("pkAwards") Integer pkAwards, - @Param("pkTeamCode") Integer pkTeamCode, - @Param("pkVertex") Integer pkVertex, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate, - @Param("staDueDate") Date staDueDate, - @Param("endDueDate") Date endDueDate, - @Param("waterStatus") Integer waterStatus, - @Param("infusingWaterType") Integer infusingWaterType - ); + /** + * 特殊业务-注水业绩记录查询 + **/ + List queryMemberAchieveLogList(@Param("memberCode") String memberCode, + @Param("memberName") String memberName, + @Param("pkCountry") Integer pkCountry, + @Param("pkAwards") Integer pkAwards, + @Param("pkTeamCode") Integer pkTeamCode, + @Param("pkVertex") Integer pkVertex, + @Param("startDate") Date startDate, + @Param("endDate") Date endDate, + @Param("staDueDate") Date staDueDate, + @Param("endDueDate") Date endDueDate, + @Param("waterStatus") Integer waterStatus, + @Param("infusingWaterType") Integer infusingWaterType + ); - /** - * @description: 根据历史期数查询历史业绩 - * @author: zhang jing - * @date: 2023/9/10 14:18 - * @param: [memberAchieveLogVO] - * @return: java.util.List - **/ - List queryMemberAchieveHistoryList(@Param("calList") List calList); + /** + * 根据历史期数查询历史业绩 + **/ + List queryMemberAchieveHistoryList(@Param("calList") List calList); - /** - * @description: 特殊业务-注水业绩-审核列表 - * @author: zhang jing - * @date: 2023/3/28 16:25 - * @param: [tableName] - * @return: java.util.List - **/ - List queryTryAchieveLogList(@Param("approveStatus") Integer approveStatus, - @Param("businessNo") String businessNo); + /** + * 特殊业务-注水业绩-审核列表 + **/ + List queryTryAchieveLogList(@Param("approveStatus") Integer approveStatus, + @Param("businessNo") String businessNo); - /** - * @description: 查询会员当期业绩 - * @author: zhang jing - * @date: 2023/2/4 9:28 - * @param: [tableName, cuMemberAchieveLogVO] - * @return: java.util.List - **/ - List searchList(@Param("tableName") String tableName, - @Param("memberCode") String memberCode, - @Param("pkMemberList") Set pkMemberList); + /** + * 查询会员当期业绩 + **/ + List searchList(@Param("tableName") String tableName, + @Param("memberCode") String memberCode, + @Param("pkMemberList") Set pkMemberList); - /** - * @description: 查询单个会员当期业绩 - * @author: zhang jing - * @date: 2023/2/4 10:13 - * @param: [tableName, cuMemberAchieveLogVO] - * @return: com.hzs.member.base.vo.CuMemberAchieveLogVO - **/ - CuMemberAchieveLogVO searchOne(@Param("tableName") String tableName, - @Param("pkMember") Long pkMember); + /** + * 查询单个会员当期业绩 + **/ + CuMemberAchieveLogVO searchOne(@Param("tableName") String tableName, + @Param("pkMember") Long pkMember); - /** - * @description: 查询最大审核次数 - * @author: zhang jing - * @date: 2023/2/6 16:11 - * @param: [pkMember, approveStatus] - * @return: java.lang.Integer - **/ - Integer selectByMaxApproveNumber(@Param("pkMember") Long pkMember,@Param("approveStatus") int approveStatus); + /** + * 查询最大审核次数 + **/ + Integer selectByMaxApproveNumber(@Param("pkMember") Long pkMember, @Param("approveStatus") int approveStatus); - /** - * @description: 通过注水修改业绩 - * @author: zhang jing - * @date: 2023/2/9 10:22 - * @param: [cuMemberAchieveLogVO] - * @return: boolean - **/ - boolean updateSearch(@Param("tableName") String tableName, - @Param("asumRealPv") BigDecimal asumRealPv, - @Param("bsumRealPv") BigDecimal bsumRealPv, - @Param("afirstPv") BigDecimal afirstPv, - @Param("bfirstPv") BigDecimal bfirstPv, - @Param("abalance") BigDecimal abalance, - @Param("bbalance") BigDecimal bbalance, - @Param("repASumPv") BigDecimal repASumPv, - @Param("repBSumPv") BigDecimal repBSumPv, - @Param("repABalance") BigDecimal repABalance, - @Param("repBBalance") BigDecimal repBBalance, - @Param("pkModified") Long pkModified, - @Param("pkMember") Long pkMember, - @Param("pkCountry") Integer pkCountry); + /** + * 通过注水修改业绩 + **/ + boolean updateSearch(@Param("tableName") String tableName, + @Param("asumRealPv") BigDecimal asumRealPv, + @Param("bsumRealPv") BigDecimal bsumRealPv, + @Param("afirstPv") BigDecimal afirstPv, + @Param("bfirstPv") BigDecimal bfirstPv, + @Param("abalance") BigDecimal abalance, + @Param("bbalance") BigDecimal bbalance, + @Param("repASumPv") BigDecimal repASumPv, + @Param("repBSumPv") BigDecimal repBSumPv, + @Param("repABalance") BigDecimal repABalance, + @Param("repBBalance") BigDecimal repBBalance, + @Param("pkModified") Long pkModified, + @Param("pkMember") Long pkMember, + @Param("pkCountry") Integer pkCountry); - /** - * @description: 校验是否存在未审核数据 - * @author: zhang jing - * @date: 2023/3/28 14:36 - * @param: [memberAchieveLogVO] - * @return: java.util.List - **/ - List checkAchieveList(CuMemberAchieveLogVO memberAchieveLogVO); + /** + * 校验是否存在未审核数据 + **/ + List checkAchieveList(CuMemberAchieveLogVO memberAchieveLogVO); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAchieveLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAchieveLogService.java index a8a7706f..afe9ef00 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAchieveLogService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberAchieveLogService.java @@ -1,111 +1,59 @@ package com.hzs.member.base.service; - import com.baomidou.mybatisplus.extension.service.IService; import com.hzs.common.domain.member.detail.CuMemberAchieveLog; import com.hzs.member.base.vo.CuMemberAchieveLogVO; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; -import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; /** - *

* 注水业绩记录表 服务类 - *

- * - * @author zhangjing - * @since 2023-02-03 */ public interface ICuMemberAchieveLogService extends IService { /** - * @description: 特殊业务-注水业绩记录查询 - * @author: zhang jing - * @date: 2023/2/3 17:16 - * @param: [cuMemberAchieveLogVO] - * @return: java.util.List + * 特殊业务-注水业绩记录查询 **/ List queryMemberAchieveLogList(CuMemberAchieveLogVO cuMemberAchieveLogVO); /** - * @description: 特殊业务-注水业绩-审核列表 - * @author: zhang jing - * @date: 2023/3/28 16:28 - * @param: [cuMemberAchieveLogVO] - * @return: java.util.List + * 特殊业务-注水业绩-审核列表 **/ List queryTryAchieveLogList(CuMemberAchieveLogVO cuMemberAchieveLogVO); /** - * @description: 查询某一期历史业绩 - * @author: zhang jing - * @date: 2023/9/11 9:20 - * @param: [calList] - * @return: java.util.List + * 查询某一期历史业绩 **/ List queryMemberAchieveHistoryList(List calList); /** - * @description: 查询单个会员当期业绩 - * @author: zhang jing - * @date: 2023/2/4 10:13 - * @param: [tableName, cuMemberAchieveLogVO] - * @return: com.hzs.member.base.vo.CuMemberAchieveLogVO + * 查询单个会员当期业绩 **/ - CuMemberAchieveLogVO searchOne(CuMemberAchieveLogVO cuMemberAchieveLogVO,Integer pkCountry); - /** - * @description: 查询最大审核次数 - * @author: zhang jing - * @date: 2023/2/6 16:10 - * @param: [pkMember, approveStatus] - * @return: java.lang.Integer - **/ - Integer selectByMaxApproveNumber(Long pkMember,int approveStatus); + CuMemberAchieveLogVO searchOne(CuMemberAchieveLogVO cuMemberAchieveLogVO, Integer pkCountry); /** - * @description: 注水业绩 - * @author: zhang jing - * @date: 2023/4/11 19:15 - * @param: [cuMemberAchieveLogVO] - * @return: com.hzs.member.base.vo.CuMemberAchieveLogVO + * 查询最大审核次数 + **/ + Integer selectByMaxApproveNumber(Long pkMember, int approveStatus); + + /** + * 注水业绩 **/ CuMemberAchieveLogVO infusingWater(CuMemberAchieveLogVO cuMemberAchieveLogVO); /** - * @description: 发起签呈 - * @author: zhang jing - * @date: 2023/4/11 19:18 - * @param: [cuMemberAchieveLogVO] - * @return: com.hzs.member.base.vo.CuMemberAchieveLogVO + * 发起签呈 **/ CuMemberAchieveLogVO petition(CuMemberAchieveLogVO cuMemberAchieveLogVO); /** - * @description: 审核注水业绩 - * @author: zhang jing - * @date: 2023/2/9 17:45 - * @param: [cuMemberAchieveLogVO] - * @return: boolean + * 审核注水业绩 **/ boolean toExamine(ApprovalBusinessResultDTO approvalBusinessResultDTO); /** - * 根据期间查询特殊业务注水业务，用于更新业绩，奖金计算使用 - * @param period 期间 - * @return: List - * @Author: sui q - * @Date: 2023/3/11 11:26 - */ - List queryMemberAchieveLogByPeriod(Integer period); - - /** - * @description: 校验是否存在未审核数据 - * @author: zhang jing - * @date: 2023/3/28 14:36 - * @param: [memberAchieveLogVO] - * @return: java.util.List + * 校验是否存在未审核数据 **/ List checkAchieveList(CuMemberAchieveLogVO memberAchieveLogVO); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java index 000e1c0d..b55d66e6 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberAchieveLogServiceImpl.java @@ -2,7 +2,6 @@ package com.hzs.member.base.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -22,7 +21,6 @@ import com.hzs.member.account.dto.BusinessCommissionDTO; import com.hzs.member.account.dto.MemberAmountDTO; import com.hzs.member.account.service.ICuMemberTradeService; import com.hzs.member.achieve.service.ICuMemberSettlePeriodService; -import com.hzs.member.achieve.service.ICuMemberTreeService; import com.hzs.member.base.mapper.CuMemberAchieveLogMapper; import com.hzs.member.base.service.ICuMemberAchieveLogService; import com.hzs.member.base.vo.CuMemberAchieveLogVO; @@ -34,154 +32,53 @@ import com.hzs.system.sys.dto.ApprovalSubmitDTO; import com.hzs.system.sys.dto.BusinessLogDTO; import com.hzs.system.sys.dto.LoginUser; import org.apache.dubbo.config.annotation.DubboReference; -import org.apache.ibatis.annotations.Param; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.math.RoundingMode; -import java.time.Instant; -import java.time.LocalDate; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.temporal.ChronoUnit; import java.util.*; /** - *

* 注水业绩记录表 服务实现类 - *

- * - * @author zhangjing - * @since 2023-02-03 */ @Service public class CuMemberAchieveLogServiceImpl extends ServiceImpl implements ICuMemberAchieveLogService { @Autowired - private ICuMemberSettlePeriodService cuMemberSettlePeriodService; + private ICuMemberSettlePeriodService iCuMemberSettlePeriodService; @Autowired - private ICuMemberTradeService cuMemberTradeService; - @DubboReference - IApprovalServiceApi approvalServiceApi; + private ICuMemberTradeService iCuMemberTradeService; + @Autowired + private ICuMemberAchieveLogService iCuMemberAchieveLogService; @Autowired private UserTokenService userTokenService; @Autowired - private ICuMemberSettlePeriodService memberSettlePeriodService; - @Autowired - private ICuMemberTreeService memberTreeService; - @DubboReference - private ICurrencyServiceApi currencyServiceApi; - @Autowired private RabbitTemplate rabbitTemplate; - @Autowired - private ICuMemberAchieveLogService cuMemberAchieveLogService; - /** - * @description: 特殊业务-注水业绩记录查询 - * @author: zhang jing - * @date: 2023/2/3 17:15 - * @param: [cuMemberAchieveLogVO] - * @return: java.util.List - **/ + @DubboReference + IApprovalServiceApi iApprovalServiceApi; + @DubboReference + ICurrencyServiceApi iCurrencyServiceApi; + @Override public List queryMemberAchieveLogList(CuMemberAchieveLogVO cuMemberAchieveLogVO) { - //先查询 -// List listAll = new ArrayList<>(); -// if (StringUtils.isNotNull(cuMemberAchieveLogVO.getStartDate()) && -// StringUtils.isNotNull(cuMemberAchieveLogVO.getEndtDate())) { -// Instant startInstant = cuMemberAchieveLogVO.getStartDate().toInstant(); -// Instant endInstant = cuMemberAchieveLogVO.getEndtDate().toInstant(); -// ZoneId zoneId = ZoneId.systemDefault(); -// LocalDate startLocalDate = startInstant.atZone(zoneId).toLocalDate(); -// LocalDate endLocalDate = endInstant.atZone(zoneId).toLocalDate(); -// //根据日期范围遍历日期 -// for (LocalDate localDate = startLocalDate; localDate.isBefore(endLocalDate); -// localDate = localDate.plusDays(1)) { -// ZonedDateTime zdt = localDate.atStartOfDay(zoneId); -// Date date = Date.from(zdt.toInstant()); -// String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); -// String month = DateUtils.getMonth(datestr); -// String tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month; -// List list = baseMapper.queryMemberAchieveLogList(cuMemberAchieveLogVO.getMemberCode(), -// cuMemberAchieveLogVO.getMemberName(), cuMemberAchieveLogVO.getPkCountry(), -// cuMemberAchieveLogVO.getPkAwards(), cuMemberAchieveLogVO.getPkTeamCode(), -// cuMemberAchieveLogVO.getPkVertex(), cuMemberAchieveLogVO.getStartDate(), -// cuMemberAchieveLogVO.getEndtDate(), cuMemberAchieveLogVO.getStaDueDate(), -// cuMemberAchieveLogVO.getEndDueDate(), cuMemberAchieveLogVO.getWaterStatus(), -// cuMemberAchieveLogVO.getInfusingWaterType()); -// listAll.addAll(list); -// } -// } else { -// Date date = new Date(); -// date = DateUtils.beforeDate(1, ChronoUnit.DAYS, date); -// String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); -// String month = DateUtils.getMonth(datestr); -// String tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month; -// listAll = baseMapper.queryMemberAchieveLogList(cuMemberAchieveLogVO.getMemberCode(), -// cuMemberAchieveLogVO.getMemberName(), cuMemberAchieveLogVO.getPkCountry(), -// cuMemberAchieveLogVO.getPkAwards(), cuMemberAchieveLogVO.getPkTeamCode(), -// cuMemberAchieveLogVO.getPkVertex(), cuMemberAchieveLogVO.getStartDate(), -// cuMemberAchieveLogVO.getEndtDate(), cuMemberAchieveLogVO.getStaDueDate(), -// cuMemberAchieveLogVO.getEndDueDate(), cuMemberAchieveLogVO.getWaterStatus(), -// cuMemberAchieveLogVO.getInfusingWaterType()); -// } //先查询注水日志表 - List list = baseMapper.queryMemberAchieveLogList(cuMemberAchieveLogVO.getMemberCode(), + return baseMapper.queryMemberAchieveLogList(cuMemberAchieveLogVO.getMemberCode(), cuMemberAchieveLogVO.getMemberName(), cuMemberAchieveLogVO.getPkCountry(), cuMemberAchieveLogVO.getPkAwards(), cuMemberAchieveLogVO.getPkTeamCode(), cuMemberAchieveLogVO.getPkVertex(), cuMemberAchieveLogVO.getStartDate(), cuMemberAchieveLogVO.getEndtDate(), cuMemberAchieveLogVO.getStaDueDate(), cuMemberAchieveLogVO.getEndDueDate(), cuMemberAchieveLogVO.getWaterStatus(), cuMemberAchieveLogVO.getInfusingWaterType()); -// if (CollectionUtil.isNotEmpty(list)) { -// list.forEach(itm -> { -// String datestr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, itm.getSettleDate()); -// String month = DateUtils.getMonth(datestr); -// String tableName = TableNameConstants.CU_MEMBER_ACHIEVE + month; -// //查询最新期数 -// int period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate( -// DateUtils.parseDateToStr(datestr)).getPkId(); -// itm.setPeriod(period); -// itm.setTableName(tableName); -// }); -// List achieveHistoryList = baseMapper.queryMemberAchieveHistoryList(list); -// if (CollectionUtil.isNotEmpty(achieveHistoryList)) { -// list.forEach(itm -> { -// achieveHistoryList.forEach(itmm -> { -// if (itmm.getPkMember().equals(itm.getPkMember()) && -// itmm.getPeriod().equals(itm.getPeriod())) { -// itm.setAbalance(itmm.getAbalance()); -// itm.setBbalance(itmm.getBbalance()); -// itm.setAsumPv(itmm.getAsumPv()); -// itm.setBsumPv(itmm.getBsumPv()); -// itm.setAsumRealPv(itmm.getAsumRealPv()); -// itm.setBsumRealPv(itmm.getBsumRealPv()); -// itm.setRepABalance(itmm.getRepABalance()); -// itm.setRepBBalance(itmm.getRepBBalance()); -// itm.setRepASumPv(itmm.getRepASumPv()); -// itm.setRepBSumPv(itmm.getRepBSumPv()); -// } -// }); -// }); -// } -// } - return list; } - /** - * @description: 查询某一期的历史业绩 - * @author: zhang jing - * @date: 2023/9/11 9:19 - * @param: [calList] - * @return: java.util.List - **/ + @Override public List queryMemberAchieveHistoryList(List calList) { List list = baseMapper.queryMemberAchieveHistoryList(calList); - R currency = currencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); - BigDecimal exchangeRate = SecurityUtils.getPkCountry() == CountryConstants.CHINA_COUNTRY ? currency.getData().getInExchangeRate() : BigDecimal.ONE; + R currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry()); + BigDecimal exchangeRate = SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY) ? currency.getData().getInExchangeRate() : BigDecimal.ONE; List listnew = new ArrayList<>(); if (CollectionUtil.isNotEmpty(list)) { list.forEach(itm -> { @@ -201,33 +98,18 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl - **/ + @Override public List queryTryAchieveLogList(CuMemberAchieveLogVO cuMemberAchieveLogVO) { return baseMapper.queryTryAchieveLogList(cuMemberAchieveLogVO.getApproveStatus(), cuMemberAchieveLogVO.getBusinessNo()); } - - /** - * @description: 查询单个会员当期业绩 - * @author: zhang jing - * @date: 2023/2/4 10:14 - * @param: [cuMemberAchieveLogVO] - * @return: com.hzs.member.base.vo.CuMemberAchieveLogVO - **/ @Override public CuMemberAchieveLogVO searchOne(CuMemberAchieveLogVO cuMemberAchieveLogVO, Integer pkCountry) { CuMemberAchieveLogVO achieveLogVO = new CuMemberAchieveLogVO(); Date date = new Date(); String time = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, date); //查询秒结 - CuMemberSettlePeriod csPeriod = memberSettlePeriodService.getCuMemberSettlePeriodByDate(time); + CuMemberSettlePeriod csPeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(time); if (StringUtils.isNotNull(csPeriod)) { Integer secondid = csPeriod.getPkId(); // 会员结算秒结表 @@ -240,7 +122,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl 0; i--) { String settleDate = DateUtils.getDay(date, -1); - Integer period = cuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); + Integer period = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(settleDate).getPkId(); if (StringUtils.isNull(period)) { continue; } @@ -256,194 +138,112 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl dtoList = new ArrayList<>(); - R 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(1137); + cuMemberAchieveLogVO.setPeriod(period); cuMemberAchieveLogVO.setPkMember(cmal.getPkMember()); - List calList=new ArrayList<>(); - calList.add(cuMemberAchieveLogVO); - calList=cuMemberAchieveLogService.queryMemberAchieveHistoryList(calList); + List 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()); - 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.setPkCountry(pkCountry); - memberAchieveLog.setInfusingWaterType(cuMemberAchieveLogVO.getInfusingWaterType()); - memberAchieveLog.setProcessType(cuMemberAchieveLogVO.getProcessType()); - memberAchieveLog.setApproveStatus(EApproveStatus.FINISH.getValue()); - memberAchieveLog.setEditType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()); - memberAchieveLog.setBusinessNo(code); - memberAchieveLog.setCost(cmal.getCost()); - memberAchieveLog.setPkAccount(cmal.getPkAccount()); - memberAchieveLog.setRemarks(cmal.getRemarks()); - memberAchieveLog.setDueDate(cmal.getDueDate()); - memberAchieveLog.setSettleDate(cmal.getSettleDate()); - memberAchieveLog.setCreationTime(date); - memberAchieveLog.setPkCreator(userID); - if(CollectionUtil.isNotEmpty(calList)){ - memberAchieveLog.setAsumRealPv(calList.get(0).getAsumRealPv()); - memberAchieveLog.setBsumRealPv(calList.get(0).getBsumRealPv()); - memberAchieveLog.setAsumPv(calList.get(0).getAsumPv()); - 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()); - } - baseMapper.insert(memberAchieveLog); - String content = EApprovalBusiness.MEMBER_ACHIEVE.getLabel(); - String waterType = ""; - if(cuMemberAchieveLogVO.getInfusingWaterType()==EInfusingWaterType.ADD.getValue()){ - waterType =EInfusingWaterType.ADD.getLabel(); - }else if(cuMemberAchieveLogVO.getInfusingWaterType()==EInfusingWaterType.BANK_TRANSFER.getValue()){ - waterType =EInfusingWaterType.BANK_TRANSFER.getLabel(); - }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(); - } if (cmal.getBfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) { - content = content + " 右区首购业绩"+waterType+": " + cmal.getBfirstModifyPv(); - } if (cmal.getRepAFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) { - 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(); - } + CuMemberAchieveLog memberAchieveLog = BeanUtil.copyProperties(cmal, CuMemberAchieveLog.class); + // 2025.05.15 不需要真实业绩，此处保留与业绩一致，方便后续奖衔等计算 + 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.setPkCountry(pkCountry); + memberAchieveLog.setInfusingWaterType(cuMemberAchieveLogVO.getInfusingWaterType()); + memberAchieveLog.setProcessType(cuMemberAchieveLogVO.getProcessType()); + memberAchieveLog.setApproveStatus(EApproveStatus.FINISH.getValue()); + memberAchieveLog.setEditType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()); + memberAchieveLog.setBusinessNo(code); + memberAchieveLog.setCost(cmal.getCost()); + memberAchieveLog.setPkAccount(cmal.getPkAccount()); + memberAchieveLog.setRemarks(cmal.getRemarks()); + memberAchieveLog.setDueDate(cmal.getDueDate()); + memberAchieveLog.setSettleDate(cmal.getSettleDate()); + memberAchieveLog.setCreationTime(date); + memberAchieveLog.setPkCreator(userID); + if (CollectionUtil.isNotEmpty(calList)) { + memberAchieveLog.setAsumRealPv(calList.get(0).getAsumRealPv()); + memberAchieveLog.setBsumRealPv(calList.get(0).getBsumRealPv()); + memberAchieveLog.setAsumPv(calList.get(0).getAsumPv()); + 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()); + } + baseMapper.insert(memberAchieveLog); - //组装日志数据 - BusinessLogDTO businessLog = BusinessLogDTO.builder() - .businessType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()) - .businessCode(code) - .pkMember(cmal.getPkMember()) - .content(content) - .pkCreator(userID) - .pkCountry(pkCountry) - .freeSignFlag(true).build(); - dtoList.add(businessLog); + String content = EApprovalBusiness.MEMBER_ACHIEVE.getLabel(); + String waterType = ""; + if (cuMemberAchieveLogVO.getInfusingWaterType() == EInfusingWaterType.ADD.getValue()) { + waterType = EInfusingWaterType.ADD.getLabel(); + } else if (cuMemberAchieveLogVO.getInfusingWaterType() == EInfusingWaterType.BANK_TRANSFER.getValue()) { + waterType = EInfusingWaterType.BANK_TRANSFER.getLabel(); + } else if (cuMemberAchieveLogVO.getInfusingWaterType() == EInfusingWaterType.FULL_PV.getValue()) { + waterType = EInfusingWaterType.FULL_PV.getLabel(); } - } - //扣钱 - 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); + if (cmal.getAfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) { + content = content + " 左区业绩" + waterType + ": " + cmal.getAfirstModifyPv(); } + if (cmal.getBfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) { + content = content + " 右区业绩" + waterType + ": " + cmal.getBfirstModifyPv(); + } + if (cmal.getRepAFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) { + content = content + " 左区结余" + waterType + ": " + cmal.getRepAFirstModifyBalance(); + } + if (cmal.getRepBFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) { + content = content + " 右区结余" + waterType + ": " + cmal.getRepBFirstModifyBalance(); + } + + //组装日志数据 + BusinessLogDTO businessLog = BusinessLogDTO.builder() + .businessType(EApprovalBusiness.MEMBER_ACHIEVE.getValue()) + .businessCode(code) + .pkMember(cmal.getPkMember()) + .content(content) + .pkCreator(userID) + .pkCountry(pkCountry) + .freeSignFlag(true).build(); + dtoList.add(businessLog); } //发送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; } - /** - * @description: 发起签呈 - * @author: zhang jing - * @date: 2023/4/12 9:04 - * @param: [cuMemberAchieveLogVO] - * @return: com.hzs.member.base.vo.CuMemberAchieveLogVO - **/ @Override @Transactional(rollbackFor = Exception.class) public CuMemberAchieveLogVO petition(CuMemberAchieveLogVO cuMemberAchieveLogVO) { @@ -458,20 +258,19 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl calList=new ArrayList<>(); + List calList = new ArrayList<>(); calList.add(cuMemberAchieveLogVO); - calList=cuMemberAchieveLogService.queryMemberAchieveHistoryList(calList); + calList = iCuMemberAchieveLogService.queryMemberAchieveHistoryList(calList); //免支付 或 需签呈+支付 if (cuMemberAchieveLogVO.getProcessType() == EProcessType.AVOIDPAY.getValue() || @@ -502,7 +301,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl 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(); - } if (cmal.getBfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) { - content = content + " 右区首购业绩"+waterType+": " + cmal.getBfirstModifyPv(); - } if (cmal.getRepAFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) { - 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.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(); + } + if (cmal.getBfirstModifyPv().compareTo(BigDecimal.ZERO) > 0) { + content = content + " 右区首购业绩" + waterType + ": " + cmal.getBfirstModifyPv(); + } + if (cmal.getRepAFirstModifyBalance().compareTo(BigDecimal.ZERO) > 0) { + 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(); } //组装日志数据 @@ -569,7 +377,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl submit = approvalServiceApi.submit(approvalSubmitDTO, loginUser); + R submit = iApprovalServiceApi.submit(approvalSubmitDTO, loginUser); if (!submit.isSuccess()) { log.error("====" + submit.getData()); throw new RuntimeException(ConfigMsgConstants.MEMBER_ACHIEVE_DEDUCT_PETITION); @@ -583,7 +391,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("BUSINESS_NO", approvalBusinessResultDTO.getBusinessCode()); queryWrapper.eq("APPROVE_STATUS", EApproveStatus.ALREADY_SUBMIT.getValue()); List malList = baseMapper.selectList(queryWrapper); @@ -616,7 +417,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper(); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); updateWrapper.eq("PK_MEMBER", cmal.getPkMember()); updateWrapper.eq("BUSINESS_NO", cmal.getBusinessNo()); updateWrapper.set("APPROVE_STATUS", EApproveStatus.FINISH.getValue()); @@ -658,7 +459,7 @@ public class CuMemberAchieveLogServiceImpl extends ServiceImpl queryMemberAchieveLogByPeriod(Integer period) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(MemberFieldConstants.PERIOD, period); - queryWrapper.in(SystemFieldConstants.APPROVE_STATUS, EApproveStatus.FINISH.getValue()); - queryWrapper.orderByAsc(MemberFieldConstants.PK_MEMBER, SystemFieldConstants.CREATION_TIME); - return baseMapper.selectList(queryWrapper); - } - - /** - * @description: 校验是否存在未审核数据 - * @author: zhang jing - * @date: 2023/3/28 14:36 - * @param: [memberAchieveLogVO] - * @return: java.util.List - **/ @Override public List checkAchieveList(CuMemberAchieveLogVO memberAchieveLogVO) { return baseMapper.checkAchieveList(memberAchieveLogVO); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java index 3bec56fe..2b67abe9 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogImportVO.java @@ -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; /** - *

* 注水业绩记录表下载模板VO - *

- * - * @author hzs - * @since 2022-08-22 */ +@EqualsAndHashCode(callSuper = true) @Data public class CuMemberAchieveLogImportVO extends BaseApprovalEntity { @@ -32,7 +29,7 @@ public class CuMemberAchieveLogImportVO extends BaseApprovalEntity { /** * 会员编号 */ - @Excel(name = "会员编号" ) + @Excel(name = "会员编号") private String memberCode; /** @@ -43,73 +40,72 @@ 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; /** * 结算日期 注水日期（年-月-日） */ - @Excel(name = "注水日期",dateFormat = "yyyy-MM-dd" ) + @Excel(name = "注水日期", dateFormat = "yyyy-MM-dd") private Date settleDate; /** * 到期日期 */ - @Excel(name = "到期日期",dateFormat = "yyyy-MM-dd" ) + @Excel(name = "到期日期", dateFormat = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") private Date dueDate; @@ -134,5 +130,4 @@ public class CuMemberAchieveLogImportVO extends BaseApprovalEntity { private String pkAccountKeyVal; - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java index 9a7f4bae..cd2a81fd 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/CuMemberAchieveLogVO.java @@ -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; @@ -79,113 +80,124 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity { /** * 变更后左区真实业绩 */ + @BigDecimalFormat @Excel(name = "变更后左区真实业绩(PV)") private BigDecimal asumRealModifyPv = BigDecimal.ZERO; /** * 变更后右区真实业绩 */ + @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; /** * 变更前左区真实业绩 */ + @BigDecimalFormat @Excel(name = "变更前左区真实业绩(PV)") private BigDecimal asumRealPv; - /** * 变更前右区真实业绩 */ + @BigDecimalFormat @Excel(name = "变更前右区真实业绩(PV)") private BigDecimal bsumRealPv; /** * 变更前左区首购业绩 */ + @BigDecimalFormat @Excel(name = "变更前左区首购业绩(PV)") private BigDecimal asumPv; - /** * 变更前右区首购业绩 */ + @BigDecimalFormat @Excel(name = "变更前右区首购业绩(PV)") private BigDecimal bsumPv; /** * 变更前左区首购结余 */ + @BigDecimalFormat @Excel(name = "变更前左区首购结余") private BigDecimal abalance; /** * 变更前右区首购结余 */ + @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; /** @@ -237,13 +249,11 @@ public class CuMemberAchieveLogVO extends BaseApprovalEntity { */ private Long pkCreator; - /** * 注水业绩记录 */ private List cmalvList; - /** * 注水备注 */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeVO.java index eb87e2af..2650dd92 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/UpdateCodeVO.java @@ -19,17 +19,14 @@ import java.util.List; import java.util.Set; /** - * @Description: 特殊业务-修改会员编号实体vo - * @Author: zhangjing - * @Time: 2022/12/28 11:21 - * @Classname: UpdateCodeVO - * @PackageName: com.hzs.member.base.vo + * 特殊业务-修改会员编号实体vo */ @Data @EqualsAndHashCode(callSuper = false) @AllArgsConstructor @NoArgsConstructor public class UpdateCodeVO extends BaseApprovalEntity { + private static final long serialVersionUID = 1L; /** @@ -85,7 +82,7 @@ public class UpdateCodeVO extends BaseApprovalEntity { * 变更次数 */ @Excel(name = "变更次数") - private Integer changeNumber=0; + private Integer changeNumber = 0; /** * 审核状态 2 待审核 4 已驳回 5 已完成(审核成功) 枚举 ： EApproveStatus */ @@ -94,7 +91,7 @@ public class UpdateCodeVO extends BaseApprovalEntity { /** * 创建时间 变更日期 */ - @Excel(name = "变更日期",dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "变更日期", dateFormat = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date creationTime; /** @@ -121,7 +118,6 @@ public class UpdateCodeVO extends BaseApprovalEntity { private Integer pkAwards; - /** * 签呈流程类型（1 免签呈 2免付费 3免签呈+免付费 4 需要签呈需要付费） */ @@ -130,11 +126,11 @@ public class UpdateCodeVO extends BaseApprovalEntity { /** * 修改会员编号集合 */ - private List updateCodeVOList; + private List updateCodeVOList; /** * 业务诉求集合 */ - private List updateParentParamList; + private List updateParentParamList; /** * 业务单号 @@ -224,12 +220,5 @@ public class UpdateCodeVO extends BaseApprovalEntity { private Long pkCreator; - - - - - - - } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java index e8ee98e4..dc71eba5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/service/ICuMemberServiceLogService.java @@ -24,16 +24,12 @@ public interface ICuMemberServiceLogService extends IService Integer selectByMaxApproveNumber(Long pkMember, Integer editType, Integer approveStatus); /** - * @description: 查询会员办理业务日志最新数据 - * @param: [pkMember, editType, approveStatus] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 查询会员办理业务日志最新数据 **/ CuMemberServiceLog selectTopData(Long pkMember, int editType, int approveStatus); /** - * @description: 查询用户是否已经存在未审核业务 - * @param: [cuMemberServiceLogVO] - * @return: java.util.List + * 查询用户是否已经存在未审核业务 **/ List selectServiceLogList(CuMemberServiceLogVO cuMemberServiceLogVO); @@ -46,16 +42,12 @@ public interface ICuMemberServiceLogService extends IService List selectByServiceLogList(CuMemberServiceLog cuMemberServiceLog); /** - * @description: 查询会员原值 - * @param: [cuMemberOldValueVO] - * @return: java.util.List + * 查询会员原值 **/ List selectOldValue(BusinessMemberVO businessMemberVO); /** - * @description: 再次发起签呈 - * @param: [cmslList, cuMemberServiceLogVO] - * @return: com.hzs.member.detail.vo.CuMemberServiceLogVO + * 再次发起签呈 **/ CuMemberServiceLogVO againBusiness(List cmslList, CuMemberServiceLogVO cuMemberServiceLogVO); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceMapper.xml index 282f1053..6eb1898a 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/attest/CuMakerSpaceMapper.xml @@ -233,28 +233,6 @@ - - - - - - update CU_MAKER_SPACE cms - set cms.modified_time = sysdate, - cms.certificate_status = - (select case - when sum(tmp.file_count) = 4 then - 2 - else - 1 - end - from (select count(cmsf.type) file_count - from CU_MAKER_SPACE_FILE cmsf - where cmsf.del_flag = 0 - and cmsf.pk_maker_space = #{pkId} - and cmsf.type in (11, 12, 13) - group by cmsf.pk_maker_space - union - select 1 - from CU_MAKER_SPACE_FILE cmsf - where cmsf.del_flag = 0 - and cmsf.pk_maker_space = #{pkId} - and cmsf.type in (14, 15) - group by cmsf.pk_maker_space) tmp) - where cms.pk_id = #{pkId} - and cms.del_flag = 0 - - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml index 1a13192b..70cca3b4 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberAchieveLogMapper.xml @@ -4,80 +4,68 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - PK_COUNTRY, - DEL_FLAG, - PK_CREATOR, - CREATION_TIME, - PK_MODIFIED, - MODIFIED_TIME, - PK_ID, PK_MEMBER, PK_RATE, A_BALANCE, B_BALANCE, A_SUM_AMOUNT, B_SUM_AMOUNT, A_SUM_PV, B_SUM_PV, A_NEW_AMOUNT, B_NEW_AMOUNT, A_NEW_PV, B_NEW_PV, A_SUM_REAL_AMOUNT, B_SUM_REAL_AMOUNT, A_SUM_REAL_PV, B_SUM_REAL_PV, REP_A_BALANCE, REP_B_BALANCE, REP_A_NEW_AMOUNT, REP_B_NEW_AMOUNT, REP_A_NEW_PV, REP_B_NEW_PV, REP_A_SUM_AMOUNT, REP_B_SUM_AMOUNT, REP_A_SUM_PV, REP_B_SUM_PV - - - select cm.MEMBER_CODE, cm.MEMBER_NAME, @@ -117,8 +105,8 @@ ct.TEAM_NAME, ver.VERTEX_NAME, awa.PK_TRANSACTION as awards - from CU_MEMBER_ACHIEVE_LOG a - INNER JOIN CU_MEMBER cm on a.PK_MEMBER=cm.PK_ID + from CU_MEMBER_ACHIEVE_LOG a + INNER JOIN CU_MEMBER cm on a.PK_MEMBER=cm.PK_ID LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code left join bd_vertex ver on cm.pk_vertex = ver.pk_id left join bd_awards awa on awa.pk_id = cm.PK_AWARDS @@ -152,7 +140,6 @@ and a.DUE_DATE between #{staDueDate, jdbcType=DATE} and #{endDueDate, jdbcType=DATE} - and a.SETTLE_DATE > sysdate @@ -163,15 +150,13 @@ and a.DUE_DATE <sysdate - and (a.APPROVE_STATUS = 5 or a.APPROVE_STATUS = 6 ) order by a.PK_ID desc - - select PK_MEMBER, @@ -187,66 +172,62 @@ REP_A_BALANCE, REP_B_BALANCE from ${item.tableName} - 1=1 + 1 = 1 - and PERIOD =#{item.period} + and PERIOD = #{item.period} - and PK_MEMBER =#{item.pkMember} + and PK_MEMBER = #{item.pkMember} - - + - + - - - + + UPDATE ${tableName} @@ -297,23 +279,27 @@ pk_member = #{pkMember} WHERE pk_member = #{pkMember} and PK_SETTLE_COUNTRY=#{pkCountry} + - - + 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 - and (a.APPROVE_STATUS=1 or a.APPROVE_STATUS=2) + where + a.DEL_FLAG = 0 + and b.DEL_FLAG = 0 + and (a.APPROVE_STATUS = 1 or a.APPROVE_STATUS = 2) and a.PK_MEMBER in @@ -325,6 +311,4 @@ - - diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java index 6d55ee77..cc9a98d3 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsController.java @@ -432,11 +432,7 @@ public class EnumsController extends BaseController { } /** - * @description: 直推配置取值枚举 - * @author: zhang jing - * @date: 2023/6/2 16:32 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 直推配置取值枚举 **/ @GetMapping("/take-value-type") public AjaxResult takeValueType() { @@ -477,11 +473,7 @@ public class EnumsController extends BaseController { } /** - * @description: 专区枚举list - * @author: zhang jing - * @date: 2022/9/29 16:29 - * @param: [] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 专区枚举list **/ @GetMapping("/special-area") public AjaxResult specialArea() { @@ -495,11 +487,7 @@ public class EnumsController extends BaseController { } /** - * @description: 控制类型枚举 - * @author: zhang jing - * @date: 2024/6/24 10:47 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 控制类型枚举 **/ @GetMapping("/authority-control-type") public AjaxResult authorityControlType() { @@ -511,11 +499,7 @@ public class EnumsController extends BaseController { } /** - * @description: 地区类型枚举 - * @author: zhang jing - * @date: 2022/9/29 16:29 - * @param: [] - * @return: com.hzs.common.core.web.page.TableDataInfo + * 地区类型枚举 **/ @GetMapping("/areaType") public AjaxResult areaType() { @@ -529,11 +513,7 @@ public class EnumsController extends BaseController { } /** - * @description: 专区枚举-消费配置专用 - * @author: zhang jing - * @date: 2023/5/8 15:10 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 专区枚举-消费配置专用 **/ @GetMapping("/special-area-consume") public AjaxResult specialAreaConsume() { @@ -545,27 +525,21 @@ public class EnumsController extends BaseController { } /** - * @description: 注水业绩枚举 - * @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 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(), EnumsPrefixConstants.MEMBER_ACHIEVE)); + } } return AjaxResult.success(enumEntityList); } /** - * @description: 注水方式枚举 - * @author: zhang jing - * @date: 2023/4/11 14:52 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 注水方式枚举 **/ @GetMapping("/member-watertype") public AjaxResult watertype() { @@ -577,11 +551,7 @@ public class EnumsController extends BaseController { } /** - * @description: 统计值枚举 - * @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() { @@ -593,11 +563,7 @@ public class EnumsController extends BaseController { } /** - * @description: 注册权限 - * @author: zhang jing - * @date: 2022/9/30 14:57 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult + * 注册权限 **/ @GetMapping("/registration-authority") public AjaxResult registrationAuthority() { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java index 8ff765d9..9e977e3d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EActType.java @@ -6,12 +6,6 @@ import lombok.Getter; /** * 活动类型 - * - * @author: sui q - * @time: 2022/8/27 10:54 - * @description: - * @classname: EActType - * @package_name: com.hzs.common.core.enums */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java index 8c836411..2099b6aa 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EApprovalBusiness.java @@ -175,39 +175,11 @@ public enum EApprovalBusiness { */ DEALER_ATTEST(143, "经销商认证", EnumsPrefixConstants.APPROVAL_BUSINESS + "143"), - /** - * 推荐创客空间 - */ - MAKER_SPACE_RECOMMEND(146, "推荐创客空间", EnumsPrefixConstants.APPROVAL_BUSINESS + "146"), - /** - * 取消推荐创客空间 - */ - MAKER_SPACE_RECOMMEND_CANCEL(147, "取消推荐创客空间", EnumsPrefixConstants.APPROVAL_BUSINESS + "147"), /** * 直推数据发送站内信 */ DIRECT_PUSH_DATA_MAIL(151, "直推数据发送站内信", EnumsPrefixConstants.APPROVAL_BUSINESS + "151"), - /** - * 创客发起人上传资料 - */ - MAKER_SPACE_ATTEST_UPLOAD(161, "创客发起人上传资料", EnumsPrefixConstants.APPROVAL_BUSINESS + "161"), - /** - * 超级工作室认证上传资料 - */ - SUPER_STUDIO_ATTEST_UPLOAD(162, "超级工作室认证上传资料", EnumsPrefixConstants.APPROVAL_BUSINESS + "162"), - /** - * 经销商认证上传资料 - */ - DEALER_ATTEST_UPLOAD(163, "经销商认证上传资料", EnumsPrefixConstants.APPROVAL_BUSINESS + "163"), - /** - * 创客空间有舱 - */ - MAKER_SPACE_CABIN(164, "创客空间有舱", EnumsPrefixConstants.APPROVAL_BUSINESS + "164"), - /** - * 创客空间新协议 - */ - MAKER_SPACE_ACCORD(165, "创客空间新协议", EnumsPrefixConstants.APPROVAL_BUSINESS + "165"), /** * 修改历史最高奖衔 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java index ba4008e3..882bf071 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EInfusingWaterType.java @@ -5,15 +5,12 @@ 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 public enum EInfusingWaterType { + /** * 增加 */ @@ -28,6 +25,7 @@ public enum EInfusingWaterType { * 最终业绩 */ FULL_PV(3, "最终业绩", 0, EnumsPrefixConstants.INFUSING_WATER_TYPE + "3"), + ; /** @@ -46,4 +44,25 @@ public enum EInfusingWaterType { * 国际化翻译key值 */ private final String key; + + + /** + * 根据值获取标签显示 + * + * @param value + * @return + */ + public static String getLabelByValue(Integer value) { + if (null == value) { + return null; + } + for (EInfusingWaterType enums : EInfusingWaterType.values()) { + if (enums.getValue() == value) { + return enums.getLabel(); + } + } + return ""; + } + + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ELevelValue.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ELevelValue.java index 37e2cd06..0118d578 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ELevelValue.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ELevelValue.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 店铺等级枚举 - * @Author: 张敬 - * @Time: 2023/5/4 11:35 - * @Classname: EStoreType - * @PackageName: com.hzs.common.core.enums + * 店铺等级枚举 */ @AllArgsConstructor @Getter diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAchieve.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAchieve.java index 9e3db8fb..92885450 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAchieve.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EMemberAchieve.java @@ -5,11 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * Description:注水业绩枚举 - * Author: zhangjing - * Time: 2022/9/1 9:06 - * Classname: EMemberAchieve - * PackageName: com.hzs.common.core.enums + * 注水业绩枚举 */ @AllArgsConstructor @Getter @@ -18,45 +14,45 @@ public enum EMemberAchieve { /** * 变更后左区区真实业绩 */ - ASUMREALMODIFY_PV(1, "变更后左区区真实业绩", "asumRealModifyPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "1"), + ASUMREALMODIFY_PV(1, "变更后左区区真实业绩", "asumRealModifyPv", 1, EnumsPrefixConstants.MEMBER_ACHIEVE + "1"), /** * 变更后右区真实业绩 */ - BSUMREALMODIFY_PV(2, "变更后右区真实业绩", "bsumRealModifyPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "2"), + BSUMREALMODIFY_PV(2, "变更后右区真实业绩", "bsumRealModifyPv", 1, EnumsPrefixConstants.MEMBER_ACHIEVE + "2"), /** * 变更后左区首购业绩 */ - AFIRSTMODIFY_PV(3, "变更后左区首购业绩", "afirstModifyPv", EnumsPrefixConstants.MEMBER_ACHIEVE + "3"), + AFIRSTMODIFY_PV(3, "变更后左区业绩", "afirstModifyPv", 0, EnumsPrefixConstants.MEMBER_ACHIEVE + "3"), /** * 变更后右区首购业绩 */ - 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, EnumsPrefixConstants.MEMBER_ACHIEVE + "4"), +// /** +// * 变更后左区复购业绩 +// */ +// 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, EnumsPrefixConstants.MEMBER_ACHIEVE + "5"), /** * 变更后右区首购结余 */ - 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, EnumsPrefixConstants.MEMBER_ACHIEVE + "6"), +// /** +// * 变更后左区复购结余 +// */ +// REPAMODIFY_BALANCE(7, "变更后左区复购结余", "repAModifyBalance", EnumsPrefixConstants.MEMBER_ACHIEVE + "7"), +// /** +// * 变更后右区复购结余 +// */ +// REPBMODIFY_BALANCE(8, "变更后右区复购结余", "repBModifyBalance", EnumsPrefixConstants.MEMBER_ACHIEVE + "8"), ; @@ -72,6 +68,10 @@ public enum EMemberAchieve { * 标识（前端用） */ private final String prop; + /** + * 是否启用（0=是,1=否） -- 来源EYesNo + */ + private final int enable; /** * 国际化翻译key值 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EProcessType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EProcessType.java index 8728a78a..da40f1a4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EProcessType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EProcessType.java @@ -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 diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAchieveLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAchieveLog.java index 197954fb..5b460335 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAchieveLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberAchieveLog.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.hzs.common.core.annotation.Excel; import com.hzs.common.core.web.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,12 +14,7 @@ import java.math.BigDecimal; import java.util.Date; /** - *

* 注水业绩记录表 - *

- * - * @author zhangjing - * @since 2023-02-03 */ @Data @EqualsAndHashCode(callSuper = true) @@ -55,32 +49,24 @@ public class CuMemberAchieveLog extends BaseEntity { @TableField("B_SUM_REAL_MODIFY_PV") private BigDecimal bSumRealModifyPv; - - /** * 变更后A区首购业绩 */ @TableField("A_FIRST_MODIFY_PV") private BigDecimal aFirstModifyPv; - - /** * 变更后B区首购业绩 */ @TableField("B_FIRST_MODIFY_PV") private BigDecimal bFirstModifyPv; - - /** * 变更后A区首购结余 */ @TableField("REP_A_FIRST_MODIFY_BALANCE") private BigDecimal repAFirstModifyBalance; - - /** * 变更后B区首购结余 */ @@ -112,13 +98,13 @@ public class CuMemberAchieveLog extends BaseEntity { private BigDecimal repBModifyBalance; /** - * 变更前左区真实业绩 + * 变更前左区真实业绩 */ @TableField("A_SUM_REAL_PV") private BigDecimal asumRealPv; /** - * 变更前右区真实业绩 + * 变更前右区真实业绩 */ @TableField("B_SUM_REAL_PV") private BigDecimal bsumRealPv; @@ -218,7 +204,6 @@ public class CuMemberAchieveLog extends BaseEntity { private Integer pkAccount; - /** * 期间 */ diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java index 7a6bf662..c42b58bb 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/detail/CuMemberServiceLog.java @@ -14,9 +14,7 @@ import lombok.*; import lombok.experimental.Accessors; /** - *

* 办理业务记录信息表 - *

* * @author hzs * @since 2022-08-22