Преглед изворни кода

Merge branch 'release_toaliyun_real_202210' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210

release_toaliyun_real
zhengfangyuan пре 3 година
родитељ
комит
1aaac40814
2 измењених фајлова са 21 додато и 1 уклоњено
  1. +13
    -0
      mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java
  2. +8
    -1
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java

+ 13
- 0
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;
}

}

+ 8
- 1
mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java Прегледај датотеку

@@ -667,7 +667,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
List<String> addDouyinIdList = new ArrayList<>();
addDouyinIdList.addAll(record.getDouyinIdList());
List<String> oldDouyinIdList = JSONObject.parseArray(oldTakeRate.getDouyinId(), String.class);
addDouyinIdList.remove(oldDouyinIdList);
addDouyinIdList.removeAll(oldDouyinIdList);
if(!addDouyinIdList.isEmpty()){//有新增的达人
poiPlan.setDouyinIdList(addDouyinIdList);
Map<String, Integer> douyinMap = JSONObject.parseObject(oldTakeRate.getDouyinIdStatus(), Map.class);
@@ -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<Integer> 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();


Loading…
Откажи
Сачувај