From 29dfc355df928ec8a1e4253b027afc569b4c7776 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 16 Jan 2022 13:38:14 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81.test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WxCouponMerchantMapper.java | 3 +- .../iformall/mapper/WxMallBuildingMapper.java | 2 ++ .../iformall/mapper/WxMallFloorMapper.java | 2 ++ .../com/iformall/mapper/WxMerchantMapper.java | 2 ++ .../com/iformall/mapper/WxShopMapper.java | 2 ++ .../service/WxMallBuildingService.java | 4 +++ .../iformall/service/WxMallFloorService.java | 4 +++ .../iformall/service/WxMerchantService.java | 2 ++ .../com/iformall/service/WxShopService.java | 8 +++++ .../impl/WxCouponOrderServiceImpl.java | 4 +++ .../impl/WxMallBuildingServiceImpl.java | 7 ++++ .../service/impl/WxMallFloorServiceImpl.java | 10 ++++++ .../service/impl/WxMerchantServiceImpl.java | 33 +++++++++++++++++++ .../service/impl/WxShopServiceImpl.java | 7 ++++ .../mapper/WxCouponMerchantMapper.xml | 12 +++++++ .../resources/mapper/WxMallBuildingMapper.xml | 9 +++-- .../resources/mapper/WxMallFloorMapper.xml | 6 ++++ .../resources/mapper/WxMerchantMapper.xml | 18 ++++++++++ .../main/resources/mapper/WxShopMapper.xml | 19 ++++++++++- 19 files changed, 150 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java index d429c64e5..8da415eaa 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java @@ -19,6 +19,7 @@ public interface WxCouponMerchantMapper extends CommonMapper findMerchantBaseList(@Param("productId")Long productId,@Param("tenantId")String tenantId); List findMerchantProduct(@Param("tenantId")String tenantId,@Param("merchantIdList")List merchantIdList); List findMerchantProductIds(@Param("tenantId")String tenantId,@Param("merchantIdList")List merchantIdList,@Param("status")Integer status); - List findOneMerchantProductIds(@Param("tenantId")String tenantId,@Param("merchantId")Long merchantIdList); + List findOneMerchantProductIds(@Param("tenantId")String tenantId,@Param("merchantId")Long merchantId); List findMerchantByProductIds(@Param("tenantId")String tenantId,@Param("productIds")List productIds); + List findMerchantByProductId(@Param("tenantId")String tenantId,@Param("productId")Long productId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java index 1c443fb9a..559bf8934 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallBuildingMapper.java @@ -10,4 +10,6 @@ public interface WxMallBuildingMapper extends CommonMapper findIdAndName(String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java index 4ee4d1b02..c7c1e87dd 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallFloorMapper.java @@ -11,4 +11,6 @@ public interface WxMallFloorMapper extends CommonMapper { int deleteByBuildingId(Long buildingId); void deleteByTenantId(String tenantId); + + List findIdAndName(String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index bbbb334af..6e3030259 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -63,4 +63,6 @@ public interface WxMerchantMapper extends CommonMapper { List> findMerchantByShop(@Param("shopId")Long shopId); List> detailByShopId(@Param("tenantInfo")TenantEntity tenantInfo,@Param("shopId") Long shopId); + + List newFindListCVo(@Param("tenantId")String tenantId, @Param("merchantIds")List merchantIds); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 09f6135f7..f277fc19e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -49,4 +49,6 @@ public interface WxShopMapper extends CommonMapper { List> detailBySid(WxShop wxShop); + List newFindShopVoList(@Param("tenantId")String tenantId, @Param("shopIds")List shopIds); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java index 5471dd4ff..33c1ae0fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java @@ -7,6 +7,8 @@ import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallFloor; +import java.util.Map; + public interface WxMallBuildingService { /** @@ -71,4 +73,6 @@ public interface WxMallBuildingService { void deleteByTenantId(String tenantId); void saveFloorImg(WxMallFloor floor); + + Map getBuildingMap(TenantEntity tenantInfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java index 87ea918ff..bd1a806b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallFloorService.java @@ -5,6 +5,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.WxMallFloor; +import java.util.Map; + public interface WxMallFloorService { /** @@ -45,4 +47,6 @@ public interface WxMallFloorService { void deleteByBuildingId(Long buildingId); void deleteByTenantId(String tenantId); + + Map getFloorMap(TenantEntity tenantInfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index e7e4ad0d6..8ef51024c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -187,4 +187,6 @@ public interface WxMerchantService { Map findMerchantByShop(Long shopId); Map detailByShopId(TenantEntity tenantInfo, Long shopId); + + List newFindByCouponId(TenantEntity tenantInfo, Long couponId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index a8492528b..8e41a24a1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -9,6 +9,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.WxShop; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxShopVo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -86,4 +87,11 @@ public interface WxShopService { Map detailBySid(TenantEntity tenantInfo, String sid); + /** + * 无楼层信息.楼层信息单独处理 + * @param tenantId + * @param merchantId + * @return + */ + List newFindByMerchantId(String tenantId, Long merchantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index ef3a007ae..caa996322 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -110,6 +110,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxCouponMapper wxCouponMapper; + @Autowired + WxMerchantService wxMerchantService; + @Lazy @Autowired WxAppinfoService wxAppinfoService; @@ -640,6 +643,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { cvo.setPickEndDate(coupon.getPickEndDate()); cvo.setAutoRefund(coupon.getAutoRefund()); } + cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,cvo.getCouponId())); return cvo; } catch (IllegalAccessException | InvocationTargetException e) { logger.error("getCouponOrderCVo error.",e); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index 40616f8d4..508b00af3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -231,5 +231,12 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { wxMallFloorMapper.updateById(mallFloor); } + @Override + public Map getBuildingMap(TenantEntity tenantInfo) { + List idAndNameS = wxMallBuildingMapper.findIdAndName(tenantInfo.getTenantId()); + Map maps = idAndNameS.stream().collect(Collectors.toMap(WxMallBuilding::getId, WxMallBuilding::getBuildingName, (key1, key2) -> key2)); + return maps; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java index b3adcf43c..3561f2876 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallFloorServiceImpl.java @@ -1,6 +1,8 @@ package com.iformall.service.impl; import java.util.*; +import java.util.stream.Collectors; + import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; @@ -16,6 +18,7 @@ import com.iformall.common.IdWorker; @Service public class WxMallFloorServiceImpl implements WxMallFloorService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired @@ -73,5 +76,12 @@ public class WxMallFloorServiceImpl implements WxMallFloorService { wxMallFloorMapper.deleteByTenantId(tenantId); } + @Override + public Map getFloorMap(TenantEntity tenantInfo) { + List idAndNameS = wxMallFloorMapper.findIdAndName(tenantInfo.getTenantId()); + Map maps = idAndNameS.stream().collect(Collectors.toMap(WxMallFloor::getId, WxMallFloor::getFloorName, (key1, key2) -> key2)); + return maps; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 45ee43bf3..a339be149 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -107,12 +107,20 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired WxMallService wxMallService; + @Autowired + WxShopService wxShopService; + @Autowired TtCouponMapper ttCouponMapper; @Autowired TtUserFollowMapper ttUserFollowMapper; + @Autowired + WxMallFloorService wxMallFloorService; + @Autowired + WxMallBuildingService wxMallBuildingService; + @Autowired private QrCodeService qrCodeService; @@ -1188,4 +1196,29 @@ public class WxMerchantServiceImpl implements WxMerchantService { return null; } + @Override + public List newFindByCouponId(TenantEntity tenantInfo, Long couponId) { + List merchantIds = wxCouponMerchantMapper.findMerchantByProductId(tenantInfo.getTenantId(), couponId); + List wxMerchantVoList = wxMerchantMapper.newFindListCVo(tenantInfo.getTenantId(),merchantIds); + handleShopVo(tenantInfo,wxMerchantVoList); + return wxMerchantVoList; + } + + private void handleShopVo(TenantEntity tenantInfo,List wxMerchantVoList){ + if(wxMerchantVoList != null && wxMerchantVoList.size() > 0){ + Map floorMap = wxMallFloorService.getFloorMap(tenantInfo); + Map buildingMap = wxMallBuildingService.getBuildingMap(tenantInfo); + for (WxMerchantVo wv:wxMerchantVoList) { + List shopVoList = wxShopService.newFindByMerchantId(tenantInfo.getTenantId(),wv.getId()); + if(shopVoList != null && shopVoList.size() > 0){ + for (WxShopVo sv:shopVoList) { + sv.setBuildingName(buildingMap.get(sv.getBuilding())); + sv.setFloorName(floorMap.get(sv.getFloor())); + } + } + wv.setShopVoList(shopVoList); + } + } + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index e4f21908f..72e25c258 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -260,4 +260,11 @@ public class WxShopServiceImpl implements WxShopService { } return null; } + + @Override + public List newFindByMerchantId(String tenantId, Long merchantId) { + List shopIds = wxMerchantShopMapper.findShopIds(merchantId); + List shopVoList = wxShopMapper.newFindShopVoList(tenantId,shopIds); + return shopVoList; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index 2940bd67f..52cb52ecf 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -200,5 +200,17 @@ + + diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml index 91a62fe4a..abaf69301 100644 --- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml @@ -78,8 +78,13 @@ delete from wx_mall_building where `tenant_id` = #{tenantId} - - + + diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index 83f2d8aaf..9cc81b1b6 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -84,5 +84,11 @@ delete from wx_mall_floor where `tenant_id` = #{tenantId} + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index b9651a4b6..16447c0b9 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -753,4 +753,22 @@ and s.`id` = #{shopId} + + + diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 7ba72ee6e..d4d506494 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -619,7 +619,8 @@ + + +