From baa447de98d9f449dbc1ad4055136bed300670b6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Nov 2022 14:01:59 +0800 Subject: [PATCH 1/2] //plan --- .../com/iformall/service/impl/TtCouponGoodsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index d58b69af3..4a8bb0eca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -667,7 +667,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { List addDouyinIdList = new ArrayList<>(); addDouyinIdList.addAll(record.getDouyinIdList()); List oldDouyinIdList = JSONObject.parseArray(oldTakeRate.getDouyinId(), String.class); - addDouyinIdList.remove(oldDouyinIdList); + addDouyinIdList.removeAll(oldDouyinIdList); if(!addDouyinIdList.isEmpty()){//有新增的达人 poiPlan.setDouyinIdList(addDouyinIdList); Map douyinMap = JSONObject.parseObject(oldTakeRate.getDouyinIdStatus(), Map.class); From a9a8735ae00fb9892fc464a0fd2ae8314fcae64a Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Nov 2022 15:48:03 +0800 Subject: [PATCH 2/2] //plan --- .../java/com/iformall/domain/po/TtPoiTakeRate.java | 13 +++++++++++++ .../service/impl/TtCouponGoodsServiceImpl.java | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java b/mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java index 3ac4b28bf..7c984ee5e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java @@ -3,6 +3,9 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumCpsPlanContentType; +import com.iformall.enums.EnumCpsPlanStatus; +import com.iformall.enums.EnumCpsPlanType; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -61,4 +64,14 @@ public class TtPoiTakeRate extends TenantEntity { @TableField(exist = false) private WxCoupon coupon; + public Integer getStatus(){ + if(EnumCpsPlanType.DIRECTIONAL.getCode().equals(type) + && EnumCpsPlanContentType.VIDEO.getCode().equals(contentType) + && endTime != null + && endTime.before(new Date())){ + status = EnumCpsPlanStatus.OFF.getCode(); + } + return status; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index 4a8bb0eca..db76a33d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -804,10 +804,17 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { TtWebService ttWebService = ttMerchantPoiService.getTtWebService(record); boolean b = ttWebService.getPoiPlanService().poiOrientedPlanDeleteTalent(record.getId(), record.getDouyinId()); + TtPoiTakeRate updTakeRate = new TtPoiTakeRate(); updTakeRate.setId(record.getId()); updTakeRate.updateTenantInfo(record); updTakeRate.setDouyinIdStatus(JSON.toJSONString(douyinMap)); + + Collection values = douyinMap.values(); + values.removeIf(e -> e.equals(EnumCpsPlanStatus.OFF.getCode())); + if(values.isEmpty()){ + updTakeRate.setStatus(EnumCpsPlanStatus.OFF.getCode()); + } updTakeRate.setUpdateDate(new Date()); ttPoiTakeRateMapper.updateById(updTakeRate); return new ResultData();