From 1a3736fd29100046be716edea15c728ee23bb2a4 Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Thu, 28 Aug 2025 09:34:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor(framework):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=B8=AD=E7=9A=84=E7=A9=BA=E5=80=BC=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E5=92=8C=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=A4=84=E7=90=86?= =?UTF-8?q?-=20=E4=BD=BF=E7=94=A8=20CollUtil.isNotEmpty()=20=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=E7=A9=BA=E9=9B=86=E5=90=88=E5=88=A4=E6=96=AD=20-=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20CharSequenceUtil.isNotEmpty()=20=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=88=A4=E6=96=AD?= =?UTF-8?q?=20-=20=E4=BD=BF=E7=94=A8=20Objects.nonNull()=20=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3=E5=AF=B9=E8=B1=A1=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= =?UTF-8?q?-=20=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BB=A5=E6=8F=90=E9=AB=98=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/MemberAddressBuyerController.java | 2 +- .../goods/entity/dto/GoodsSearchParams.java | 28 ++++++++++++------- .../plugin/kuaidi100/Kuaidi100Plugin.java | 11 ++++---- .../lili/modules/member/entity/dos/Clerk.java | 3 +- .../order/serviceimpl/OrderServiceImpl.java | 14 +++++----- .../statistics/entity/vo/PlatformViewVO.java | 5 ++-- .../OrderStatisticsServiceImpl.java | 4 +-- .../serviceimpl/RechargeServiceImpl.java | 3 +- .../goods/GoodsStoreController.java | 7 +++++ 9 files changed, 48 insertions(+), 29 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java index fdd8e297d..a2712f784 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java @@ -59,7 +59,7 @@ public class MemberAddressBuyerController { public ResultMessage addShippingAddress(@Valid MemberAddress shippingAddress) { //添加会员地址 shippingAddress.setMemberId(Objects.requireNonNull(UserContext.getCurrentUser()).getId()); - if(shippingAddress.getIsDefault()==null){ + if(Objects.isNull(shippingAddress.getIsDefault())){ shippingAddress.setIsDefault(false); } return ResultUtil.data(memberAddressService.saveMemberAddress(shippingAddress)); diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java index 907c8afe1..27b6dbabf 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java @@ -11,6 +11,7 @@ import lombok.*; import java.util.Arrays; import java.util.List; +import java.util.Objects; /** * 商品查询条件 @@ -99,6 +100,8 @@ public class GoodsSearchParams extends PageVO { public QueryWrapper queryWrapper() { QueryWrapper queryWrapper = new QueryWrapper<>(); + + // 统一使用 CharSequenceUtil.isNotEmpty() 处理字符串 if (CharSequenceUtil.isNotEmpty(goodsId)) { queryWrapper.eq("goods_id", goodsId); } @@ -108,9 +111,12 @@ public class GoodsSearchParams extends PageVO { if (CharSequenceUtil.isNotEmpty(id)) { queryWrapper.in("id", Arrays.asList(id.split(","))); } + + // 统一使用 CollUtil.isNotEmpty() 处理集合 if (CollUtil.isNotEmpty(ids)) { queryWrapper.in("id", ids); } + if (CharSequenceUtil.isNotEmpty(storeId)) { queryWrapper.eq("store_id", storeId); } @@ -125,51 +131,53 @@ public class GoodsSearchParams extends PageVO { } if (CharSequenceUtil.isNotEmpty(goodsStatus)) { if(goodsStatus.equals(GoodsStatusEnum.UPPER.name())){ - //审核通过+已上架 queryWrapper.eq("auth_flag", GoodsAuthEnum.PASS.name()); queryWrapper.eq("market_enable", GoodsStatusEnum.UPPER.name()); }else if(goodsStatus.equals(GoodsStatusEnum.DOWN.name())){ - //审核通过+未上架 queryWrapper.eq("auth_flag", GoodsAuthEnum.PASS.name()); queryWrapper.eq("market_enable", GoodsStatusEnum.DOWN.name()); }else if(goodsStatus.equals(GoodsAuthEnum.TOBEAUDITED.name())){ - //待审核 queryWrapper.eq("auth_flag", GoodsAuthEnum.TOBEAUDITED.name()); }else if(goodsStatus.equals(GoodsAuthEnum.REFUSE.name())){ - //审核拒绝 queryWrapper.eq("auth_flag", GoodsAuthEnum.REFUSE.name()); } } - if (selfOperated != null) { + + // 统一使用 Objects.nonNull() 处理对象非空判断 + if (Objects.nonNull(selfOperated)) { queryWrapper.eq("self_operated", selfOperated); } + if (CharSequenceUtil.isNotEmpty(marketEnable)) { queryWrapper.eq("market_enable", marketEnable); } if (CharSequenceUtil.isNotEmpty(authFlag)) { queryWrapper.eq("auth_flag", authFlag); } - if (leQuantity != null) { + + if (Objects.nonNull(leQuantity)) { queryWrapper.le("quantity", leQuantity); } - if (geQuantity != null) { + if (Objects.nonNull(geQuantity)) { queryWrapper.gt("quantity", geQuantity); } - if (recommend != null) { + if (Objects.nonNull(recommend)) { queryWrapper.le("recommend", recommend); } + if (CharSequenceUtil.isNotEmpty(goodsType)) { queryWrapper.eq("goods_type", goodsType); } if (CharSequenceUtil.isNotEmpty(salesModel)) { queryWrapper.eq("sales_model", salesModel); } - if(alertQuantity != null && alertQuantity){ + + if(Objects.nonNull(alertQuantity) && alertQuantity){ queryWrapper.apply("quantity <= alert_quantity"); queryWrapper.ge("alert_quantity", 0); } + queryWrapper.in(CollUtil.isNotEmpty(ids), "id", ids); - queryWrapper.eq("delete_flag", false); this.betweenWrapper(queryWrapper); return queryWrapper; diff --git a/framework/src/main/java/cn/lili/modules/logistics/plugin/kuaidi100/Kuaidi100Plugin.java b/framework/src/main/java/cn/lili/modules/logistics/plugin/kuaidi100/Kuaidi100Plugin.java index 7b9628213..037b9a7bb 100644 --- a/framework/src/main/java/cn/lili/modules/logistics/plugin/kuaidi100/Kuaidi100Plugin.java +++ b/framework/src/main/java/cn/lili/modules/logistics/plugin/kuaidi100/Kuaidi100Plugin.java @@ -1,5 +1,6 @@ package cn.lili.modules.logistics.plugin.kuaidi100; +import cn.hutool.core.text.CharSequenceUtil; import cn.lili.modules.logistics.LogisticsPlugin; import cn.lili.modules.logistics.entity.dto.LabelOrderDTO; import cn.lili.modules.logistics.entity.enums.LogisticsEnum; @@ -148,25 +149,25 @@ public class Kuaidi100Plugin implements LogisticsPlugin { //电子面单客户账户或月结账号，需贵司向当地快递公司网点申请（参考电子面单申请指南）； 是否必填该属性，请查看参数字典 orderReq.setPartnerId(storeLogistics.getCustomerName()); //电子面单密码，需贵司向当地快递公司网点申请； 是否必填该属性，请查看参数字典 - if(storeLogistics.getCustomerPwd()!=null){ + if(CharSequenceUtil.isNotEmpty(storeLogistics.getCustomerPwd())){ orderReq.setPartnerKey(storeLogistics.getCustomerPwd()); } //电子面单密钥，需贵司向当地快递公司网点申请； 是否必填该属性，请查看参数字典 - if(storeLogistics.getMonthCode()!=null) { + if(CharSequenceUtil.isNotEmpty(storeLogistics.getMonthCode())) { orderReq.setPartnerSecret(storeLogistics.getMonthCode()); } //电子面单客户账户名称，需贵司向当地快递公司网点申请； 是否必填该属性，请查看参数字典 - if(storeLogistics.getPartnerName()!=null) { + if(CharSequenceUtil.isNotEmpty(storeLogistics.getPartnerName())) { orderReq.setPartnerName(storeLogistics.getPartnerName()); } // orderReq.setNet(); // 电子面单承载编号，需贵司向当地快递公司网点申请； 是否必填该属性，请查看参数字典 - if(storeLogistics.getSendSite()!=null) { + if(CharSequenceUtil.isNotEmpty(storeLogistics.getSendSite())) { orderReq.setCode(storeLogistics.getSendSite()); } //电子面单承载快递员名，需贵司向当地快递公司网点申请； 是否必填该属性，请查看参数字典 - if(storeLogistics.getSendStaff()!=null) { + if(CharSequenceUtil.isNotEmpty(storeLogistics.getSendStaff())) { orderReq.setCheckMan(storeLogistics.getSendStaff()); } diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Clerk.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Clerk.java index fc9f8b013..14fd6fab3 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Clerk.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Clerk.java @@ -1,5 +1,6 @@ package cn.lili.modules.member.entity.dos; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.lili.modules.member.entity.dto.ClerkAddDTO; import cn.lili.modules.store.entity.dos.Store; @@ -59,7 +60,7 @@ public class Clerk extends BaseEntity { * @param clerkAddDTO */ public Clerk(ClerkAddDTO clerkAddDTO) { - if (clerkAddDTO.getRoles()!=null && !clerkAddDTO.getRoles().isEmpty()) { + if (CollUtil.isNotEmpty(clerkAddDTO.getRoles()) && !clerkAddDTO.getRoles().isEmpty()) { this.roleIds = CharSequenceUtil.join(",", clerkAddDTO.getRoles()); } this.memberId = clerkAddDTO.getMemberId(); diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index 7df0121aa..68daa668c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -1289,13 +1289,13 @@ public class OrderServiceImpl extends ServiceImpl implements row.createCell(2).setCellValue(dto.getGoodsName()); row.createCell(3).setCellValue(dto.getNum()); row.createCell(4).setCellValue(dto.getGoodsId()); - row.createCell(5).setCellValue(dto.getUnitPrice()!=null?dto.getUnitPrice():0); - row.createCell(6).setCellValue(dto.getFlowPrice()!=null?dto.getFlowPrice():0); - row.createCell(7).setCellValue(dto.getFreightPrice()!=null?dto.getFreightPrice():0); - row.createCell(8).setCellValue(dto.getDiscountPrice()!=null?dto.getDiscountPrice():0); - row.createCell(9).setCellValue(dto.getSiteMarketingCost()!=null?dto.getSiteMarketingCost():0); - row.createCell(10).setCellValue(dto.getStoreMarketingCost()!=null?dto.getStoreMarketingCost():0); - row.createCell(11).setCellValue(dto.getUpdatePrice()!=null?dto.getUpdatePrice():0); + row.createCell(5).setCellValue(Objects.nonNull(dto.getUnitPrice())?dto.getUnitPrice():0); + row.createCell(6).setCellValue(Objects.nonNull(dto.getFlowPrice())?dto.getFlowPrice():0); + row.createCell(7).setCellValue(Objects.nonNull(dto.getFreightPrice())?dto.getFreightPrice():0); + row.createCell(8).setCellValue(Objects.nonNull(dto.getDiscountPrice())?dto.getDiscountPrice():0); + row.createCell(9).setCellValue(Objects.nonNull(dto.getSiteMarketingCost())?dto.getSiteMarketingCost():0); + row.createCell(10).setCellValue(Objects.nonNull(dto.getStoreMarketingCost())?dto.getStoreMarketingCost():0); + row.createCell(11).setCellValue(Objects.nonNull(dto.getUpdatePrice())?dto.getUpdatePrice():0); row.createCell(12).setCellValue(dto.getPaymentMethod()); row.createCell(13).setCellValue(dto.getConsigneeName()); row.createCell(14).setCellValue(dto.getConsigneeMobile()); diff --git a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java index 2e8486bc4..7fba78a9d 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/entity/vo/PlatformViewVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.Objects; /** * 流量数据展示VO @@ -36,14 +37,14 @@ public class PlatformViewVO { } public Long getPvNum() { - if(pvNum==null){ + if(Objects.isNull(pvNum)){ return 0L; } return pvNum; } public Long getUvNum() { - if(uvNum==null){ + if(Objects.isNull(uvNum)){ return 0L; } return uvNum; diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsServiceImpl.java index 6b0d44570..0920bc109 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsServiceImpl.java @@ -186,10 +186,10 @@ public class OrderStatisticsServiceImpl extends ServiceImpl i LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(Recharge::getPayStatus, PayStatusEnum.PAID.name()); queryWrapper.between(Recharge::getPayTime, dates[0], dates[1]); - if(paymentMethodEnum!=null){ + if(Objects.nonNull(paymentMethodEnum)){ queryWrapper.eq(Recharge::getRechargeWay,paymentMethodEnum.name()); } return this.baseMapper.getRecharge(queryWrapper); diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java index 48a9b0343..7fcac7b98 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java @@ -15,6 +15,7 @@ import cn.lili.modules.goods.entity.dto.GoodsOperationDTO; import cn.lili.modules.goods.entity.dto.GoodsSearchParams; import cn.lili.modules.goods.entity.dto.GoodsSkuStockDTO; import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; +import cn.lili.modules.goods.entity.vos.GoodsNumVO; import cn.lili.modules.goods.entity.vos.GoodsSkuVO; import cn.lili.modules.goods.entity.vos.GoodsVO; import cn.lili.modules.goods.entity.vos.StockWarningVO; @@ -81,6 +82,12 @@ public class GoodsStoreController { return ResultUtil.data(goodsService.queryByParams(goodsSearchParams)); } + @ApiOperation(value = "获取商品数量") + @GetMapping(value = "/goodsNumber") + public ResultMessage getGoodsNumVO(GoodsSearchParams goodsSearchParams) { + return ResultUtil.data(goodsService.getGoodsNumVO(goodsSearchParams)); + } + @ApiOperation(value = "分页获取商品Sku列表") @GetMapping(value = "/sku/list") public ResultMessage> getSkuByPage(GoodsSearchParams goodsSearchParams) {