From cb9e558c284b38ab1bbc9ed5a565c928d50ff21d Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 21 Jul 2025 11:10:53 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=B5=B7=E7=B2=89=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/common/util/TransactionUtils.java | 7 - .../api/ApiMemberAddressController.java | 41 ++-- .../controller/api/ApiMemberController.java | 67 +----- .../mapper/member/base/CuMemberMapper.xml | 2 + .../controller/ParentOrderController.java | 4 +- .../api/ApiFanSaOrderController.java | 217 ++++++++++++++++++ .../order/param/FansConfirmOrderParam.java | 68 ++++++ .../order/param/FansConfirmOrderSkuParam.java | 21 ++ .../param/FansConfirmOrderWaresParam.java | 28 +++ .../hzs/sale/order/vo/FansConfirmOrderVO.java | 34 +++ .../wares/mapper/BdWaresSpecsSkuMapper.java | 8 + .../service/IBdWaresSpecsSkuService.java | 11 +- .../impl/BdWaresSpecsSkuServiceImpl.java | 12 + .../sale/wares/BdWaresSpecsSkuMapper.xml | 19 ++ .../controller/api/ApiAreaController.java | 54 +---- 15 files changed, 456 insertions(+), 137 deletions(-) create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiFanSaOrderController.java create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderParam.java create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderSkuParam.java create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/param/FansConfirmOrderWaresParam.java create mode 100644 bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/FansConfirmOrderVO.java diff --git a/bd-business/bd-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java b/bd-business/bd-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java index 968171cc..73cf39a4 100644 --- a/bd-business/bd-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java +++ b/bd-business/bd-business-common/src/main/java/com/hzs/common/util/TransactionUtils.java @@ -1,22 +1,16 @@ package com.hzs.common.util; -import com.hzs.common.core.service.RedisService; -import com.hzs.common.core.utils.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; /** * 国际化翻译工具 - * - * @author hzs */ @Component @Slf4j public class TransactionUtils implements InitializingBean { -// private static RedisService redisService; - /** * 获取国际化翻译内容 * @@ -49,7 +43,6 @@ public class TransactionUtils implements InitializingBean { @Override public void afterPropertiesSet() { -// redisService = SpringUtils.getBean(RedisService.class); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberAddressController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberAddressController.java index 3edcc6e6..68844830 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberAddressController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberAddressController.java @@ -3,10 +3,9 @@ package com.hzs.member.base.controller.api; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; -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.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.constant.SystemFieldConstants; import com.hzs.common.core.enums.EDelFlag; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; @@ -28,11 +27,7 @@ import java.util.List; import java.util.Map; /** - * @Description: 会员地址控制器 - * @Author: jiang chao - * @Time: 2023/1/18 9:52 - * @Classname: ApiMemberAddressController - * @PackageName: com.hzs.member.base.controller.api + * 会员地址控制器 */ @Slf4j @RequestMapping("/api/member-address") @@ -52,9 +47,9 @@ public class ApiMemberAddressController extends BaseController { */ @GetMapping("/list") public AjaxResult list() { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("PK_MEMBER", SecurityUtils.getUserId()); - queryWrapper.orderByDesc("IS_DEFAULT", SystemFieldConstants.CREATION_TIME); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberReceiving::getPkMember, SecurityUtils.getUserId()); + queryWrapper.orderByDesc(CuMemberReceiving::getIsDefault, CuMemberReceiving::getCreationTime); List list = iCuMemberReceivingService.list(queryWrapper); List resultList = new ArrayList<>(); @@ -99,9 +94,9 @@ public class ApiMemberAddressController extends BaseController { */ @GetMapping("/detail/{id}") public AjaxResult detail(@PathVariable("id") Long id) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_ID, id); - queryWrapper.eq("PK_MEMBER", SecurityUtils.getUserId()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberReceiving::getPkId, id); + queryWrapper.eq(CuMemberReceiving::getPkMember, SecurityUtils.getUserId()); CuMemberReceiving cuMemberReceiving = iCuMemberReceivingService.getOne(queryWrapper); if (null == cuMemberReceiving) { return AjaxResult.error("会员地址不存在"); @@ -135,12 +130,12 @@ public class ApiMemberAddressController extends BaseController { public AjaxResult delete(@PathVariable("id") Long id) { Long userId = SecurityUtils.getUserId(); - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(SystemFieldConstants.PK_ID, id); - updateWrapper.eq("PK_MEMBER", userId); - updateWrapper.set(SystemFieldConstants.DEL_FLAG, EDelFlag.DELETE.getValue()); - updateWrapper.set(SystemFieldConstants.PK_MODIFIED, userId); - updateWrapper.set(SystemFieldConstants.MODIFIED_TIME, new Date()); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(CuMemberReceiving::getPkId, id); + updateWrapper.eq(CuMemberReceiving::getPkMember, userId); + updateWrapper.set(CuMemberReceiving::getDelFlag, EDelFlag.DELETE.getValue()); + updateWrapper.set(CuMemberReceiving::getPkModified, userId); + updateWrapper.set(CuMemberReceiving::getModifiedTime, new Date()); return toAjax(iCuMemberReceivingService.update(updateWrapper)); } @@ -154,9 +149,9 @@ public class ApiMemberAddressController extends BaseController { public AjaxResult setDefault(@PathVariable("id") Long id) { Long userId = SecurityUtils.getUserId(); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SystemFieldConstants.PK_ID, id); - queryWrapper.eq("PK_MEMBER", userId); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CuMemberReceiving::getPkId, id); + queryWrapper.eq(CuMemberReceiving::getPkMember, userId); CuMemberReceiving cuMemberReceiving = iCuMemberReceivingService.getOne(queryWrapper); if (null == cuMemberReceiving) { return AjaxResult.success("会员地址不存在"); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java index 6f86efb7..0d79452f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java @@ -259,53 +259,6 @@ public class ApiMemberController extends BaseController { return AjaxResult.error(); } -// /** -// * 更新邮箱 -// * -// * @param param -// * @return -// */ -// @PutMapping("/update-email") -// public AjaxResult updateEmail(@RequestBody MemberDataParam param) { -// if (StringUtils.isEmpty(param.getEmail())) { -// // 缺少参数 -// return AjaxResult.error("缺少参数"); -// } -// if (StringUtils.isEmpty(param.getCode())) { -// // 验证码不能为空 -// return AjaxResult.error(TransactionUtils.getContent(FinanceMsgConstants.VERIFICATION_CODE_CANNOT_EMPTY)); -// } -// -// Long memberId = SecurityUtils.getUserId(); -// CuMember member = iCuMemberService.getMemberById(memberId); -// if (null == member) { -// // 会员不存在 -// return AjaxResult.error(TransactionUtils.getContent(MemberMsgConstants.MEMBER_NOT_EXITS)); -// } -// -// // 短信校验码校验 -// String checkStr = iApiSmsService.checkSms(ESmsTemplate.VERIFICATION.getCache() + memberId, param.getCode()); -// if (null != checkStr) { -// return AjaxResult.error(checkStr); -// } -// -// // 会员修改信息 -// CuMember cuMember = new CuMember(); -// cuMember.setPkId(memberId); -// cuMember.setEmail(param.getEmail()); -// cuMember.setPkModified(memberId); -// cuMember.setModifiedTime(new Date()); -// // 会员修改记录信息 -// CuMemberChangeLog cuMemberChangeLog = CuMemberChangeLog.builder() -// .pkMember(memberId) -// .changeType(EMemberChangeType.EMAIL.getValue()) -// .changeFront(member.getEmail()) -// .changeAfter(param.getEmail()) -// .build(); -// iMemberInfoService.updateMemberInfo(cuMember, Collections.singletonList(cuMemberChangeLog)); -// return AjaxResult.success(); -// } - /** * 忘记密码更新 * @@ -396,7 +349,7 @@ public class ApiMemberController extends BaseController { // /** // * @param memberParam 订单参数 -// * @Description: 确认注册订单，生成待支付订单,只有注册订单有待支付订单 +// * 确认注册订单，生成待支付订单,只有注册订单有待支付订单 // * @return: AjaxResult // * @Author: sui q // * @Date: 2022/8/27 16:47 @@ -490,10 +443,7 @@ public class ApiMemberController extends BaseController { } /** - * @Description: 确认注册订单，生成待支付订单,只有注册订单有待支付订单 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 + * 确认注册订单，生成待支付订单,只有注册订单有待支付订单 */ @GetMapping("/validate-share-member/{memberCode}") public AjaxResult validateShareMemberCode(@PathVariable("memberCode") String memberCode) { @@ -510,10 +460,7 @@ public class ApiMemberController extends BaseController { } /** - * @Description: 获得推荐人国家前缀 - * @return: AjaxResult - * @Author: sui q - * @Date: 2022/8/27 16:47 + * 获得推荐人国家前缀 */ @GetMapping("/query-country-prefix/{pkParent}") public AjaxResult queryCountryPrefix(@PathVariable("pkParent") String pkParent) { @@ -545,7 +492,7 @@ public class ApiMemberController extends BaseController { } CuMember cuMember = iCuMemberService.getMemberById(Long.parseLong(new String(Base64Decoder.decode(pkParent)))); if (null != cuMember) { - return AjaxResult.success(cuMember.getMemberCode()); + return AjaxResult.success("", cuMember.getMemberCode()); } return AjaxResult.error(); } @@ -673,11 +620,9 @@ public class ApiMemberController extends BaseController { } /** + * 验证字段是否必输 + * * @param fieldList 需要验证的字段 - * @Description: 验证字段是否必输 - * @return: boolean - * @Author: sui q - * @Date: 2022/8/29 11:13 */ private boolean validateFieldNotNull(MemberParam memberParam, List fieldList) { return fieldList.stream().anyMatch(field -> { 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 37a0c2ad..19166190 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 @@ -324,6 +324,7 @@ + + + + + diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiAreaController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiAreaController.java index e8a65a66..deb7e536 100644 --- a/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiAreaController.java +++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/base/controller/api/ApiAreaController.java @@ -5,7 +5,7 @@ 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; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.system.base.BdArea; @@ -23,19 +23,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -/** - * @Description: - * @Author: yuhui - * @Time: 2023/1/30 16:26 - * @Classname: BdAreaController - * @PackageName: com.hzs.system.base.controller.api - */ @RestController("apiAreaController") @RequestMapping("/api/area") public class ApiAreaController { @Autowired - private IBdAreaService areaService; + private IBdAreaService iBdAreaService; /** * 查询树形图 省市区 @@ -47,7 +40,7 @@ public class ApiAreaController { if (pkCountry == null) { pkCountry = SecurityUtils.getPkCountry(); } - List areaList = areaService.getAreaList(pkCountry); + List areaList = iBdAreaService.getAreaList(pkCountry); TreeNodeConfig treeNodeConfig = new TreeNodeConfig(); treeNodeConfig.setDeep(3); @@ -62,21 +55,11 @@ public class ApiAreaController { } /** - * @description: 查询所有省市区 - * @author: yh - * @date: 2022/11/24 16:26 - * @param: [] - * @return: com.hz.common.core.domain.AjaxResult + * 查询所有省市区 **/ @GetMapping("/provinceList") public AjaxResult provinceList(Integer pkCountry) { - // Integer pkCountry = SecurityUtils.getPkCountry(); -// QueryWrapper qw = new QueryWrapper(); -// qw.eq("PARENT",0); -// qw.eq("PK_COUNTRY",pkCountry); -// // 查询第一层国家层 -// BdArea area = areaService.getOne(qw); - List list = areaService.getAreaList(pkCountry); + List list = iBdAreaService.getAreaList(pkCountry); List provinceList = new ArrayList<>(); List cityList = new ArrayList<>(); List countyList = new ArrayList<>(); @@ -100,14 +83,6 @@ public class ApiAreaController { } } areaCache.setCityList(cityList); - //县 -// for(AreaCache ac:cityList){ -// for(AreaCache co:list){ -// if(co.getParent().intValue()==ac.getPkId()){ -// countyList.add(co); -// } -// } -// } Set idSet = new HashSet<>(); for (AreaCache cache : cityList) { for (AreaCache ac : list) { @@ -133,25 +108,20 @@ public class ApiAreaController { * @param parent * @return */ - @GetMapping("get-level-list") + @GetMapping("/get-level-list") public AjaxResult getLevelList(Integer parent) { List list = new ArrayList<>(); if (parent == null) { return AjaxResult.success(list); } - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("parent", parent); - queryWrapper.eq("PK_COUNTRY", SecurityUtils.getPkCountry()); - queryWrapper.eq("enable_state", EYesNo.YES.getIntValue()); - list = areaService.list(queryWrapper); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(BdArea::getParent, parent); + queryWrapper.eq(BdArea::getPkCountry, SecurityUtils.getPkCountry()); + queryWrapper.eq(BdArea::getEnableState, EYesNo.YES.getIntValue()); + list = iBdAreaService.list(queryWrapper); List resultList = new ArrayList<>(); for (BdArea bdArea : list) { - BdAreaVo bdAreaVo = BeanUtil.copyProperties(bdArea, BdAreaVo.class); -// QueryWrapper areaWrapper = new QueryWrapper<>(); -// areaWrapper.eq("parent", bdAreaVo.getPkId()); -// int count = areaService.count(areaWrapper); -// bdAreaVo.setLevelCount(count); - resultList.add(bdAreaVo); + resultList.add(BeanUtil.copyProperties(bdArea, BdAreaVo.class)); } return AjaxResult.success(resultList); }