Ver Fonte

利润单-头条

yangzian há 3 anos atrás
pai
commit
68696dacea

+ 3 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/ReportSettlementMapper.java

@@ -56,7 +56,9 @@ public interface ReportSettlementMapper {
      * 查询 头条利润表 总花费
      * @return
      */
-    List<Map<String,Object>> getProfitBytedanceAccountCost(@Param("accountId") String accountId,@Param("startTime") String startTime,@Param("endTime") String endTime);
+    List<Map<String,Object>> getProfitBytedanceAccount(@Param("startTime") String startTime,@Param("endTime") String endTime);
+    Map<String,Object> getProfitBytedanceAccountCost(@Param("accountId") String accountId,@Param("startTime") String startTime,@Param("endTime") String endTime);
+
     List<Map<String,Object>> getProfitBytedanceCost(@Param("accountId") String accountId,@Param("startTime") String startTime,@Param("endTime") String endTime);
 
     /**

+ 19 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/ReportSettlementMapper.xml

@@ -157,6 +157,23 @@
 
     </select>
 
+
+    <!-- 查询 头条利润表 所用账户-->
+    <select id="getProfitBytedanceAccount" resultType="java.util.LinkedHashMap">
+        SELECT
+        d.advertiser_id as accountId
+        FROM
+        ctop_account_transaction_day d
+        WHERE d.cost >0
+    <if test="startTime !=null and startTime != ''">
+        AND d.date &gt;= #{startTime}
+    </if>
+    <if test="endTime !=null and endTime != ''">
+        AND d.date &lt;= #{endTime}
+    </if>
+        GROUP BY d.advertiser_id;
+</select>
+
     <!-- 查询 头条利润表 所用账户-->
     <select id="getProfitBytedanceAccountCost" resultType="java.util.LinkedHashMap">
         SELECT
@@ -184,8 +201,8 @@
         AND d.date &lt;= #{endTime}
     </if>
 </where>
-        GROUP BY
-        d.advertiser_id;
+        GROUP BY d.advertiser_id
+        limit 1
 
 </select>
 

+ 6 - 3
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -523,19 +523,20 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
 
         try {
             //查询 头条利润表 时间段内 所有 账户
-            List<Map<String,Object>> list = reportSettlementMapper.getProfitBytedanceAccountCost(null,paramsVo.getStartTime(),paramsVo.getEndTime());
+
+            List<Map<String,Object>> list = reportSettlementMapper.getProfitBytedanceAccount(paramsVo.getStartTime(),paramsVo.getEndTime());
             if (Check.isNull(list)){
                 return Result.errorMsg("暂无数据");
             }
             List<ProfitReportBytedanceVo> resultList = new ArrayList<>(list.size());
-            for (Map<String, Object> map : list) {
+            for (Map<String, Object> mapList : list) {
               //查看该账户 状态信息
                 QueryWrapper<SysLog> sysLogQw = new QueryWrapper<>();
                 sysLogQw.eq("log_type", 2);
                 //操作类型
                 sysLogQw.eq("operate_type", 10001);
                 sysLogQw.eq("log_content", "0");//0开 1关
-                sysLogQw.eq("request_param", map.get("accountId").toString());
+                sysLogQw.eq("request_param", mapList.get("accountId").toString());
                 sysLogQw.orderByDesc("create_time");
                 sysLogQw.last("limit 1");
                 SysLog sysLog = sysLogMapper.selectOne(sysLogQw);
@@ -549,6 +550,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                         continue;
                     }
                 }
+                //查看账户数据
+                Map<String,Object> map = reportSettlementMapper.getProfitBytedanceAccountCost(mapList.get("accountId").toString(),paramsVo.getStartTime(),paramsVo.getEndTime());
 
                 ProfitReportBytedanceVo voSource = new ProfitReportBytedanceVo();
                 voSource.setAccountId(map.get("accountId")+"");