From b15c9eed79ea07c522584111847b0676ced310b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 12 May 2025 10:38:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:askbot=20=E9=97=A8=E5=BA=97=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E5=BC=8F=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/StoreDao.java | 7 ++++++ .../com/cool/store/mapper/StoreMapper.java | 7 ++++++ .../main/resources/mapper/ShopInfoMapper.xml | 3 ++- .../src/main/resources/mapper/StoreMapper.xml | 10 ++++++++ .../cool/store/dto/ShopNameAndCodeDTO.java | 3 +++ .../store/response/MiniShopsResponse.java | 2 ++ .../store/service/impl/ShopServiceImpl.java | 24 +++++++++++-------- 7 files changed, 45 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java index d6e22cdef..df21e9bd4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/StoreDao.java @@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; @Repository @@ -55,6 +56,12 @@ public class StoreDao { return storeMapper.getByStoreNum(storeNum); } + public List listByMobile(String mobile) { + if(StringUtils.isBlank(mobile)) { + return new ArrayList<>(); + } + return storeMapper.listByMobile(mobile); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java index d9f95274c..e77c86a9a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java @@ -24,4 +24,11 @@ public interface StoreMapper { StoreDO getByStoreNum(@Param("storeNum") String storeNum); + /** + * 查询自定义字段含有该手机号的门店 + * @param mobile + * @return + */ + List listByMobile(@Param("mobile") String mobile); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index f66c75445..7d4dd5cf0 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -441,7 +441,8 @@ + + diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ShopNameAndCodeDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ShopNameAndCodeDTO.java index 6e8f7e150..4b0fddfea 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ShopNameAndCodeDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ShopNameAndCodeDTO.java @@ -17,4 +17,7 @@ public class ShopNameAndCodeDTO { @ApiModelProperty("店铺编码") private String shopCode; + + @ApiModelProperty("店铺地址") + private String shopAddress; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java index 177a97120..48deb803d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/MiniShopsResponse.java @@ -16,4 +16,6 @@ public class MiniShopsResponse { private String shopName; @ApiModelProperty("店铺编码") private String shopCode; + @ApiModelProperty("店铺详细地址") + private String detailAddress; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index c18672ddb..d12f1509e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -96,6 +96,8 @@ public class ShopServiceImpl implements ShopService { ShopAccountDAO shopAccountDAO; @Resource HyPartnerUserInfoDAO hyPartnerUserInfoDAO; + @Resource + StoreDao storeDao; @Override @@ -599,6 +601,7 @@ public class ShopServiceImpl implements ShopService { ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); dto.setShopName(shopInfoDO.getShopName()); dto.setShopCode(shopInfoDO.getShopCode()); + dto.setShopAddress(shopInfoDO.getDetailAddress()); list.add(dto); } Map shopMap = shopList.stream().collect(Collectors.toMap(MiniShopsResponse::getShopId, Function.identity())); @@ -607,18 +610,19 @@ public class ShopServiceImpl implements ShopService { ShopNameAndCodeDTO currentShop = new ShopNameAndCodeDTO(); currentShop.setShopName(shopMap.get(shopId).getShopName()); currentShop.setShopCode(shopMap.get(shopId).getShopCode()); + currentShop.setShopAddress(shopMap.get(shopId).getDetailAddress()); response.setCurrentShop(currentShop); } } - List oldMobile = oldShopDAO.getByMobile(lineInfoDO.getMobile()); - if (CollectionUtils.isNotEmpty(oldMobile)) { - for (OldShopDO oldShopDO : oldMobile) { - ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); - dto.setShopName(oldShopDO.getShopName()); - dto.setShopCode(oldShopDO.getShopCode()); - list.add(dto); - } - } + List storeDOS = storeDao.listByMobile(lineInfoDO.getMobile()); + storeDOS.stream().forEach(x->{ + ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); + dto.setShopName(x.getStoreName()); + dto.setShopCode(x.getStoreNum()); + dto.setShopAddress(x.getStoreAddress()); + list.add(dto); + }); + if (CollectionUtils.isEmpty(list)) { return null; } @@ -631,8 +635,8 @@ public class ShopServiceImpl implements ShopService { )) .values()); response.setShopList(distinctList); + log.info("shopInfo：{}",JSONObject.toJSONString(response)); return response; - } @Override