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

src/main/java/com/ydtech/modules/admin/controller/SysUserBankController.java

@@ -67,6 +67,12 @@ public class SysUserBankController extends BaseController {
 
         return HttpResult.ok("新增成功");
     }
+    @PostMapping("/auditByBankNumber")
+    @ApiOperation("审核卡号开户行")
+    public HttpResult<Object> auditByBankNumber(@RequestBody SysUserBankCardVO sysUserBankCardVO) {
+        bankCardService.auditByBankNumber(sysUserBankCardVO);
+        return HttpResult.ok("新增成功");
+    }
 
     @GetMapping("getUserBankList")
     @ApiOperation("返回卡包")

src/main/java/com/ydtech/modules/admin/dao/SysDeptAccountHistoryMapper.java

@@ -9,5 +9,5 @@ import org.apache.ibatis.annotations.Param;
 
 
 public interface SysDeptAccountHistoryMapper extends BaseMapper<SysDeptAccountHistory> {
-    Page<SysDeptAccountHistoryDto> getDeptHistory(Page page,@Param("sysDeptAccountHistoryDto") SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
+    Page<SysDeptAccountHistory> getDeptHistory(Page page,@Param("sysDeptAccountHistoryDto") SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
 }

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

@@ -51,7 +51,6 @@ public class SysDeptAccountHistoryDto{
 
     @ApiModelProperty(value = "创建时间")
     @TableField(value = "create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
     @ApiModelProperty(value = "备注")

src/main/java/com/ydtech/modules/admin/model/po/SysAmountAuditingEntity.java

@@ -123,6 +123,15 @@ public class SysAmountAuditingEntity implements Serializable {
     @TableField(exist = false)
     private String bankAccount;
 
+    /**
+     * 开户行地址
+     */
+    @TableField(exist = false)
+    private String bankAddress;
+
+    @TableField(exist = false)
+    private String mobile;
+
     /**
      * 审核人名称
      */

src/main/java/com/ydtech/modules/admin/model/po/SysUserBankCard.java

@@ -49,6 +49,10 @@ public class SysUserBankCard implements Serializable {
     @TableField(value = "user_id")
     private String userId;
 
+    @TableField(value = "user_name")
+    private String userName;
+
+
     /**
      * 是否默认值
      */
@@ -62,6 +66,18 @@ public class SysUserBankCard implements Serializable {
     @TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE)
     private Date createTime;
 
+    @TableField(value = "audit_status")
+    private String auditStatus;
+
+    @TableField(value = "audit_time")
+    private Date auditTime;
+
+    @TableField(value = "audit_user_id")
+    private String auditUserId;
+
+    @TableField(value = "audit_user_name")
+    private String auditUserName;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysUserBankCardVO.java

@@ -42,6 +42,17 @@ public class SysUserBankCardVO {
     @TableField(value = "create_time",fill = FieldFill.INSERT_UPDATE)
     private Date createTime;
 
+    @ApiModelProperty(value = "用户名")
+    private String userName;
+
+    @TableField(value = "audit_status")
+    private String auditStatus;
+
+    @TableField(value = "audit_time")
+    private Date auditTime;
+
+    @TableField(value = "audit_user_id")
+    private String auditUserId;
 
     @ApiModelProperty(value = "每页页数")
     @Min(value = 20, message = "页数最小为20")

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

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 
 
 public interface SysDeptAccountHistoryService extends IService<SysDeptAccountHistory> {
-    IPage<SysDeptAccountHistoryDto> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
+    IPage<SysDeptAccountHistory> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto);
 
     /**
      * 添加历史记录

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

@@ -25,10 +25,12 @@ public interface SysUserBankCardService extends IService<SysUserBankCard> {
 
     void uodate(SysUserBankCardVO sysUserBankCardVO);
 
-    HttpResult<SysUserBankCardVO> getByUserId(String userId);
+    HttpResult<SysUserBankCardVO>   getByUserId(String userId);
 
     void insertByBankNumber(SysUserBankCardVO sysUserBankCardVO);
 
+    void auditByBankNumber(SysUserBankCardVO sysUserBankCardVO);
+
     HttpResult<List<SysUserBankCard>> getUserBankList();
 
 

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

@@ -25,13 +25,12 @@ public class SysDeptAccountHistoryServiceImpl extends ServiceImpl<SysDeptAccount
     @Autowired
     private SysDeptAccountHistoryMapper sysDeptAccountHistoryMapper;
     @Override
-    public IPage<SysDeptAccountHistoryDto> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto) {
+    public IPage<SysDeptAccountHistory> selectList(SysDeptAccountHistoryDto sysDeptAccountHistoryDto) {
         PageRequest pageRequest = new PageRequest();
         pageRequest.setPageNum(sysDeptAccountHistoryDto.getPageNo());
         pageRequest.setPageSize(sysDeptAccountHistoryDto.getPageSize());
         Page page = PageRequest.buildPageRequest(pageRequest);
-        Page<SysDeptAccountHistoryDto> deptHistoryList = sysDeptAccountHistoryMapper.getDeptHistory(page,sysDeptAccountHistoryDto);
-        return deptHistoryList;
+        return sysDeptAccountHistoryMapper.getDeptHistory(page,sysDeptAccountHistoryDto);
     }
 
     /**

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

@@ -212,10 +212,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         Long fromBankCardId = sysUserAccountVo.getFromBankCardId();
         if (fromBankCardId != null) {
             SysUserBankCard byId = sysUserBankCardService.getById(fromBankCardId);
-            String bankUserId = byId.getUserId();
-            if (!userId.equals(bankUserId)) {
-                return HttpResult.ok("非本人提现");
-            }
+//            String bankUserId = byId.getUserId();
+//            if (!userId.equals(bankUserId)) {
+//                return HttpResult.ok("非本人提现");
+//            }
             byId.setIsDefault(1);
 
             sysAmountAuditingEntity.setBankNumber(byId.getBankNumber());

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

@@ -44,8 +44,7 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
 
         LambdaQueryWrapper<SysUserBankCard> wrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankNumber())) {
-            wrapper.eq(SysUserBankCard::getBankNumber, ObjectUtils.isNotEmpty(sysUserBankCardVO.getBankNumber()));
-
+            wrapper.eq(SysUserBankCard::getBankNumber, sysUserBankCardVO.getBankNumber());
         }
         if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankAccount())) {
             wrapper.eq(SysUserBankCard::getBankAccount, sysUserBankCardVO.getBankAccount());
@@ -53,6 +52,12 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankAddress())) {
             wrapper.eq(SysUserBankCard::getBankAddress, sysUserBankCardVO.getBankAddress());
         }
+        if (StringUtils.isNotEmpty(sysUserBankCardVO.getUserName())) {
+            wrapper.eq(SysUserBankCard::getUserName, sysUserBankCardVO.getUserName());
+        }
+        if (sysUserBankCardVO.getAuditStatus() != null) {
+            wrapper.eq(SysUserBankCard::getAuditStatus, sysUserBankCardVO.getAuditStatus());
+        }
         Page<SysUserBankCard> insOrdersPage = page(page, wrapper);
         return new BasePageResult<>(sysUserBankCardVO.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
                 insOrdersPage.getRecords());
@@ -100,9 +105,23 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
 
         BeanUtils.copyProperties(sysUserBankCardVO, sysUserBankCard);
         sysUserBankCard.setCreateTime(new Date());
+        sysUserBankCard.setAuditStatus("0"); //待审核
+        sysUserBankCard.setUserName(BaseController.getUser().getName());
+
         baseMapper.insert(sysUserBankCard);
     }
 
+    @Override
+    @Transactional
+    public void auditByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
+        SysUserBankCard sysUserBankCard =  sysUserBankCardService.getById(sysUserBankCardVO.getId());
+        sysUserBankCard.setAuditStatus(sysUserBankCardVO.getAuditStatus());
+        sysUserBankCard.setAuditTime(new Date());
+        sysUserBankCard.setAuditUserId(BaseController.getUser().getId());
+        sysUserBankCard.setAuditUserName(BaseController.getUser().getName());
+        sysUserBankCardService.updateById(sysUserBankCard);
+    }
+
     @Override
     public HttpResult<List<SysUserBankCard>> getUserBankList() {
         String userId = BaseController.getUser().getId();

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

@@ -234,4 +234,14 @@ public class InsAreaCompany implements Serializable {
     @ApiModelProperty("签单时间")
     @TableField("signing_time")
     private LocalDateTime signingTime;
+
+    @TableField(value = "productid")
+    private String productid;
+
+    /**
+     * 产品名称
+     */
+    @TableField(value = "product")
+    private String product;
+
 }

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

@@ -40,6 +40,8 @@ import com.ydtech.modules.order.service.InsFeeOrderService;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNewDistribution;
+import com.ydtech.modules.protocols.service.InsFeeOrderNewDistributionService;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import com.ydtech.utils.DateUtil;
 import com.ydtech.utils.StringUtils;
@@ -50,6 +52,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -101,6 +104,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     @Autowired
     private PtlAgreementService ptlAgreementService;
 
+    @Resource
+    private InsFeeOrderNewDistributionService insFeeOrderNewDistributionService;
+
+
 
     public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper, InsDeptFeeService insDeptFeeService, EsmUserReferrerService esmUserReferrerService, SysUserService sysUserService, InsCommissionService insCommissionService, InsCompanyFeeService insCompanyFeeService, InsPlyIncomeMapper insPlyIncomeMapper) {
         this.insAreaCompanyMapper = insAreaCompanyMapper;
@@ -171,6 +178,22 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 sysUserAccount.setSuborderId(orderNo);  // 订单Id
                 sysUserAccountService.addOrUpdate(sysUserAccount);
 
+                if (insFeeOrderNew.getFirstLevelUserId() != null) {
+                    createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
+                            insFeeOrderNew.getFirstLevelUserId(), insFeeOrderNew.getFirstDetailProportion(),
+                            insFeeOrderNew.getFirstDetailPremiums(), insFeeOrderNew.getDistributionStatus());
+                }
+                if (insFeeOrderNew.getTwoLevelUserId() != null) {
+                    createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
+                            insFeeOrderNew.getTwoLevelUserId(), insFeeOrderNew.getSecondDetailProportion(),
+                            insFeeOrderNew.getSecondDetailPremiums(), insFeeOrderNew.getDistributionStatus());
+                }
+                if (insFeeOrderNew.getThreeLevelUserId() != null) {
+                    createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, order,
+                            insFeeOrderNew.getThreeLevelUserId(), insFeeOrderNew.getThirdDetailProportion(),
+                            insFeeOrderNew.getThirdDetailPremiums(), insFeeOrderNew.getDistributionStatus());
+                }
+
 
                 String deptid = insFeeOrderNew.getDeptId();
                 // 定义一个数组来存储各级机构的管理费
@@ -234,6 +257,25 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         }
     }
 
+    private void createInsFeeOrderNewDistribution(InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany, InsOrders insOrders, String userId, BigDecimal commissionRate, BigDecimal commissionAmount, String commissionLevel) {
+        InsFeeOrderNewDistribution insFeeOrderNewDistribution = new InsFeeOrderNewDistribution();
+        insFeeOrderNewDistribution.setId(IdGenerate.nextId());
+        insFeeOrderNewDistribution.setOrderNo(insFeeOrderNew.getInsOrderNo());
+        insFeeOrderNewDistribution.setJqPolicyNo(insAreaCompany.getJqpolicyno());
+        insFeeOrderNewDistribution.setSyPolicyNo(insAreaCompany.getSypolicyno());
+        insFeeOrderNewDistribution.setLicenseNo(insOrders.getLicenseno());
+        insFeeOrderNewDistribution.setProductId(insAreaCompany.getProductid());
+        insFeeOrderNewDistribution.setProduct(insAreaCompany.getProduct());
+        insFeeOrderNewDistribution.setSignTime(insAreaCompany.getSigningTime());
+        insFeeOrderNewDistribution.setInsCompany(insAreaCompany.getInscompany());
+        insFeeOrderNewDistribution.setUserId(userId);
+        insFeeOrderNewDistribution.setCommissionRate(commissionRate);
+        insFeeOrderNewDistribution.setCommissionAmount(commissionAmount);
+        insFeeOrderNewDistribution.setCommissionLevel(commissionLevel);
+        // 保存insFeeOrderNewDistribution
+        insFeeOrderNewDistributionService.save(insFeeOrderNewDistribution);
+    }
+
     private String getDeptFeeHistoryLog(Integer index,BigDecimal[] jqDeptPremiumsLevels,BigDecimal[] syDeptPremiumsLevels,
                                         BigDecimal[] noDeptPremiumsLevels,BigDecimal distributionFee){
         StringBuilder remarkBuilder = new StringBuilder();

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

@@ -30,10 +30,7 @@ import com.ydtech.modules.fnc.vo.InsPlyIncomeVo;
 import com.ydtech.modules.fnc.vo.SettlementDocumentaryFeesVo;
 import com.ydtech.modules.ins.model.vo.res.*;
 import com.ydtech.modules.inv.model.InvChannelsExternalBillsDetails;
-import com.ydtech.modules.inv.model.dto.InsBxNoPlyIncomeExcelDto;
-import com.ydtech.modules.inv.model.dto.InsBxPlyIncomeExcelDto;
-import com.ydtech.modules.inv.model.dto.InsPlyIncomeExcelDto;
-import com.ydtech.modules.inv.model.dto.InvChannelExcelDto;
+import com.ydtech.modules.inv.model.dto.*;
 import com.ydtech.modules.inv.model.excel.InvDisburseExcel;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -77,6 +74,8 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -1366,14 +1365,6 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
 //            分批结算
         SettlementDocumentaryFeesVo settlementDocumentaryFeesVo = new SettlementDocumentaryFeesVo();
 
-        if ("0".equals(insPlyIncomeVo.getInvoicingMethod())) {
-            allAmount =insPlyIncomeVo.getInvoicCommissionFeevalue().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100))));
-            settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getInvoicCommissionFeevalue().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
-            settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
-
-        } else {
-            settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
-        }
         settlementDocumentaryFeesVo.setInvoiceId(insPlyIncomeVo.getInvoicId());   //开票号
         settlementDocumentaryFeesVo.setSettlementTime(insPlyIncomeVo.getSettlementTime());   //结算时间
         settlementDocumentaryFeesVo.setSettlementStatus("2");   //2为结算状态
@@ -1383,7 +1374,9 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         settlementDocumentaryFeesVo.setIsNotCar(insPlyIncomeVo.getIsNotCar()); // 是否是非车
         settlementDocumentaryFeesVo.setInvoicingMethod(insPlyIncomeVo.getInvoicingMethod());  //开票方式
         settlementDocumentaryFeesVo.setTaxPoints(insPlyIncomeVo.getTaxPoints());  //税点
-        settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getExpendAmount()); //税点支出
+//            allAmount =insPlyIncomeVo.getInvoicCommissionFeevalue().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100))));
+        settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getInvoicCommissionFeevalue().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
+        settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
         settlementDocumentaryFeesVo.setHandlingFeesStatus(insPlyIncomeVo.getHandlingFeesStatus());
         settlementDocumentaryFeesVo.setTotalAmount(insPlyIncomeVo.getInvoicCommissionFeevalue());
         settlementDocumentaryFeesVo.setCreateTime(LocalDate.now());
@@ -1484,12 +1477,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
 //            分批结算
         SettlementDocumentaryFeesVo settlementDocumentaryFeesVo = new SettlementDocumentaryFeesVo();
 
-        if ("0".equals(insPlyIncomeVo.getInvoicingMethod())) {
-            settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getInvoicCommissionFeevalue().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
-            settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
-        } else {
-            settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
-        }
+
         settlementDocumentaryFeesVo.setInvoiceId(insPlyIncomeVo.getInvoicId());   //开票号
         settlementDocumentaryFeesVo.setSettlementTime(insPlyIncomeVo.getSettlementTime());   //结算时间
         settlementDocumentaryFeesVo.setSettlementStatus("2");   //2为结算状态
@@ -1498,7 +1486,8 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         settlementDocumentaryFeesVo.setIsNotCar(insPlyIncomeVo.getIsNotCar()); // 是否是非车
         settlementDocumentaryFeesVo.setInvoicingMethod(insPlyIncomeVo.getInvoicingMethod());  //开票方式
         settlementDocumentaryFeesVo.setTaxPoints(insPlyIncomeVo.getTaxPoints());  //税点
-//        settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getExpendAmount()); //税点支出
+        settlementDocumentaryFeesVo.setExpendAmount(insPlyIncomeVo.getInvoicCommissionFeevalue().multiply(BigDecimal.ONE.subtract(insPlyIncomeVo.getTaxPoints().divide(new BigDecimal(100)))));
+        settlementDocumentaryFeesVo.setSettlementAmount(insPlyIncomeVo.getSettlementAmount());   //进账金额
         settlementDocumentaryFeesVo.setTotalAmount(insPlyIncomeVo.getInvoicCommissionFeevalue());
         settlementDocumentaryFeesVo.setHandlingFeesStatus("0");
         settlementDocumentaryFeesVo.setParentId(insPlyIncomeVo.getId());

src/main/java/com/ydtech/modules/protocols/controller/InsFeeOrderNewDistributionController.java

@@ -4,6 +4,8 @@ package com.ydtech.modules.protocols.controller;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.admin.model.dto.SysDeptAccountHistoryDto;
 import com.ydtech.modules.admin.service.SysDeptAccountHistoryService;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNewDistribution;
 import com.ydtech.modules.protocols.entity.vo.InsFeeOrderNewDistributionVo;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewDistributionService;
 import io.swagger.annotations.Api;
@@ -22,7 +24,7 @@ public class InsFeeOrderNewDistributionController {
     private InsFeeOrderNewDistributionService insFeeOrderNewDistributionService;
 
     @PostMapping("/queryPage")
-    @ApiOperation(value = "机构账户表日志记录分页")
+    @ApiOperation(value = "推广费用清单分页")
     public HttpResult getSysDeptAccountHistory(@RequestBody InsFeeOrderNewDistributionVo insFeeOrderNewDistributionVo){
         return HttpResult.ok("", insFeeOrderNewDistributionService.selectList(insFeeOrderNewDistributionVo));
     }

src/main/java/com/ydtech/modules/protocols/entity/po/InsFeeOrderNewDistribution.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 @TableName(value = "ins_fee_order_new_distribution", autoResultMap = true)
 @Data
@@ -70,4 +71,17 @@ public class InsFeeOrderNewDistribution {
     @TableField(value = "commission_level")
     private String commissionLevel;
 
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    @TableField(exist = false)
+    private String userName;
+
+    @TableField(exist = false)
+    private String deptId;
+
+    @TableField(exist = false)
+    private String deptName;
+
 }

src/main/java/com/ydtech/modules/protocols/entity/vo/InsFeeOrderNewDistributionVo.java

@@ -63,6 +63,19 @@ public class InsFeeOrderNewDistributionVo {
     @TableField(value = "commission_level")
     private String commissionLevel;
 
+    @TableField(exist = false)
+    private String userName;
+
+    @TableField(exist = false)
+    private String deptId;
+
+    @TableField(exist = false)
+    private String deptName;
+
+    private String signTimeStart;
+
+    private String signTimeEnd;
+
     private int pageNum;
 
     private int pageSize;

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

@@ -12,7 +12,7 @@
         <result column="suborder" jdbcType="VARCHAR" property="suborder"/>
         <result column="user_id" jdbcType="VARCHAR" property="userId"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
-        <result column="create_date" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
         <result property="createTimeStart" column="createTimeStart" jdbcType="VARCHAR"/>
         <result property="createTimeEnd" column="createTimeEnd" jdbcType="VARCHAR"/>
     </resultMap>
@@ -28,7 +28,7 @@
         a.suborder,
         a.user_id,
         a.remark,
-        DATE(a.create_time) as create_date
+        a.create_time
         FROM
         sys_dept_account_history a
         LEFT JOIN sys_dept b ON a.dept_id = b.id
@@ -44,10 +44,10 @@
             AND a.documentary = #{sysDeptAccountHistoryDto.documentary}
         </if>
         <if test="sysDeptAccountHistoryDto.createTimeStart != null and sysDeptAccountHistoryDto.createTimeStart != ''">
-            and DATE(a.create_time) &gt;= #{sysDeptAccountHistoryDto.createTimeStart}
+            and a.create_time &gt;= #{sysDeptAccountHistoryDto.createTimeStart}
         </if>
         <if test="sysDeptAccountHistoryDto.createTimeEnd != null and sysDeptAccountHistoryDto.createTimeEnd != ''">
-            and DATE(a.create_time) &lt;= #{sysDeptAccountHistoryDto.createTimeEnd}
+            and a.create_time &lt;= #{sysDeptAccountHistoryDto.createTimeEnd}
         </if>
     </select>
 

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

@@ -15,7 +15,7 @@
             <result property="handlingAmountPayment" column="handling_amount_payment" jdbcType="DECIMAL"/>
             <result property="documentaryAmountWithdrawal" column="documentary_amount_withdrawal" jdbcType="DECIMAL"/>
             <result property="documentaryAmountAccount" column="documentary_amount_account" jdbcType="DECIMAL"/>
-            <result property="documentaryAmountPayment" column="documentary_amount_payment" jdbcType="DECIMAL"/>
+            <result property="documentaryAmountpayment" column="documentary_amount_payment" jdbcType="DECIMAL"/>
             <result property="promotionAmountWithdrawal" column="promotion_amount_withdrawal" jdbcType="DECIMAL"/>
             <result property="promotionAmountAccount" column="promotion_amount_account" jdbcType="DECIMAL"/>
             <result property="promotionAmountPayment" column="promotion_amount_payment" jdbcType="DECIMAL"/>
@@ -54,6 +54,9 @@
             <if test="sysUserAccountVo.userId != null and sysUserAccountVo.userId != ''">
                 and a.user_id = #{sysUserAccountVo.userId}
             </if>
+            <if test="sysUserAccountVo.deptId != null and sysUserAccountVo.deptId != ''">
+                and b.dept_id like concat(#{sysUserAccountVo.deptId},'%')
+            </if>
         </where>
     </select>
     <select id="getById" resultType="com.ydtech.modules.admin.model.po.SysUserAccount">

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

@@ -874,7 +874,10 @@
         GROUP BY partner_companies_id
         ) d ON d.partnerCompaniesId = a.partner_companies_id
         LEFT JOIN ( SELECT a.partner_companies_id AS "partnerCompaniesId",sum(
-        settlement_amount ) AS "settleMentAmount" , sum(a.expend_amount) as  "expendAmount", sum(a.tax_points ) as "taxPoints" FROM settlement_documentary_fees a
+        settlement_amount ) AS "settleMentAmount" ,
+        SUM(CASE WHEN a.invoicing_method = '0' THEN a.expend_amount ELSE 0 END) as  "expendAmount",
+        SUM(CASE WHEN a.invoicing_method = '0' THEN a.tax_points ELSE 0 END) as  "taxPoints"
+        FROM settlement_documentary_fees a
         WHERE a.settlement_status = '2'
         and  a.handling_fees_status ='0'
         <if test="isNotCar !=null  and  isNotCar  !=''">
@@ -957,8 +960,8 @@
         IFNULL ( max(d.settleMentAmount),0.00)-IFNULL(max(f.settleMentAmount) , 0.00)  as "invoicCommissionFeevalue",
         sum(COALESCE( a.other_feevalue,0.00) )-IFNULL ( max(d.settleMentAmount),0.00)  as "noInvoicCommissionFeevalue",
         sum(COALESCE( a.other_feevalue,0.00) )-COALESCE(max(c.settleMentAmount),0.00)+IFNULL ( max(d.settleMentAmount),0.00)  AS "unSettledAmount",
-        MAX( f.expendAmount ) AS "expendAmount",
-        MAX( f.taxPoints ) AS "taxPoints",
+        IFNULL(MAX(f.expendAmount),0.00) as   "expendAmount",
+        MAX(COALESCE( f.settleMentAmount,0.00) )-IFNULL ( max(f.expendAmount),0.00)  as "taxesFees",
         sum( a.other_feevalue ) AS "otherFeevalue"
         FROM
         ins_ply_income a
@@ -982,7 +985,10 @@
         GROUP BY partner_companies_id
         ) d ON d.partnerCompaniesId = a.partner_companies_id
         LEFT JOIN ( SELECT a.partner_companies_id AS "partnerCompaniesId",sum(
-        settlement_amount ) AS "settleMentAmount",  sum(a.expend_amount) as  "expendAmount"  , sum(a.tax_points) as "taxPoints"  FROM settlement_documentary_fees a
+        settlement_amount ) AS "settleMentAmount",
+        SUM(CASE WHEN a.invoicing_method = '0' THEN a.expend_amount ELSE 0 END) as  "expendAmount",
+        SUM(CASE WHEN a.invoicing_method = '0' THEN a.tax_points ELSE 0 END) as  "taxPoints"
+        FROM settlement_documentary_fees a
         WHERE a.settlement_status = '2'
           and  a.handling_fees_status ='1'
         <if test="isNotCar !=null  and  isNotCar  !=''">

src/main/resources/mapper/modules/protocols/InsFeeOrderNewDistributionMapper.xml

@@ -12,14 +12,69 @@
         <result column="sign_time" jdbcType="TIMESTAMP" property="signTime"/>
         <result column="ins_company" jdbcType="VARCHAR" property="insCompany"/>
         <result column="user_id" jdbcType="VARCHAR" property="userId"/>
+        <result column="deptId" jdbcType="VARCHAR" property="deptId"/>
+        <result column="deptName" jdbcType="VARCHAR" property="deptName"/>
         <result column="commission_rate" jdbcType="DECIMAL" property="commissionRate"/>
         <result column="commission_amount" jdbcType="DECIMAL" property="commissionAmount"/>
         <result column="commission_level" jdbcType="DECIMAL" property="commissionLevel"/>
+        <result property="signTimeStart" column="signTimeStart" jdbcType="VARCHAR"/>
+        <result property="signTimeEnd" column="signTimeEnd" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="getList" resultMap="BaseResultMap">
-        select * FROM ins_fee_order_new_distribution
+        select
+            a.id,
+            a.order_no,
+            a.jq_policy_no,
+            a.sy_policy_no,
+            a.license_no,
+            a.product_id,
+            a.product,
+            a.sign_time,
+            a.ins_company,
+            a.user_id,
+            a.commission_rate,
+            a.commission_amount,
+            a.commission_level,
+            b.name as userName,
+            c.name as deptName,
+            c.id as deptId
+            FROM ins_fee_order_new_distribution a
+            left join sys_user b on a.user_id = b.id
+            left join sys_dept c on b.dept_id = c.id
             where 1=1
-
+            <if test="insFeeOrderNewDistributionVo.orderNo != null and insFeeOrderNewDistributionVo.deptId != ''">
+                    and a.order_no = #{insFeeOrderNewDistributionVo.orderNo}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.deptId != null and insFeeOrderNewDistributionVo.deptId != ''">
+                    and b.dept_id like concat(#{insFeeOrderNewDistributionVo.deptId},'%')
+            </if>
+            <if test="insFeeOrderNewDistributionVo.userId != null and insFeeOrderNewDistributionVo.userId != ''">
+                    and a.user_id = #{insFeeOrderNewDistributionVo.userId}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.userName != null and insFeeOrderNewDistributionVo.userName != ''">
+                    and b.name = #{insFeeOrderNewDistributionVo.userName}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.licenseNo != null and insFeeOrderNewDistributionVo.licenseNo != ''">
+                    and a.license_no = #{insFeeOrderNewDistributionVo.licenseNo}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.product != null and insFeeOrderNewDistributionVo.product != ''">
+                    and a.product = #{insFeeOrderNewDistributionVo.product}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.jqPolicyNo != null and insFeeOrderNewDistributionVo.jqPolicyNo != ''">
+                    and a.jq_policy_no = #{insFeeOrderNewDistributionVo.jqPolicyNo}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.syPolicyNo != null and insFeeOrderNewDistributionVo.syPolicyNo != ''">
+                    and a.sy_policy_no = #{insFeeOrderNewDistributionVo.syPolicyNo}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.insCompany != null and insFeeOrderNewDistributionVo.insCompany != ''">
+                    and a.ins_company = #{insFeeOrderNewDistributionVo.insCompany}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.signTimeStart != null and insFeeOrderNewDistributionVo.signTimeStart != ''">
+                    and a.sign_time &gt;= #{insFeeOrderNewDistributionVo.signTimeStart}
+            </if>
+            <if test="insFeeOrderNewDistributionVo.signTimeEnd != null and insFeeOrderNewDistributionVo.signTimeEnd != ''">
+                    and a.sign_time &lt;= #{insFeeOrderNewDistributionVo.signTimeEnd}
+            </if>
     </select>
 </mapper>