结算增加筛选条件 数据项

推广费用清单查询功能完善

src/main/java/com/ydtech/modules/admin/model/SysDeptAccountWithdraw.java

@@ -3,9 +3,6 @@ package com.ydtech.modules.admin.model;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.ydtech.utils.LocalDateTimeDeserializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -60,8 +57,6 @@ public class SysDeptAccountWithdraw implements Serializable {
 
     @TableField(value = "create_time")
     @ApiModelProperty("创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
     private LocalDateTime createTime;
 
     @TableField(value = "voucher_id")

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

@@ -64,6 +64,9 @@ public class SysAmountAuditingVo {
     @ApiModelProperty(value = "用户名称")
     private String userName;
 
+    @ApiModelProperty(value = "电话")
+    private String mobile;
+
 
     @ApiModelProperty(value = "部门id")
     private String deptId;

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

@@ -110,6 +110,13 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
             if(StringUtils.isNotEmpty(sysAmountAuditingVo.getAmountStatus())){
                 params.put("amountStatus",sysAmountAuditingVo.getAmountStatus());
             }
+            if(StringUtils.isNotEmpty(sysAmountAuditingVo.getMobile())){
+                params.put("mobile",sysAmountAuditingVo.getMobile());
+            }
+            if(StringUtils.isNotEmpty(sysAmountAuditingVo.getUserName())){
+                params.put("userName",sysAmountAuditingVo.getUserName());
+            }
+
             List<SysAmountAuditingEntity> list = baseMapper.queryPageOrderNew(params);
             pageHelper=new PageInfo(list);
             BasePageResult<SysAmountAuditingEntity> pageResult=new BasePageResult<SysAmountAuditingEntity>(sysAmountAuditingVo.getPageNum(), sysAmountAuditingVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list);

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -91,6 +91,9 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     @Autowired
     private FeeRuleSchemeService feeRuleSchemeService;
 
+    @Resource
+    private InsFeeOrderNewDistributionService insFeeOrderNewDistributionService;
+
 
     @Override
     public QueryOrderFeeVo queryFeeOrderInfo(String companyId) {
@@ -433,6 +436,40 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
         //endregion
 
         insFeeOrderNewService.saveOrUpdate(insFeeOrderNew);
+        if (insFeeOrderNew.getFirstLevelUserId() != null) {
+            createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, insOrders,
+                    insFeeOrderNew.getFirstLevelUserId(), insFeeOrderNew.getFirstDetailProportion(),
+                    insFeeOrderNew.getFirstDetailPremiums(), insFeeOrderNew.getDistributionStatus());
+        }
+        if (insFeeOrderNew.getTwoLevelUserId() != null) {
+            createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, insOrders,
+                    insFeeOrderNew.getTwoLevelUserId(), insFeeOrderNew.getSecondDetailProportion(),
+                    insFeeOrderNew.getSecondDetailPremiums(), insFeeOrderNew.getDistributionStatus());
+        }
+        if (insFeeOrderNew.getThreeLevelUserId() != null) {
+            createInsFeeOrderNewDistribution(insFeeOrderNew, insAreaCompany, insOrders,
+                    insFeeOrderNew.getThreeLevelUserId(), insFeeOrderNew.getThirdDetailProportion(),
+                    insFeeOrderNew.getThirdDetailPremiums(), insFeeOrderNew.getDistributionStatus());
+        }
+    }
+
+    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);
     }
 
 

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

@@ -0,0 +1,29 @@
+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.protocols.entity.vo.InsFeeOrderNewDistributionVo;
+import com.ydtech.modules.protocols.service.InsFeeOrderNewDistributionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "推广费用")
+@RequestMapping("/ins/feeOrderNewDistribution")
+@RestController
+public class InsFeeOrderNewDistributionController {
+    @Autowired
+    private InsFeeOrderNewDistributionService insFeeOrderNewDistributionService;
+
+    @PostMapping("/queryPage")
+    @ApiOperation(value = "机构账户表日志记录分页")
+    public HttpResult getSysDeptAccountHistory(@RequestBody InsFeeOrderNewDistributionVo insFeeOrderNewDistributionVo){
+        return HttpResult.ok("", insFeeOrderNewDistributionService.selectList(insFeeOrderNewDistributionVo));
+    }
+}

src/main/java/com/ydtech/modules/protocols/dao/InsFeeOrderNewDistributionMapper.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.protocols.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNewDistribution;
+import com.ydtech.modules.protocols.entity.vo.InsFeeOrderNewDistributionVo;
+import org.apache.ibatis.annotations.Param;
+
+public interface InsFeeOrderNewDistributionMapper extends BaseMapper<InsFeeOrderNewDistribution> {
+    Page<InsFeeOrderNewDistribution> getList(Page page, @Param("insFeeOrderNewDistributionVo") InsFeeOrderNewDistributionVo insFeeOrderNewDistributionVo);
+}

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

@@ -0,0 +1,73 @@
+package com.ydtech.modules.protocols.entity.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@TableName(value = "ins_fee_order_new_distribution", autoResultMap = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class InsFeeOrderNewDistribution {
+
+    @TableId(value = "id")
+    private String id;
+
+
+    @ApiModelProperty(value = "订单号")
+    @TableField(value = "order_no")
+    private String orderNo;
+
+
+    @ApiModelProperty(value = "交强保单号")
+    @TableField(value = "jq_policy_no")
+    private String jqPolicyNo;
+
+    @ApiModelProperty(value = "商业保单号")
+    @TableField(value = "sy_policy_no")
+    private String syPolicyNo;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField(value = "license_no")
+    private String licenseNo;
+
+    @ApiModelProperty(value = "险种id")
+    @TableField(value = "product_id")
+    private String productId;
+
+    @ApiModelProperty(value = "险种")
+    @TableField(value = "product")
+    private String product;
+
+    @ApiModelProperty(value = "签单时间")
+    @TableField(value = "sign_time")
+    private LocalDateTime signTime;
+
+    @ApiModelProperty("保险公司")
+    @TableField(value = "ins_company")
+    private String insCompany;
+
+    @ApiModelProperty(value = "工号")
+    @TableField(value = "user_id")
+    private String userId;
+
+    @ApiModelProperty(value = "佣金比例")
+    @TableField(value = "commission_rate")
+    private BigDecimal commissionRate;
+
+    @ApiModelProperty(value = "佣金金额")
+    @TableField(value = "commission_amount")
+    private BigDecimal commissionAmount;
+
+    @ApiModelProperty(value = "佣金级别")
+    @TableField(value = "commission_level")
+    private String commissionLevel;
+
+}

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

@@ -0,0 +1,69 @@
+package com.ydtech.modules.protocols.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class InsFeeOrderNewDistributionVo {
+    @TableId(value = "id")
+    private String id;
+
+
+    @ApiModelProperty(value = "订单号")
+    @TableField(value = "order_no")
+    private String orderNo;
+
+
+    @ApiModelProperty(value = "交强保单号")
+    @TableField(value = "jq_policy_no")
+    private String jqPolicyNo;
+
+    @ApiModelProperty(value = "商业保单号")
+    @TableField(value = "sy_policy_no")
+    private String syPolicyNo;
+
+    @ApiModelProperty(value = "车牌号")
+    @TableField(value = "license_no")
+    private String licenseNo;
+
+    @ApiModelProperty(value = "险种id")
+    @TableField(value = "product_id")
+    private String productId;
+
+    @ApiModelProperty(value = "险种")
+    @TableField(value = "product")
+    private String product;
+
+    @ApiModelProperty(value = "签单时间")
+    @TableField(value = "sign_time")
+    private LocalDateTime signTime;
+
+    @ApiModelProperty("保险公司")
+    @TableField(value = "ins_company")
+    private String insCompany;
+
+    @ApiModelProperty(value = "工号")
+    @TableField(value = "user_id")
+    private String userId;
+
+    @ApiModelProperty(value = "佣金比例")
+    @TableField(value = "commission_rate")
+    private BigDecimal commissionRate;
+
+    @ApiModelProperty(value = "佣金金额")
+    @TableField(value = "commission_amount")
+    private BigDecimal commissionAmount;
+
+    @ApiModelProperty(value = "佣金级别")
+    @TableField(value = "commission_level")
+    private String commissionLevel;
+
+    private int pageNum;
+
+    private int pageSize;
+}

src/main/java/com/ydtech/modules/protocols/service/InsFeeOrderNewDistributionService.java

@@ -0,0 +1,12 @@
+package com.ydtech.modules.protocols.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.dto.SysDeptAccountHistoryDto;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNewDistribution;
+import com.ydtech.modules.protocols.entity.vo.InsFeeOrderNewDistributionVo;
+
+public interface InsFeeOrderNewDistributionService extends IService<InsFeeOrderNewDistribution> {
+
+    IPage<InsFeeOrderNewDistribution> selectList(InsFeeOrderNewDistributionVo insFeeOrderNewDistributionVo);
+}

src/main/java/com/ydtech/modules/protocols/service/impl/InsFeeOrderNewDistributionServiceImpl.java

@@ -0,0 +1,26 @@
+package com.ydtech.modules.protocols.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.PageRequest;
+import com.ydtech.modules.protocols.dao.InsFeeOrderNewDistributionMapper;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNewDistribution;
+import com.ydtech.modules.protocols.entity.vo.InsFeeOrderNewDistributionVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class InsFeeOrderNewDistributionServiceImpl extends ServiceImpl<InsFeeOrderNewDistributionMapper, InsFeeOrderNewDistribution> {
+    @Resource
+    private InsFeeOrderNewDistributionMapper insFeeOrderNewDistributionMapper;
+
+    public IPage<InsFeeOrderNewDistribution> selectList(InsFeeOrderNewDistributionVo insFeeOrderNewDistributionVo) {
+        PageRequest pageRequest = new PageRequest();
+        pageRequest.setPageNum(insFeeOrderNewDistributionVo.getPageNum());
+        pageRequest.setPageSize(insFeeOrderNewDistributionVo.getPageSize());
+        Page page = PageRequest.buildPageRequest(pageRequest);
+        return insFeeOrderNewDistributionMapper.getList(page,insFeeOrderNewDistributionVo);
+    }
+}

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -113,8 +113,6 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                                 .or()
                                 .lt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now())
                 );
-//                ptlAgreementProductCostsNewLambdaQueryWrapper.gt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
-//                        .lt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());
             } else if (agreementProductQueryVo.getIsEffective().equals("2")) {
                 ptlAgreementProductCostsNewLambdaQueryWrapper.lt(PtlAgreementProductCostsNew::getCostsStartDate, LocalDateTime.now())
                         .gt(PtlAgreementProductCostsNew::getCostsEndDate, LocalDateTime.now());

src/main/java/com/ydtech/utils/LocalDateTimeDeserializer.java

@@ -1,29 +0,0 @@
-package com.ydtech.utils;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import lombok.Data;
-
-import java.io.IOException;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-
-
-/**
- *
- *   LocalDateTime反序列化器
- *
- */
-@Data
-public class LocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
-    @Override
-    public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
-        String dateStr = p.getValueAsString();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate date = LocalDate.parse(dateStr, formatter);
-        return date.atStartOfDay(ZoneId.systemDefault()).toLocalDateTime();
-    }
-}

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

@@ -110,10 +110,12 @@
         b.amount as "historyAmount",
         b.surplus_amount as "surplusAmount",
         su.name as "userName",
+        su.mobile as "mobile",
         su2.name as "auditingUserName",
         su.dept_id as "deptId",
         sd.name as "deptName",
-        bc.bank_account as "bankAccount"
+        bc.bank_account as "bankAccount",
+        bc.bank_address as "bankAddress"
         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

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

@@ -35,7 +35,7 @@
         where
         b.del_flag = 0
         <if test="sysDeptAccountHistoryDto.deptId != null and sysDeptAccountHistoryDto.deptId != ''">
-            AND a.dept_id = #{sysDeptAccountHistoryDto.deptId}
+            AND a.dept_id like concat(#{sysDeptAccountHistoryDto.deptId},'%')
         </if>
         <if test="sysDeptAccountHistoryDto.deptName != null and sysDeptAccountHistoryDto.deptName != ''">
             AND b.name = #{sysDeptAccountHistoryDto.deptName}

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

@@ -10,7 +10,7 @@
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
         <result property="voucherId" column="voucher_id" jdbcType="VARCHAR"/>
         <result property="picId" column="pic_id" jdbcType="VARCHAR"/>
-        <result property="createTime" column="create_date" jdbcType="TIMESTAMP"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="createTimeStart" column="createTimeStart" jdbcType="VARCHAR"/>
         <result property="createTimeEnd" column="createTimeEnd" jdbcType="VARCHAR"/>
         <result property="auditName" column="audit_name" jdbcType="VARCHAR"/>
@@ -34,23 +34,26 @@
         withdraw_name,
         audit_userid,
         audit_name,
-        DATE(create_time) as create_date
+        create_time
         from sys_dept_account_withdraw
         where
         <if test="sysDeptAccountWithdrawVo.status != null and sysDeptAccountWithdrawVo.status != ''">
              status = #{sysDeptAccountWithdrawVo.status}
         </if>
+        <if test="sysDeptAccountWithdrawVo.id != null and sysDeptAccountWithdrawVo.id != ''">
+            and id = #{sysDeptAccountWithdrawVo.id}
+        </if>
         <if test="sysDeptAccountWithdrawVo.deptId != null and sysDeptAccountWithdrawVo.deptId != ''">
-            and dept_id = #{sysDeptAccountWithdrawVo.deptId}
+            and dept_id like concat(#{sysDeptAccountWithdrawVo.deptId},'%')
         </if>
         <if test="sysDeptAccountWithdrawVo.voucherId != null and sysDeptAccountWithdrawVo.voucherId != ''">
             and voucher_id = #{sysDeptAccountWithdrawVo.voucherId}
         </if>
         <if test="sysDeptAccountWithdrawVo.createTimeStart != null and sysDeptAccountWithdrawVo.createTimeStart != ''">
-            and DATE(create_time) &gt;= #{sysDeptAccountWithdrawVo.createTimeStart}
+            and create_time &gt;= #{sysDeptAccountWithdrawVo.createTimeStart}
         </if>
         <if test="sysDeptAccountWithdrawVo.createTimeEnd != null and sysDeptAccountWithdrawVo.createTimeEnd != ''">
-            and DATE(create_time) &lt;= #{sysDeptAccountWithdrawVo.createTimeEnd}
+            and create_time &lt;= #{sysDeptAccountWithdrawVo.createTimeEnd}
         </if>
     </select>
 

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

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.protocols.dao.InsFeeOrderNewDistributionMapper">
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.protocols.entity.vo.InsFeeOrderNewDistributionVo">
+        <id column="id" jdbcType="VARCHAR" property="id"/>
+        <result column="order_no" jdbcType="VARCHAR" property="orderNo"/>
+        <result column="jq_policy_no" jdbcType="VARCHAR" property="jqPolicyNo"/>
+        <result column="sy_policy_no" jdbcType="VARCHAR" property="syPolicyNo"/>
+        <result column="license_no" jdbcType="VARCHAR" property="licenseNo"/>
+        <result column="product_id" jdbcType="VARCHAR" property="productId"/>
+        <result column="product" jdbcType="VARCHAR" property="product"/>
+        <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="commission_rate" jdbcType="DECIMAL" property="commissionRate"/>
+        <result column="commission_amount" jdbcType="DECIMAL" property="commissionAmount"/>
+        <result column="commission_level" jdbcType="DECIMAL" property="commissionLevel"/>
+    </resultMap>
+
+    <select id="getList" resultMap="BaseResultMap">
+        select * FROM ins_fee_order_new_distribution
+            where 1=1
+
+    </select>
+</mapper>