yumeng il y a 5 ans
Parent
commit
0a2a89d1be

+ 2 - 1
module-report/src/main/java/cn/com/ctop/bytedance/service/impl/AccountReportServiceImpl.java

@@ -232,6 +232,7 @@ public class AccountReportServiceImpl implements IAccountReportService {
             String nowDate = DateUtils.getNowDate("yyyy-MM-dd"); // 当前日期
             String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", nowDate, -1); // 当前日期-1
             JSONArray accountIds = json.getJSONArray("accountIds");
+            BigDecimal discount = json.getBigDecimal("discount");
             if (Check.isNull(accountIds)) {
                 return null;
             }
@@ -359,7 +360,7 @@ public class AccountReportServiceImpl implements IAccountReportService {
                         if (!Check.isNull(nowFormPrice) && !Check.isNull(yesterdayFormPrice)) {
                             if (yesterdayFormPrice.compareTo(new BigDecimal(0)) != 0) {
                                 BigDecimal formPriceProportion = (nowFormPrice.subtract(yesterdayFormPrice)).divide(yesterdayFormPrice, BigDecimal.ROUND_HALF_UP, 2);
-                                chainRatioJson.put("formPriceProportion", formPriceProportion);
+                                chainRatioJson.put("formPriceProportion", formPriceProportion.divide(discount, BigDecimal.ROUND_HALF_UP, 2));
                             } else {
                                 chainRatioJson.put("formPriceProportion", 0); // 表单提交单价环比
                             }