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

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

release_toaliyun_real
xhxu 3 лет назад
Родитель
Сommit
ff79215f28
3 измененных файлов: 62 добавлений и 1 удалений
  1. +41
    -0
      mallinkBApi/src/main/java/com/iformall/controller/SysConfigController.java
  2. +13
    -0
      mallinkService/src/main/java/com/iformall/domain/po/TtPoiTakeRate.java
  3. +8
    -1
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java

+ 41
- 0
mallinkBApi/src/main/java/com/iformall/controller/SysConfigController.java Просмотреть файл

@@ -0,0 +1,41 @@
package com.iformall.controller;

import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.common.SysConfigConstant;
import com.iformall.domain.po.SysConfig;
import com.iformall.service.SysConfigService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

/**
* @author gongbiao
*/
@RestController
@RequestMapping("api/sysConfig")
public class SysConfigController extends BaseController {

private final Logger logger = LoggerFactory.getLogger(this.getClass());

@Autowired
private SysConfigService sysConfigService;
@ApiOperation("详情接口")
@GetMapping("getByKey")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true)})
public ResultData detail(String key) {

SysConfig sysConfig = sysConfigService.getByKey(key, getTenantInfo());
if (null == sysConfig || StringUtils.isBlank(sysConfig.getConfigItemValue())) {
return new ResultData("");
}
return new ResultData(sysConfig.getConfigItemValue());
}
}

+ 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 Просмотреть файл

@@ -657,7 +657,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);
@@ -794,10 +794,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();


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