diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml
index c4d5722..4ba4479 100644
--- a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml
+++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/CreatorProfitMapper.xml
@@ -62,6 +62,7 @@
from img_creator_profit icp
left join img_tiktok_img iti on iti.id = icp.img_id
where icp.is_show = '1' and icp.creator_id = #{creatorId} and icp.status = '0' and icp.type = #{type}
+ order by icp.create_time desc
@@ -75,6 +76,7 @@
from img_creator_profit icp
left join img_tiktok_img iti on iti.id = icp.img_id
where icp.is_show = '1' and icp.creator_id = #{creatorId} and icp.status = '1' and icp.type = #{type}
+ order by icp.income_time desc
diff --git a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProfitVerifyOrderServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProfitVerifyOrderServiceImpl.java
index 7070777..bb77810 100644
--- a/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProfitVerifyOrderServiceImpl.java
+++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/ProfitVerifyOrderServiceImpl.java
@@ -1,5 +1,6 @@
package com.bnyer.system.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.bnyer.common.core.constant.ProfitOrderConstant;
@@ -134,7 +135,7 @@ public class ProfitVerifyOrderServiceImpl implements IProfitVerifyOrderService {
BigDecimal invitePrice = yesterdayTotalInviteProfit.divide(BigDecimal.valueOf(platformDownloadNum), 3, RoundingMode.DOWN);
//查出昨日对应平台的所有广告待入账信息
List adProfits = creatorProfitService.queryPreProfit(params.getPlatform(), params.getAppType(), "0",date);
- if(adProfits.size() > 0){
+ if(CollectionUtil.isNotEmpty(adProfits)){
for (CreatorProfit adProfit : adProfits) {
//设置广告收益
adProfit.setProfit(BigDecimal.valueOf(adProfit.getDownloadNum()).multiply(adPrice));
@@ -146,7 +147,7 @@ public class ProfitVerifyOrderServiceImpl implements IProfitVerifyOrderService {
}
//查出昨日对应平台的所有邀请待入账信息
List inviteProfits = creatorProfitService.queryPreProfit(params.getPlatform(), params.getAppType(), "1",date);
- if(inviteProfits.size() > 0){
+ if(CollectionUtil.isNotEmpty(inviteProfits)){
//设置邀请收益
for (CreatorProfit inviteProfit : inviteProfits) {
inviteProfit.setProfit(BigDecimal.valueOf(inviteProfit.getDownloadNum()).multiply(invitePrice));