Sfoglia il codice sorgente

//tt share

release_toaliyun_real
xhxu 3 anni fa
parent
commit
01be2a4395
2 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java Vedi File

@@ -1,5 +1,6 @@
package com.iformall.service.impl; package com.iformall.service.impl;


import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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")); long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd"));
datamap.put("todaycar", todaycar); datamap.put("todaycar", todaycar);
//环比 //环比
logger.info("-----"+JSON.toJSONString(historymap));
String yesterday = DateUtils.getTimeBefore(1, new Date()); String yesterday = DateUtils.getTimeBefore(1, new Date());
logger.info("-----"+yesterday);
long yesterdaycar = (long) historymap.get(yesterday.substring(5).replace("-", "/")); long yesterdaycar = (long) historymap.get(yesterday.substring(5).replace("-", "/"));
if (yesterdaycar > 0) { if (yesterdaycar > 0) {
double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100; double hbd = (double) (todaycar - yesterdaycar) / yesterdaycar * 100;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java Vedi File

@@ -338,7 +338,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{


jo.put("amount", childOrderShare.getShareAmount() - darenTakeAmount); jo.put("amount", childOrderShare.getShareAmount() - darenTakeAmount);
jo.put("rateAmount", childOrderShare.getRateAmount()); jo.put("rateAmount", childOrderShare.getRateAmount());
jo.put("realRateAmount", childOrderShare.getRateAmount());
jo.put("realRateAmount", childOrderShare.getRealRateAmount());
jo.put("commissionAmount", childOrderShare.getCommissionAmount()); jo.put("commissionAmount", childOrderShare.getCommissionAmount());
jo.put("darenTakeAmount", darenTakeAmount); jo.put("darenTakeAmount", darenTakeAmount);
//jo.put("description",receiver.getReceiverComments()); //改为存ID, //jo.put("description",receiver.getReceiverComments()); //改为存ID,


Caricamento…
Annulla
Salva