فهرست منبع

Merge remote-tracking branch 'origin/master'

yumeng 3 سال پیش
والد
کامیت
6ed509e757

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/ExportReportController.java

@@ -53,6 +53,7 @@ public class ExportReportController {
         if(null == date||date.equals("")){
         if(null == date||date.equals("")){
             paramsVo.setUploadYears(DateUtils.formatDate(new Date(),"yyyy-MM"));
             paramsVo.setUploadYears(DateUtils.formatDate(new Date(),"yyyy-MM"));
         }
         }
+        log.info("快手结算单----------{}",paramsVo);
         return reportSettlementService.settlementReportKuaiShou(paramsVo,response,user);
         return reportSettlementService.settlementReportKuaiShou(paramsVo,response,user);
     }
     }
 
 

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

@@ -312,8 +312,11 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
         }
         }
         //查询财务模块中已上传的账户
         //查询财务模块中已上传的账户
         List<String> settlementAccountList = reportSettlementMapper.getAccountIdBytedance(sales,String.valueOf(mediaId),paramsVo.getAdvertiserId(),paramsVo.getProductId(),paramsVo.getProjectId());
         List<String> settlementAccountList = reportSettlementMapper.getAccountIdBytedance(sales,String.valueOf(mediaId),paramsVo.getAdvertiserId(),paramsVo.getProductId(),paramsVo.getProjectId());
+        log.info("快手结算单----已上传的账户------{}",settlementAccountList);
+
         //查询已绑定账户
         //查询已绑定账户
         allocations = userAllocationMapper.getAccountInfoBySalesId(sales,String.valueOf(mediaId),paramsVo.getAdvertiserId(),paramsVo.getProductId(),paramsVo.getProjectId());
         allocations = userAllocationMapper.getAccountInfoBySalesId(sales,String.valueOf(mediaId),paramsVo.getAdvertiserId(),paramsVo.getProductId(),paramsVo.getProjectId());
+        log.info("快手结算单------已绑定账户----{},{}",allocations.size(),allocations);
         return mergeAccountId(settlementAccountList,allocations,uploadYears);
         return mergeAccountId(settlementAccountList,allocations,uploadYears);
     }
     }
 
 
@@ -360,6 +363,9 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             //查询 需要导出的数据的账户id
             //查询 需要导出的数据的账户id
             List<String> accountIdList = this.getAccountId(paramsVo,user);
             List<String> accountIdList = this.getAccountId(paramsVo,user);
 
 
+            log.info("最终的账户{}==={}",accountIdList.size(),accountIdList);
+
+
             if (Check.isNull(accountIdList)){
             if (Check.isNull(accountIdList)){
                 return Result.errorMsg("该广告主和产品下无法查询到绑定的快手账户信息");
                 return Result.errorMsg("该广告主和产品下无法查询到绑定的快手账户信息");
             }
             }