yangzian 3 سال پیش
والد
کامیت
9f80114ba0

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

@@ -64,7 +64,8 @@ public interface ReportSettlementMapper {
      * @param
      * @return
      */
-    List<Map<String,Object>> getProfitKuaiShouAccountCost(@Param("accountId")String accountId,@Param("startTime")String startTime ,@Param("endTime")String endTime);
+    List<Map<String,Object>> getProfitKuaiShouAgentAccount(@Param("startTime")String startTime ,@Param("endTime")String endTime);
+    Map<String,Object> getProfitKuaiShouAccountCost(@Param("accountId")String accountId,@Param("startTime")String startTime ,@Param("endTime")String endTime);
     //快手 利润表 账户 时间段内的数据信息
     List<Map<String,Object>> getProfitKuaiShouCost(@Param("accountId")String accountId,@Param("startTime")String startTime ,@Param("endTime")String endTime);
 

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

@@ -300,6 +300,20 @@
         limit 1
     </select>
 
+    <!-- 查询 快手 代理商 所有账户-->
+    <select id="getProfitKuaiShouAgentAccount" resultType="java.util.LinkedHashMap">
+        SELECT k.* from
+        ctop_kuaishou_daily_agent k
+        where k.total_charged_in_yuan !=0
+            <if test="startTime !=null and startTime != ''">
+                AND k.date_time &gt;= #{startTime}
+            </if>
+            <if test="endTime !=null and endTime != ''">
+                AND k.date_time &lt;= #{endTime}
+            </if>
+        GROUP BY k.account_id
+    </select>
+
     <!-- 查询 快手 利润表 总花费-->
     <select id="getProfitKuaiShouAccountCost" resultType="java.util.LinkedHashMap">
         SELECT
@@ -328,6 +342,9 @@
             </if>
         </where>
         GROUP BY d.account_id
+        limit 1
+
+
     </select>
 
     <!-- 查询 快手 利润表 总花费-->

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

@@ -683,19 +683,19 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
 
         try {
             //查询 快手利润表  时间段内的 所有账户
-            List<Map<String,Object>> list = reportSettlementMapper.getProfitKuaiShouAccountCost(null,paramsVo.getStartTime(),paramsVo.getEndTime());
+            List<Map<String,Object>> list = reportSettlementMapper.getProfitKuaiShouAgentAccount(paramsVo.getStartTime(),paramsVo.getEndTime());
             if (Check.isNull(list)){
                 return Result.errorMsg("暂无数据");
             }
             List<ProfitReportKuaiShouVo> 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("account_id").toString());
                 sysLogQw.orderByDesc("create_time");
                 sysLogQw.last("limit 1");
                 SysLog sysLog = sysLogMapper.selectOne(sysLogQw);
@@ -710,8 +710,9 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                     }
                 }
 
+                //查询账户数据信息
+               Map<String,Object> map = reportSettlementMapper.getProfitKuaiShouAccountCost(mapList.get("account_id").toString(),paramsVo.getStartTime(),paramsVo.getEndTime());
                 ProfitReportKuaiShouVo voSource = new ProfitReportKuaiShouVo();
-
                 voSource.setAccountId(map.getOrDefault("accountId", "") + "");//账户id
                 voSource.setProductName( !Check.isNull(map.get("productName")) ? map.getOrDefault("productName", "") + "" : "");//产品名称
                 voSource.setKsId(map.getOrDefault("ksId", "") + "");//快手id