From 1192bea7a457ebf1844b95e586a7befbc223441a Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 11 Sep 2025 10:43:19 +0800 Subject: [PATCH 01/24] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/DeleteDeadLockController.java | 7 ++--- .../mapper/member/base/CuMemberMapper.xml | 29 ++++++++----------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java index 85c3fd25..0b45ccc0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java @@ -9,10 +9,7 @@ import com.hzs.member.base.param.DeleteDeadLockParam; import com.hzs.member.base.service.DeleteDeadLockService; import com.hzs.member.base.vo.DeleteDeadLockVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -38,7 +35,7 @@ public class DeleteDeadLockController extends BaseController { * 删除死点 */ @PostMapping("delete") - public AjaxResult delete(DeleteDeadLockParam deleteDeadLockParam) { + public AjaxResult delete(@RequestBody DeleteDeadLockParam deleteDeadLockParam) { String check = deleteDeadLockService.deleteDeadLockMember(deleteDeadLockParam); if (check == null) { return AjaxResult.success(); diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml index f6f4ab5d..3b08b904 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml @@ -3218,7 +3218,7 @@ WHERE cu.DEL_FLAG = 0 AND cu.CATEGORY = 2 - + AND cu.MEMBER_CODE = #{memberCode} @@ -3230,23 +3230,18 @@ SELECT MEMBER_CODE FROM - ( - SELECT - MEMBER_CODE - FROM - CU_MEMBER START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PARENT - AND MEMBER_CODE = #{memberCode} - AND DEL_FLAG = 0 UNION - SELECT - MEMBER_CODE - FROM - CU_MEMBER START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PLACE_PARENT - AND MEMBER_CODE = #{memberCode} - AND DEL_FLAG = 0 - ) t + CU_MEMBER WHERE - t.MEMBER_CODE != #{memberCode} - ) + DEL_FLAG = 0 START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PARENT UNION ALL + SELECT + MEMBER_CODE + FROM + CU_MEMBER + WHERE + DEL_FLAG = 0 START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PLACE_PARENT + ) t + WHERE + t.MEMBER_CODE != #{memberCode} From 8c62bcf380bd60fd3477e00bb7383f5c3f946a50 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Thu, 11 Sep 2025 13:52:38 +0800 Subject: [PATCH 02/24] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/manage/DeleteDeadLockController.java | 5 +++++ .../member/base/service/impl/DeleteDeadLockServiceImpl.java | 3 +++ .../java/com/hzs/common/core/enums/EOperationModule.java | 2 ++ 3 files changed, 10 insertions(+) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java index 0b45ccc0..fa15741f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java @@ -1,6 +1,9 @@ package com.hzs.member.base.controller.manage; +import com.hzs.common.core.annotation.Log; +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.domain.AjaxResult; import com.hzs.common.core.web.page.TableDataInfo; @@ -23,6 +26,7 @@ public class DeleteDeadLockController extends BaseController { /** * 删除死点列表 */ + @Log(module = EOperationModule.DELETE_DEAD_LOCK, method = EOperationMethod.SELECT) @GetMapping("list") public TableDataInfo list(DeleteDeadLockParam deleteDeadLockParam) { startPage(); @@ -34,6 +38,7 @@ public class DeleteDeadLockController extends BaseController { /** * 删除死点 */ + @Log(module = EOperationModule.DELETE_DEAD_LOCK, method = EOperationMethod.DELETE) @PostMapping("delete") public AjaxResult delete(@RequestBody DeleteDeadLockParam deleteDeadLockParam) { String check = deleteDeadLockService.deleteDeadLockMember(deleteDeadLockParam); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java index e6f213f2..ea11891c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java @@ -10,6 +10,7 @@ import com.hzs.member.base.mapper.CuMemberMapper; import com.hzs.member.base.param.DeleteDeadLockParam; import com.hzs.member.base.service.DeleteDeadLockService; import com.hzs.member.base.vo.DeleteDeadLockVO; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,6 +19,7 @@ import java.util.Date; import java.util.List; @Service +@Slf4j public class DeleteDeadLockServiceImpl extends ServiceImpl implements DeleteDeadLockService { @Autowired private ICuMemberAccountService iCuMemberAccountService; @@ -35,6 +37,7 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl Date: Fri, 12 Sep 2025 09:15:42 +0800 Subject: [PATCH 03/24] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/base/service/impl/DeleteDeadLockServiceImpl.java | 3 ++- .../resources/mapper/member/account/CuMemberAccountMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java index ea11891c..15b3da6e 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java @@ -3,6 +3,7 @@ package com.hzs.member.base.service.impl; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.hzs.common.core.constant.msg.MemberMsgConstants; +import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.account.service.ICuMemberAccountService; @@ -47,7 +48,7 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl - + update cu_member_account cma set cma.del_flag = 1,cma.PK_MODIFIED = #{userId},cma.MODIFIED_TIME = #{date} where cma.pk_member in (select cm.pk_id from cu_member cm where cm.member_code = #{memberCode}) - + - select ac.*,pac.CLASSIFY_NAME parentClassifyName from BD_AREA_CLASSIFY ac + select ac.*,pac.CLASSIFY_NAME parentClassifyName from BD_AREA_CLASSIFY ac left join BD_AREA_CLASSIFY pac on pac.PK_ID = ac.PK_PARENT where ac.DEL_FLAG = 0 @@ -52,16 +48,16 @@ AND ( - (select count(csa.PK_ID) from BD_AREA_CLASSIFY_SPECIAL_AREA csa where csa.SPECIAL_AREA = #{specialArea} and csa.PK_AREA_CLASSIFY = ac.PK_ID ) > 0 + (select count(csa.PK_ID) from BD_AREA_CLASSIFY_SPECIAL_AREA csa where csa.SPECIAL_AREA = #{specialArea} and csa.PK_AREA_CLASSIFY = + ac.PK_ID ) > 0 or - ( select count(t.PK_ID) from BD_AREA_CLASSIFY t - where (select count(csa.PK_ID) from BD_AREA_CLASSIFY_SPECIAL_AREA csa where csa.SPECIAL_AREA = #{specialArea} and csa.PK_AREA_CLASSIFY = t.PK_ID) > 0 + where (select count(csa.PK_ID) from BD_AREA_CLASSIFY_SPECIAL_AREA csa where csa.SPECIAL_AREA = #{specialArea} and csa.PK_AREA_CLASSIFY = + t.PK_ID) > 0 start with t.pk_id = ac.PK_ID connect by t.pk_id = prior t.pk_parent - ) > 0 ) @@ -75,6 +71,7 @@ AND ac.CLASSIFY_NAME like #{classifyName}||'%' - order by ac.SORT desc + order by ac.SORT desc + diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index 7264e341..a891cc86 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -98,7 +98,6 @@ S_LABEL, SALES, IS_SALE, ARRIVAL_TIME, WARN_MESSAGE, IS_LAND_TRANS, IS_AIR_TRANS, IS_OCEAN_TRANS, VIDEO_URL, COVER, be.maker_income, be.PK_SPECIAL_CURRENCY, - be.INVENTORY, be.INVENTORY_RATIO, be.MEMBER_LIMIT, be.MEMBER_MONTH_LIMIT, be.INVENTORY_USE from bd_wares bw inner join bd_wares_extend be @@ -153,6 +152,7 @@ select bw.PK_COUNTRY, bw.PK_ID, be.pk_id PK_WARES_EXTEND, be.IS_MAKER_GIFT, bw.WARES_CODE, bw.WARES_NAME, PK_AREA_CLASSIFY, COVER, COVER1, COVER2, + DETAILS_TYPE, bw.WARES_PRICE, bw.WARES_ACHIEVE, SORT, SPECIAL_AREA, IS_PUT_ON, PRE_SALE_STATUS, @@ -176,6 +176,9 @@ and bw.pk_country = #{pkCountry} + + and bw.WARES_NAME like '%' || #{waresName} || '%' + order by bw.SORT_STATUS desc , bw.sort desc, bw.WARES_PRICE ,bw.CREATION_TIME desc diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/api/ApiBdRegisterPageController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/api/ApiBdRegisterPageController.java index c0761587..b5347923 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/api/ApiBdRegisterPageController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/controller/api/ApiBdRegisterPageController.java @@ -1,59 +1,25 @@ package com.hzs.system.config.controller.api; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.hzs.common.core.constant.SystemFieldConstants; -import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.web.domain.AjaxResult; -import com.hzs.common.domain.system.config.BdRegisterPage; -import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.system.config.service.IBdRegisterPageService; -import com.hzs.system.config.vo.RegisterPageVO; -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.ArrayList; -import java.util.List; +import java.util.Collections; /** - * @Description: 前端注册页面配置控制器 - * @Author: jiang chao - * @Time: 2022/10/19 9:44 - * @Classname: ApiBdRegisterPageController - * @PackageName: com.hzs.system.config.controller.api + * 前端注册页面配置控制器 */ @RestController @RequestMapping("/api/register-page") public class ApiBdRegisterPageController { - @Autowired - private IBdRegisterPageService iBdRegisterPageService; - /** * 获取菜单权限列表 - * - * @return */ @GetMapping("/list") - public AjaxResult list(Integer pkCountry) { - if (null == pkCountry) { - pkCountry = SecurityUtils.getPkCountry(); - } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - queryWrapper.eq("DISPLAY", EYesNo.YES.getIntValue()); - queryWrapper.orderByAsc(SystemFieldConstants.PK_ID); - List list = iBdRegisterPageService.list(queryWrapper); - - List resultList = new ArrayList<>(); - for (BdRegisterPage bdRegisterPage : list) { - resultList.add(RegisterPageVO.builder() - .field(bdRegisterPage.getField()) - .build()); - } - - return AjaxResult.success(resultList); + public AjaxResult list() { + return AjaxResult.success(Collections.emptyList()); } } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRegisterPageMapper.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRegisterPageMapper.java index cf3fd168..9fa132fc 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRegisterPageMapper.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/mapper/BdRegisterPageMapper.java @@ -5,9 +5,6 @@ import com.hzs.common.domain.system.config.BdRegisterPage; /** * 注册页面配置 Mapper 接口 - * - * @author hzs - * @since 2022-10-18 */ public interface BdRegisterPageMapper extends BaseMapper { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRegisterPageService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRegisterPageService.java index 70ec5fea..e23c1a65 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRegisterPageService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/IBdRegisterPageService.java @@ -7,9 +7,6 @@ import java.util.List; /** * 注册页面配置 服务类 - * - * @author hzs - * @since 2022-10-18 */ public interface IBdRegisterPageService extends IService { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRegisterPageServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRegisterPageServiceImpl.java index 73b011a0..a6d08962 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRegisterPageServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdRegisterPageServiceImpl.java @@ -1,9 +1,8 @@ package com.hzs.system.config.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.core.enums.ERegisterPage; import com.hzs.common.core.enums.EYesNo; @@ -18,18 +17,15 @@ import java.util.List; /** * 注册页面配置 服务实现类 - * - * @author hzs - * @since 2022-10-18 */ @Service public class BdRegisterPageServiceImpl extends ServiceImpl implements IBdRegisterPageService { @Override public List queryList(Integer pkCountry) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - queryWrapper.orderByAsc("PK_ID"); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdRegisterPage::getPkCountry, pkCountry); + queryWrapper.orderByAsc(BdRegisterPage::getPkId); return baseMapper.selectList(queryWrapper); } @@ -39,11 +35,11 @@ public class BdRegisterPageServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(SystemFieldConstants.PK_COUNTRY, pkCountry); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EDelFlag.DELETE.getValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, nowDate); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(BdRegisterPage::getPkCountry, pkCountry); + updateWrapper.set(BdRegisterPage::getDelFlag, EDelFlag.DELETE.getValue()); + updateWrapper.set(BdRegisterPage::getPkModified, userId); + updateWrapper.set(BdRegisterPage::getModifiedTime, nowDate); baseMapper.update(null, updateWrapper); for (String field : registerPageFieldList) { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/controller/api/ApiIdempotentController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/controller/api/ApiIdempotentController.java index 1f2e3555..a59569ef 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/controller/api/ApiIdempotentController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/controller/api/ApiIdempotentController.java @@ -13,12 +13,8 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j public class ApiIdempotentController { - private IIdempotentService idempotentService; - @Autowired - public void setIdempotentService(IIdempotentService idempotentService) { - this.idempotentService = idempotentService; - } + private IIdempotentService idempotentService; @GetMapping("/generate") public AjaxResult generateIdempotentToken() { diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/service/IIdempotentService.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/service/IIdempotentService.java index 5a082b88..5923264a 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/service/IIdempotentService.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/service/IIdempotentService.java @@ -4,11 +4,6 @@ import com.hzs.common.core.constant.CacheConstants; /** * 解决系统幂等性的公共方法 - * @author: sui q - * @time: 2022/8/27 13:46 - * @description: - * @classname: IIdempotentService - * @package_name: com.hzs.system.tools.service */ public interface IIdempotentService { @@ -19,33 +14,16 @@ public interface IIdempotentService { /** * 生成唯一的token - * @Description: - * @return: String - * @throws - * @Author: sui q - * @Date: 2022/8/27 13:47 - */ + */ String generateToken(); /** * 验证token，是否存在系统中 - * @Description: - * @param token - * @return: Boolean - * @throws - * @Author: sui q - * @Date: 2022/8/27 13:48 - */ + */ Boolean validateToken(String token); /** * 刷新token - * @Description: - * @param token - * @return: void - * @throws - * @Author: sui q - * @Date: 2022/8/27 13:48 - */ + */ void refreshToken(String token); } diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/service/impl/IdempotentServiceImpl.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/service/impl/IdempotentServiceImpl.java index b9f122a2..08ff1f96 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/service/impl/IdempotentServiceImpl.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/tools/service/impl/IdempotentServiceImpl.java @@ -12,68 +12,30 @@ import java.util.concurrent.TimeUnit; /** * 解决系统幂等性的公共方法的实现类 - * @author: sui q - * @time: 2022/8/27 13:49 - * @description: - * @classname: IdempotentServiceImpl - * @package_name: com.hzs.system.tools.service.impl */ @Service public class IdempotentServiceImpl implements IIdempotentService { + @Autowired private RedisService redisService; - @Autowired - public void setRedisService(RedisService redisService) { - this.redisService = redisService; - } - - /** - * 生成唯一的token - * @Description: - * @param - * @return: String - * @throws - * @Author: sui q - * @Date: 2022/8/27 13:47 - */ @Override public String generateToken() { String token = IdUtils.fastSimpleUUID(); - redisService.setCacheObject(CacheToolsConstants.IDEMPOTENT_TOKEN+token, + redisService.setCacheObject(CacheToolsConstants.IDEMPOTENT_TOKEN + token, token, EXPIRE_TIME, TimeUnit.MINUTES); return token; } - /** - * 验证token，是否存在系统中 - * @Description: - * @param token - * @return: Boolean - * @throws - * @Author: sui q - * @Date: 2022/8/27 13:48 - */ @Override public Boolean validateToken(String token) { String redisToken = redisService.getCacheObject(CacheToolsConstants.IDEMPOTENT_TOKEN + token); - if(StringUtils.isEmpty(redisToken) || !redisToken.equals(token)){ - return false; - } - return true; + return !StringUtils.isEmpty(redisToken) && redisToken.equals(token); } - /** - * 刷新token - * @Description: - * @param token - * @return: void - * @throws - * @Author: sui q - * @Date: 2022/8/27 13:48 - */ @Override public void refreshToken(String token) { } + } diff --git a/bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java b/bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java index a983db07..64523f8d 100644 --- a/bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java +++ b/bd-common/bd-common-aop/src/main/java/com/hzs/common/core/aspect/RepeatSubmitAspectAdvice.java @@ -23,11 +23,7 @@ import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; /** - * @author: sui q - * @time: 2022/8/27 14:45 - * @description:防止重复提交的切面类 - * @classname: RepeatSubmitAspectAdvice - * @package_name: com.hzs.common.core.aspect + * 防止重复提交的切面类 */ @Aspect @Component 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 5c84a570..5a6ef252 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 @@ -57,9 +57,4 @@ public class SystemFieldConstants { */ public static final String PK_COUNTRY = "pk_country"; - /** - * 公司 - */ - public static final String PK_CORP = "pk_corp"; - } 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 ba328736..326a86de 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 @@ -2,11 +2,6 @@ package com.hzs.common.core.constant.msg; public class MemberMsgConstants { - /** - * 重复提交，或者没有token生成，不是正规流程进入的保存 提交token失效 -- 请求已经失效，请刷新重试！ - */ - public static final String TOKEN_REPEAT_SUBMIT = "请求已经失效，请刷新重试！"; - /** * 手机号码长度验证 -- 联系方式长度超长 * 2024.06.21 兼容新需求，特殊账号联系方式长度不能超过30位 diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java index 50152b44..8e1b9b53 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrade.java @@ -93,4 +93,5 @@ public enum EGrade { } return null; } + } diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderTypeExtend.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderTypeExtend.java index a1147d03..952892f9 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderTypeExtend.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOrderTypeExtend.java @@ -25,7 +25,7 @@ public enum EOrderTypeExtend { /** * 实际值 */ - private final int value; + private final Integer value; /** * 显示标签 */ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java index 055167ca..caf912ea 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java @@ -61,6 +61,12 @@ public enum ESpecialArea { */ RENEWAL_AREA(30, "续约专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 30, 30, EMenuDetail.RENEWAL_AREA.getValue()), + /** + * 会员专区 -- 0元注册之后，只能看到会员专区，就是注册专区的188商品 + * SANGELXIU1 enable = 1->0 + */ + MEMBER_AREA(41, "会员专区", 0, EnumsPrefixConstants.SPECIAL_AREA + 41, 41, -1), + /** * 自助购票 */ @@ -115,4 +121,18 @@ public enum ESpecialArea { } return null; } + + /** + * 获取会员专区，支持188的会员专区（41）返回为注册专区（1） + * + * @param value + * @return + */ + public static Integer getMemberArea(Integer value) { + if (null != value && value.equals(ESpecialArea.MEMBER_AREA.getValue())) { + return ESpecialArea.REGISTER_AREA.getValue(); + } + return value; + } + } diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdAreaClassify.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdAreaClassify.java index 46df51b7..dd894806 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdAreaClassify.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/product/BdAreaClassify.java @@ -2,10 +2,8 @@ package com.hzs.common.domain.sale.product; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; import com.hzs.common.core.web.domain.BaseEntity; import lombok.Data; @@ -13,12 +11,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - *

* 商品分类 - *

- * - * @author hzs - * @since 2022-09-05 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRegisterPage.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRegisterPage.java index 5ec02d07..574ed3ea 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRegisterPage.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdRegisterPage.java @@ -11,9 +11,6 @@ import lombok.experimental.Accessors; /** * 注册页面配置 - * - * @author hzs - * @since 2022-10-18 */ @Data @EqualsAndHashCode(callSuper = true) From 5968a63f0a848c33081c222439d1ba7cccf8ed94 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 15 Sep 2025 17:01:33 +0800 Subject: [PATCH 07/24] =?UTF-8?q?##=20=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E4=B8=BA=E7=A9=BA=E8=BF=94=E5=9B=9E=E7=A9=BA?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/controller/api/ApiAreaClassifyController.java | 4 ++++ .../main/java/com/hzs/sale/product/vo/AreaClassifyVo.java | 8 +------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/api/ApiAreaClassifyController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/api/ApiAreaClassifyController.java index 181da286..761245da 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/api/ApiAreaClassifyController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/controller/api/ApiAreaClassifyController.java @@ -1,5 +1,6 @@ package com.hzs.sale.product.controller.api; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; @@ -35,6 +36,9 @@ public class ApiAreaClassifyController extends BaseController { areaClassifyParam.setEnableState(EYesNo.YES.getIntValue()); areaClassifyParam.setPkCountry(SecurityUtils.getPkCountry()); List list = iBdAreaClassifyService.selectByAreaClassifyList(areaClassifyParam); + if (CollectionUtil.isEmpty(list)) { + list.add(new AreaClassifyVo()); + } return AjaxResult.success(list); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/AreaClassifyVo.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/AreaClassifyVo.java index 2f72d81c..73d51ee4 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/AreaClassifyVo.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/product/vo/AreaClassifyVo.java @@ -1,18 +1,12 @@ package com.hzs.sale.product.vo; import com.hzs.common.core.web.domain.BaseEntity; +import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.List; -/** - * @Description: - * @Author: yuhui - * @Time: 2022/11/1 14:29 - * @Classname: AreaClassifyVo - * @PackageName: com.hzs.sale.product.vo - */ @EqualsAndHashCode(callSuper = true) @Data public class AreaClassifyVo extends BaseEntity { From b37fd5dd559dc654bff55bbe8e649c7c2524caf4 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 15 Sep 2025 17:07:16 +0800 Subject: [PATCH 08/24] =?UTF-8?q?##=20=E6=97=A5=E4=B8=9A=E7=BB=A9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E6=B7=BB=E5=8A=A0=E5=A4=8D=E8=B4=AD=E6=96=B0=E5=A2=97?= =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/bonus/service/impl/BonusSettlePurchaseHandle.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java index 063dd408..055febd7 100644 --- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java +++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java @@ -730,6 +730,11 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle { for (SaOrderExt saOrderExt : purchaseOrderList) { // 来源会员 CuMemberSettleExt sourceMemberSettleExt = cuMemberSettleExtMap.get(saOrderExt.getPkMember()); + // 处理会员复购业绩 + sourceMemberSettleExt.setRepurchaseAmount(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseAmount(), saOrderExt.getOrderAmount())); + sourceMemberSettleExt.setRepurchasePv(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchasePv(), saOrderExt.getOrderAchieve())); + sourceMemberSettleExt.setRepurchaseNewAmount(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseNewAmount(), saOrderExt.getOrderAmount())); + sourceMemberSettleExt.setRepurchaseNewPv(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseNewPv(), saOrderExt.getOrderAchieve())); // 订单产生的见点收益 List orderBonusCoachList = new ArrayList<>(); From 5ebe4bc60143f56a3bfff6a952cd268f617cefa5 Mon Sep 17 00:00:00 2001 From: zhangheng Date: Fri, 12 Sep 2025 10:06:09 +0800 Subject: [PATCH 09/24] =?UTF-8?q?##=20=E5=88=A0=E9=99=A4=E6=AD=BB=E7=82=B9?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java index 9c5375ec..43ba3037 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java @@ -53,7 +53,7 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl Date: Mon, 15 Sep 2025 13:54:27 +0800 Subject: [PATCH 10/24] =?UTF-8?q?##=20Opt=20-=20=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E5=90=8D=E7=A7=B0&=E4=BD=93=E7=B3=BB=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/domain/third/pay/ext/TOnlinePaymentExt.java | 8 ++++++++ .../java/com/hzs/third/pay/param/OnlinePaymentParam.java | 1 + .../main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java | 6 +++++- .../resources/mapper/third/pay/TOnlinePaymentMapper.xml | 8 +++++++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java index 65afa7c2..4e57b6e0 100644 --- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java +++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java @@ -32,6 +32,14 @@ public class TOnlinePaymentExt extends TOnlinePayment { private Integer orderType; private String orderTypeVal; + /** + * 体系ID + */ + private Integer vertexId; + /** + * 体系名称 + */ + private String vertexName; private Long rechargeId; diff --git a/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java b/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java index 60ff31a1..586795d2 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java +++ b/bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java @@ -71,4 +71,5 @@ public class OnlinePaymentParam { */ private Integer orderType; + private Integer vertexId; } diff --git a/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java b/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java index a297c982..4f46fef5 100644 --- a/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java +++ b/bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java @@ -39,7 +39,11 @@ public class OnlinePaymentVO { */ @Excel(name = "会员姓名") private String memberName; - + /** + * 体系名称 + */ + @Excel(name = "体系名称") + private String vertexName; /** * 业务类型（1=直销订单,3=充值,4=抽奖） */ diff --git a/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml index 1810fb74..327b344a 100644 --- a/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml +++ b/bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml @@ -31,14 +31,20 @@ diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java index da82c1a3..d8618c1b 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/ETransferType.java @@ -4,11 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * @Description: 转账类型 - * @Author: ljc - * @Time: 2022/9/26 10:33 - * @Classname: ETransferType - * @Package_name: com.hzs.common.core.enums + * 转账类型 */ @AllArgsConstructor @Getter From f5ff1cb5f0993a5681aeffe3087fbfedc1c51cee Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 16 Sep 2025 11:43:08 +0800 Subject: [PATCH 15/24] =?UTF-8?q?##=20=E8=90=A5=E9=94=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=AD=BE=E5=91=88=E6=B5=81=E7=A8=8B=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consume/service/impl/AcConsumeRuleConfigServiceImpl.java | 2 -- .../consume/service/impl/AcMemberConsumeRuleServiceImpl.java | 2 -- .../wares/service/impl/AcWaresRuleConfigServiceImpl.java | 2 -- 3 files changed, 6 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java index 522eaf89..7dc426f1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java @@ -130,14 +130,12 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl Date: Tue, 16 Sep 2025 11:58:36 +0800 Subject: [PATCH 16/24] =?UTF-8?q?##=200=E5=85=83=E8=B4=AD=E4=B9=B0188?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/sale/order/service/impl/SaOrderServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 90ffb4d5..d128d093 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -455,7 +455,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public Boolean confirmRegSaOrderByOrderParam(OrderParam orderParam) { boolean isToBePay = getIsToBePayByOrderType(orderParam.getPkSettleCountry(), orderParam.getSpecialArea()); - CuMember cuMember = saOrderHandle.packageSaveUser(orderParam, iMemberServiceApi.queryMember(orderParam.getCenterCodeId()).getData()); + CuMember otherMember = iMemberServiceApi.queryMember(orderParam.getCenterCodeId()).getData(); + CuMember cuMember = saOrderHandle.packageSaveUser(orderParam, otherMember); if (!EOrderTypeExtend.REG_REP.getValue().equals(orderParam.getOrderTypeExtend())) { // 非0元需要获取会员编号、会员主键 @@ -467,6 +468,8 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 2023.10.16按最新需求，注册订单需要在支付前需要显示会员编号 cuMember = iMemberServiceApi.createRegisterMemberCode(cuMember).getData(); } + } else { + cuMember.setPkId(otherMember.getPkId()); } SaOrderExt saOrderExt = packageWholeSaOrder(orderParam, cuMember); From ff3cbac038c1a4a908726efd1a2da75b122c0308 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Tue, 16 Sep 2025 12:03:00 +0800 Subject: [PATCH 17/24] =?UTF-8?q?##=200=E5=85=83=E8=B4=AD=E4=B9=B0188?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/sale/order/service/impl/SaOrderServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index d128d093..f22cb6e1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -455,11 +455,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public Boolean confirmRegSaOrderByOrderParam(OrderParam orderParam) { boolean isToBePay = getIsToBePayByOrderType(orderParam.getPkSettleCountry(), orderParam.getSpecialArea()); - CuMember otherMember = iMemberServiceApi.queryMember(orderParam.getCenterCodeId()).getData(); - CuMember cuMember = saOrderHandle.packageSaveUser(orderParam, otherMember); + CuMember cuMember; if (!EOrderTypeExtend.REG_REP.getValue().equals(orderParam.getOrderTypeExtend())) { // 非0元需要获取会员编号、会员主键 + cuMember = saOrderHandle.packageSaveUser(orderParam, iMemberServiceApi.queryMember(orderParam.getCenterCodeId()).getData()); // 获取会员编号、会员主键 if (isToBePay) { cuMember = iMemberServiceApi.createMemberIdAndCode(cuMember, Boolean.FALSE).getData(); @@ -469,7 +469,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl cuMember = iMemberServiceApi.createRegisterMemberCode(cuMember).getData(); } } else { - cuMember.setPkId(otherMember.getPkId()); + cuMember = iMemberServiceApi.queryMember(orderParam.getCenterCodeId()).getData(); } SaOrderExt saOrderExt = packageWholeSaOrder(orderParam, cuMember); From 6693d44a2799c37b560ccaa3d60d87837c37d91e Mon Sep 17 00:00:00 2001 From: zhangheng Date: Tue, 16 Sep 2025 11:26:55 +0800 Subject: [PATCH 18/24] =?UTF-8?q?##=20=E8=90=A5=E9=94=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=AD=BE=E5=91=88=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/AcConsumeRuleConfigController.java | 7 +++- .../manage/AcMemberConsumeRuleController.java | 7 +++- .../service/IAcConsumeRuleConfigService.java | 2 +- .../service/IAcMemberConsumeRuleService.java | 2 +- .../impl/AcConsumeRuleConfigServiceImpl.java | 34 +++++++++++++++-- .../impl/AcMemberConsumeRuleServiceImpl.java | 37 +++++++++++++++++-- .../manage/WaresRuleConfigController.java | 7 +++- .../service/IAcWaresRuleConfigService.java | 2 +- .../impl/AcWaresRuleConfigServiceImpl.java | 34 +++++++++++++++-- 9 files changed, 114 insertions(+), 18 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java index 389f40d1..3b143642 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcConsumeRuleConfigController.java @@ -173,12 +173,15 @@ public class AcConsumeRuleConfigController extends BaseController { * @return AjaxResult */ @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈") - @PostMapping("/online-petition") + @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) { recommendParam.setPkCountry(SecurityUtils.getPkCountry()); recommendParam.setPkMember(SecurityUtils.getUserId()); recommendParam.setLoginUser(userTokenService.getLoginUser()); - consumeRuleConfigService.onLinePetition(recommendParam); + String str = consumeRuleConfigService.onLinePetition(recommendParam); + if (str != null) { + return AjaxResult.error(str); + } return AjaxResult.success(); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java index d5a1638d..b19c5675 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/controller/manage/AcMemberConsumeRuleController.java @@ -112,10 +112,13 @@ public class AcMemberConsumeRuleController extends BaseController { * @return AjaxResult */ @Log(module = EOperationModule.CONSUME_GIVE, business = EOperationBusiness.CONSUME_GIVE, method = EOperationMethod.INSERT, remark = "在线签呈") - @PostMapping("/online-petition") + @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcMemberConsumeRuleVo memberConsumeRuleVo) { memberConsumeRuleVo.setLoginUser(userTokenService.getLoginUser()); - iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo); + String str = iAcMemberConsumeRuleService.onLinePetition(memberConsumeRuleVo); + if (str != null) { + return AjaxResult.error(str); + } return AjaxResult.success(); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java index 707de3bd..28cf19c9 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/IAcConsumeRuleConfigService.java @@ -38,7 +38,7 @@ public interface IAcConsumeRuleConfigService extends IService implements IAcConsumeRuleConfigService { @Autowired @@ -106,7 +108,9 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl implements IAcMemberConsumeRuleService { @Autowired @@ -80,7 +82,9 @@ public class AcMemberConsumeRuleServiceImpl extends ServiceImpl { * * @param recommendParam */ - Boolean onLinePetition(AcRecommendParam recommendParam); + String onLinePetition(AcRecommendParam recommendParam); /** * 商品赠送 审核规则 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java index f7d1e9b1..ae007051 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/wares/service/impl/AcWaresRuleConfigServiceImpl.java @@ -30,6 +30,7 @@ import com.hzs.system.sys.IApprovalServiceApi; import com.hzs.system.sys.dto.ApprovalBusinessResultDTO; import com.hzs.system.sys.dto.ApprovalSubmitDTO; import com.hzs.system.sys.dto.LoginUser; +import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,6 +44,7 @@ import java.util.List; * @since 2023-04-20 */ @Service +@Slf4j public class AcWaresRuleConfigServiceImpl extends ServiceImpl implements IAcWaresRuleConfigService { @Autowired @@ -108,7 +110,8 @@ public class AcWaresRuleConfigServiceImpl extends ServiceImpl Date: Tue, 16 Sep 2025 11:43:08 +0800 Subject: [PATCH 19/24] =?UTF-8?q?##=20=E8=90=A5=E9=94=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=AD=BE=E5=91=88=E6=B5=81=E7=A8=8B=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consume/service/impl/AcConsumeRuleConfigServiceImpl.java | 2 -- .../consume/service/impl/AcMemberConsumeRuleServiceImpl.java | 2 -- .../wares/service/impl/AcWaresRuleConfigServiceImpl.java | 2 -- 3 files changed, 6 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java index 522eaf89..7dc426f1 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/consume/service/impl/AcConsumeRuleConfigServiceImpl.java @@ -130,14 +130,12 @@ public class AcConsumeRuleConfigServiceImpl extends ServiceImpl Date: Wed, 17 Sep 2025 09:29:02 +0800 Subject: [PATCH 20/24] =?UTF-8?q?##=20=E6=B3=A8=E5=86=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD=E4=BF=AE=E6=94=B9=EF=BC=88378=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/common/core/constant/msg/MemberMsgConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 326a86de..21bfa94e 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 @@ -32,7 +32,7 @@ public class MemberMsgConstants { /** * 验证手机号是否被注册 -- 会员信息已存在！ */ - public static final String SYSTEM_REGISTER_COUNT = "会员信息已存在！"; + public static final String SYSTEM_REGISTER_COUNT = "注册信息已超过注册次数。"; /** * 验证手机号是否被用户使用 -- 会员信息已注册，若有异议请及时联系在线客服！ From 0b5494e21d707a46bfd6c9ba89fdf83a3f6d5839 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 17 Sep 2025 09:51:20 +0800 Subject: [PATCH 21/24] =?UTF-8?q?##=200=E5=85=83=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=88=86=E4=BA=AB=EF=BC=9B0=E5=85=83?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=B8=8D=E8=83=BD=E5=81=9A=E4=B8=BA=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E4=BA=BA=E3=80=81=E5=AE=89=E7=BD=AE=E4=BA=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiShareController.java | 12 +++++--- .../controller/ParentOrderController.java | 26 +++++++---------- .../api/ApiRegSaOrderController.java | 29 ++----------------- 3 files changed, 21 insertions(+), 46 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java index b822b002..3d08b3e5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java @@ -16,6 +16,7 @@ import com.hzs.common.core.utils.sign.Base64Util; import com.hzs.common.core.utils.uuid.IdUtils; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.member.base.CuMember; +import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.base.vo.MemberShare; @@ -54,12 +55,17 @@ public class ApiShareController { /** * 获取188分享码（H5） - * - * @return */ @GetMapping("/fans-code-h5") public AjaxResult fansCodeH5() { Long userId = SecurityUtils.getUserId(); + + // 0元会员不涌进行分享 + CuMemberExt cuMemberExt = iCuMemberService.getMemberById(userId); + if (null == cuMemberExt.getPkPlaceParent()) { + return AjaxResult.error("当前会员无权进行个人推广"); + } + // 188注册分享人就是自己 R resultR = iShareServiceApi.queryShareCode(ShareServiceDTO.builder() .eShareType(EShareType.FANS) @@ -85,7 +91,6 @@ public class ApiShareController { * 分享查询推荐人编号 -- 不需要登录 * * @param parentCode 推荐人（加密） - * @return */ @GetMapping("/find-share-code/{parentCode}") public AjaxResult findShareCode(@PathVariable("parentCode") String parentCode) { @@ -100,7 +105,6 @@ public class ApiShareController { * 分享注册 -- 不需要登录 * * @param registerParam 分享注册入参 - * @return */ @RepeatSubmitSimple @PostMapping("/share-register") diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java index 200a892b..6ca375b8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/ParentOrderController.java @@ -33,8 +33,6 @@ import com.hzs.sale.shopping.vo.ProductGroup; import com.hzs.sale.shopping.vo.ShoppingCartRedis; import com.hzs.sale.shopping.vo.ShoppingCartVO; import com.hzs.system.base.IAreaServiceApi; -import com.hzs.system.base.ICurrencyServiceApi; -import com.hzs.system.base.dto.CurrencyDTO; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.factory.annotation.Autowired; @@ -49,8 +47,6 @@ public abstract class ParentOrderController extends BaseController { @DubboReference IAreaServiceApi iAreaServiceApi; @DubboReference - ICurrencyServiceApi iCurrencyServiceApi; - @DubboReference IMemberServiceApi iMemberServiceApi; @Autowired @@ -257,25 +253,23 @@ public abstract class ParentOrderController extends BaseController { if (parentMember == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.PARENT_NOT_EXISTS)); } - orderParam.setParent(CommonUtil.getMemberCode(parentMember.getMemberCode(), parentMember.getServiceCode())); - if (SecurityUtils.getUserId().equals(parentMember.getPkId())) { - orderParam.setParentName(parentMember.getMemberName()); - } else { - orderParam.setParentName(CommonUtil.getMemberName(parentMember.getPkVertex(), parentMember.getMemberName(), parentMember.getNickName())); + if (null == parentMember.getPkPlaceParent()) { + return AjaxResult.error("当前推荐编号不能成为推荐人"); } + orderParam.setParent(CommonUtil.getMemberCode(parentMember.getMemberCode(), parentMember.getServiceCode())); + orderParam.setParentName(parentMember.getMemberName()); CuMember placeMember = getCuMemberByCode(orderParam.getPlaceParent()); if (placeMember == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.PLACE_PARENT_NOT_EXISTS)); } - orderParam.setPlaceParentId(placeMember.getPkId()); - orderParam.setPlaceParent(CommonUtil.getMemberCode(placeMember.getMemberCode(), placeMember.getServiceCode())); - - if (SecurityUtils.getUserId().equals(placeMember.getPkId())) { - orderParam.setPlaceParentName(placeMember.getMemberName()); - } else { - orderParam.setPlaceParentName(CommonUtil.getMemberName(placeMember.getPkVertex(), placeMember.getMemberName(), placeMember.getNickName())); + if (null == placeMember.getPkPlaceParent()) { + return AjaxResult.error("当前安置编号不能成为安置人"); } + orderParam.setPlaceParentId(placeMember.getPkId()); + orderParam.setPlaceParent(placeMember.getMemberCode()); + orderParam.setPlaceParentName(placeMember.getMemberName()); + // 当安置人跟安置位置都有值是需要验证 需要验证安置位置 if (orderParam.getPlaceDept() != null && orderParam.getPlaceDept() > 0) { // 安置人在推荐人伞下，含自己。 推荐人在报单中心伞下，含自己，在推荐那边验证 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java index 075ac247..a9872dbe 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiRegSaOrderController.java @@ -498,24 +498,14 @@ public class ApiRegSaOrderController extends ParentOrderController { if (StringUtils.isEmpty(orderParam.getParent())) { orderParam.setParentId(SecurityUtils.getUserId()); parentCuMember = getOrderService().getCuMemberByKey(orderParam.getParentId()); - if (SecurityUtils.getUserId().equals(orderParam.getParentId())) { - // 如果是自己，则不需要处理昵称 - orderParam.setParentName(parentCuMember.getMemberName()); - } else { - orderParam.setParentName(CommonUtil.getMemberName(parentCuMember.getPkVertex(), parentCuMember.getMemberName(), parentCuMember.getNickName())); - } + orderParam.setParentName(parentCuMember.getMemberName()); } else { parentCuMember = getCuMemberByCode(orderParam.getParent()); if (parentCuMember == null) { return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.PARENT_NOT_EXISTS)); } orderParam.setParentId(parentCuMember.getPkId()); - if (SecurityUtils.getUserId().equals(orderParam.getParentId())) { - // 如果是自己，则不需要处理昵称 - orderParam.setParentName(parentCuMember.getMemberName()); - } else { - orderParam.setParentName(CommonUtil.getMemberName(parentCuMember.getPkVertex(), parentCuMember.getMemberName(), parentCuMember.getNickName())); - } + orderParam.setParentName(parentCuMember.getMemberName()); } CuMember cuMember = CuMember.builder() @@ -527,20 +517,7 @@ public class ApiRegSaOrderController extends ParentOrderController { boolean isFirst = getOrderService().validateFirstOrder(cuMember.getPkParent(), cuMember.getPkSettleCountry()); cuMember = getOrderService().obtainLastResettleByRecommend(cuMember, Boolean.TRUE, isFirst); - String placeParentName; - if (null == cuMember.getPkPlaceParent()) { - if (SecurityUtils.getUserId().equals(parentCuMember.getPkId())) { - placeParentName = cuMember.getMemberName(); - } else { - placeParentName = CommonUtil.getMemberName(parentCuMember.getPkVertex(), cuMember.getMemberName(), cuMember.getNickName()); - } - } else { - if (SecurityUtils.getUserId().equals(cuMember.getPkId())) { - placeParentName = cuMember.getMemberName(); - } else { - placeParentName = CommonUtil.getMemberName(cuMember.getPkVertex(), cuMember.getMemberName(), cuMember.getNickName()); - } - } + String placeParentName = cuMember.getMemberName(); return AjaxResult.success(OrderReturn.builder() .isFirst(isFirst) From e426c3b8d531ec19baccb182f2bd65e70e06a469 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 17 Sep 2025 09:59:02 +0800 Subject: [PATCH 22/24] =?UTF-8?q?##=200=E5=85=83=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=AC=A1=E6=95=B0=E9=99=90=E5=88=B6=EF=BC=88?= =?UTF-8?q?379=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzs/member/share/controller/api/ApiShareController.java | 5 +++-- .../src/main/java/com/hzs/common/core/enums/EDelFlag.java | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java index 3d08b3e5..d75cb67b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java @@ -6,6 +6,7 @@ import com.hzs.common.core.annotation.RepeatSubmitSimple; import com.hzs.common.core.config.BdConfig; import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.CountryConstants; +import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; import com.hzs.common.core.enums.ECategory; import com.hzs.common.core.enums.EDelFlag; @@ -127,8 +128,8 @@ public class ApiShareController { .eq(CuMember::getDelFlag, EDelFlag.UN_DELETE.getValue()) .eq(CuMember::getCategory, ECategory.NORMAL.getValue()) ); - if (phoneCount > Integer.parseInt(value)) { - return AjaxResult.error("会员信息已存在"); + if (phoneCount >= Integer.parseInt(value)) { + return AjaxResult.error(MemberMsgConstants.SYSTEM_REGISTER_COUNT); } CuMember newCuMember = iCuMemberService.shareRegisterMember(registerParam); diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelFlag.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelFlag.java index c5e155d0..57c02ad0 100644 --- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelFlag.java +++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EDelFlag.java @@ -6,8 +6,6 @@ import lombok.Getter; /** * 删除标记枚举类 - * - * @author hzs */ @AllArgsConstructor @Getter From 8692a233fe8c5010a122dcb37a71883818573254 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 17 Sep 2025 10:04:52 +0800 Subject: [PATCH 23/24] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E5=94=AF=E4=B8=80=E4=BC=9A=E5=91=98=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiShareController.java | 19 ++++++++++++------- .../core/constant/msg/MemberMsgConstants.java | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java index d75cb67b..8ffa9506 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/share/controller/api/ApiShareController.java @@ -1,6 +1,7 @@ package com.hzs.member.share.controller.api; import cn.hutool.core.codec.Base64Decoder; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hzs.common.core.annotation.RepeatSubmitSimple; import com.hzs.common.core.config.BdConfig; @@ -8,10 +9,7 @@ import com.hzs.common.core.constant.CacheConstants; import com.hzs.common.core.constant.CountryConstants; import com.hzs.common.core.constant.msg.MemberMsgConstants; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.ECategory; -import com.hzs.common.core.enums.EDelFlag; -import com.hzs.common.core.enums.EShareType; -import com.hzs.common.core.enums.ESystemConfig; +import com.hzs.common.core.enums.*; import com.hzs.common.core.service.RedisService; import com.hzs.common.core.utils.sign.Base64Util; import com.hzs.common.core.utils.uuid.IdUtils; @@ -19,6 +17,7 @@ import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.member.base.CuMember; import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.security.utils.SecurityUtils; +import com.hzs.common.util.TransactionUtils; import com.hzs.member.base.service.ICuMemberService; import com.hzs.member.base.vo.MemberShare; import com.hzs.member.share.param.ShareRegisterParam; @@ -32,6 +31,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -121,16 +121,21 @@ public class ApiShareController { } registerParam.setParentMember(parentMember); - // 手机号注册次数 String value = iSystemConfigServiceApi.getBonusSystemConfig(CountryConstants.CHINA_COUNTRY, ESystemConfig.REGISTER_NUMBER.getKey()).getData(); - int phoneCount = iCuMemberService.count(Wrappers.lambdaQuery() + List memberList = iCuMemberService.list(Wrappers.lambdaQuery() .eq(CuMember::getPhone, registerParam.getPhone()) .eq(CuMember::getDelFlag, EDelFlag.UN_DELETE.getValue()) .eq(CuMember::getCategory, ECategory.NORMAL.getValue()) ); - if (phoneCount >= Integer.parseInt(value)) { + // 手机号注册次数 + if (memberList.size() >= Integer.parseInt(value)) { return AjaxResult.error(MemberMsgConstants.SYSTEM_REGISTER_COUNT); } + // 一个手机号只能有一个姓名 + if (!memberList.stream().allMatch(cuMember -> registerParam.getMemberName().equals(cuMember.getMemberName()))) { + return AjaxResult.error(MemberMsgConstants.PHONE_ALREADY_REGISTER); + } + CuMember newCuMember = iCuMemberService.shareRegisterMember(registerParam); if (null != newCuMember) { 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 21bfa94e..d48bc6f9 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 @@ -37,7 +37,7 @@ public class MemberMsgConstants { /** * 验证手机号是否被用户使用 -- 会员信息已注册，若有异议请及时联系在线客服！ */ - public static final String PHONE_ALREADY_REGISTER = "会员信息已注册，若有异议请及时联系在线客服！"; + public static final String PHONE_ALREADY_REGISTER = "会员信息已注册，若有异议请及时联系客服！"; /** * 验证手机号是否在同一个团队 -- 注册信息已存在,请重新输入注册信息！ From 4093e0716d8989822bcec82898c692d954b779eb Mon Sep 17 00:00:00 2001 From: zhangheng Date: Wed, 17 Sep 2025 11:59:24 +0800 Subject: [PATCH 24/24] =?UTF-8?q?##=20=E8=90=A5=E9=94=80=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8A=BD=E5=A5=96=E9=85=8D=E7=BD=AE,=E7=9B=B4=E6=8E=A8?= =?UTF-8?q?=E8=B5=A0=E9=80=81,=E6=97=85=E6=B8=B8=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=AD=BE=E5=91=88=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/service/IActivityService.java | 2 +- .../service/impl/ActivityServiceImpl.java | 40 +++++++++++++++++-- .../AcDrawGiftRuleConfigController.java | 8 +++- .../service/IAcDrawGiftRuleConfigService.java | 2 +- .../impl/AcDrawGiftRuleConfigServiceImpl.java | 32 ++++++++++++++- .../AcRecommendConfigController.java | 8 +++- .../IAcRepurCouponsRuleConfigService.java | 2 +- .../AcRepurCouponsRuleConfigServiceImpl.java | 17 ++++++-- .../manage/AcTourismController.java | 8 +++- 9 files changed, 101 insertions(+), 18 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java index d40d489c..fc0bbc0c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/IActivityService.java @@ -109,7 +109,7 @@ public interface IActivityService { * @param recommendParam * @return */ - Boolean onLinePetition(AcRecommendParam recommendParam); + String onLinePetition(AcRecommendParam recommendParam); /** * 活动签呈审核通过 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java index c604a83f..011078e8 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/base/service/impl/ActivityServiceImpl.java @@ -631,7 +631,8 @@ public class ActivityServiceImpl implements IActivityService { * @return */ @Override - public Boolean onLinePetition(AcRecommendParam recommendParam) { + public String onLinePetition(AcRecommendParam recommendParam) { + log.info("旅游活动新增参数{}",JSONUtil.toJsonStr(recommendParam)); //业务单号 String code = CommonUtil.createSerialNumber(EOrderPrefix.ACTIVITY_CODE.getValue()); EApprovalBusiness approvalBusiness = null; @@ -643,7 +644,40 @@ public class ActivityServiceImpl implements IActivityService { approvalBusiness = EApprovalBusiness.TOURISM_DELETE; } recommendParam.getActivityParam().setBusinessCode(code); - Boolean b = submitApproval(recommendParam, approvalBusiness); + Integer controlType = recommendParam.getControlType(); + if (controlType.equals(EControlType.SAVE.getValue())) { + ActivityParam activityParam = recommendParam.getActivityParam(); + activityParam.setPkCountry(recommendParam.getPkCountry()); + activityParam.setPkCreator(recommendParam.getPkMember()); + activityParam.setActType(EActType.TOURISM.getValue()); + + // 增加基础配置 + AcBaseConfig baseConfig = saveBaseConfig(activityParam); + // 目标群体配置 + saveGoalMemberConfig(activityParam, baseConfig); + } else if (controlType.equals(EControlType.MODIFY.getValue())) { + ActivityParam activityParam = recommendParam.getActivityParam(); + activityParam.setActType(EActType.TOURISM.getValue()); + activityParam.setPkCountry(recommendParam.getPkCountry()); + activityParam.setPkCreator(recommendParam.getPkMember()); + //目标用户群删除 + LambdaQueryWrapper qe = new LambdaQueryWrapper<>(); + qe.eq(AcGoalMemberConfig::getPkBaseId, activityParam.getPkId()); + goalMemberConfigService.remove(qe); + // 增加基础配置 + AcBaseConfig baseConfig = BeanUtil.copyProperties(activityParam, AcBaseConfig.class); + baseConfigService.updateById(baseConfig); + // 目标群体配置 + saveGoalMemberConfig(activityParam, baseConfig); + } else if (controlType.equals(EControlType.DELETE.getValue())) { + ActivityParam activityParam = recommendParam.getActivityParam(); + //目标用户群删除 + LambdaQueryWrapper qe = new LambdaQueryWrapper<>(); + qe.eq(AcGoalMemberConfig::getPkBaseId, activityParam.getPkId()); + goalMemberConfigService.remove(qe); + baseConfigService.removeById(activityParam.getPkId()); + drawGiftConfigService.removeDrawGiftConfig(activityParam.getPkId().intValue()); + } //日志 ActivityParam activityParam = recommendParam.getActivityParam(); activityParam.setPkCountry(SecurityUtils.getPkCountry()); @@ -651,7 +685,7 @@ public class ActivityServiceImpl implements IActivityService { activityParam.setActType(EActType.TOURISM.getValue()); activityParam.setBusinessCode(recommendParam.getActivityParam().getBusinessCode()); this.createBaseConfigLog(activityParam, new StringBuffer(), null, approvalBusiness.getValue(), false); - return b; + return null; } /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java index b6c66f9f..5b20c88c 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/controller/manage/AcDrawGiftRuleConfigController.java @@ -86,7 +86,7 @@ public class AcDrawGiftRuleConfigController extends BaseController { * @return AjaxResult */ @Log(module = EOperationModule.AC_RECOMMEEND_CONFIG, method = EOperationMethod.INSERT, remark = "抽奖在线配置") - @PostMapping("/online-petition") + @PostMapping("/submit") public AjaxResult onLinePetition(@RequestBody AcRecommendParam recommendParam) { if (recommendParam.getActivityParam().getDrawGiftConfigList() != null) { for (AcDrawGiftRuleConfigVo acDrawGiftRuleConfigVo : recommendParam.getActivityParam().getDrawGiftConfigList()) { @@ -99,7 +99,11 @@ public class AcDrawGiftRuleConfigController extends BaseController { recommendParam.setPkCountry(SecurityUtils.getPkCountry()); recommendParam.setPkMember(SecurityUtils.getUserId()); recommendParam.setLoginUser(userTokenService.getLoginUser()); - return toAjax(drawGiftConfigService.onLinePetition(recommendParam)); + String str = drawGiftConfigService.onLinePetition(recommendParam); + if (str != null) { + return AjaxResult.error(str); + } + return AjaxResult.success(); } /** diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java index 050d3239..94a9b3bc 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/draw/service/IAcDrawGiftRuleConfigService.java @@ -62,5 +62,5 @@ public interface IAcDrawGiftRuleConfigService extends IService implements IAcDrawGiftRuleConfigService { @Autowired @@ -181,7 +184,9 @@ public class AcDrawGiftRuleConfigServiceImpl extends ServiceImpl recommendUpgradeList = recommendParam.getRecommendUpgradeList(); @@ -113,12 +114,20 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl