From f8f46d8f3c296762504229d4772ae49d27b5d4f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 7 Mar 2025 13:33:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/UPlatFormDictController.java | 39 +++++++++++++++++++ .../controller/user/UShopInfoController.java | 14 +++++++ .../account/dto/shopinfo/ShopInfoSubVO.java | 16 ++++++++ .../dto/shopuser/ShopUserDetailDTO.java | 3 ++ .../service/PlatformDictService.java | 2 +- .../service/PlatformDictTypeService.java | 2 +- .../czg/account/service/ShopInfoService.java | 3 ++ .../account}/mapper/PlatformDictMapper.java | 2 +- .../mapper/PlatformDictTypeMapper.java | 2 +- .../account/mapper/ShopInfoMapper.java | 6 +++ .../service/impl/PlatformDictServiceImpl.java | 6 +-- .../impl/PlatformDictTypeServiceImpl.java | 8 ++-- .../service/impl/ShopInfoServiceImpl.java | 9 +++++ .../service/impl/ShopUserServiceImpl.java | 7 +++- .../resources/mapper/PlatformDictMapper.xml | 2 +- .../mapper/PlatformDictTypeMapper.xml | 2 +- .../main/resources/mapper/ShopInfoMapper.xml | 9 +++++ .../service/impl/HomePageServiceImpl.java | 12 ++---- 18 files changed, 122 insertions(+), 22 deletions(-) create mode 100644 cash-api/account-server/src/main/java/com/czg/controller/user/UPlatFormDictController.java create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoSubVO.java rename cash-common/cash-common-service/src/main/java/com/czg/{product => account}/service/PlatformDictService.java (87%) rename cash-common/cash-common-service/src/main/java/com/czg/{product => account}/service/PlatformDictTypeService.java (88%) rename cash-service/{product-service/src/main/java/com/czg/service/product => account-service/src/main/java/com/czg/service/account}/mapper/PlatformDictMapper.java (85%) rename cash-service/{product-service/src/main/java/com/czg/service/product => account-service/src/main/java/com/czg/service/account}/mapper/PlatformDictTypeMapper.java (86%) rename cash-service/{product-service/src/main/java/com/czg/service/product => account-service/src/main/java/com/czg/service/account}/service/impl/PlatformDictServiceImpl.java (70%) rename cash-service/{product-service/src/main/java/com/czg/service/product => account-service/src/main/java/com/czg/service/account}/service/impl/PlatformDictTypeServiceImpl.java (62%) rename cash-service/{product-service => account-service}/src/main/resources/mapper/PlatformDictMapper.xml (73%) rename cash-service/{product-service => account-service}/src/main/resources/mapper/PlatformDictTypeMapper.xml (74%) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UPlatFormDictController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UPlatFormDictController.java new file mode 100644 index 00000000..9972911c --- /dev/null +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UPlatFormDictController.java @@ -0,0 +1,39 @@ +package com.czg.controller.user; + +import com.czg.account.entity.PlatformDict; +import com.czg.account.service.PlatformDictService; +import com.czg.resp.CzgResult; +import com.mybatisflex.core.query.QueryWrapper; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * 小程序平台配置相关 + * @author Administrator + */ +@RequestMapping("/user/dict") +@RestController +public class UPlatFormDictController { + @Resource + private PlatformDictService platformDictService; + + /** + * 获取小程序dict配置 + * @param type homeDistrict--金刚区（首页） + * carousel--轮播图 + * proTag--商品标签 + * shopTag--店铺标签 + * icon--小图标 + * subShop--预约到店顶部图 + * group--团购卷分类对应顶部图 value为团购卷Id + * ownMenu--个人中心菜单 + * @return dict信息 + */ + @GetMapping + public CzgResult get(@RequestParam String type) { + return CzgResult.success(platformDictService.getOne(new QueryWrapper().eq(PlatformDict::getType, type))); + } +} diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopInfoController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopInfoController.java index 752efea3..f7496a62 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopInfoController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopInfoController.java @@ -2,9 +2,11 @@ package com.czg.controller.user; import com.czg.account.dto.shopinfo.ShopInfoByCodeDTO; import com.czg.account.dto.shopinfo.ShopInfoDetailDTO; +import com.czg.account.dto.shopinfo.ShopInfoSubVO; import com.czg.account.service.ShopInfoService; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; +import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import jakarta.validation.constraints.NotEmpty; import org.springframework.web.bind.annotation.GetMapping; @@ -39,4 +41,16 @@ public class UShopInfoController { public CzgResult get(Long shopId) { return CzgResult.success(shopInfoService.getDetail(shopId == null ? StpKit.USER.getShopId() : shopId)); } + + /** + * 预约店铺列表,对应预约到店 + * @param lng 精度 + * @param lat 维度 + * @param distance 单位m + * @return 列表 + */ + @GetMapping("/subList") + public CzgResult> subList(@RequestParam String lng, @RequestParam String lat, @RequestParam float distance) { + return CzgResult.success(shopInfoService.getSubList(lat, lng, distance)); + } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoSubVO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoSubVO.java new file mode 100644 index 00000000..e5124a26 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoSubVO.java @@ -0,0 +1,16 @@ +package com.czg.account.dto.shopinfo; + +import lombok.Data; + +/** + * @author Administrator + */ +@Data +public class ShopInfoSubVO { + private Long id; + private String shopName; + private String logo; + private String phone; + private String address; + private Long distance; +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java index 4a65750f..669387d8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java @@ -1,5 +1,6 @@ package com.czg.account.dto.shopuser; +import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,4 +30,6 @@ public class ShopUserDetailDTO extends ShopUser { */ private Long shopId; + private ShopInfo shopInfo; + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/PlatformDictService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/PlatformDictService.java similarity index 87% rename from cash-common/cash-common-service/src/main/java/com/czg/product/service/PlatformDictService.java rename to cash-common/cash-common-service/src/main/java/com/czg/account/service/PlatformDictService.java index 1487203d..ca31957f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/PlatformDictService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/PlatformDictService.java @@ -1,4 +1,4 @@ -package com.czg.product.service; +package com.czg.account.service; import com.mybatisflex.core.service.IService; import com.czg.account.entity.PlatformDict; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/PlatformDictTypeService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/PlatformDictTypeService.java similarity index 88% rename from cash-common/cash-common-service/src/main/java/com/czg/product/service/PlatformDictTypeService.java rename to cash-common/cash-common-service/src/main/java/com/czg/account/service/PlatformDictTypeService.java index 0cab891c..8fc01e7a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/product/service/PlatformDictTypeService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/PlatformDictTypeService.java @@ -1,4 +1,4 @@ -package com.czg.product.service; +package com.czg.account.service; import com.mybatisflex.core.service.IService; import com.czg.account.entity.PlatformDictType; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java index a1952085..ad305df8 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java @@ -21,4 +21,7 @@ public interface ShopInfoService extends IService { ShopInfoByCodeDTO getByCode(String tableCode, String lat, String lng, boolean checkState); ShopInfoDetailDTO getDetail(Long shopId); + + Page getSubList(String lat, String lng, float distance); + } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/PlatformDictMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/PlatformDictMapper.java similarity index 85% rename from cash-service/product-service/src/main/java/com/czg/service/product/mapper/PlatformDictMapper.java rename to cash-service/account-service/src/main/java/com/czg/service/account/mapper/PlatformDictMapper.java index ffb492b4..23303a91 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/PlatformDictMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/PlatformDictMapper.java @@ -1,4 +1,4 @@ -package com.czg.service.product.mapper; +package com.czg.service.account.mapper; import com.mybatisflex.core.BaseMapper; import com.czg.account.entity.PlatformDict; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/PlatformDictTypeMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/PlatformDictTypeMapper.java similarity index 86% rename from cash-service/product-service/src/main/java/com/czg/service/product/mapper/PlatformDictTypeMapper.java rename to cash-service/account-service/src/main/java/com/czg/service/account/mapper/PlatformDictTypeMapper.java index f12db9b4..0a07b703 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/PlatformDictTypeMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/PlatformDictTypeMapper.java @@ -1,4 +1,4 @@ -package com.czg.service.product.mapper; +package com.czg.service.account.mapper; import com.mybatisflex.core.BaseMapper; import com.czg.account.entity.PlatformDictType; diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopInfoMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopInfoMapper.java index 492f086e..9fdb9e07 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopInfoMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopInfoMapper.java @@ -1,7 +1,12 @@ package com.czg.service.account.mapper; +import com.czg.account.dto.shopinfo.ShopInfoDetailDTO; +import com.czg.account.dto.shopinfo.ShopInfoSubVO; import com.czg.account.entity.ShopInfo; import com.mybatisflex.core.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 店铺信息 映射层。 @@ -11,4 +16,5 @@ import com.mybatisflex.core.BaseMapper; */ public interface ShopInfoMapper extends BaseMapper { + List getSubList(@Param("lng") String lng, @Param("lat") String lat, @Param("distance") float distance); } diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/PlatformDictServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java similarity index 70% rename from cash-service/product-service/src/main/java/com/czg/service/product/service/impl/PlatformDictServiceImpl.java rename to cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java index 4a8c9f2a..5c2f4af6 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/PlatformDictServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictServiceImpl.java @@ -1,9 +1,9 @@ -package com.czg.service.product.service.impl; +package com.czg.service.account.service.impl; -import com.czg.service.product.mapper.PlatformDictMapper; +import com.czg.service.account.mapper.PlatformDictMapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.PlatformDict; -import com.czg.product.service.PlatformDictService; +import com.czg.account.service.PlatformDictService; import org.springframework.stereotype.Service; /** diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/PlatformDictTypeServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictTypeServiceImpl.java similarity index 62% rename from cash-service/product-service/src/main/java/com/czg/service/product/service/impl/PlatformDictTypeServiceImpl.java rename to cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictTypeServiceImpl.java index ef22214c..207c421d 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/PlatformDictTypeServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PlatformDictTypeServiceImpl.java @@ -1,9 +1,10 @@ -package com.czg.service.product.service.impl; +package com.czg.service.account.service.impl; -import com.czg.service.product.mapper.PlatformDictTypeMapper; +import com.czg.service.account.mapper.PlatformDictTypeMapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.account.entity.PlatformDictType; -import com.czg.product.service.PlatformDictTypeService; +import com.czg.account.service.PlatformDictTypeService; +import org.apache.dubbo.config.annotation.DubboService; import org.springframework.stereotype.Service; /** @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; * @author zs * @since 2025-02-28 */ +@DubboService @Service public class PlatformDictTypeServiceImpl extends ServiceImpl implements PlatformDictTypeService{ diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java index 3dad7f62..7c0d6023 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java @@ -17,6 +17,9 @@ import com.czg.service.RedisService; import com.czg.service.account.mapper.ShopInfoMapper; import com.czg.utils.AssertUtil; import com.czg.utils.GeoUtil; +import com.czg.utils.PageUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; @@ -210,4 +213,10 @@ public class ShopInfoServiceImpl extends ServiceImpl i Map shopExtendMap = shopExtends.stream().collect(Collectors.toMap(ShopExtend::getAutoKey, i -> i)); return new ShopInfoDetailDTO(shopInfo, shopExtendMap); } + + @Override + public Page getSubList(String lat, String lng, float distance) { + PageHelper.startPage(PageUtil.buildPageHelp()); + return PageUtil.convert(new PageInfo<>(mapper.getSubList(lng, lat, distance))); + } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index f6cd0af6..8f7e1c42 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -274,8 +274,11 @@ public class ShopUserServiceImpl extends ServiceImpl i shopUserDetailDTO.setCouponNum(couponNum); ShopInfo shopInfo = shopInfoMapper.selectOneById(shopId); - shopUserDetailDTO.setShopName(shopInfo.getShopName()); - shopUserDetailDTO.setShopId(shopInfo.getId()); + if (shopInfo != null) { + shopUserDetailDTO.setShopName(shopInfo.getShopName()); + shopUserDetailDTO.setShopId(shopInfo.getId()); + shopUserDetailDTO.setShopInfo(shopInfo); + } return shopUserDetailDTO; } } diff --git a/cash-service/product-service/src/main/resources/mapper/PlatformDictMapper.xml b/cash-service/account-service/src/main/resources/mapper/PlatformDictMapper.xml similarity index 73% rename from cash-service/product-service/src/main/resources/mapper/PlatformDictMapper.xml rename to cash-service/account-service/src/main/resources/mapper/PlatformDictMapper.xml index 9cd55a8d..986b53d2 100644 --- a/cash-service/product-service/src/main/resources/mapper/PlatformDictMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/PlatformDictMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/cash-service/product-service/src/main/resources/mapper/PlatformDictTypeMapper.xml b/cash-service/account-service/src/main/resources/mapper/PlatformDictTypeMapper.xml similarity index 74% rename from cash-service/product-service/src/main/resources/mapper/PlatformDictTypeMapper.xml rename to cash-service/account-service/src/main/resources/mapper/PlatformDictTypeMapper.xml index 87fdc6e6..423f6cb3 100644 --- a/cash-service/product-service/src/main/resources/mapper/PlatformDictTypeMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/PlatformDictTypeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/cash-service/account-service/src/main/resources/mapper/ShopInfoMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopInfoMapper.xml index 0128ed0d..f81b841d 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopInfoMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopInfoMapper.xml @@ -4,4 +4,13 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java index bc3e6c48..ec5bfc14 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java +++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/HomePageServiceImpl.java @@ -1,12 +1,10 @@ package com.czg.service.product.service.impl; import cn.hutool.core.util.RandomUtil; -import cn.hutool.core.util.StrUtil; import com.czg.account.entity.PlatformDict; -import com.czg.account.entity.ShopInfo; import com.czg.account.entity.SysDict; import com.czg.product.service.HomePageService; -import com.czg.product.service.PlatformDictService; +import com.czg.account.service.PlatformDictService; import com.czg.product.service.SysDictService; import com.czg.account.vo.home.BannerInfoVo; import com.czg.account.vo.home.HomePageVO; @@ -17,18 +15,15 @@ import com.czg.product.service.ProdSkuService; import com.czg.product.service.ProductService; import com.czg.product.vo.RecommendProVO; import com.czg.service.product.mapper.ProductMapper; -import com.czg.utils.JoinQueryWrapper; import com.czg.utils.PageUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; -import org.apache.commons.lang3.StringUtils; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -45,8 +40,9 @@ public class HomePageServiceImpl implements HomePageService { }; - @Resource + @DubboReference private PlatformDictService platformDictService; + @Resource private SysDictService sysDictService; @Resource