diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index 018806aa..fb1a9a0a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -253,10 +253,10 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl tmp.getAwardsValue() > bdAwards.getAwardsValue()) .min(Comparator.comparingInt(BdAwards::getAwardsValue)).get(); resultVO.setTarAwardsName(nextBdAwards.getAwardsName()); - resultVO.setTargetPv(nextBdAwards.getCommunityCheck().divide(big10000, 2, BigDecimal.ROUND_FLOOR)); + resultVO.setTargetPv(BigDecimalUtil.handleBig10000Down(nextBdAwards.getCommunityCheck())); if (resultVO.getASumRealPv().compareTo(resultVO.getBSumRealPv()) <= 0) { // 左区 小于等于 右区，左区为小区 - resultVO.setSumRealPv(resultVO.getASumRealPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR)); + resultVO.setSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumRealPv())); } else { // 右区为小区 - resultVO.setSumRealPv(resultVO.getBSumRealPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR)); + resultVO.setSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumRealPv())); } } - resultVO.setASumPv(resultVO.getASumPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR)); - resultVO.setBSumPv(resultVO.getBSumPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR)); - resultVO.setASumRealPv(resultVO.getASumRealPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR)); - resultVO.setBSumRealPv(resultVO.getBSumRealPv().divide(big10000, 2, BigDecimal.ROUND_FLOOR)); + resultVO.setASumPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumPv())); + resultVO.setBSumPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumPv())); + resultVO.setASumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumRealPv())); + resultVO.setBSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumRealPv())); return resultVO; } @@ -560,7 +558,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl list = awardsList.stream().filter(awards -> awards.getAwardsValue() > awardsValue).collect(Collectors.toList()); if (CollUtil.isNotEmpty(list)) { BigDecimal targetPv = awardsMap.get(list.get(0).getAwardsValue()).getCommunityCheck(); - if (pkCountry.equals(CountryConstants.CHINA_COUNTRY)) { - memberAwardsUnderVO.setTargetPv(targetPv.multiply(rate).divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_DOWN)); - } else { - memberAwardsUnderVO.setTargetPv(targetPv.divide(new BigDecimal("10000"), 2, BigDecimal.ROUND_DOWN)); - } - + memberAwardsUnderVO.setTargetPv(targetPv.multiply(rate).divide(MagicNumberConstants.big10000, 2, BigDecimal.ROUND_DOWN)); } else { BigDecimal targetPv = new BigDecimal("-1"); memberAwardsUnderVO.setTargetPv(targetPv); @@ -834,7 +822,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl 0) { - leftAchieve = leftAchieve.divide(constant, 4, RoundingMode.DOWN); + leftAchieve = leftAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN); } if (rightAchieve.compareTo(BigDecimal.ZERO) > 0) { - rightAchieve = rightAchieve.divide(constant, 4, RoundingMode.DOWN); + rightAchieve = rightAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN); } rtupna.setLeftAchieve(leftAchieve); rtupna.setRightAchieve(rightAchieve); @@ -1029,7 +1016,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl 0) { - rtupna.setDirectAchieve(rtupna.getDirectAchieve().divide(constant, 4, RoundingMode.DOWN)); + rtupna.setDirectAchieve(rtupna.getDirectAchieve().divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN)); } else { rtupna.setDirectAchieve(BigDecimal.ZERO); } @@ -1047,15 +1034,11 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl(); } - BigDecimal ten = new BigDecimal("10000"); - /** * 查询会员真实业绩 */ @@ -1448,12 +1429,10 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl currencyDto = iCurrencyServiceApi.getCurrency(pkCountry); CurrencyDTO currency = currencyDto.getData(); //当月 - AzAchievementPie achievementPie = null; + AzAchievementPie achievementPie; //左区人数 Long leftCount = iCuMemberService.selectByDeptNumberCount(pkMember, EPlaceDept.LEFT_DEPT.getValue()); // 右区人数 @@ -1503,13 +1482,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl { /** * @description: 校验关联编号是否绑定 - * @author: zhang jing - * @date: 2024/10/8 14:42 * @param: [param] * @return: java.lang.Integer **/ @@ -81,10 +77,4 @@ public interface CuMakerSpaceMapper extends BaseMapper { * @return */ int updateCertificateStatus(@Param("pkId") Long pkId); - - /** - * 查询门店升级改造列表 - * @return - */ - List queryShopInfoList(); } 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 efefc8f5..6d404415 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 @@ -6,12 +6,10 @@ import com.hzs.common.core.enums.EStoreFileType; import com.hzs.common.core.enums.EStoreType; import com.hzs.common.domain.member.attest.CuMakerSpace; import com.hzs.common.domain.member.attest.ext.CuMakerSpaceExt; -import com.hzs.common.domain.sale.ext.SaOrderExt; 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.member.store.vo.CuMakerSpaceVo; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.LoginUser; @@ -89,8 +87,6 @@ public interface ICuMakerSpaceService extends IService { /** * @description: 创客空间有舱发起签呈 - * @author: zhang jing - * @date: 2024/6/14 11:14 * @param: [param, cuMakerSpace, loginUser] * @return: java.lang.String **/ @@ -123,15 +119,11 @@ public interface ICuMakerSpaceService extends IService { /** * @description: 校验关联编号是否绑定 - * @author: zhang jing - * @date: 2024/10/8 14:42 * @param: [param] * @return: java.lang.Integer **/ Integer checkCode(AttestationQueryParam param); - - /** * 查询详情 * @@ -215,8 +207,6 @@ public interface ICuMakerSpaceService extends IService { /* * @description: 查询创客空间 - * @author: sui q - * @date: 2023/8/8 15:09 * @param: null null **/ List queryMakerSpace(Integer pkCountry, MakerSpaceSaveParam makerSpaceSaveParam); @@ -247,10 +237,9 @@ public interface ICuMakerSpaceService extends IService { * @return */ String uploadDataAgree(ApprovalBusinessResultDTO approvalBusinessResultDTO); + /** - * @description: 创客空间有舱,创客空间新协议审核通过 - * @author: zhang jing - * @date: 2024/6/14 13:48 + * @description: 创客空间有舱, 创客空间新协议审核通过 * @param: [approvalBusinessResultDTO] * @return: java.lang.String **/ @@ -263,18 +252,12 @@ public interface ICuMakerSpaceService extends IService { * @return */ String uploadDataReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); + /** - * @description: 创客空间有舱,创客空间新协议审核驳回 - * @author: zhang jing - * @date: 2024/6/14 13:49 + * @description: 创客空间有舱, 创客空间新协议审核驳回 * @param: [approvalBusinessResultDTO] * @return: java.lang.String **/ String uploadCabinAccordReject(ApprovalBusinessResultDTO approvalBusinessResultDTO); - /** - * 查询门店升级改造列表 - * @return - */ - List queryShopInfoList(); } 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 535f468e..0d09c172 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 @@ -8,14 +8,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.RabbitMqConstants; import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.constant.msg.CommonMsgConstants; import com.hzs.common.core.constant.msg.DocumentMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.*; -import com.hzs.common.core.exception.ServiceException; import com.hzs.common.core.exception.base.BaseException; import com.hzs.common.core.utils.CommonUtil; import com.hzs.common.core.utils.StringUtils; @@ -24,9 +22,7 @@ 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.sale.ext.SaOrderExt; import com.hzs.common.util.TransactionUtils; -import com.hzs.member.account.service.ICuMemberRechargeService; import com.hzs.member.attest.mapper.CuMakerSpaceMapper; import com.hzs.member.attest.param.AttestationQueryParam; import com.hzs.member.attest.param.MakerSpaceSaveParam; @@ -37,7 +33,6 @@ 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.member.store.vo.CuMakerSpaceVo; import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.*; import lombok.extern.slf4j.Slf4j; @@ -66,8 +61,6 @@ public class CuMakerSpaceServiceImpl extends ServiceImpl queryShopInfoList() { - return baseMapper.queryShopInfoList(); - } - @Override public String uploadDataReject(ApprovalBusinessResultDTO approvalBusinessResultDTO) { // 用户ID diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/api/ApiCuStoreController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/api/ApiCuStoreController.java deleted file mode 100644 index 85d7bbbd..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/api/ApiCuStoreController.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hzs.member.store.controller.api; - - -import com.hzs.common.core.annotation.Log; -import com.hzs.common.core.enums.EOperationBusiness; -import com.hzs.common.core.enums.EOperationMethod; -import com.hzs.common.core.enums.EOperationModule; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.member.base.service.ICuMemberService; -import com.hzs.member.store.service.ICuStoreService; -import com.hzs.member.store.vo.CuStoreVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - *

- * 店铺设置 前端控制器 - *

- * - * @author hzs - * @since 2023-05-04 - */ -@RestController -@RequestMapping("/api/store") -public class ApiCuStoreController extends BaseController { - - @Autowired - private ICuStoreService storeService; - @Autowired - private ICuMemberService cuMemberService; - - /** - * @description: 查询店铺配置列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [custoreVO] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.CU_STORE, business = EOperationBusiness.CU_STORE, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(CuStoreVO custoreVO) { - custoreVO.setPkCountry(SecurityUtils.getPkCountry()); - custoreVO.setPkMember(SecurityUtils.getUserId()); - List list = storeService.queryStoreList(custoreVO); - return getDataTable(list); - } -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/CuStoreController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/CuStoreController.java deleted file mode 100644 index 53151224..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/CuStoreController.java +++ /dev/null @@ -1,235 +0,0 @@ -package com.hzs.member.store.controller.manager; - - -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.Log; -import com.hzs.common.core.constant.msg.ConfigMsgConstants; -import com.hzs.common.core.enums.*; -import com.hzs.common.core.utils.RandomNumberGenerator; -import com.hzs.common.core.utils.StringUtils; -import com.hzs.common.core.utils.poi.ExcelUtil; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.common.domain.member.base.CuMember; -import com.hzs.common.domain.member.store.CuStore; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; -import com.hzs.member.base.service.ICuMemberService; -import com.hzs.member.store.service.ICuStoreService; -import com.hzs.member.store.vo.CuStoreVO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.Date; -import java.util.List; - -/** - *

- * 店铺设置 前端控制器 - *

- * - * @author hzs - * @since 2023-05-04 - */ -@RestController -@RequestMapping("/manage/store") -public class CuStoreController extends BaseController { - - @Autowired - private ICuStoreService storeService; - @Autowired - private ICuMemberService cuMemberService; - - /** - * @description: 查询店铺配置列表 - * @author: zhang jing - * @date: 2022/8/30 10:20 - * @param: [custoreVO] - * @return: com.hzs.common.core.web.page.TableDataInfo - **/ - @Log(module = EOperationModule.CU_STORE, business = EOperationBusiness.CU_STORE, method = EOperationMethod.SELECT) - @GetMapping("/list") - public TableDataInfo list(CuStoreVO custoreVO) { - startPage(); - custoreVO.setPkCountry(SecurityUtils.getPkCountry()); - List list = storeService.queryStoreList(custoreVO); - return getDataTable(list); - } - - /** - * @description: 导出店铺信息 - * @author: zhang jing - * @date: 2023/3/9 16:08 - * @param: [response, custoreVO] - * @return: void - **/ - @Log(module = EOperationModule.CU_STORE, business = EOperationBusiness.CU_STORE, method = EOperationMethod.SELECT) - @PostMapping("/export") - public void export(HttpServletResponse response, CuStoreVO custoreVO) { - List list = storeService.queryStoreList(custoreVO); - ExcelUtil util = new ExcelUtil<>(CuStoreVO.class); - util.exportExcel(response, list, "店铺信息"); - } - - /** - * @description: 生成店铺编号 - * @author: zhang jing - * @date: 2023/5/5 10:41 - * @param: [] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.CU_STORE, business = EOperationBusiness.CU_STORE, method = EOperationMethod.SELECT) - @GetMapping("/getCode") - public AjaxResult getCode() { - QueryWrapper queryWrapper=new QueryWrapper(); - queryWrapper.orderByDesc("CREATION_TIME"); - List cuStore = storeService.list(queryWrapper); - String code=""; - if(CollectionUtil.isNotEmpty(cuStore)){ - code = RandomNumberGenerator.getNextNumber(cuStore.get(0).getStoreCode(),2); - }else{ - code = RandomNumberGenerator.getNextNumber("SH00000001",2); - } - return AjaxResult.success(code); - } - - /** - * @description: 新增店铺配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [custoreVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.CU_STORE, business = EOperationBusiness.CU_STORE, method = EOperationMethod.INSERT) - @PostMapping("/save") - public AjaxResult save(@RequestBody CuStoreVO custoreVO) { - Integer pkCountry = SecurityUtils.getPkCountry(); - if (StringUtils.isEmpty(custoreVO.getStoreCode())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.STORE_CODE_NOT_NULL)); - } - if (StringUtils.isEmpty(custoreVO.getMemberCode())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.STORE_MEMBER_CODE_NOT_NULL)); - } - CuMember member= cuMemberService.getMember(custoreVO.getMemberCode()); - if(StringUtils.isNull(member)){ - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_NOT_VALID)); - } - custoreVO.setPkMember(member.getPkId()); - - if (StringUtils.isEmpty(custoreVO.getStoreName())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.STORE_NAME_NOT_NULL)); - } - - if (StringUtils.isNull(custoreVO.getProvince())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.GLO_PROVINCE_NOT_NULL)); - } - if (StringUtils.isNull(custoreVO.getCity())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.GLO_CITY_NOT_NULL)); - } - - if (StringUtils.isEmpty(custoreVO.getShopowner())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SHOPOWNER_NOT_NULL)); - } - if (StringUtils.isNull(custoreVO.getPkStoreLevel())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PKSTORELEVEL_NOT_NULL)); - } - if (StringUtils.isEmpty(custoreVO.getAddress())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_ADDRESS_NOT_NULL)); - } - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("STORE_CODE", custoreVO.getStoreCode()); - List list = storeService.list(queryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.STORE_CODE_REPEAT)); - } - custoreVO.setPkCountry(pkCountry); - custoreVO.setPkCreator(SecurityUtils.getUserId()); - custoreVO.setCreationTime(new Date()); - CuStore cuStore= BeanUtil.copyProperties(custoreVO, CuStore.class); - return AjaxResult.success(storeService.save(cuStore)); - } - - /** - * @description: 修改店铺配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [custoreVO] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.CU_STORE, business = EOperationBusiness.CU_STORE, method = EOperationMethod.UPDATE) - @PostMapping("/update") - public AjaxResult update(@RequestBody CuStoreVO custoreVO) { - - if (StringUtils.isEmpty(custoreVO.getStoreName())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.STORE_NAME_NOT_NULL)); - } - - if (StringUtils.isNull(custoreVO.getProvince())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.LEVEL_VALUE_NOT_NULL)); - } - if (StringUtils.isNull(custoreVO.getCity())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.LEVEL_VALUE_NOT_NULL)); - } - - if (StringUtils.isEmpty(custoreVO.getShopowner())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.SHOPOWNER_NOT_NULL)); - } - if (StringUtils.isNull(custoreVO.getPkStoreLevel())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.PKSTORELEVEL_NOT_NULL)); - } - if (StringUtils.isEmpty(custoreVO.getAddress())) { - return AjaxResult.error(TransactionUtils.getContent(ConfigMsgConstants.HO_ADDRESS_NOT_NULL)); - } - custoreVO.setPkModified(SecurityUtils.getUserId()); - custoreVO.setModifiedTime(new Date()); - CuStore cuStore= BeanUtil.copyProperties(custoreVO, CuStore.class); - return toAjax(storeService.updateById(cuStore)); - } - - - - /** - * @description: 查询单条店铺配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.CU_STORE, business = EOperationBusiness.CU_STORE, method = EOperationMethod.SELECT) - @GetMapping("/getOne/{pkId}") - public AjaxResult getOne(@PathVariable Integer pkId) { - CuStoreVO custoreVO=new CuStoreVO(); - custoreVO.setPkId(pkId); - List list = storeService.queryStoreList(custoreVO); - if(CollectionUtil.isNotEmpty(list)){ - custoreVO=list.get(0); - }else{ - custoreVO=null; - } - return AjaxResult.success(custoreVO); - } - - - /** - * @description: 删除店铺配置 - * @author: zhang jing - * @date: 2022/8/30 10:21 - * @param: [pkId] - * @return: com.hzs.common.core.web.domain.AjaxResult - **/ - @Log(module = EOperationModule.CU_STORE, business = EOperationBusiness.CU_STORE, method = EOperationMethod.DELETE) - @DeleteMapping("/{pkId}") - public AjaxResult delete(@PathVariable Long pkId) { - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq("PK_ID", pkId); - updateWrapper.set("DEL_FLAG", EDelFlag.DELETE.getValue()); - updateWrapper.set("PK_MODIFIED", SecurityUtils.getUserId()); - updateWrapper.set("MODIFIED_TIME", new Date()); - return toAjax(storeService.update(updateWrapper)); - } -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/MakerSpaceController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/MakerSpaceController.java deleted file mode 100644 index 4c46ce98..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/controller/manager/MakerSpaceController.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.hzs.member.store.controller.manager;/** - * @Description: - * @Author: yuhui - * @Time: 2024/9/14 14:28 - * @Classname: CuMakerSpaceController - * @PackageName: com.hzs.member.store.controller.manager - */ - -import com.hzs.common.core.enums.EStoreType; -import com.hzs.common.core.enums.EYesNo; -import com.hzs.common.core.enums.HeaderStatus; -import com.hzs.common.core.web.controller.BaseController; -import com.hzs.common.core.web.page.TableDataInfo; -import com.hzs.member.attest.service.ICuMakerSpaceService; -import com.hzs.member.store.vo.CuMakerSpaceVo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.store.controller.manager - *@Author: yh - *@CreateTime: 2024-09-14 14:28 - *@Description: TODO - *@Version: 1.0 - */ -@RestController -@RequestMapping("/manage/cumaker-space") -public class MakerSpaceController extends BaseController { - - @Autowired - private ICuMakerSpaceService makerSpaceService; - - - /** - * 门店升级改造列表 - * @return - */ - @GetMapping("list") - public TableDataInfo list(){ - startPage(); - List list = makerSpaceService.queryShopInfoList(); - for (CuMakerSpaceVo cuMakerSpaceVo : list) { - if (cuMakerSpaceVo.getStoreType() != null){ - cuMakerSpaceVo.setStoreTypeVal(EStoreType.getEnumByValue(cuMakerSpaceVo.getStoreType()).getLabel()); - } - if (cuMakerSpaceVo.getIsUpdateHeader() != null){ - if (cuMakerSpaceVo.getIsUpdateHeader().equals(EYesNo.YES.getIntValue())){ - cuMakerSpaceVo.setIsUpdateHeaderVal("已申请"); - }else { - cuMakerSpaceVo.setIsUpdateHeaderVal("未申请"); - } - } - if (cuMakerSpaceVo.getHeaderStatus() != null){ - cuMakerSpaceVo.setHeaderStatusVal(HeaderStatus.getEnumByValue(cuMakerSpaceVo.getHeaderStatus()).getLabel()); - } - if (cuMakerSpaceVo.getIsUpdateRenovation() != null){ - if (cuMakerSpaceVo.getIsUpdateRenovation().equals(EYesNo.YES.getIntValue())){ - cuMakerSpaceVo.setIsUpdateRenovationVal("已申请"); - }else { - cuMakerSpaceVo.setIsUpdateRenovationVal("未申请"); - } - } - if (cuMakerSpaceVo.getRenovationStatus() != null){ - cuMakerSpaceVo.setRenovationStatusVal(HeaderStatus.getEnumByValue(cuMakerSpaceVo.getRenovationStatus()).getLabel()); - } - - - } - return getDataTable(list); - } - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/mapper/CuStoreMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/mapper/CuStoreMapper.java deleted file mode 100644 index 165795b8..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/mapper/CuStoreMapper.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.hzs.member.store.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.hzs.common.domain.member.store.CuStore; -import com.hzs.member.store.vo.CuStoreVO; - -import java.util.List; - -/** - *

- * 店铺设置 Mapper 接口 - *

- * - * @author hzs - * @since 2023-05-04 - */ -public interface CuStoreMapper extends BaseMapper { - - /** - * @description: 查询店铺列表 - * @author: zhang jing - * @date: 2023/5/4 17:55 - * @param: [storeVO] - * @return: java.util.List - **/ - ListqueryStoreList(CuStoreVO storeVO); -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/param/MakerSpaceParam.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/param/MakerSpaceParam.java deleted file mode 100644 index 5252379a..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/param/MakerSpaceParam.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.hzs.member.store.param;/** - * @Description: - * @Author: yuhui - * @Time: 2024/9/14 15:13 - * @Classname: MakerSpaceParam - * @PackageName: com.hzs.member.store.param - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.store.param - *@Author: yh - *@CreateTime: 2024-09-14 15:13 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class MakerSpaceParam { - - /** - * 门店名称 - */ - private String storeName; - - /** - * 门店类型 - */ - private Integer storeType; - - /** - * 发起人编号 - */ - private String memberCode; - - /** - * 发起人名称 - */ - private String memberName; - - /** - * 隶属体系 - */ - private String vertexName; - - /** - * 是否已申请更换体验中心新门头 0 是 1 否 - */ - private Integer isUpdateHeader; - - /** - * 门头更换状态 - */ - private Integer headerStatus; - - /** - * 是否已申请更换体验中心店内装修 0 是 1 否 - */ - private Integer isUpdateRenovation; - - /** - * 装修更换状态 - */ - private Integer renovationStatus; - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/ICuStoreService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/ICuStoreService.java deleted file mode 100644 index 1d2e5477..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/ICuStoreService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hzs.member.store.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.hzs.common.domain.member.store.CuStore; -import com.hzs.member.store.vo.CuStoreVO; - -import java.util.List; - -/** - *

- * 店铺设置 服务类 - *

- * - * @author hzs - * @since 2023-05-04 - */ -public interface ICuStoreService extends IService { - - /** - * @description: 查询店铺列表 - * @author: zhang jing - * @date: 2023/5/4 17:55 - * @param: [storeVO] - * @return: java.util.List - **/ - List queryStoreList(CuStoreVO storeVO); - -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/impl/CuStoreServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/impl/CuStoreServiceImpl.java deleted file mode 100644 index 1174a2b8..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/service/impl/CuStoreServiceImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hzs.member.store.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.domain.member.store.CuStore; -import com.hzs.member.store.mapper.CuStoreMapper; -import com.hzs.member.store.service.ICuStoreService; -import com.hzs.member.store.vo.CuStoreVO; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - *

- * 店铺设置 服务实现类 - *

- * - * @author hzs - * @since 2023-05-04 - */ -@Service -public class CuStoreServiceImpl extends ServiceImpl implements ICuStoreService { - - - /** - * @description: 查询店铺列表 - * @author: zhang jing - * @date: 2023/5/4 17:56 - * @param: [storeVO] - * @return: java.util.List - **/ - @Override - public List queryStoreList(CuStoreVO storeVO) { - return baseMapper.queryStoreList(storeVO); - } -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuMakerSpaceVo.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuMakerSpaceVo.java deleted file mode 100644 index 6e78e68c..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuMakerSpaceVo.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.hzs.member.store.vo;/** - * @Description: - * @Author: yuhui - * @Time: 2024/9/14 14:31 - * @Classname: CuMakerSpaceVo - * @PackageName: com.hzs.member.store.vo - */ - -import lombok.Data; - -/** - *@BelongsProject: hzs_cloud - *@BelongsPackage: com.hzs.member.store.vo - *@Author: yh - *@CreateTime: 2024-09-14 14:31 - *@Description: TODO - *@Version: 1.0 - */ -@Data -public class CuMakerSpaceVo { - - /** - * 门店名称 - */ - private String storeName; - - /** - * 门店类型 - */ - private Integer storeType; - /** - * 门店类型 值 - */ - private String storeTypeVal; - - /** - * 门店地址 - */ - private String storeAddress; - - /** - * 发起人编号 - */ - private String memberCode; - - /** - * 发起人名称 - */ - private String memberName; - - /** - * 隶属体系 - */ - private String vertexName; - - /** - * 是否已申请更换体验中心新门头 0 是 1 否 - */ - private Integer isUpdateHeader; - - private String isUpdateHeaderVal; - - /** - * 门头更换状态 - */ - private Integer headerStatus; - - - private String headerStatusVal; - - /** - * 是否已申请更换体验中心店内装修 0 是 1 否 - */ - private Integer isUpdateRenovation; - - - private String isUpdateRenovationVal; - - /** - * 装修更换状态 - */ - private Integer renovationStatus; - - private String renovationStatusVal; - - /** - * 门店信息图片 - */ - private String shopInfoImg; - - - /** - * 地址 - */ - private String licenseAddress; -} diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuStoreVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuStoreVO.java deleted file mode 100644 index 0cf8413c..00000000 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/store/vo/CuStoreVO.java +++ /dev/null @@ -1,162 +0,0 @@ -package com.hzs.member.store.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.util.Date; - -/** - *

- * 店铺设置VO - *

- * - * @author hzs - * @since 2023-05-04 - */ -@Data -public class CuStoreVO { - - private static final long serialVersionUID = 1L; - private Integer pkId; - - /** - * 店铺编号 - */ - @Excel(name = "店铺编号") - private String storeCode; - - /** - * 店铺名称 - */ - @Excel(name = "店铺名称") - private String storeName; - - /** - * 图片 - */ - private String picture; - - - - /** - * 省 - */ - private Integer province; - /** - * 省 - */ - @Excel(name = "省") - private String provinceVal; - - /** - * 市 - */ - private Integer city; - /** - * 市 - */ - @Excel(name = "市") - private String cityVal; - - /** - * 区、县 - */ - private Integer county; - /** - * 区、县 - */ - @Excel(name = "区/县") - private String countyVal; - - /** - * 详细地址 - */ - @Excel(name = "详细地址") - private String address; - - /** - * 店长编号 - */ - private Long pkMember; - /** - * 店长编号 - */ - @Excel(name = "店长编号") - private String memberCode; - - /** - * 店长姓名 - */ - @Excel(name = "店长姓名") - private String shopowner; - - /** - * 店铺等级 - */ - private Integer pkStoreLevel; - /** - * 店铺等级翻译key - */ - @Transaction(transactionKey = EnumsPrefixConstants.KEY_STORE_LEVEL) - private Integer pkTransaction; - /** - * 店铺等级 - */ - @Excel(name = "店铺等级") - private String pkTransactionVal; - - /** - * 创建人ID - */ - @TableField("PK_CREATOR") - private Long pkCreator; - - /** - * 创建时间 - */ - @Excel(name = "创建时间",dateFormat = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date creationTime; - - /** - * 修改人ID - */ - private Long pkModified; - - /** - * 修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date modifiedTime; - - /** - * 逻辑删除 (0=未删除，1已删除) - */ - private Integer delFlag; - - /** - * 国家 - */ - private Integer pkCountry; - - /** - * 创建开始时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startDate; - /** - * 创建结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - private Date endDate; - - - - - - -} 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 b195ec8a..282f1053 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 @@ -303,57 +303,4 @@ and cms.del_flag = 0 - - diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/store/CuStoreMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/store/CuStoreMapper.xml deleted file mode 100644 index fa38d4dd..00000000 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/store/CuStoreMapper.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEL_FLAG, - PK_COUNTRY, - CREATION_TIME, - MODIFIED_TIME, - PK_CREATOR, - PK_MODIFIED, - PK_ID, STORE_CODE, STORE_NAME, PROVINCE, CITY, COUNTY, ADDRESS, PK_MEMBER, SHOPOWNER, PK_STORE_LEVEL - - - - - - diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java index bababeac..fabfb653 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/member/service/impl/MemberReportServiceImpl.java @@ -2,6 +2,7 @@ package com.hzs.report.member.service.impl; import cn.hutool.core.collection.CollUtil; import com.hzs.common.core.constant.EnumsPrefixConstants; +import com.hzs.common.core.constant.MagicNumberConstants; import com.hzs.common.core.constant.TableNameConstants; import com.hzs.common.core.enums.ETradeType; import com.hzs.common.core.utils.DateUtils; @@ -144,7 +145,7 @@ public class MemberReportServiceImpl implements MemberReportService { //String settleTable = TableNameConstants.CU_MEMBER_SETTLE + period; addAchieveVO.setSettleTable(getMonthTableName(beforeLocalDate)); addAchieveVO.setMonthAchieveVOList(getAchieveMonthTable(startDate, addAchieveVO.getEndDate())); - if (addAchieveVO.getAchieve().compareTo(new BigDecimal("10000")) > -1) { + if (addAchieveVO.getAchieve().compareTo(MagicNumberConstants.big10000) > -1) { //查询开始时间前一天大小区的新增业绩 areaNewAddAchieveVOList = memberReportMapper.selectSmallAreaNewAdd(addAchieveVO); //查询时间段时新增会员的大小区新增业绩 diff --git a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/impl/CuMemberAchieveServiceImpl.java index 95403140..e3fe9436 100644 --- a/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-report/src/main/java/com/hzs/report/report/service/impl/CuMemberAchieveServiceImpl.java @@ -87,7 +87,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl cuMemberNewAddAchieveVOList = baseMapper.selectNewAddAchieve(cuMemberNewAddAchieveVO); @@ -99,15 +99,12 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl recommendAchievementVoList = iMemberTreeService.listParentAchieve(settleTableName, Arrays.asList(pkMember)); - // List recommendAchievementVoList = iMemberTreeService.recommendAchievement(settleTableName, Arrays.asList(pkMember)); + List recommendAchievementVoList = iMemberTreeService.listParentAchieve(settleTableName, Collections.singletonList(pkMember)); // 大区业绩 BigDecimal maxAchieve = BigDecimal.ZERO; //小区业绩 BigDecimal minAchieve = BigDecimal.ZERO; // 大区人数 - Long maxNumber = 0L; + long maxNumber = 0L; // 小区人数 - Long minNumber = 0L; + long minNumber = 0L; if (recommendAchievementVoList.size() > 0) { // 查询小区业绩 List pkParentMembers = new ArrayList<>(); for (int i = 0; i < recommendAchievementVoList.size(); i++) { - if (i == 0){ + if (i == 0) { // 大区累加 maxAchieve = recommendAchievementVoList.get(0).getAchieve(); - }else { + } else { // 小区累加 minAchieve = minAchieve.add(recommendAchievementVoList.get(i).getAchieve()); pkParentMembers.add(recommendAchievementVoList.get(i).getPkMember()); @@ -253,7 +241,7 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl maxAchievementVoList = iMemberTreeService.recommendAchievement(settleTableName, Arrays.asList(recommendAchievementVoList.get(0).getPkMember())); + List maxAchievementVoList = iMemberTreeService.recommendAchievement(settleTableName, Collections.singletonList(recommendAchievementVoList.get(0).getPkMember())); if (maxAchievementVoList.size() > 0) { for (RecommendAchievementVo recommendAchievementVo : maxAchievementVoList) { maxAchieve = maxAchieve.add(recommendAchievementVo.getAchieve()); @@ -271,17 +259,10 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl deptMemberNumberVoList = iCuMemberService.selectByDeptNumberPlace(pkMember); Map memberNumberMap = deptMemberNumberVoList.stream().collect(Collectors.toMap(DeptMemberNumberVO::getPlaceDept, DeptMemberNumberVO::getQuantity)); achievementVo.setLeftPeopleNumber(memberNumberMap.get(EPlaceDept.LEFT_DEPT.getValue())); achievementVo.setRightPeopleNumber(memberNumberMap.get(EPlaceDept.RIGHT_DEPT.getValue())); - return achievementVo; } @@ -357,9 +329,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl dayAchieveList = iBoardService.getDayAchieve(); + if (CollectionUtil.isNotEmpty(dayAchieveList)) { + for (BoardAchieveVO boardAchieveVO : dayAchieveList) { + if (boardAchieveVO.getSort() == 0) { + resultVO.setToday(BoardAchieveVO.builder() + .firstAchieve(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getFirstAchieve())) + .firstAmount(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getFirstAmount())) + .repAchieve(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getRepAchieve())) + .repAmount(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getRepAmount())) + .build()); + } else { + resultVO.setYesterday(BoardAchieveVO.builder() + .firstAchieve(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getFirstAchieve())) + .firstAmount(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getFirstAmount())) + .repAchieve(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getRepAchieve())) + .repAmount(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getRepAmount())) + .build()); + } + } + } + + return AjaxResult.success(resultVO); + } + + /** + * 月业绩数据 + * + * @return + */ + @GetMapping("/month-achieve") + public AjaxResult monthAchieve() { + BoardAchieveVO boardAchieveVO = iBoardService.getMonthAchieve(); + boardAchieveVO.setFirstAchieve(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getFirstAchieve())); + boardAchieveVO.setFirstAmount(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getFirstAmount())); + boardAchieveVO.setRepAchieve(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getRepAchieve())); + boardAchieveVO.setRepAmount(BigDecimalUtil.handleBig10000Down(boardAchieveVO.getRepAmount())); + return AjaxResult.success(boardAchieveVO); + } + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/mapper/BoardMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/mapper/BoardMapper.java new file mode 100644 index 00000000..f78ebaed --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/mapper/BoardMapper.java @@ -0,0 +1,34 @@ +package com.hzs.system.board.mapper; + +import com.hzs.system.board.vo.BoardAchieveVO; +import com.hzs.system.board.vo.BoardMemberVO; + +import java.util.List; + +/** + * 首页看板 mapper + */ +public interface BoardMapper { + + /** + * 查询会员汇总数据 + * + * @return + */ + BoardMemberVO getMemberBoard(); + + /** + * 查询日业绩汇总数据 + * + * @return + */ + List getDayAchieve(); + + /** + * 查询月业绩汇总数据 + * + * @return + */ + BoardAchieveVO getMonthAchieve(); + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/IBoardService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/IBoardService.java new file mode 100644 index 00000000..fa0b11ee --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/IBoardService.java @@ -0,0 +1,34 @@ +package com.hzs.system.board.service; + +import com.hzs.system.board.vo.BoardAchieveVO; +import com.hzs.system.board.vo.BoardMemberVO; + +import java.util.List; + +/** + * 首页看板 service + */ +public interface IBoardService { + + /** + * 查询会员汇总数据 + * + * @return + */ + BoardMemberVO getMemberBoard(); + + /** + * 查询日业绩汇总数据 + * + * @return + */ + List getDayAchieve(); + + /** + * 查询月业绩汇总数据 + * + * @return + */ + BoardAchieveVO getMonthAchieve(); + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/impl/BoardServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/impl/BoardServiceImpl.java new file mode 100644 index 00000000..fadfb789 --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/service/impl/BoardServiceImpl.java @@ -0,0 +1,36 @@ +package com.hzs.system.board.service.impl; + +import com.hzs.system.board.mapper.BoardMapper; +import com.hzs.system.board.service.IBoardService; +import com.hzs.system.board.vo.BoardAchieveVO; +import com.hzs.system.board.vo.BoardMemberVO; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 首页看板 service + */ +@Service +public class BoardServiceImpl implements IBoardService { + + @Resource + private BoardMapper boardMapper; + + @Override + public BoardMemberVO getMemberBoard() { + return boardMapper.getMemberBoard(); + } + + @Override + public List getDayAchieve() { + return boardMapper.getDayAchieve(); + } + + @Override + public BoardAchieveVO getMonthAchieve() { + return boardMapper.getMonthAchieve(); + } + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardAchieveVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardAchieveVO.java new file mode 100644 index 00000000..7e8d9e29 --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardAchieveVO.java @@ -0,0 +1,50 @@ +package com.hzs.system.board.vo; + +import com.hzs.common.core.annotation.BigDecimalFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 看板业绩汇总数据 + */ +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Data +public class BoardAchieveVO implements Serializable { + + /** + * 首购业绩 + */ + @BigDecimalFormat + private BigDecimal firstAchieve; + + /** + * 首购金额 + */ + @BigDecimalFormat + private BigDecimal firstAmount; + + /** + * 复购业绩 + */ + @BigDecimalFormat + private BigDecimal repAchieve; + + /** + * 复购金额 + */ + @BigDecimalFormat + private BigDecimal repAmount; + + /** + * 序号 + */ + private Integer sort; + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardDayAchieveVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardDayAchieveVO.java new file mode 100644 index 00000000..0f7ccaaf --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardDayAchieveVO.java @@ -0,0 +1,23 @@ +package com.hzs.system.board.vo; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 看板业绩汇总数据返回 + */ +@Data +public class BoardDayAchieveVO implements Serializable { + + /** + * 今日 + */ + private BoardAchieveVO today; + + /** + * 昨日 + */ + private BoardAchieveVO yesterday; + +} diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberVO.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberVO.java new file mode 100644 index 00000000..8dfba028 --- /dev/null +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/board/vo/BoardMemberVO.java @@ -0,0 +1,33 @@ +package com.hzs.system.board.vo; + +import com.hzs.common.core.annotation.BigDecimalFormat; +import lombok.Data; +import java.io.Serializable; + +/** + * 看板会员汇总数据 + */ +@Data +public class BoardMemberVO implements Serializable { + + /** + * 会员总数 + */ + private Integer memberTotal; + + /** + * 今日新増会员 + */ + private Integer memberToday; + + /** + * 昨日新増会员 + */ + private Integer memberYesterday; + + /** + * 本月新増会员 + */ + private Integer memberMonth; + +} diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml new file mode 100644 index 00000000..43bd9ecf --- /dev/null +++ b/bd-business/bd-business-system/src/main/resources/mapper/system/board/BoardMapper.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/lenjoy/BdAccountLenMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/lenjoy/BdAccountLenMapper.xml deleted file mode 100644 index 77061097..00000000 --- a/bd-business/bd-business-system/src/main/resources/mapper/system/lenjoy/BdAccountLenMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ActivityFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ActivityFieldConstants.java deleted file mode 100644 index fadec401..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ActivityFieldConstants.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hzs.common.core.constant; - -import com.baomidou.mybatisplus.annotation.TableField; - -/** - * @description: 活动字段值 - * @author: sui q - * @time: 2023/4/22 10:04 - * @classname: ActivityFieldConstants - * @package_name: com.hzs.common.core.constant - * version 1.0.0 - */ -public class ActivityFieldConstants { - - /** - * 活动基本主键 - */ - public static final String PK_BASE_ID = "PK_BASE_ID"; - - /** - * 规则主键 - */ - public static final String PK_RULE_ID = "PK_RULE_ID"; - public static final String AVAILABLE_USED_NUM = "AVAILABLE_USED_NUM"; - public static final String AVAILABLE_SURPLUS_NUM = "AVAILABLE_SURPLUS_NUM"; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java index 84c1b023..8852d4c8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/BonusFieldConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant; -/** - * @Description: - * @Author: sui q - * @Time: 2022/12/20 10:18 - * @Classname: BonusFieldConstants - * @PackageName: com.hzs.common.core.constant - */ public class BonusFieldConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java index be0dac3d..2eddf979 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 缓存的统一key 常量 - * - * @author hzs */ public class CacheConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheToolsConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheToolsConstants.java index 7ef54376..67155719 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheToolsConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CacheToolsConstants.java @@ -1,13 +1,5 @@ package com.hzs.common.core.constant; -/** - * 缓存-所有工具的常量类 - * @author: sui q - * @time: 2022/8/27 14:22 - * @description: - * @classname: CacheToolsConstants - * @package_name: com.hzs.common.core.constant - */ public class CacheToolsConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/Constants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/Constants.java index 9417c9a3..1aebccb0 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/Constants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/Constants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 通用常量信息 - * - * @author hzs */ public class Constants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CountryConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CountryConstants.java index 9533ab97..d1eef96d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CountryConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/CountryConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 国家常量信息 - * - * @author hzs */ public class CountryConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsKeyConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsKeyConstants.java index 82c03d16..fb31a977 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsKeyConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsKeyConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant; -/** - * @Description: 定义枚举的key值 - * @Author: sui q - * @Time: 2022/11/10 14:40 - * @Classname: EnumsKeyConstants - * @PackageName: com.hzs.common.core.constant - */ public class EnumsKeyConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java index 0c1536f8..17169e8c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant; -/** - * Description: 定义每个枚举的前缀，用于自动翻译 - * Author: sui q - * Time: 2022/9/1 16:51 - * Classname: EnumsPrefixConstants - * PackageName: com.hzs.common.core.constant - */ public class EnumsPrefixConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/HttpStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/HttpStatus.java index 0b27b6f4..56b6fae2 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/HttpStatus.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/HttpStatus.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 返回状态码 - * - * @author hzs */ public class HttpStatus { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/LanguageConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/LanguageConstants.java index b1e915ef..27ea7d20 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/LanguageConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/LanguageConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 语言常量信息 - * - * @author hzs */ public class LanguageConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java index 6822e061..a3f5ff56 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MagicNumberConstants.java @@ -2,14 +2,6 @@ package com.hzs.common.core.constant; import java.math.BigDecimal; -/** - * Description: 魔法数字常量类 - * - * @Author: sui q - * Time: 2022/9/8 14:25 - * Classname: MagicNumberConstants - * PackageName: com.hzs.common.core.constant - */ public class MagicNumberConstants { /** @@ -23,6 +15,7 @@ public class MagicNumberConstants { * 小数位数 */ public static final Integer DECIMAL = 6; + public static final Integer ZERO = 0; /** @@ -99,6 +92,11 @@ public class MagicNumberConstants { */ public static final Integer WITHDRAW_MULTIPLE = 100; + /** + * 转换万处理 + */ + public static final BigDecimal big10000 = new BigDecimal("10000"); + /** * 乐学复购 v4 价格 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberBonusFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberBonusFieldConstants.java index 27afe6f8..7b38193d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberBonusFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberBonusFieldConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant; /** - * @Description: 会员奖金字符串常量 - * @Author: sui q - * @Time: 2023/3/21 9:46 - * @Classname: MemberBonusFieldConstants - * @PackageName: com.hzs.common.core.constant + * 会员奖金字符串常量 */ public class MemberBonusFieldConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFieldConstants.java index 1aa51603..ffe0f8c4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/MemberFieldConstants.java @@ -1,11 +1,7 @@ package com.hzs.common.core.constant; /** - * @Description:会员前台字符串常量 - * @Author: sui q - * @Time: 2022/8/29 10:20 - * @Classname: MemberFieldConstants - * @PackageName: com.hzs.common.core.constant + * 会员前台字符串常量 */ public class MemberFieldConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java index 62fadd60..780768be 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/RabbitMqConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * RabbitMq 静态变量 - * - * @author hzs **/ public class RabbitMqConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SaOrderFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SaOrderFieldConstants.java index fd0648e9..96beed04 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SaOrderFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SaOrderFieldConstants.java @@ -2,13 +2,6 @@ package com.hzs.common.core.constant; import java.math.BigDecimal; -/** - * @Description: - * @Author: sui q - * @Time: 2023/1/5 14:01 - * @Classname: SaOrderFieldConstants - * @PackageName: com.hzs.common.core.constant - */ public class SaOrderFieldConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java index 993b7bbd..f5605fec 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/ScmFieldConstants.java @@ -2,14 +2,6 @@ package com.hzs.common.core.constant; import java.util.Date; -/** - * @description: 供应链模块的反射字段 - * @author: sui q - * @time: 2023/11/22 14:33 - * @classname: ScmFieldConstants - * @package_name: com.hzs.common.core.constant - * version 1.0.0 - */ public class ScmFieldConstants { public static final String SCM_ITEM_SPECS_LIST = "scmItemSpecsList"; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SecurityConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SecurityConstants.java index 1b5c6dd1..f3865183 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SecurityConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SecurityConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 权限相关通用常量 - * - * @author hzs */ public class SecurityConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SmsConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SmsConstants.java index 258a655e..2b81177a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SmsConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SmsConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant; -/** - * @Description: 短信使用常量 - * @Author: jiang chao - * @Time: 2023/3/8 16:18 - * @Classname: SmsConstants - * @PackageName: com.hzs.common.core.constant - */ public class SmsConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SystemFieldConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SystemFieldConstants.java index f9771795..5a105188 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SystemFieldConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/SystemFieldConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant; -/** - * @Description: system服务的公共字段 - * @Author: sui q - * @Time: 2022/9/8 13:39 - * @Classname: SystemFieldConstants - * @PackageName: com.hzs.common.core.constant - */ public class SystemFieldConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java index 7874a0c5..b84d728c 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TableNameConstants.java @@ -1,10 +1,5 @@ package com.hzs.common.core.constant; -/** - * @Description: 表名 - * @Classname: TableNameConstants - * @PackageName: com.hzs.common.core.constant - */ public class TableNameConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TokenConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TokenConstants.java index 55781534..71d839a8 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TokenConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/TokenConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * Token的Key常量 - * - * @author hzs */ public class TokenConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/UserConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/UserConstants.java index 8132c088..80925fc7 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/UserConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/UserConstants.java @@ -2,8 +2,6 @@ package com.hzs.common.core.constant; /** * 用户常量信息 - * - * @author hzs */ public class UserConstants { diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java index a9647af6..a8e8f1b4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ActivityMsgConstants.java @@ -1,11 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @description: 活动提示常量 - * @classname: ActivityMsgConstants - * @package_name: com.hzs.common.core.constant.msg - * version 1.0.0 - */ public class ActivityMsgConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java index b0f7346c..a6ad5863 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/AreaMsgConstants.java @@ -10,4 +10,5 @@ public class AreaMsgConstants { * 地区不存在 -- 地区不存在 */ public static final String AREA_NOT_EXIST = "地区不存在"; + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java index 2fc347fb..d8e44d5e 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java @@ -1,10 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 奖金相关记录返回到前台的所有通知消息 - * @Classname: BonusMsgConstants - * @PackageName: com.hzs.common.core.constant.msg - */ public class BonusMsgConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/CommonMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/CommonMsgConstants.java index 9be28984..81cc80c3 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/CommonMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/CommonMsgConstants.java @@ -1,10 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 公用类提示 - * @Classname: CommonMsgConstants - * @PackageName: com.hzs.common.core.constant.msg - */ public class CommonMsgConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java index 2a12733d..f4fbbd79 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java @@ -1,8 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @description: 配置相关记录返回到前台的所有通知消息 - **/ public class ConfigMsgConstants { /** * 最低提现金额不能为空 -- 最低提现金额不能为空！ @@ -279,7 +276,7 @@ public class ConfigMsgConstants { /** * 结算值 注册金额/业绩不能为空 -- 注册金额/业绩不能为 */ - public static final String START_VALUE_NOT_NULL = "MSG_CONFIG_073空"; + public static final String START_VALUE_NOT_NULL = "注册金额/业绩不能为空"; /** * 拓展比例不能为空 -- 拓展比例不能为空 */ @@ -457,10 +454,6 @@ public class ConfigMsgConstants { * 协议不能为空 -- 协议不能为空 */ public static final String PK_AGREEMENT_NOT_NULL = "协议不能为空"; - /** - * 店铺名称不能为空 -- 店铺名称不能为空 - */ - public static final String SHOP_NAME_NOT_NULL = "店铺名称不能为空"; /** * 店铺等级名称不能为空 -- 店铺等级名称不能为空 */ @@ -479,22 +472,6 @@ public class ConfigMsgConstants { * 店铺等级重复 -- 店铺等级重复 */ public static final String LEVEL_VALUE_REPEAT = "店铺等级重复"; - /** - * 店铺编号不能为空 -- 店铺编号不能为空 - */ - public static final String STORE_CODE_NOT_NULL = "店铺编号不能为空"; - /** - * 店长编号不能为空 -- 店长编号不能为空 - */ - public static final String STORE_MEMBER_CODE_NOT_NULL = "店长编号不能为空"; - /** - * 店长姓名不能为空 -- 店长姓名不能为空 - */ - public static final String SHOPOWNER_NOT_NULL = "店长姓名不能为空"; - /** - * 店铺等级不能为空 -- 店铺等级不能为空 - */ - public static final String PKSTORELEVEL_NOT_NULL = "店铺等级不能为空"; /** * 仓库编号不能为空 -- 仓库编号不能为空 @@ -517,15 +494,6 @@ public class ConfigMsgConstants { */ public static final String AREA_BINDING_REPEAT = "已绑定仓库"; - /** - * 店铺编号重复 -- 店铺编号重复 - */ - public static final String STORE_CODE_REPEAT = "店铺编号重复"; - /** - * 店铺名称不能为空 -- 店铺名称不能为空 - */ - public static final String STORE_NAME_NOT_NULL = "店铺名称不能为空"; - /** * 配送中心名称不能为空 -- 配送中心名称不能为空 */ @@ -1269,25 +1237,6 @@ public class ConfigMsgConstants { * 请选择政策币业务 -- 请选择政策币业务 */ public static final String POLICY_CURRENCY_NOT_NULL = "请选择政策币业务"; - - /** - * 供应商申请发起签呈失败 -- 供应商申请发起签呈失败 - */ - public static final String TH_SUPPLIER_APPLY_PETITION = "商品预售数量不足"; - /** - * 供应商签呈审核失败 -- 供应商签呈审核失败 - */ - public static final String TH_SUPPLIER_APPLY_TO_EXAMINE = "请选择政策币业务"; - - /** - * 保证金缴纳发起签呈失败 -- 保证金缴纳发起签呈失败 - */ - public static final String TH_MARGIN_PETITION = "保证金缴纳发起签呈失败"; - - /** - * 未配置签呈 -- 未配置签呈 - */ - public static final String TH_PETITION_IS_NULL = "未配置签呈"; /** * 领用用途重复 -- 领用用途重复 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java index 84ea86fb..5d7ebe90 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/DocumentMsgConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 签呈的相关提示 - * @Author: sui q - * @Time: 2023/3/25 11:12 - * @Classname: DocumentMsgConstants - * @PackageName: com.hzs.common.core.constant.msg - */ public class DocumentMsgConstants { /** @@ -39,11 +32,6 @@ public class DocumentMsgConstants { */ public static final String DOCUMENT_ORDER_SETTLED = "签呈处理失败：订单已结算"; - /** - * 签呈配置流程中出现重复部门 -- 审批流程中出现重复部门 - */ - public static final String DOCUMENT_FLOW_REPEAT = "审批流程中出现重复部门"; - /** * 删除签呈时校验是否已经使用 -- 业务类型存在审批中数据，不能进行删除 */ @@ -81,10 +69,6 @@ public class DocumentMsgConstants { * 提交签呈时，审批人重复出现 -- 审批流程不能重复 */ public static final String APPROVAL_FLOW_REPEAT_USER = "审批流程不能重复"; - /** - * 提交签呈时，审批流程重复部门 -- 审批流程部门出现重复 - */ - public static final String APPROVAL_FLOW_REPEAT_DEPT = "审批流程部门出现重复 "; /** * 提交签呈时，签呈已经提交了 -- 正在审批中,不能重复提交 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java index eb881707..6b8e2ab4 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 财务模块词条 - * @Author: ljc - * @Time: 2022/11/3 15:37 - * @Classname: FinanceMsgConstants - * @Package_name: com.hzs.common.core.constant.msg - */ public class FinanceMsgConstants { /** * 支付密码错误！ -- 支付密码不能为空！ @@ -272,11 +265,6 @@ public class FinanceMsgConstants { */ public static final String TRANSFER_OUT_ACCOUNT_NOT_EMPTY = "请选择要转出的账户"; - /** - * 请选择要转出的账户 -- 请选择要转出的账户 - */ - public static final String TRANSFER_OUT_ACCOUNT_STOP = "不允许给该账户转账"; - /** * 转账金额有误 -- 转账金额有误 */ @@ -299,16 +287,6 @@ public class FinanceMsgConstants { * 该账号不允许转账 -- 该账号不允许转账 */ public static final String NOT_ALLOWED_TRANSFER = "该账号不允许转账"; - - /** - * 该账号不允许给该接收账号转账 -- 该账号不允许给该接收账号转账 - */ - public static final String NOT_ALLOWED_TRANSFER_TO_CODE = "该账号不允许给该接收账号转账"; - - /** - * 政策币只允许同一体系互转 -- 政策币只允许同一体系互转 - */ - public static final String NOT_ALLOWED_TRANSFER_DIFFERENT_POLICY = "政策币只允许同一体系互转"; /** * 会员账号不允许转账（结算等级为1） -- 会员级别不允许转账 */ @@ -351,11 +329,6 @@ public class FinanceMsgConstants { */ public static final String RECEIVER_NUMBER_NOT_IN_BLOOD_LINE = "接收方编号不在血缘线中"; - /** - * 接收方编号不在血缘线下 - */ - public static final String RECEIVER_NUMBER_NOT_IN_BLOOD_LINE_DOWN = "接收方编号不在血缘线下"; - /** * 转账明细导出 -- 转账明细导出 */ @@ -522,12 +495,6 @@ public class FinanceMsgConstants { */ public static final String WITHDRAW_AMOUNT_MULTIPLE = "提现金额必须为100的整数倍"; - - /** - * 提现金额必须为50的整数倍(乐享海购) - */ - public static final String LENJOY_WITHDRAW_AMOUNT_MULTIPLE = "提现金额必须为50的整数倍"; - /** * 身份证的图片地址不能为空 */ @@ -537,10 +504,6 @@ public class FinanceMsgConstants { * 身份证已过期 */ public static final String ID_CARD_EXPIRE = "身份证已过期"; - /** - * 该用户不允许消费账户转账 - */ - public static final String CONSUME_CAN_NOT_TRANSFER = "该用户不允许消费账户转账"; /** * 该会员已实名,请不要重复是提交 @@ -552,17 +515,6 @@ public class FinanceMsgConstants { */ public static final String MEMBER_NOT_REAL_NAME = "该会员未实名，请先实名认证"; - /** - * 该用户不允许政策币账户转账 - */ - public static final String NOT_ALLOWED_TRANSFER_POLICY = "该用户不允许政策币账户转账"; - - - /** - * 该用户不允许政策币账户转账 - */ - public static final String NOT_ALLOWED_TRANSFER_BONUS = "该用户不允许奖金账户转账"; - /** * 会员存在重复充值，请核对 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java index eb8d4cd2..82a821cb 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/MemberMsgConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 会员记录返回到前台的所有通知消息 - * @Author: sui q - * @Time: 2022/8/29 9:16 - * @Classname: MemberMsgConstants - * @PackageName: com.hzs.common.core.constant - */ public class MemberMsgConstants { /** @@ -151,11 +144,6 @@ public class MemberMsgConstants { */ public static final String LEVEL_NOT_ENOUGH = "不满足升级条件！"; - /** - * 注册-是否满足升级条件 -- 不满足升级条件！ - */ - public static final String REGISTER_LEVEL_NOT_ENOUGH = "不满足升级条件"; - /** * 判断会员账号是否满足支付 -- 余额不足，请及时充值！ */ @@ -271,10 +259,6 @@ public class MemberMsgConstants { * 空单注册，导入的点位数据安置编号下安置部门已经存在会员 -- 安置部门存在重复 */ public static final String EMPTY_PLACE_REPEAT = "安置部门存在重复"; - /** - * 空单注册，会员数据中联系方式跨团队了 -- 注册信息在其他团队存在 - */ - public static final String EMPTY_MEMBER_IN_OTHER = "注册信息在其他团队存在"; /** * 空单注册，会员编号与推荐编号相同 -- 会员编号与推荐编号相同 */ @@ -283,10 +267,6 @@ public class MemberMsgConstants { * 空单注册，会员编号与安置编号相同 -- 会员编号与安置编号相同 */ public static final String EMPTY_MEMBER_EQ_PLACE = "会员编号与安置编号相同"; - /** - * 空单注册，导入的会员编号中存在重复 -- 会员编号存在重复，请重新输入！ - */ - public static final String EMPTY_MEMBER_REPEAT_1 = "会员编号存在重复，请重新输入！"; /** * 订单撤单时，会员账户不存在 -- 会员账户不存在 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java index 69bea873..98bbb6e0 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/NoticeMsgConstants.java @@ -1,14 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * 公告、站内信词条 - * - * @Description: - * @Author: ljc - * @Time: 2023/4/11 17:42 - * @Classname: NoticeMsgConstants - * @Package_name: com.hzs.common.core.constant.msg - */ public class NoticeMsgConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java index 1ad2dcab..98925b2d 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ProductMsgConstants.java @@ -1,12 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 产品相关 - * @Author: yuhui - * @Time: 2022/9/8 9:31 - * @Classname: ProductMsgConstants - * @PackageName: com.hzs.common.core.constant.msg - */ public class ProductMsgConstants { /** @@ -153,8 +146,4 @@ public class ProductMsgConstants { */ public static final String THIS_CLASSIFY_EXIST_BELOW = "当前商品分类下存在子级类目,无法删除,请先删除子级"; - /** - * 该产品每个国家只能存在一款 - */ - public static final String PRODUCT_BAS_COUNTYR_FIRST = "该产品每个国家只能存在一款"; } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java index 9a7eb31d..21c40064 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SaOrderMsgConstants.java @@ -1,8 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 订单记录返回到前台的所有通知消息 - */ public class SaOrderMsgConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java index 0a655a30..bcee3e89 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java @@ -1,13 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @description: 供应链模块后台返回到前台的提示语 - * @author: sui q - * @time: 2023/11/20 15:25 - * @classname: ScmMsgConstants - * @package_name: com.hzs.common.core.constant.msg - * version 1.0.0 - */ public class ScmMsgConstants { public static final String PO_ORDER_NOT_EXIST = "没有查询到采购订单，不能操作！"; @@ -34,30 +26,18 @@ public class ScmMsgConstants { public static final String IC_PURCHASE_NOT_EXIST = "没有查询到采购入库单，不能操作！"; - public static final String IC_PURCHASE_OUT_NOT_EXIST = "没有查询到采购退货单，不能操作！"; - - public static final String PURCHASE_EXISTS_AGENT = "该采购入库单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String IO_ORDER_EXISTS_AGENT = "该业务领用订单存在已经提交的签呈，不能再次发起签呈！"; - public static final String IC_GENERAL_IN_NOT_EXIST = "没有查询到其他入库单，不能操作！"; public static final String IC_GENERAL_OUT_NOT_EXIST = "没有查询到其他出库单，不能操作！"; public static final String TRANSFER_ORDER_NOT_EXIST = "没有查询到调拨订单，不能操作！"; - public static final String TRANSFER_ORDER_EXISTS_AGENT = "该调拨订单存在已经提交的签呈，不能再次发起签呈！"; - public static final String TRANSFER_IN_NOT_EXIST = "没有查询到调拨入库单，不能操作！"; public static final String TRANSFER_OUT_NOT_EXIST = "没有查询到调拨出库单，不能操作！"; public static final String INVENTORY_ORDER_NOT_EXIST = "没有查询到库存盘点单，不能操作！"; - public static final String TRANSFER_IN_EXISTS_AGENT = "该调拨入库单存在已经提交的签呈，不能再次发起签呈！"; - - public static final String TRANSFER_OUT_EXISTS_AGENT = "该调拨出库单存在已经提交的签呈，不能再次发起签呈！"; - public static final String BILL_NOT_OPERATION = "该单据正在被其他人操作，请稍后重试！"; public static final String IC_ON_HAND_NUM_NOT_EMPTY = "产品现存量不足，不能扣减库存，不能出库！"; @@ -72,24 +52,16 @@ public class ScmMsgConstants { public static final String AVAILABLE_NUM_EXIST = "已经存在该仓库该产品的可用量，不能新增！"; - public static final String AVAILABLE_NUM_NOT_ENOUGH = "商品可售量不足，不能购买！"; - public static final String IC_ON_HAND_NUM_B_NOT_EXIST = "产品现存量流水有问题，不能回退库存，不能驳回！"; public static final String SOURCE_BILL_EXIST_SPECS = "来源单据必须存在规格明细！"; - public static final String INVENTORY_ORDER_EXISTS_AGENT = "该库存盘点单存在已经提交的签呈，不能再次发起签呈！"; - public static final String INVENTORY_OUT = "盘亏账面数量必须大于调整数量！"; public static final String INVENTORY_IN = "盘盈账面数量必须小于调整数量！"; public static final String SALE_OUT_NOT_EXIST = "没有查询到销售出库单，不能操作！"; - public static final String BACK_SALE_OUT_NOT_EXIST = "没有查询到销售退货单，不能操作！"; - - public static final String BACK_SALE_OUT_EXISTS_AGENT = "该销售退货单存在已经提交的签呈，不能再次发起签呈！"; - public static final String TH_SUPPLIER_APPLY_NAME = "客商名称不能为空"; public static final String TH_SUPPLIER_APPLY_SHORT_NAME = "客商简称不能为空"; diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java index f07abb37..f3eb903a 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/SystemMsgConstants.java @@ -1,10 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 系统提示信息 - * @Classname: DocumentMsgConstants - * @PackageName: com.hzs.common.core.constant.msg - */ public class SystemMsgConstants { /** @@ -37,13 +32,4 @@ public class SystemMsgConstants { */ public static final String USER_ERROR = "用户不存在/密码错误"; - /** - * 验证码错误 -- 验证码错误 - */ - public static final String CODE_ERROR = "验证码错误"; - /** - * 验证码已失效 -- 验证码已失效 - */ - public static final String CODE_EXPIRE = "验证码已失效"; - } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ThSupplierApplyMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ThSupplierApplyMsgConstants.java deleted file mode 100644 index a64bcb84..00000000 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ThSupplierApplyMsgConstants.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hzs.common.core.constant.msg; - -/** - * @description: 供应商相关提示常量 - **/ -public class ThSupplierApplyMsgConstants { - - /** - * 查询是否存在签呈 -- 签呈处理失败：签呈不存在! - */ - public static final String DOCUMENT_SUPPLIER_NOT_EXISTS = "签呈处理失败：签呈不存在!"; - -} diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java index e2b4f4d6..4eed3bb1 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/WaresMsgConstants.java @@ -1,10 +1,5 @@ package com.hzs.common.core.constant.msg; -/** - * @Description: 商品相关 - * @Classname: WaresMsgConstans - * @PackageName: com.hzs.common.core.constant.msg - */ public class WaresMsgConstants { /** diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BigDecimalUtil.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BigDecimalUtil.java new file mode 100644 index 00000000..ec61fad4 --- /dev/null +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/BigDecimalUtil.java @@ -0,0 +1,20 @@ +package com.hzs.common.core.utils; + +import com.hzs.common.core.constant.MagicNumberConstants; + +import java.math.BigDecimal; +import java.math.RoundingMode; + +public class BigDecimalUtil { + + /** + * 除万取2位小数并且去尾 + * + * @param bigDecimal + * @return + */ + public static BigDecimal handleBig10000Down(BigDecimal bigDecimal) { + return bigDecimal.divide(MagicNumberConstants.big10000, 2, RoundingMode.DOWN); + } + +}