Jelajahi Sumber

修改结算单导出逻辑

songyh 3 tahun lalu
induk
melakukan
0584f0f9d6

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

@@ -5,12 +5,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
 import org.jeecg.ctop.finance.settlement.service.IReportSettlementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 
 
 /**
@@ -30,8 +32,12 @@ public class ExportReportController {
 
     @ApiOperation(value = "财务结算-结算单导出-头条", notes = "财务结算-结算单导出-头条")
     @GetMapping(value = "/settlementReportBytedance")
-    public Result settlementReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response) {
+    public Result settlementReportBytedance(SettlementFileParamsVo paramsVo, HttpServletResponse response) throws Exception{
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String date = paramsVo.getUploadYears();
+        if(null == date||date.equals("")){
+            paramsVo.setUploadYears(DateUtils.formatDate(new Date(),"yyyy-MM"));
+        }
         return reportSettlementService.settlementReportBytedance(paramsVo,response,user);
     }
 
@@ -40,6 +46,10 @@ public class ExportReportController {
     @GetMapping(value = "/settlementReportKuaiShou")
     public Result settlementReportKuaiShou(SettlementFileParamsVo paramsVo, HttpServletResponse response) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String date = paramsVo.getUploadYears();
+        if(null == date||date.equals("")){
+            paramsVo.setUploadYears(DateUtils.formatDate(new Date(),"yyyy-MM"));
+        }
         return reportSettlementService.settlementReportKuaiShou(paramsVo,response,user);
     }
 

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

@@ -289,7 +289,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
         if(sales.isEmpty()){
             sales = null;
         }
-        allocations = userAllocationMapper.getAccountInfoBySalesId(sales,mediaId+"");
+        allocations = userAllocationMapper.getAccountInfoBySalesId(sales,mediaId+"",paramsVo.getAdvertiserId(),paramsVo.getProductId());
         return mergeAccountId(settlementAccountList,allocations,uploadYears);
     }
 

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/UserAllocationMapper.java

@@ -68,5 +68,5 @@ public interface UserAllocationMapper extends BaseMapper<UserAllocation> {
     Map<String,Object>getCwjsSettlementByAccountId(String accountId);
     void updCwjsSettlementStatus(@Param("id") String id, @Param("status") Integer status);
 
-    List<UserAllocation> getAccountInfoBySalesId(@Param("sales")Set<String> sales,@Param("mediaId")String mediaId);
+    List<UserAllocation> getAccountInfoBySalesId(@Param("sales")Set<String> sales,@Param("mediaId")String mediaId,@Param("advertiserId")String advertiserId,@Param("productId")String productId);
 }

+ 6 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/UserAllocationMapper.xml

@@ -251,6 +251,12 @@
             left join ctop_project cp on cp.id = cua.project_id
         where 1=1
           and cua.media_id = #{mediaId}
+          <if test="advertiserId!=null and advertiserId!= '' ">
+              and cp.advertiser_id = #{advertiserId}
+          </if>
+        <if test="productId!=null and productId!= '' ">
+            and cp.product_id = #{productId}
+        </if>
         <if test="sales !=null and sales != ''">
             AND cp.sale_id in
             <foreach collection="sales" item="item" separator=","