Przeglądaj źródła

快手结算单-代理商数据

yangzian 3 lat temu
rodzic
commit
5523c34bb9

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

@@ -32,6 +32,8 @@ public interface ReportSettlementMapper {
      * @return
      */
     List<SettlementReportKuaiShouVo> getAccountTransactionDayKuaiShou(SettlementFileParamsVo paramsVo);
+    //获取快手 账户 日流水信息  代理商维度
+    List<SettlementReportKuaiShouVo> getAccountTransactionDayKuaiShouAgent(SettlementFileParamsVo paramsVo);
 
 
     /**

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

@@ -51,7 +51,7 @@
 
 
 
-    <!-- 获取快手 账户 日流水信息 -->
+    <!-- 获取快手 账户 日流水信息  账户维度-->
     <select id="getAccountTransactionDayKuaiShou" resultType="org.jeecg.ctop.finance.settlement.entity.vo.SettlementReportKuaiShouVo">
         select t.*,c.auth_name as accountName,
                base.user_id as ksId from (select id,
@@ -73,6 +73,38 @@
 
 
 
+    <!-- 获取快手 账户 日流水信息  代理商维度-->
+    <select id="getAccountTransactionDayKuaiShouAgent" resultType="org.jeecg.ctop.finance.settlement.entity.vo.SettlementReportKuaiShouVo">
+
+        SELECT
+            t.*
+        FROM
+            (
+                SELECT
+                    account_id,
+                    date_time AS date,
+		DATE_FORMAT( date_time, '%Y-%m' ) AS uploadYears,
+		user_id AS ksId,
+		total_charged_in_yuan AS dailyCharge,
+		credit_real_charged_in_yuan AS realCharged,
+		account_name,
+		create_time
+                FROM
+                    ctop_kuaishou_daily_agent
+                WHERE
+                    account_id = #{accountId}
+            ) t
+        WHERE
+            t.uploadYears = #{uploadYears}
+        ORDER BY
+            t.date
+
+
+    </select>
+
+
+
+
 
     <!-- 查询 头条利润表 所用账户-->
     <select id="getProfitBytedanceAccountCost" resultType="java.util.LinkedHashMap">

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

@@ -293,7 +293,14 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                 paramsVo.setAccountId(accountId);
 
                 //获取账户 日流水数据  根据账户id 和 年月 查询数据
-                List<SettlementReportKuaiShouVo> settlementList = reportSettlementMapper.getAccountTransactionDayKuaiShou(paramsVo);
+                List<SettlementReportKuaiShouVo> settlementList = new ArrayList<>();
+                //查询账户维度
+                settlementList = reportSettlementMapper.getAccountTransactionDayKuaiShou(paramsVo);
+                if (Check.isNull(settlementList)){
+                    //查询代理商维度
+                    settlementList = reportSettlementMapper.getAccountTransactionDayKuaiShouAgent(paramsVo);
+                }
+
                 if (Check.isNull(settlementList)){
                     num++;
                     continue;

+ 2 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementFileInfoServiceImpl.java

@@ -168,11 +168,11 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
 
             settlement.setAccountId(SettlementUtil.subAccountName(settlement.getFileName()));
 
-            Map<String,String> map = settlementFileInfoMapper.getSettlementAccount(settlement.getAccountId(),String.valueOf(settlementFileInfo.getMediaId()));
+           /* Map<String,String> map = settlementFileInfoMapper.getSettlementAccount(settlement.getAccountId(),String.valueOf(settlementFileInfo.getMediaId()));
             if (Check.isNull(map)){
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                 return Result.errorMsg("无法查询到账户【"+settlement.getAccountId()+"】信息,请到账户列表上传正确的账户信息");
-            }
+            }*/
             BeanUtils.copyProperties(settlementFileInfo,settlement,SettlementUtil.getNullPropertyNames(settlementFileInfo));
             settlementFileInfoMapper.insert(settlement);
         }