From 284610bddc59797aca305730631d98453726db90 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 27 Apr 2022 16:36:44 +0800 Subject: [PATCH] //update spu --- .../basic/TtMerchantPoiController.java | 24 +++++++++---------- .../impl/TtMerchantPoiServiceImpl.java | 13 ++++++---- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java index 548b264b3..b87223f2b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -164,18 +164,18 @@ public class TtMerchantPoiController extends BaseController { if(couponChannelId == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - String merchantIdStr = param.get("merchantIds"); - List merchantIds = new ArrayList<>(); - try{ - List strings = Arrays.asList(merchantIdStr.split(",")); - merchantIds = strings.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); - }catch(Exception e){ - return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR); - } - if(merchantIds == null || merchantIds.size() == 0){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - return ttMerchantPoiService.spuSync(getTenantInfo(),couponChannelId,merchantIds); +// String merchantIdStr = param.get("merchantIds"); +// List merchantIds = new ArrayList<>(); +// try{ +// List strings = Arrays.asList(merchantIdStr.split(",")); +// merchantIds = strings.stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList()); +// }catch(Exception e){ +// return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR); +// } +// if(merchantIds == null || merchantIds.size() == 0){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); +// } + return ttMerchantPoiService.spuSync(getTenantInfo(),couponChannelId,null); } @ApiOperation("商品同步查询") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java index b3d9055ef..1dcedb3d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java @@ -579,18 +579,23 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { if(!EnumCouponType.getSpuSyncType().contains(coupon.getType())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"卷类型不支持同步poi"); } + List couponMerchantIds = wxCouponMerchantMapper.findMerchantIdListByProduct(coupon.getId(), tenantInfo.getTenantId()); + if(couponMerchantIds == null || couponMerchantIds.size() == 0 ){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到门店"); + } TtMerchantPoi poi = new TtMerchantPoi(); poi.updateTenantInfo(tenantInfo); - poi.setIds(merchantIds); + poi.setIds(couponMerchantIds); poi.setMatchStatus(EnumSupplierMathStatus.match_success.getCode()); poi.setSyncStatus(EnumSupplierSyncStatus.sync_success.getCode()); List poiList = ttMerchantPoiMapper.findList(poi); - if(merchantIds.size() != poiList.size()){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到poi或poi不匹配"); + if(poiList == null || poiList.isEmpty()){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到可用poi"); } + List collect = poiList.stream().map(p -> p.getId()).collect(Collectors.toList()); - String spuId = spuSync(coupon,couponChannel,merchantIds); + String spuId = spuSync(coupon,couponChannel,collect); if(StringUtils.isBlank(spuId)){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"同步失败"); }