Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/profitAnalysis/ProfitAnalysisController.java

@@ -102,6 +102,17 @@ public class ProfitAnalysisController {
     }
 
 
+    /**
+     * @description:   控制台-利润分析应付金额明细导出
+     * @author: whp
+     **/
+    @PostMapping("/payableAmountExcel")
+    @ApiOperation(value = "控制台-利润分析应付金额明细导出")
+    public HttpResult payableAmountExcel(@RequestBody ProfitAnalysisQueryDto profitAnalysisQueryDto) {
+        return this.profitAnalysisService.payableAmountExcel(profitAnalysisQueryDto);
+    }
+
+
 
 
 

src/main/java/com/ydtech/modules/admin/model/dto/PayableAmountExcel.java

@@ -0,0 +1,171 @@
+package com.ydtech.modules.admin.model.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PayableAmountExcel {
+    @ApiModelProperty("保险公司id")
+    @ExcelIgnore
+    private String companyId;
+
+    @ApiModelProperty("接口类型")
+    @ExcelIgnore
+    private String apiType;
+
+    @ApiModelProperty("驾意json字符串")
+    @ExcelIgnore
+    private String crossInsurance;
+
+    @ApiModelProperty("渠道")
+    @ExcelProperty("渠道")
+    private String username;
+
+    @ApiModelProperty("出单日期")
+    @ExcelProperty("出单日期")
+    private String signingTime;
+
+    @ApiModelProperty("车牌号")
+    @ExcelProperty("车牌号")
+    private String licenseno;
+
+    @ApiModelProperty("被保险人")
+    @ExcelProperty("被保险人")
+    private String applyname;
+
+    @ApiModelProperty("承保公司")
+    @ExcelProperty("承保公司")
+    private String insCompany;
+
+    @ApiModelProperty("险种")
+    @ExcelProperty("险种")
+    private String product;
+
+    @ApiModelProperty("合作公司")
+    @ExcelProperty("合作公司")
+    private String namesimple;
+
+    @ApiModelProperty("交强保单号")
+    @ExcelProperty("交强保单号")
+    private String jqapplyno;
+
+    @ApiModelProperty("商业保单号")
+    @ExcelProperty("商业保单号")
+    private String syapplyno;
+
+    @ApiModelProperty("非车保单号")
+    @ExcelProperty("非车保单号")
+    private String jyapplyno;
+
+    @ApiModelProperty("交强保费")
+    @ExcelProperty("交强保费")
+    private String jqpremium;
+
+    @ApiModelProperty("车船税")
+    @ExcelProperty("车船税")
+    private String taxamount;
+
+    @ApiModelProperty("商业保费")
+    @ExcelProperty("商业保费")
+    private String sypremium;
+
+    @ApiModelProperty("非车保费")
+    @ExcelProperty("非车保费")
+    private String jypremium;
+
+    @ExcelProperty(value = "协议号")
+    private String agreementCode;
+
+    @ExcelProperty(value = "工号描述")
+    private String jobDescription;
+
+    @ExcelProperty(value = "对接人")
+    private String dockingPerson;
+
+    @ExcelProperty(value = "联系方式")
+    private String dockingPhone;
+
+    @ApiModelProperty("交强出口比例")
+    @ExcelProperty("交强出口比例")
+    private String jqExportProportion;
+
+    @ApiModelProperty("商业出口比例")
+    @ExcelProperty("商业出口比例")
+    private String syExportProportion;
+
+    @ApiModelProperty("非车出口比例")
+    @ExcelProperty("非车出口比例")
+    private String noExportProportion;
+
+    @ApiModelProperty("结算金额")
+    @ExcelProperty("结算金额")
+    private String settlement;
+
+    @ApiModelProperty("交强入口")
+    @ExcelProperty("交强入口")
+    private String jqEntranceProportion;
+
+    @ApiModelProperty("商业入口")
+    @ExcelProperty("商业入口")
+    private String syEntranceProportion;
+
+    @ApiModelProperty("非车入口")
+    @ExcelProperty("非车入口")
+    private String noEntranceProportion;
+
+    @ApiModelProperty("应收金额")
+    @ExcelProperty("应收金额")
+    private String receivable;
+
+    @ApiModelProperty("一级机构管理费")
+    @ExcelProperty("一级机构管理费")
+    private String deptPremiumsLevel1;
+
+    @ApiModelProperty("二级机构管理费")
+    @ExcelProperty("二级机构管理费")
+    private String deptPremiumsLevel2;
+
+    @ApiModelProperty("三级机构管理费")
+    @ExcelProperty("三级机构管理费")
+    private String deptPremiumsLevel3;
+
+    @ApiModelProperty("四级机构管理费")
+    @ExcelProperty("四级机构管理费")
+    private String deptPremiumsLevel4;
+
+    @ApiModelProperty("五级机构管理费")
+    @ExcelProperty("五级机构管理费")
+    private String deptPremiumsLevel5;
+
+    @ApiModelProperty("一级分销金额")
+    @ExcelProperty("一级分销金额")
+    private String firstDetailPremiums;
+
+    @ApiModelProperty("二级分销金额")
+    @ExcelProperty("二级分销金额")
+    private String secondDetailPremiums;
+
+    @ApiModelProperty("三级分销金额")
+    @ExcelProperty("三级分销金额")
+    private String thirdDetailPremiums;
+
+    @ApiModelProperty("交强利润差值")
+    @ExcelProperty("交强利润差值")
+    private String jqProfitMarginPremiums;
+
+    @ApiModelProperty("商业利润差值")
+    @ExcelProperty("商业利润差值")
+    private String syProfitMarginPremiums;
+
+    @ApiModelProperty("非车利润差值")
+    @ExcelProperty("非车利润差值")
+    private String noProfitMarginPremiums;
+
+
+    @ApiModelProperty("是否是补录订单")
+    @ExcelProperty("补录订单")
+    private String isExternal;
+
+}

src/main/java/com/ydtech/modules/admin/service/ProfitAnalysisService.java

@@ -43,6 +43,11 @@ public interface ProfitAnalysisService {
      **/
     HttpResult payAmountExcel(ProfitAnalysisQueryDto profitAnalysisQueryDto);
 
+    /**
+     * @description:   控制台-利润分析应付金额明细导出
+     * @author: whp
+     **/
+    HttpResult payableAmountExcel(ProfitAnalysisQueryDto profitAnalysisQueryDto);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/CompanyDataReportServiceImpl.java

@@ -266,7 +266,7 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
 //            }
         dateMapByType.put("userId", userId);
 
-        this.insExcelTaskAsyncService.importasync(resultSubOrder,dateMapByType);
+        this.insExcelTaskAsyncService.importasync(resultSubOrder,dateMapByType, ordersDataVo.getBeginDate(), ordersDataVo.getEndDate());
 //        String uploadPath = this.uploadPath + "/excel/";
 //        Path path = Paths.get(uploadPath);
 //        if (!Files.exists(path)) {

src/main/java/com/ydtech/modules/admin/service/impl/ProfitAnalysisServiceImpl.java

@@ -2,7 +2,9 @@ package com.ydtech.modules.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.dto.PayAmountExcel;
+import com.ydtech.modules.admin.model.dto.PayableAmountExcel;
 import com.ydtech.modules.admin.model.dto.ReceivableExcel;
 import com.ydtech.modules.admin.model.report.profitAnalysis.ProfitAnalysisDto;
 import com.ydtech.modules.admin.model.report.profitAnalysis.ProfitAnalysisQueryDto;
@@ -16,7 +18,12 @@ import com.ydtech.modules.inv.model.InvAccount;
 import com.ydtech.modules.inv.model.InvAccountCardVo;
 import com.ydtech.modules.inv.model.InvAccountExpenses;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
+import com.ydtech.modules.order.entity.vo.AuditExportVo;
+import com.ydtech.modules.order.entity.vo.CarBusinessDetailVo;
+import com.ydtech.modules.order.service.ExcelExportService;
 import com.ydtech.utils.BigDecimalUtils;
+import com.ydtech.utils.ExcelUtils;
+import com.ydtech.utils.OrderUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +60,12 @@ public class ProfitAnalysisServiceImpl implements ProfitAnalysisService {
     @Autowired
     private InvAccountExpensesMapper invAccountExpensesMapper;
 
+    @Autowired
+    private ExcelExportService excelExportService;
+    private String EXCEL_PATH = "excel//";
+    private String UPLOAD_PATH = "/upload//excel//";
+
+
 
     @Value("${upload.file.path}")
     private String uploadPath;
@@ -441,6 +454,31 @@ public class ProfitAnalysisServiceImpl implements ProfitAnalysisService {
         String fileName = EasyExcelUtils.downExcel(uploadPath, "实付明细", PayAmountExcel.class, list);
         return HttpResult.ok("", uploadUrl + "excel/" + fileName);
     }
+    /**
+     * @description:   控制台-利润分析应付金额明细导出
+     * @author: whp
+     **/
+    @Override
+    public HttpResult payableAmountExcel(ProfitAnalysisQueryDto profitAnalysisQueryDto) {
+        List<PayableAmountExcel> auditExportList = profitAnalysisMapper.getAuditExportList(profitAnalysisQueryDto);
+        auditExportList.forEach(item->{
+            //获取驾意险保单号
+            if(item.getCrossInsurance() != null) {
+                item.setJyapplyno(OrderUtils.getJyPolicyNo(item.getCompanyId(), item.getApiType(), item.getCrossInsurance(), item.getIsExternal()));
+            }
+            //处理补录订单
+            if(item.getIsExternal().equals("0")){
+                item.setIsExternal("否");
+            }else if(item.getIsExternal().equals("1")){
+                item.setIsExternal("是");
+            }
+
+        });
+        String uploadPath = this.uploadPath + "/excel/";
+        String fileName = EasyExcelUtils.downExcel(uploadPath, "应付明细导出", PayableAmountExcel.class, auditExportList);
+        return HttpResult.ok("", uploadUrl + "excel/" + fileName);
+
+    }
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -86,6 +86,9 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             throw new SystemException("内部银行卡开户行号不能为空");
         }
         SysAmountAuditingEntity sysAmountAuditingEntity = sysAmountAuditingService.getById(sysAmountAuditingVo.getId());
+        if(sysAmountAuditingEntity.getApproval() == 1){
+            throw new SystemException("线上数据自动审核，无需处理!!");
+        }
         //提现审核金额
         BigDecimal amount = sysAmountAuditingVo.getAmount();
         //提现人
@@ -281,7 +284,9 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             throw new SystemException("驳回原因不能为空");
         }
         SysAmountAuditingEntity sysAmountAuditingEntity = sysAmountAuditingService.getById(sysAmountRejectVo.getId());
-
+        if(sysAmountAuditingEntity.getApproval() == 1){
+            throw new SystemException("线上数据自动审核，无需处理!!");
+        }
         //提现审核金额
         BigDecimal amount = sysAmountAuditingEntity.getAmount();
         //提现人

src/main/java/com/ydtech/modules/console/controller/UploadOrderController.java

@@ -54,9 +54,11 @@ public class UploadOrderController {
       @PostMapping("/bigOrderCountUpload")
       @ApiOperation(value = "大订单导出导出明细功能")
       public HttpResult bigOrderCountUpload(@RequestBody BigOrderUploadVo bigOrderUploadVo) {
+          String beginDate = bigOrderUploadVo.getBeginDate();
+          String endDate = bigOrderUploadVo.getEndDate();
           String userId = BaseController.getUserId();
           List<BigOrderUploadDto> list = upLoadOrderService.uploadExcelData(bigOrderUploadVo);
-          insExcelTaskAsyncService.importasyncBigOrder(list,userId);
+          insExcelTaskAsyncService.importasyncBigOrder(list,userId,beginDate,endDate);
 //          if(list!=null && !list.isEmpty()){
 //              for (BigOrderUploadDto bigOrderUploadDto : list) {
 //                  String orderStatus="";

src/main/java/com/ydtech/modules/console/dao/ProfitAnalysisMapper.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.console.dao;
 
 import com.ydtech.modules.admin.model.dto.PayAmountExcel;
+import com.ydtech.modules.admin.model.dto.PayableAmountExcel;
 import com.ydtech.modules.admin.model.dto.ReceivableExcel;
 import com.ydtech.modules.admin.model.report.profitAnalysis.ProfitAnalysisDto;
 import com.ydtech.modules.admin.model.report.profitAnalysis.ProfitAnalysisQueryDto;
@@ -58,4 +59,12 @@ public interface ProfitAnalysisMapper {
      * @author: whp
      **/
     List<PayAmountExcel> payAmountExcel (@Param("vo") ProfitAnalysisQueryDto profitAnalysisQueryDto);
+
+    /**
+     *
+     * @param profitAnalysisQueryDto
+     * @return 利润分析应付导出
+     */
+    List<PayableAmountExcel> getAuditExportList(@Param("vo") ProfitAnalysisQueryDto profitAnalysisQueryDto);
+
 }

src/main/java/com/ydtech/modules/fnc/entity/InsExcelTaskEntity.java

@@ -42,10 +42,18 @@ public class InsExcelTaskEntity {
 
     @ApiModelProperty("导入路径")
     @TableField("upload_url")
-    private String uploadUrl; // 导入路径
+    private String uploadUrl;
 
     @ApiModelProperty("类型")
     @TableField("type")
-    private String type; // 导入路径
+    private String type;
+
+    @ApiModelProperty("列表开始时间")
+    @TableField("start_time")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty("列表结束时间")
+    @TableField("end_time")
+    private LocalDateTime endTime;
 
 }

src/main/java/com/ydtech/modules/fnc/service/InsExcelTaskAsyncService.java

@@ -12,9 +12,9 @@ import java.util.HashMap;
 import java.util.List;
 
 public interface InsExcelTaskAsyncService   extends IService<InsExcelTaskEntity> {
-    void importasync(List<OrdersDataExcel> resultSubOrder, HashMap<String, String> dateMapByType);
+    void importasync(List<OrdersDataExcel> resultSubOrder, HashMap<String, String> dateMapByType,String beginDate,String endDate);
 
-    void importasyncBigOrder(List<BigOrderUploadDto> list,String userId);
+    void importasyncBigOrder(List<BigOrderUploadDto> list,String userId,String beginDate,String endDate);
 
     /**
      *

src/main/java/com/ydtech/modules/fnc/service/impl/InsExcelTaskAsyncServiceImpl.java

@@ -36,7 +36,10 @@ import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -57,7 +60,7 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
 
     @Async
     @Override
-    public void importasync(List<OrdersDataExcel> resultSubOrder, HashMap<String, String> dateMapByType) {
+    public void importasync(List<OrdersDataExcel> resultSubOrder, HashMap<String, String> dateMapByType,String beginDate,String endDate) {
         InsExcelTaskEntity insExcelTaskEntity = new InsExcelTaskEntity();
         String taskId = String.valueOf(new SnowFlakeUtil().nextId());
         insExcelTaskEntity.setId(taskId);
@@ -66,6 +69,15 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
         insExcelTaskEntity.setCreateTime(LocalDateTime.now());
         insExcelTaskEntity.setCreatedAt(LocalDateTime.now());
         insExcelTaskEntity.setType("1");
+        // 定义时间格式的常量
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 构建开始时间
+        LocalDateTime startTime = LocalDateTime.parse(beginDate + " 00:00:00", formatter);
+        insExcelTaskEntity.setStartTime(startTime);
+        // 构建结束时间
+        LocalDateTime endTime = LocalDateTime.parse(endDate + " " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")), formatter);
+        insExcelTaskEntity.setEndTime(endTime);
+
         baseMapper.insert(insExcelTaskEntity);
 
         if (!resultSubOrder.isEmpty()) {
@@ -107,7 +119,8 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
 
     @Override
     @Async
-    public void importasyncBigOrder(List<BigOrderUploadDto> list,String  userId) {
+    public void importasyncBigOrder(List<BigOrderUploadDto> list,String  userId,String beginDate,String endDate) {
+
         InsExcelTaskEntity insExcelTaskEntity = new InsExcelTaskEntity();
         String taskId = String.valueOf(new SnowFlakeUtil().nextId());
         insExcelTaskEntity.setId(taskId);
@@ -115,6 +128,15 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
         insExcelTaskEntity.setUserId(userId);
         insExcelTaskEntity.setCreateTime(LocalDateTime.now());
         insExcelTaskEntity.setCreatedAt(LocalDateTime.now());
+        // 定义时间格式的常量
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        // 构建开始时间
+        LocalDateTime startTime = LocalDateTime.parse(beginDate + " 00:00:00", formatter);
+        insExcelTaskEntity.setStartTime(startTime);
+        // 构建结束时间
+        LocalDateTime endTime = LocalDateTime.parse(endDate + " " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")), formatter);
+        insExcelTaskEntity.setEndTime(endTime);
+
         insExcelTaskEntity.setType("0");
         baseMapper.insert(insExcelTaskEntity);
 
@@ -150,6 +172,11 @@ public class InsExcelTaskAsyncServiceImpl extends ServiceImpl<InsExcelTaskAsyncM
         baseMapper.updateById(insExcelTaskEntity1);
     }
 
+    /**
+     *
+     * @param insExcelTaskDto
+     * @return  控制台导出任务分页
+     */
     @Override
     public BasePageResult<InsExcelTaskEntity> queryPage(InsExcelTaskDto insExcelTaskDto) {
         Page<InsExcelTaskEntity> page = new Page<>(insExcelTaskDto.getPageNum(), insExcelTaskDto.getPageSize());

src/main/java/com/ydtech/modules/ttqf/PayConstantStatus.java

@@ -4,6 +4,8 @@ import com.ydtech.utils.HttpUtils;
 import com.ydtech.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+
+import javax.annotation.Signed;
 import javax.servlet.http.HttpServletRequest;
 
 @Component
@@ -71,6 +73,13 @@ public class PayConstantStatus {
     private static final String PAYMENT_NOTICE_URL = "/ttqf/paymentNotice";
 
 
+    private static final String SIGNED_SUCCESSFULLY_PNG = "/upload/personnel/auditResult/auditResult.html";
+
+
+    public static String getSignedSuccessfullyPng(){
+        return tokenUrl + SIGNED_SUCCESSFULLY_PNG;
+    }
+
     public static String getPaymentNoticeUrl(){
         return tokenUrl+ PAYMENT_NOTICE_URL;
     }

src/main/java/com/ydtech/modules/ttqf/RetrieveTTQFApi.java

@@ -215,8 +215,8 @@ public class RetrieveTTQFApi {
             throw new SystemException("用户身份证有效日期不全，请检查");
         }
         presignModel.setNotifyUrl(PayConstantStatus.getUserSignNotifyUrl());
-        for (EsmUserImageQueryVo item : esmUserImageQueryVo) {
-            try {
+        try {
+            for (EsmUserImageQueryVo item : esmUserImageQueryVo) {
                 if (StringUtils.isEmpty(item.getPath())) {
                     throw new SystemException("用户身份证影像资料不存在,请检查");
                 }
@@ -229,10 +229,10 @@ public class RetrieveTTQFApi {
                 } else if (DocumentClass.SFZ_02.getCode().equals(item.getType())) {
                     presignModel.setIdCardPicBFileId(testPictureUpload(encoded));
                 }
-            } catch (Exception e) {
-                log.error("获取影像信息错误：{}", e.getMessage());
-                e.printStackTrace();
             }
+        }catch (Exception e){
+            log.error("获取影像信息错误：{}", e.getMessage());
+            throw new SystemException("获取影像信息错误："+e.getMessage());
         }
 //        PresignModel model = PresignModel.builder().name("杨晓").idCardNo("11010219900131252X").mobile("13092411724")
 //                .bankCardNo("6225880165591124").expiryEnd("2030-03-18" ).expiryStart("2020-03-18").idCardPicAFileId("1362670410277076994").idCardPicBFileId("1362670410277076994").build();
@@ -256,7 +256,7 @@ public class RetrieveTTQFApi {
             }
         } else {
             log.error("失败{}", response);
-            return response.getBizMsg();
+            throw new SystemException("失败：" + response.getBizMsg());
         }
     }
 
@@ -281,7 +281,7 @@ public class RetrieveTTQFApi {
     public static ContractH5Response contractH5(String idCardNo) {
         return tangClient.execute(ContractH5Request.builder()
                 .requestId(System.currentTimeMillis() + "").bizModel(ContractH5Model.builder()
-                        .idCardNo(idCardNo).mchReturnUrl(PayConstantStatus.getUserSignNotifyUrl()).build())
+                        .idCardNo(idCardNo).mchReturnUrl(PayConstantStatus.getSignedSuccessfullyPng()).build())
                 .build());
 
     }

src/main/java/com/ydtech/modules/ttqf/service/impl/TtqfServiceImpl.java

@@ -21,6 +21,7 @@ import com.ydtech.modules.admin.model.po.SysUserAccount;
 import com.ydtech.modules.admin.model.po.SysUserAccountHistory;
 import com.ydtech.modules.admin.model.vo.SysAmountAuditingVo;
 import com.ydtech.modules.admin.service.*;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.lg.model.PushLgEntity;
 import com.ydtech.modules.lg.service.PushLgEntityService;
 import com.ydtech.modules.ttqf.LgInformationPush;
@@ -223,7 +224,9 @@ public class TtqfServiceImpl implements TtqfService {
 
     @Override
     public HttpResult queryPressing(UserWithdrawal withdrawal) {
-        if (!sysSwitchConfigService.getBalanceExtractStatus()){
+        //不是个代走线上提现
+        //提现控制（线上或线下）关闭走线上
+        if (isManagement(BaseController.getUser().getId()) || !sysSwitchConfigService.getBalanceExtractStatus()){
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("0").msg("").url("").build());
         }
         SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(withdrawal.getUserId());
@@ -271,6 +274,16 @@ public class TtqfServiceImpl implements TtqfService {
         }
     }
 
+
+    public boolean isManagement(String userId) {
+        SysUser sysUser = SpringUtil.getBean(SysUserBankCardMapper.class).selectByIdPay(userId);
+        if (!ManagementSource.MS_02.getCode().equals(sysUser.getManagementSource())) {
+            return true;
+        }
+        return false;
+    }
+
+
     @Override
     public HttpResult signingAddress(UserWithdrawal withdrawal) {
         try {
@@ -285,7 +298,7 @@ public class TtqfServiceImpl implements TtqfService {
             return HttpResult.ok(WithdrawalFRes.builder().bizCode("").url(pres).msg("").build());
         }catch (Exception e){
             log.error("获取用户签约信息异常{}",e.getMessage());
-            throw new SystemException("提现申请提交失败");
+            throw new SystemException("提现申请提交失败："+ e.getMessage());
         }
     }
 

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -64,7 +64,8 @@
         a.bank_card_num  as "bankCardNum",
         a.bank_name  as "bankName",
         a.bank_num  as "bankNum",
-        a.account_id as "accountId"
+        a.account_id as "accountId",
+        a.approval  as  "approval"
         from sys_amount_auditing a
         left join sys_user_account_history b on a.id = b.auditiing_id
         left join sys_user su on su.id =a.user_id
@@ -134,6 +135,7 @@
         a.bank_name  as "bankName",
         a.bank_num  as "bankNum",
         a.account_id as "accountId",
+        a.approval as "approval",
         sd.management_source  AS source
         from sys_amount_auditing a
         left join sys_user_account_history b on a.id = b.auditiing_id
@@ -146,9 +148,10 @@
             <if test="auditingStatus !=null  and auditingStatus != ''">
                 a.auditing_status=#{auditingStatus}
             </if>
-            <if test="auditingStatus !=null  and auditingStatus != '' and auditingStatus == 2">
+           <!-- <if test="auditingStatus !=null  and auditingStatus != '' and auditingStatus == 2">
                 and a.approval != 1
             </if>
+            -->
             <if test="amountStatus !=null  and amountStatus != ''">
                 and a.amount_status=#{amountStatus}
             </if>
@@ -280,9 +283,10 @@
             <if test="vo.auditingStatus !=null  and vo.auditingStatus != ''">
                 a.auditing_status=#{vo.auditingStatus}
             </if>
-            <if test="vo.auditingStatus !=null and vo.auditingStatus != '' and vo.auditingStatus == 2">
+            <!--<if test="vo.auditingStatus !=null and vo.auditingStatus != '' and vo.auditingStatus == 2">
                 and a.approval != 1
             </if>
+            -->
             <if test="vo.amountStatus !=null  and vo.amountStatus != ''">
                 and a.amount_status=#{vo.amountStatus}
             </if>

src/main/resources/mapper/modules/console/ProfitAnalysisMapper.xml

@@ -339,9 +339,9 @@
         sum(a.sy_supervise_costs_proportion) as "sySuperviseCostsProportion",
         sum(a.no_supervise_costs_premiums) as "noSuperviseCostsPremiums",
         sum(a.no_supervise_costs_proportion) as "noSuperviseCostsProportion",
-        sum(a.jq_premium) as "jqPremium",
-        sum(a.sy_premium) as "syPremium",
-        sum(a.no_premium) as "noPremium",
+        max(a.jq_premium) as "jqPremium",
+        max(a.sy_premium) as "syPremium",
+        max(a.no_premium) as "noPremium",
         sum(a.jq_other_costs_premium) as "jqOtherCostsPremium",
         sum(a.sy_other_costs_premium) as "syOtherCostsPremium",
         sum(a.no_other_costs_premium) as "noOtherCostsPremium",
@@ -389,4 +389,127 @@
         </where>
     </select>
 
+    <select id="getAuditExportList" resultType="com.ydtech.modules.admin.model.dto.PayableAmountExcel">
+        SELECT
+        iac.company_id,
+        iac.api_type,
+        iac.cross_insurance,
+        io.username,
+        iac.signing_time,
+        io.licenseno,
+        JSON_UNQUOTE(json_extract(io.applyinfo, '$.name')) as applyname,
+        io.ins_company,
+        io.product,
+        eic.namesimple,
+        iac.jqapplyno,
+        iac.syapplyno,
+        iac.cross_insurance,
+        iac.jqpremium,
+        iac.sypremium,
+        iac.jypremium,
+        iac.taxamount,
+        ifo.jq_costs_export_proportion + ifo.jq_export_other_costs_proportion AS jq_export_proportion,
+        ifo.sy_costs_export_proportion+ifo.sy_export_other_costs_proportion as sy_export_proportion,
+        ifo.no_costs_export_proportion+ifo.no_export_other_costs_proportion as no_export_proportion,
+        ifo.jq_export_supervise_costs_premiums + ifo.sy_export_supervise_costs_premiums + ifo.no_export_supervise_costs_premiums + ifo.jq_export_other_costs_premiums + ifo.sy_export_other_costs_premiums + ifo.no_export_other_costs_premiums as settlement,
+        ifo.jq_supervise_costs_proportion + ifo.jq_other_costs_proportion as jq_entrance_proportion,
+        ifo.sy_supervise_costs_proportion + ifo.sy_other_costs_proportion as sy_entrance_proportion,
+        ifo.no_supervise_costs_proportion + ifo.no_other_costs_proportion as no_entrance_proportion,
+        ifo.jq_supervise_costs_premiums + ifo.jq_other_costs_premiums + ifo.sy_supervise_costs_premiums + ifo.sy_other_costs_premiums + ifo.no_supervise_costs_premiums + ifo.no_other_costs_premiums as receivable,
+        ifo.jq_dept_premiums_level_1 + ifo.sy_dept_premiums_level_1 + ifo.no_dept_premiums_level_1 as dept_premiums_level_1,
+        ifo.jq_dept_premiums_level_2 + ifo.sy_dept_premiums_level_2 + ifo.no_dept_premiums_level_2 as dept_premiums_level_2,
+        ifo.jq_dept_premiums_level_3 + ifo.sy_dept_premiums_level_3 + ifo.no_dept_premiums_level_3 as dept_premiums_level_3,
+        ifo.jq_dept_premiums_level_4 + ifo.sy_dept_premiums_level_4 + ifo.no_dept_premiums_level_4 as dept_premiums_level_4,
+        ifo.jq_dept_premiums_level_5 + ifo.sy_dept_premiums_level_5 + ifo.no_dept_premiums_level_5 as dept_premiums_level_5,
+        ifo.first_detail_premiums,
+        ifo.second_detail_premiums,
+        ifo.third_detail_premiums,
+        ifo.jq_profit_margin_premiums,
+        ifo.sy_profit_margin_premiums,
+        ifo.no_profit_margin_premiums,
+        io.is_external,
+        pa.agreement_code,
+        pa.job_description,
+        pa.docking_person,
+        pa.docking_phone
+        FROM
+        ins_fee_order_new ifo
+        LEFT JOIN ins_fee_audit ifa ON ifo.ins_order_no = ifa.ins_order_no
+        left join ins_area_company iac on  ifa.ins_order_no = iac.id
+        left join ins_orders io on iac.orderno = io.orderno
+        left join ptl_agreement pa on iac.agreement_id =  pa.id
+        left join esm_ins_company eic on pa.partner_companies_id =  eic.id
+        WHERE
+            ifa.auditstatus = '1'
+            AND
+            iac.orderstatus = 3
+            AND io.orderstatus = '3'
+            <if test="vo.year !=null  and  vo.year !=''">
+                and DATE_FORMAT( iac.signing_time, '%Y') =#{vo.year}
+            </if>
+            GROUP BY
+            io.orderno,
+            iac.api_type,
+            iac.cross_insurance,
+            iac.signing_time,
+            eic.namesimple,
+            iac.jqapplyno,
+            iac.syapplyno,
+            iac.jqpremium,
+            iac.company_id,
+            iac.sypremium,
+            iac.jypremium,
+            iac.taxamount,
+            ifo.jq_costs_export_proportion,
+            ifo.jq_export_other_costs_proportion,
+            ifo.sy_costs_export_proportion,
+            ifo.sy_export_other_costs_proportion,
+            ifo.no_costs_export_proportion,
+            ifo.no_export_other_costs_proportion,
+            ifo.jq_export_supervise_costs_premiums,
+            ifo.sy_export_supervise_costs_premiums,
+            ifo.no_export_supervise_costs_premiums,
+            ifo.jq_export_other_costs_premiums,
+            ifo.sy_export_other_costs_premiums,
+            ifo.no_export_other_costs_premiums,
+            ifo.jq_supervise_costs_proportion,
+            ifo.jq_other_costs_proportion,
+            ifo.sy_supervise_costs_proportion,
+            ifo.sy_other_costs_proportion,
+            ifo.no_supervise_costs_proportion,
+            ifo.no_other_costs_proportion,
+            ifo.jq_supervise_costs_premiums,
+            ifo.jq_other_costs_premiums,
+            ifo.sy_supervise_costs_premiums,
+            ifo.sy_other_costs_premiums,
+            ifo.no_supervise_costs_premiums,
+            ifo.no_other_costs_premiums,
+            ifo.jq_dept_premiums_level_1,
+            ifo.jq_dept_premiums_level_2,
+            ifo.jq_dept_premiums_level_3,
+            ifo.jq_dept_premiums_level_4,
+            ifo.jq_dept_premiums_level_5,
+            ifo.sy_dept_premiums_level_1,
+            ifo.sy_dept_premiums_level_2,
+            ifo.sy_dept_premiums_level_3,
+            ifo.sy_dept_premiums_level_4,
+            ifo.sy_dept_premiums_level_5,
+            ifo.no_dept_premiums_level_1,
+            ifo.no_dept_premiums_level_2,
+            ifo.no_dept_premiums_level_3,
+            ifo.no_dept_premiums_level_4,
+            ifo.no_dept_premiums_level_5,
+            ifo.first_detail_premiums,
+            ifo.second_detail_premiums,
+            ifo.third_detail_premiums,
+            ifo.jq_profit_margin_premiums,
+            ifo.sy_profit_margin_premiums,
+            ifo.no_profit_margin_premiums,
+            pa.agreement_code,
+            pa.job_description,
+            pa.docking_person,
+            pa.docking_phone
+
+    </select>
+
 </mapper>

src/main/resources/mapper/modules/console/UpLoadOrderMapper.xml

@@ -27,5 +27,6 @@
                 AND DATE_FORMAT( io.createtime, '%Y-%m-%d') BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
         </where>
+        order by io.createtime ,io.orderno
     </select>
 </mapper>

src/main/resources/mapper/modules/console/WithdrawalTaskMapper.xml

@@ -45,7 +45,6 @@
         <where>
             and a.auditing_status in ('3','2')
             and b.id is  not  null
-            and  a.approval != 1
             <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
                 AND a.create_time BETWEEN #{vo.beginDate} AND #{vo.endDate}
             </if>
@@ -57,9 +56,9 @@
         select
               IFNULL(sum(a.amount),0) as "allWithdrawalAmount",
               IFNULL(count(a.id),0)  as "allWithdrawalNumber",
-              IFNULL(sum( CASE WHEN a.auditing_status = 2 and  a.approval != 1  THEN  IFNULL(a.amount,0)  END ),0)  AS notWithdrawalAmount,
+              IFNULL(sum( CASE WHEN a.auditing_status = 2   THEN  IFNULL(a.amount,0)  END ),0)  AS notWithdrawalAmount,
               IFNULL(sum( CASE WHEN a.auditing_status = 3 THEN  IFNULL(a.amount,0)  END ),0)  AS withdrawalAmount,
-              IFNULL(count(CASE WHEN a.auditing_status = 2  and  a.approval != 1 THEN  1  END),0) as "notAllWithdrawalNumber",
+              IFNULL(count(CASE WHEN a.auditing_status = 2   THEN  1  END),0) as "notAllWithdrawalNumber",
               IFNULL(count(CASE WHEN a.auditing_status = 3 THEN  1  END),0) as "withdrawalNumber",
               IFNULL(sum( CASE WHEN a.auditing_status = 4 THEN  IFNULL(a.amount,0)  END ),0)  AS "failedWithdrawalAmount",
               IFNULL(count(CASE WHEN a.auditing_status = 4 THEN  1  END),0) as "failedWithdrawalNumber"

src/main/resources/mapper/modules/fnc/InsExcelTaskAsyncMapper.xml

@@ -5,6 +5,6 @@
         <select id="queryPage" resultType="com.ydtech.modules.fnc.entity.InsExcelTaskEntity">
             select *
             from ins_excel_task
-
+            order by create_time desc
         </select>
 </mapper>