From 417e33605dda0f28366a1d6e13c41198a156e3a7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 16:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index e09e475..263d5f3 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -4,7 +4,6 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.Jwt.JwtPayLoad;
import com.doumee.config.Jwt.JwtTokenUtil;
-import com.doumee.config.listener.event.VisitEvent;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -424,7 +423,18 @@
queryWrapper.leftJoin(Member.class,Member::getId,Shop::getMemberId);
queryWrapper.leftJoin(Labels.class,Labels::getId,Shop::getBigAreaId);
-
+ if(pageWrap.getModel().getAreaId()!=null){
+ queryWrapper.eq( Shop::getAreaId, pageWrap.getModel().getAreaId());
+ }else if(pageWrap.getModel().getCityId()!=null){
+ queryWrapper.leftJoin("areas a1 on a1.id=t.area_id");
+ queryWrapper.leftJoin("areas a2 on a2.id=a1.parent_id");
+ queryWrapper.apply("a2.id ="+pageWrap.getModel().getCityId());
+ } else if (pageWrap.getModel().getProvinceId()!=null){
+ queryWrapper.leftJoin("areas a1 on a1.id=t.area_id");
+ queryWrapper.leftJoin("areas a2 on a2.id=a1.parent_id");
+ queryWrapper.leftJoin("areas a3 on a3.id=a2.parent_id");
+ queryWrapper.apply("a3.id ="+pageWrap.getModel().getProvinceId());
+ }
queryWrapper.eq(Shop::getIsdeleted, Constants.ZERO);
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCode()) ,Shop::getCode,pageWrap.getModel().getCode());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getUsername()) ,Shop::getName,pageWrap.getModel().getUsername());
@@ -569,9 +579,6 @@
dto.setLabels(labels.stream().map(s->s.getName()).collect(Collectors.toList()));
List<ShopMenuDTO> shopMenuDTO = shopMenuService.findShopMenuDTO(shopId);
dto.setShopMenuDTOList(shopMenuDTO);
- //璁块棶鎿嶄綔
- VisitEvent<Shop> shopVisitEvent = new VisitEvent<>(this,shop);
- applicationEventPublisher.publishEvent(shopVisitEvent);
return dto;
}
--
Gitblit v1.9.3