Browse Source

fix

release_toaliyun_real
lin 2 years ago
parent
commit
3570cd05e5
2 changed files with 374 additions and 3530 deletions
  1. +362
    -3525
      mallinkAdmin/src/main/resources/db/migration/V2023070100001_gaode.sql
  2. +12
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 362
- 3525
mallinkAdmin/src/main/resources/db/migration/V2023070100001_gaode.sql
File diff suppressed because it is too large
View File


+ 12
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -1522,16 +1522,23 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return findCouponMerchantVoList(couponIds, mallTenantEntity, null, hasShop);
}
private Map<Long,List<WxMerchantVo>> findCouponMerchantVoList(List<Long> couponIds,TenantEntity mallTenantEntity,TtMerchantPoi poiQ,boolean hasShop) {
private Map<Long,List<WxMerchantVo>> findCouponMerchantVoList(List<Long> couponIds,TenantEntity mallTenantEntity,List<Long> poiMerchantIds,boolean hasShop) {
Map<Long,List<WxMerchantVo>> retMap = new HashMap<Long,List<WxMerchantVo>>();
if (null == couponIds || couponIds.size() <= 0) {
return retMap;
}
List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(mallTenantEntity.getTenantId(), couponIds);
if(null != merchantIds && merchantIds.size() > 0 ) {
if (null == poiQ) {
poiQ = new TtMerchantPoi();
List<Long> productMerchantIds = wxCouponMerchantMapper.findMerchantByProductIds(mallTenantEntity.getTenantId(), couponIds);
if(null != productMerchantIds && productMerchantIds.size() > 0 ) {
List<Long> merchantIds = null;
if (null != poiMerchantIds && poiMerchantIds.size() > 0 ){
//取交集
merchantIds = (List<Long>) CollectionUtils.intersection(poiMerchantIds, productMerchantIds);
}
if (null == merchantIds) {
return retMap;
}
TtMerchantPoi poiQ = new TtMerchantPoi();
poiQ.updateTenantInfo(mallTenantEntity);
poiQ.setIds(merchantIds);
List<TtMerchantPoi> poiList = ttMerchantPoiMapper.findList(poiQ);


Loading…
Cancel
Save