|
@@ -10,12 +10,18 @@ import org.jeecg.common.api.vo.Result;
|
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.modules.bytedance.advertise.entity.AiBytedanceAdvertiserStrategy;
|
|
|
+import org.jeecg.modules.bytedance.advertise.entity.RuleDataAccount;
|
|
|
import org.jeecg.modules.bytedance.advertise.entity.UpdAdStaOrCpaOrBudget;
|
|
|
import org.jeecg.modules.bytedance.advertise.service.IAiBytedanceAdvertiserStrategyService;
|
|
|
+import org.jeecg.modules.bytedance.advertise.service.IRuleDataAccountService;
|
|
|
import org.jeecg.modules.bytedance.advertise.vo.AdConvertQueryVo;
|
|
|
import org.jeecg.modules.bytedance.advertise.vo.AdGroupSearchVo;
|
|
|
import org.jeecg.modules.bytedance.advertise.vo.PlanSearchVo;
|
|
|
import org.jeecg.modules.bytedance.common.constant.BytedanceConstant;
|
|
|
+import org.jeecg.modules.bytedance.common.entity.MaterialImageInfo;
|
|
|
+import org.jeecg.modules.bytedance.common.service.IMaterialImageInfoService;
|
|
|
+import org.jeecg.modules.bytedance.common.service.impl.MaterialImageInfoServiceImpl;
|
|
|
+import org.jeecg.modules.bytedance.common.utils.Check;
|
|
|
import org.jeecg.modules.system.service.ISysRoleService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -41,6 +47,12 @@ public class AiBytedanceAdvertiserStrategyController {
|
|
|
@Autowired
|
|
|
private ISysRoleService sysRoleService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IRuleDataAccountService ruleDataAccountService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IMaterialImageInfoService materialImageInfoService;
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 分页列表查询
|
|
@@ -59,13 +71,28 @@ public class AiBytedanceAdvertiserStrategyController {
|
|
|
Result<IPage<AiBytedanceAdvertiserStrategy>> result = new Result<>();
|
|
|
QueryWrapper<AiBytedanceAdvertiserStrategy> queryWrapper = QueryGenerator.initQueryWrapper(aiBytedanceAdvertiserStrategy, req.getParameterMap());
|
|
|
//获取用户角色code
|
|
|
- String roleCode = sysRoleService.getRoleCodeByUserId(aiBytedanceAdvertiserStrategy.getLogingUserId());
|
|
|
+ String roleCode = sysRoleService.getRoleCodeByUserId(aiBytedanceAdvertiserStrategy.getLoginUserId());
|
|
|
if(null != roleCode && !BytedanceConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode)){
|
|
|
- queryWrapper.eq("user_id", aiBytedanceAdvertiserStrategy.getLogingUserId());
|
|
|
+ queryWrapper.eq("user_id", aiBytedanceAdvertiserStrategy.getLoginUserId());
|
|
|
}
|
|
|
Page<AiBytedanceAdvertiserStrategy> page = new Page<AiBytedanceAdvertiserStrategy>(pageNo, pageSize);
|
|
|
//查询
|
|
|
IPage<AiBytedanceAdvertiserStrategy> pageList = aiBytedanceAdvertiserStrategyService.page(page, queryWrapper);
|
|
|
+ pageList.getRecords().forEach(pojo ->{
|
|
|
+ if (!Check.isNull(pojo.getAccountId())){
|
|
|
+ QueryWrapper<RuleDataAccount> ruleDataAccountQueryWrapper = new QueryWrapper<>();
|
|
|
+ ruleDataAccountQueryWrapper.eq("account_id",pojo.getAccountId());
|
|
|
+ //获取消耗 余额
|
|
|
+ RuleDataAccount ruleDataAccountVo = ruleDataAccountService.getOne(ruleDataAccountQueryWrapper);
|
|
|
+ //消耗
|
|
|
+ pojo.setCost(ruleDataAccountVo.getCost());
|
|
|
+ //余额
|
|
|
+ pojo.setValidBalance(ruleDataAccountVo.getValidBalance());
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ });
|
|
|
+
|
|
|
result.setSuccess(true);
|
|
|
result.setResult(pageList);
|
|
|
return result;
|
|
@@ -159,6 +186,9 @@ public class AiBytedanceAdvertiserStrategyController {
|
|
|
if(aiBytedanceAdvertiserStrategy==null) {
|
|
|
result.error500("未找到对应实体");
|
|
|
}else {
|
|
|
+ //素材图片url
|
|
|
+ MaterialImageInfo materialImageInfo = materialImageInfoService.getByCode(aiBytedanceAdvertiserStrategy.getCreativeProductImageCode());
|
|
|
+ aiBytedanceAdvertiserStrategy.setImageUrl(materialImageInfo.getUrl());
|
|
|
result.setResult(aiBytedanceAdvertiserStrategy);
|
|
|
result.setSuccess(true);
|
|
|
}
|