diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 8c22397e7..86bf73ba5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -651,7 +652,9 @@ public class DataTowerServiceImpl implements DataTowerService { long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd")); datamap.put("todaycar", todaycar); //环比 + logger.info("-----"+JSON.toJSONString(historymap)); String yesterday = DateUtils.getTimeBefore(1, new Date()); + logger.info("-----"+yesterday); long yesterdaycar = (long) historymap.get(yesterday.substring(5).replace("-", "/")); if (yesterdaycar > 0) { double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100; diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java index 9cdfccc5f..ac501de91 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java @@ -338,7 +338,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ jo.put("amount", childOrderShare.getShareAmount() - darenTakeAmount); jo.put("rateAmount", childOrderShare.getRateAmount()); - jo.put("realRateAmount", childOrderShare.getRateAmount()); + jo.put("realRateAmount", childOrderShare.getRealRateAmount()); jo.put("commissionAmount", childOrderShare.getCommissionAmount()); jo.put("darenTakeAmount", darenTakeAmount); //jo.put("description",receiver.getReceiverComments()); //改为存ID,