소스 검색

Merge branch 'V2.0.1' into test

zhaoxian 3 년 전
부모
커밋
10a6c2b0fa
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/ManagerSaleValueServiceImpl.java

+ 4 - 4
jeecg-boot-material-view/src/main/java/org/jeecg/ctop/material/service/impl/ManagerSaleValueServiceImpl.java

@@ -243,11 +243,11 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             result.put("list", list);
             //平台消耗
             if (compayAllAccountIds == null) {
-                result.put("platformCharge", result.getString("charge"));
+                result.put("platformCharge", result.getString("totalCharge"));
                 result.put("platformChargeRoi", result.getString("chargeRoi"));
             } else {
                 JSONObject ptdata = baseMapper.queryTtManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds);
-                result.put("platformCharge", ptdata.getString("charge"));
+                result.put("platformCharge", ptdata.getString("totalCharge"));
                 result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
             }
         } else if ("2".equals(mediaId)) {
@@ -256,11 +256,11 @@ public class ManagerSaleValueServiceImpl extends ServiceImpl<ManagerSaleValueMap
             result.put("list", list);
             //平台消耗
             if (compayAllAccountIds == null) {
-                result.put("platformCharge", result.getString("charge"));
+                result.put("platformCharge", result.getString("totalCharge"));
                 result.put("platformChargeRoi", result.getString("chargeRoi"));
             } else {
                 JSONObject ptdata = baseMapper.queryKsManydaysChargeAndRoi(startTime, endTime, lastTimeStart, lastTimeEnd, compayAllAccountIds);
-                result.put("platformCharge", ptdata.getString("charge"));
+                result.put("platformCharge", ptdata.getString("totalCharge"));
                 result.put("platformChargeRoi", ptdata.getString("chargeRoi"));
             }
         }