Просмотр исходного кода

//update spu

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
284610bddc
2 измененных файлов: 21 добавлений и 16 удалений
  1. +12
    -12
      mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java
  2. +9
    -4
      mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java

+ 12
- 12
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<Long> merchantIds = new ArrayList<>();
try{
List<String> 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<Long> merchantIds = new ArrayList<>();
// try{
// List<String> 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("商品同步查询")


+ 9
- 4
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<Long> 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<TtMerchantPoi> 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<Long> 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(),"同步失败");
}


Загрузка…
Отмена
Сохранить