From 695e70e7a591fd90c24ea2f0cf12eae88e8b5d14 Mon Sep 17 00:00:00 2001 From: dzq Date: Tue, 3 Jun 2025 17:34:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=92=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 在QyUserApplicationService中添加对ab98UserId为null的判断，避免空指针异常 2. 在ShopGoodsMapper的SQL查询中增加goods_detail和usage_instruction字段 3. 在SearchShopOrderQuery中添加goodsId查询条件，支持按商品ID筛选订单 --- .../domain/qywx/user/QyUserApplicationService.java | 8 ++++++-- .../agileboot/domain/shop/goods/db/ShopGoodsMapper.java | 2 +- .../domain/shop/order/query/SearchShopOrderQuery.java | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java index 84e131d..1c87904 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/user/QyUserApplicationService.java @@ -63,8 +63,12 @@ public class QyUserApplicationService { dto.setRoleName(sysRole.getRoleName()); } } - Ab98UserEntity ab98User = ab98UserService.getById(user.getAb98UserId()); - dto.setOpenid(ab98User.getOpenid()); + if (user.getAb98UserId() != null) { + Ab98UserEntity ab98User = ab98UserService.getById(user.getAb98UserId()); + if (ab98User != null) { + dto.setOpenid(ab98User.getOpenid()); + } + } return dto; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java index 7894ded..d225a56 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/goods/db/ShopGoodsMapper.java @@ -85,7 +85,7 @@ public interface ShopGoodsMapper extends BaseMapper { List getGoodsWithCabinetListByShopId(@Param("shopId")Long shopId); @Select("SELECT g.goods_id, g.goods_name, g.category_id, g.price, " + - "g.stock, g.status, g.auto_approval, g.cover_img, SUM(cc.stock) AS total_stock, " + + "g.stock, g.status, g.auto_approval, g.cover_img, g.goods_detail, g.usage_instruction, SUM(cc.stock) AS total_stock, " + "GROUP_CONCAT(DISTINCT cc.cell_no) AS cell_no_str, " + "GROUP_CONCAT(DISTINCT sc.cabinet_name) AS cabinet_name " + "FROM shop_goods g " + diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java index c2b7a91..590ffe2 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/query/SearchShopOrderQuery.java @@ -18,6 +18,7 @@ public class SearchShopOrderQuery extends AbstractPageQuery { private String userid; private Long cellId; private Long cabinetId; + private Long goodsId; private Integer status; private Integer payStatus; private Date startTime; @@ -39,6 +40,7 @@ public class SearchShopOrderQuery extends AbstractPageQuery { .or() .eq("o.userid", StringUtils.trim(userid))) .eq(cabinetId != null, "cc.cabinet_id", cabinetId) + .eq(goodsId!= null, "og.goods_id", goodsId) .eq(status != null, "o.status", status) .eq(payStatus != null, "o.pay_status", payStatus) .eq(StrUtil.isNotEmpty(paymentMethod), "o.payment_method", paymentMethod)