Browse Source

费用结算跟单

guoweisong 2 năm trước cách đây
mục cha
commit
010ec70abf
19 tập tin đã thay đổi với 765 bổ sung38 xóa
  1. 18 0
      src/main/java/com/ydtech/modules/fnc/dao/FncInsAreaCompanyMapper.java
  2. 18 0
      src/main/java/com/ydtech/modules/fnc/dao/FncInsCommissionMapper.java
  3. 18 0
      src/main/java/com/ydtech/modules/fnc/dao/FncInsCompanyfeeMapper.java
  4. 236 0
      src/main/java/com/ydtech/modules/fnc/entity/InsAreaCompany.java
  5. 104 0
      src/main/java/com/ydtech/modules/fnc/entity/InsCommission.java
  6. 136 0
      src/main/java/com/ydtech/modules/fnc/entity/InsCompanyfee.java
  7. 4 0
      src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java
  8. 22 18
      src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java
  9. 20 4
      src/main/java/com/ydtech/modules/ins/controller/InsFeeDetailController.java
  10. 36 11
      src/main/java/com/ydtech/modules/ins/controller/InsPayApplyController.java
  11. 7 1
      src/main/java/com/ydtech/modules/ins/dao/impl/InsCommissionDaoImpl.java
  12. 7 1
      src/main/java/com/ydtech/modules/ins/dao/impl/InsCompanyFeeDaoImpl.java
  13. 8 1
      src/main/java/com/ydtech/modules/ins/dao/impl/InsDeptFeeDaoImpl.java
  14. 3 1
      src/main/java/com/ydtech/modules/ins/model/InsCommission.java
  15. 1 0
      src/main/java/com/ydtech/modules/ins/model/InsCompanyFee.java
  16. 1 1
      src/main/java/com/ydtech/modules/ins/model/InsDeptFee.java
  17. 61 0
      src/main/resources/mapper/modules/fnc/InsAreaCompanyMapper.xml
  18. 28 0
      src/main/resources/mapper/modules/fnc/InsCommissionMapper.xml
  19. 37 0
      src/main/resources/mapper/modules/fnc/InsCompanyfeeMapper.xml

+ 18 - 0
src/main/java/com/ydtech/modules/fnc/dao/FncInsAreaCompanyMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.fnc.dao;
+
+import com.ydtech.modules.fnc.entity.InsAreaCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 报价渠道 Mapper 接口
+ * </p>
+ *
+ * @author gws
+ * @since 2024-01-29
+ */
+@Mapper
+public interface FncInsAreaCompanyMapper extends BaseMapper<InsAreaCompany> {
+
+}

+ 18 - 0
src/main/java/com/ydtech/modules/fnc/dao/FncInsCommissionMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.fnc.dao;
+
+import com.ydtech.modules.fnc.entity.InsCommission;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 分销费用 Mapper 接口
+ * </p>
+ *
+ * @author gws
+ * @since 2024-01-30
+ */
+@Mapper
+public interface FncInsCommissionMapper extends BaseMapper<InsCommission> {
+
+}

+ 18 - 0
src/main/java/com/ydtech/modules/fnc/dao/FncInsCompanyfeeMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.fnc.dao;
+
+import com.ydtech.modules.fnc.entity.InsCompanyfee;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 保司结算手续费、个代结算手续费 Mapper 接口
+ * </p>
+ *
+ * @author gws
+ * @since 2024-01-30
+ */
+@Mapper
+public interface FncInsCompanyfeeMapper extends BaseMapper<InsCompanyfee> {
+
+}

+ 236 - 0
src/main/java/com/ydtech/modules/fnc/entity/InsAreaCompany.java

@@ -0,0 +1,236 @@
+package com.ydtech.modules.fnc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 报价渠道
+ * </p>
+ *
+ * @author gws
+ * @since 2024-01-29
+ */
+@Getter
+@Setter
+@TableName("ins_area_company")
+@ApiModel(value = "InsAreaCompany对象", description = "报价渠道")
+public class InsAreaCompany implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键")
+    @TableId("id")
+    private String id;
+
+    @ApiModelProperty("订单号")
+    @TableField("orderno")
+    private String orderno;
+
+    @ApiModelProperty("协议id")
+    @TableField("agreement_id")
+    private Long agreementId;
+
+    @ApiModelProperty("请求类型")
+    @TableField("api_type")
+    private Byte apiType;
+
+    @ApiModelProperty("订单状态")
+    @TableField("orderstatus")
+    private String orderstatus;
+
+    @ApiModelProperty("保险公司编号")
+    @TableField("company_id")
+    private String companyId;
+
+    @ApiModelProperty("保险名称")
+    @TableField("inscompany")
+    private String inscompany;
+
+    @ApiModelProperty("请求报文")
+    @TableField("reqtxt")
+    private String reqtxt;
+
+    @ApiModelProperty("响应报文")
+    @TableField("reptxt")
+    private String reptxt;
+
+    @ApiModelProperty("交强投保单号")
+    @TableField("jqapplyno")
+    private String jqapplyno;
+
+    @ApiModelProperty("交强保单号")
+    @TableField("jqpolicyno")
+    private String jqpolicyno;
+
+    @ApiModelProperty("商业投保单号")
+    @TableField("syapplyno")
+    private String syapplyno;
+
+    @ApiModelProperty("商业保单号")
+    @TableField("sypolicyno")
+    private String sypolicyno;
+
+    @ApiModelProperty("交叉销售保单信息")
+    @TableField("cross_insurance")
+    private String crossInsurance;
+
+    @ApiModelProperty("交强险信息")
+    @TableField("riskinfo")
+    private String riskinfo;
+
+    @ApiModelProperty("商业险信息")
+    @TableField("kindinfo")
+    private String kindinfo;
+
+    @ApiModelProperty("交强险费用")
+    @TableField("jqpremium")
+    private BigDecimal jqpremium;
+
+    @ApiModelProperty("商业险费用")
+    @TableField("sypremium")
+    private BigDecimal sypremium;
+
+    @ApiModelProperty("驾意险费用")
+    @TableField("jypremium")
+    private BigDecimal jypremium;
+
+    @ApiModelProperty("总保费")
+    @TableField("sumpremium")
+    private BigDecimal sumpremium;
+
+    @ApiModelProperty("车船税费用")
+    @TableField("taxamount")
+    private BigDecimal taxamount;
+
+    @ApiModelProperty("交强优惠比例")
+    @TableField("jqdiscountrate")
+    private Object jqdiscountrate;
+
+    @ApiModelProperty("商业优惠比例")
+    @TableField("sydiscountrate")
+    private Object sydiscountrate;
+
+    @ApiModelProperty("交强手续费比例")
+    @TableField("feerate")
+    private Object feerate;
+
+    @ApiModelProperty("商业手续费比例")
+    @TableField("disrate")
+    private Object disrate;
+
+    @ApiModelProperty("核保人")
+    @TableField("auditid")
+    private String auditid;
+
+    @ApiModelProperty("核保人姓名")
+    @TableField("auditname")
+    private String auditname;
+
+    @ApiModelProperty("核保时间")
+    @TableField("audittime")
+    private LocalDateTime audittime;
+
+    @ApiModelProperty("核保意见")
+    @TableField("auditopinion")
+    private String auditopinion;
+
+    @ApiModelProperty("交强特别约定")
+    @TableField("jqappoint")
+    private String jqappoint;
+
+    @ApiModelProperty("商业特别约定")
+    @TableField("syappoint")
+    private String syappoint;
+
+    @TableField("createtime")
+    private LocalDateTime createtime;
+
+    @ApiModelProperty("支付时间")
+    @TableField("pay_date")
+    private LocalDateTime payDate;
+
+    @ApiModelProperty("支付链接")
+    @TableField("payment_link")
+    private String paymentLink;
+
+    @ApiModelProperty("保险公司订单号")
+    @TableField("ins_order_no")
+    private String insOrderNo;
+
+    @ApiModelProperty("驾意险信息")
+    @TableField("accident_info")
+    private String accidentInfo;
+
+    @ApiModelProperty("归属ID")
+    @TableField("attribution_id")
+    private String attributionId;
+
+    @ApiModelProperty("欠税")
+    @TableField("tax_arrears")
+    private String taxArrears;
+
+    @ApiModelProperty("交强险起期")
+    @TableField("jq_start_date")
+    private String jqStartDate;
+
+    @ApiModelProperty("交强险止期")
+    @TableField("jq_end_date")
+    private String jqEndDate;
+
+    @ApiModelProperty("商业险起期")
+    @TableField("sy_start_date")
+    private String syStartDate;
+
+    @ApiModelProperty("商业险止期")
+    @TableField("sy_end_date")
+    private String syEndDate;
+
+    @ApiModelProperty("出险字符串信息")
+    @TableField("accident_str_info")
+    private String accidentStrInfo;
+
+    @ApiModelProperty("评分")
+    @TableField("score")
+    private String score;
+
+    @ApiModelProperty("交强类型评分")
+    @TableField("jq_score")
+    private String jqScore;
+
+    @ApiModelProperty("商业类型评分")
+    @TableField("sy_score")
+    private String syScore;
+
+    @ApiModelProperty("总赔付率")
+    @TableField("loss_ration")
+    private Object lossRation;
+
+    @ApiModelProperty("交强赔付率")
+    @TableField("jq_loss_ration")
+    private Object jqLossRation;
+
+    @ApiModelProperty("商业赔付率")
+    @TableField("sy_loss_ration")
+    private Object syLossRation;
+
+    @ApiModelProperty("内部订单状态")
+    @TableField("inside_order_status")
+    private Byte insideOrderStatus;
+
+    @ApiModelProperty("内部支付时间")
+    @TableField("inside_pay_time")
+    private LocalDateTime insidePayTime;
+
+    @ApiModelProperty("签单时间")
+    @TableField("signing_time")
+    private LocalDateTime signingTime;
+}

+ 104 - 0
src/main/java/com/ydtech/modules/fnc/entity/InsCommission.java

@@ -0,0 +1,104 @@
+package com.ydtech.modules.fnc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 分销费用
+ * </p>
+ *
+ * @author gws
+ * @since 2024-01-30
+ */
+@Getter
+@Setter
+@TableName("ins_commission")
+@ApiModel(value = "InsCommission对象", description = "分销费用")
+public class InsCommission implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("订单号")
+    @TableField("orderno")
+    private String orderno;
+
+    @ApiModelProperty("保单号")
+    @TableField("policyno")
+    private String policyno;
+
+    @ApiModelProperty("车牌号")
+    @TableField("licenseno")
+    private String licenseno;
+
+    @ApiModelProperty("险种")
+    @TableField("riskcode")
+    private String riskcode;
+
+    @ApiModelProperty("关联ins_are_company表id")
+    @TableField("quoteno")
+    private String quoteno;
+
+    @ApiModelProperty("推荐人工号")
+    @TableField("refereescode")
+    private String refereescode;
+
+    @ApiModelProperty("推荐人姓名")
+    @TableField("refereesname")
+    private String refereesname;
+
+    @ApiModelProperty("分佣比例")
+    @TableField("commissionrate")
+    private BigDecimal commissionrate;
+
+    @ApiModelProperty("分佣金额")
+    @TableField("commissionamount")
+    private BigDecimal commissionamount;
+
+    @ApiModelProperty("分销等级")
+    @TableField("level")
+    private String level;
+
+    @ApiModelProperty("审核状态")
+    @TableField("auditstatus")
+    private String auditstatus;
+
+    @ApiModelProperty("结算状态 0未结算,1已结算")
+    @TableField("settlestatus")
+    private String settlestatus;
+
+    @ApiModelProperty("费用审核时间")
+    @TableField("insuredtime")
+    private LocalDateTime insuredtime;
+
+    @ApiModelProperty("机构代码")
+    @TableField("deptid")
+    private String deptid;
+
+    @ApiModelProperty("机构名称")
+    @TableField("deptname")
+    private String deptname;
+
+    @ApiModelProperty("保险公司")
+    @TableField("inscompany")
+    private String inscompany;
+
+    @ApiModelProperty("协议号")
+    @TableField("agreeid")
+    private String agreeid;
+
+    @ApiModelProperty(" 签单日期")
+    @TableField("signdate")
+    private LocalDateTime signdate;
+
+    @ApiModelProperty("提现申请单号")
+    @TableField("applyno")
+    private String applyno;
+}

+ 136 - 0
src/main/java/com/ydtech/modules/fnc/entity/InsCompanyfee.java

@@ -0,0 +1,136 @@
+package com.ydtech.modules.fnc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 保司结算手续费、个代结算手续费
+ * </p>
+ *
+ * @author gws
+ * @since 2024-01-30
+ */
+@Getter
+@Setter
+@TableName("ins_companyfee")
+@ApiModel(value = "InsCompanyfee对象", description = "保司结算手续费、个代结算手续费")
+public class InsCompanyfee implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("订单号")
+    @TableField("orderno")
+    private String orderno;
+
+    @ApiModelProperty("保单号")
+    @TableField("policyno")
+    private String policyno;
+
+    @ApiModelProperty("险种")
+    @TableField("riskcode")
+    private String riskcode;
+
+    @TableField("settleno")
+    private String settleno;
+
+    @ApiModelProperty("交强费用比例")
+    @TableField("feerate")
+    private BigDecimal feerate;
+
+    @ApiModelProperty("商业费用比例")
+    @TableField("disrate")
+    private BigDecimal disrate;
+
+    @ApiModelProperty("交强费用")
+    @TableField("feeamount")
+    private BigDecimal feeamount;
+
+    @ApiModelProperty("商业费用")
+    @TableField("disamount")
+    private BigDecimal disamount;
+
+    @ApiModelProperty("交强保费")
+    @TableField("jqpremium")
+    private BigDecimal jqpremium;
+
+    @ApiModelProperty("商业保费")
+    @TableField("sypremium")
+    private BigDecimal sypremium;
+
+    @ApiModelProperty("保险公司")
+    @TableField("inscompany")
+    private String inscompany;
+
+    @ApiModelProperty("协议号")
+    @TableField("agreeid")
+    private String agreeid;
+
+    @TableField("agreementcode")
+    private String agreementcode;
+
+    @TableField("agreeprodid")
+    private String agreeprodid;
+
+    @TableField("producname")
+    private String producname;
+
+    @TableField("agreetype")
+    private String agreetype;
+
+    @ApiModelProperty("结算状态 0未结算,1已结算")
+    @TableField("settlestatus")
+    private String settlestatus;
+
+    @ApiModelProperty("结算时间")
+    @TableField("settletime")
+    private LocalDateTime settletime;
+
+    @ApiModelProperty("车架号")
+    @TableField("frameno")
+    private String frameno;
+
+    @ApiModelProperty("车牌号")
+    @TableField("licenseno")
+    private String licenseno;
+
+    @ApiModelProperty("结算类型 A保险公司 B业务员")
+    @TableId("settletype")
+    private String settletype;
+
+    @ApiModelProperty("业务员工号")
+    @TableField("userid")
+    private String userid;
+
+    @ApiModelProperty("业务员姓名")
+    @TableField("username")
+    private String username;
+
+    @ApiModelProperty("机构代码")
+    @TableField("deptid")
+    private String deptid;
+
+    @ApiModelProperty("机构名称")
+    @TableField("deptname")
+    private String deptname;
+
+    @ApiModelProperty("费用审核时间")
+    @TableField("createtime")
+    private LocalDateTime createtime;
+
+    @ApiModelProperty("签单日期")
+    @TableField("signdate")
+    private LocalDateTime signdate;
+
+    @ApiModelProperty("提现申请单号")
+    @TableField("applyno")
+    private String applyno;
+}

+ 4 - 0
src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -54,6 +54,10 @@ public class InsPlyIncome implements Serializable {
     @TableField("pay_date")
     private LocalDateTime payDate;
 
+    @ApiModelProperty("签单日期")
+    @TableField("signdate")
+    private LocalDateTime signDate;
+
     @ApiModelProperty("保险公司")
     @TableField("company_id")
     private String companyId;

+ 22 - 18
src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
+import com.ydtech.modules.fnc.dao.FncInsAreaCompanyMapper;
 import com.ydtech.modules.fnc.dao.InsPlyIncomeMapper;
 import com.ydtech.modules.fnc.entity.InsFeeAudit;
 import com.ydtech.modules.fnc.dao.InsFeeAuditMapper;
@@ -17,11 +18,9 @@ import com.ydtech.modules.ins.service.InsCommissionService;
 import com.ydtech.modules.ins.service.InsCompanyFeeService;
 import com.ydtech.modules.ins.service.InsDeptFeeService;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
-import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.fnc.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsFeeOrderService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.utils.DateUtil;
@@ -51,7 +50,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
     private final InsFeeOrderService insFeeOrderService;
 
-    private final InsAreaCompanyService insAreaCompanyService;
+    private final FncInsAreaCompanyMapper insAreaCompanyMapper;
 
     private final InsDeptFeeService insDeptFeeService;
     private final InsCommissionService insCommissionService;
@@ -61,8 +60,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     private final SysUserService sysUserService;
 
 
-    public InsFeeAuditServiceImpl(InsAreaCompanyService insAreaCompanyService, InsOrdersMapper insOrdersMapper, InsFeeOrderService insFeeOrderService,InsDeptFeeService insDeptFeeService,EsmUserReferrerService esmUserReferrerService,SysUserService sysUserService,InsCommissionService insCommissionService,InsCompanyFeeService insCompanyFeeService,InsPlyIncomeMapper insPlyIncomeMapper) {
-        this.insAreaCompanyService = insAreaCompanyService;
+    public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper, InsFeeOrderService insFeeOrderService,InsDeptFeeService insDeptFeeService,EsmUserReferrerService esmUserReferrerService,SysUserService sysUserService,InsCommissionService insCommissionService,InsCompanyFeeService insCompanyFeeService,InsPlyIncomeMapper insPlyIncomeMapper) {
+        this.insAreaCompanyMapper = insAreaCompanyMapper;
         this.insOrdersMapper = insOrdersMapper;
         this.insFeeOrderService=insFeeOrderService;
         this.insDeptFeeService=insDeptFeeService;
@@ -85,7 +84,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
         InsOrders order=insOrdersMapper.selectById(orderNo);
         InsFeeOrder insFeeOrder=insFeeOrderService.getByInsOrderNo(insFeeAudit.getInsOrderNo());
-        InsAreaCompany insAreaCompany=insAreaCompanyService.getById(insFeeAudit.getInsOrderNo());
+        InsAreaCompany insAreaCompany=insAreaCompanyMapper.selectById(insFeeAudit.getInsOrderNo());
 
         //bigdecimal为null时设置为0
         handleBigdecimal(insFeeOrder);
@@ -147,9 +146,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insPlyIncome.setOrderno(order.getOrderno());
         insPlyIncome.setDeptId(order.getDeptid());
         insPlyIncome.setCompanyId(plyDto.getCompanyId());
-        insPlyIncome.setAgreementId(plyDto.getAgreementId());
+        insPlyIncome.setAgreementId(String.valueOf(plyDto.getAgreementId()));
         insPlyIncome.setLicenseno(order.getLicenseno());
         insPlyIncome.setPayDate(StringUtils.isNullOrEmpty(plyDto.getPayDate())?plyDto.getCreatetime():plyDto.getPayDate());
+        insPlyIncome.setSignDate(StringUtils.isNullOrEmpty(plyDto.getInsidePayTime())?plyDto.getPayDate():plyDto.getInsidePayTime());
         insPlyIncome.setCreateTime(LocalDateTime.now() );
         if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
             insPlyIncome.setPolicyno(plyDto.getJqpolicyno());
@@ -187,9 +187,10 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         InsDeptFee deptFee = new InsDeptFee();
         deptFee.setOrderno(order.getOrderno());
         deptFee.setQuoteno(insFeeOrder.getInsOrderNo());
-        deptFee.setAgreeid(plyDto.getAgreementId());
+        deptFee.setAgreeid(String.valueOf(plyDto.getAgreementId()));
         deptFee.setAuditstatus("1");
         deptFee.setSettlestatus("0");
+        deptFee.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
         deptFee.setInscompany(plyDto.getCompanyId());
         if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
             deptFee.setPolicyno(plyDto.getJqpolicyno());
@@ -266,13 +267,14 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 commission.setDeptid(order.getDeptid());
                 commission.setDeptname(order.getDeptname());
                 commission.setInscompany(plyDto.getCompanyId());
-                commission.setAgreeid(plyDto.getAgreementId());
+                commission.setAgreeid(String.valueOf(plyDto.getAgreementId()));
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
                 commission.setLevel("3");
                 commission.setAuditstatus("1");  //0未审核 1已审核
                 commission.setSettlestatus("0"); //0未结算 1已结算
-                commission.setInsuredtime(plyDto.getPayDate().toString()); //承保确认时间
+                commission.setInsuredtime(DateUtil.formatFullTime(plyDto.getPayDate(),DateUtil.FULL_TIME_SPLIT_PATTERN));
+                commission.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
                 if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
                     commission.setPolicyno(plyDto.getJqpolicyno());
                     commission.setRiskcode("交强");
@@ -301,7 +303,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 commission.setDeptid(order.getDeptid());
                 commission.setDeptname(order.getDeptname());
                 commission.setInscompany(plyDto.getCompanyId());
-                commission.setAgreeid(plyDto.getAgreementId());
+                commission.setAgreeid(String.valueOf(plyDto.getAgreementId()));
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
 //                commission.setCommissionrate(insFeeOrder.getSecondRetailProportion().doubleValue());
@@ -309,7 +311,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 commission.setLevel("2");
                 commission.setAuditstatus("1");  //0未审核 1已审核
                 commission.setSettlestatus("0"); //0未结算 1已结算
-                commission.setInsuredtime(plyDto.getPayDate().toString()); //承保确认时间
+                commission.setInsuredtime(DateUtil.formatFullTime(plyDto.getPayDate(),DateUtil.FULL_TIME_SPLIT_PATTERN));
+                commission.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
                 if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
                     commission.setPolicyno(plyDto.getJqpolicyno());
                     commission.setRiskcode("交强");
@@ -337,7 +340,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 commission.setDeptid(order.getDeptid());
                 commission.setDeptname(order.getDeptname());
                 commission.setInscompany(plyDto.getCompanyId());
-                commission.setAgreeid(plyDto.getAgreementId());
+                commission.setAgreeid(String.valueOf(plyDto.getAgreementId()));
                 commission.setRefereescode(user.getId());
                 commission.setRefereesname(user.getName());
 //                commission.setCommissionrate(insFeeOrder.getFirstRetailProportion().doubleValue());
@@ -345,7 +348,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 commission.setLevel("1");
                 commission.setAuditstatus("1");  //0未审核 1已审核
                 commission.setSettlestatus("0"); //0未结算 1已结算
-                commission.setInsuredtime(plyDto.getPayDate().toString()); //承保确认时间
+                commission.setInsuredtime(DateUtil.formatFullTime(plyDto.getPayDate(),DateUtil.FULL_TIME_SPLIT_PATTERN));
+                commission.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
                 if(StringUtils.isNotEmpty(plyDto.getJqpolicyno())){
                     commission.setPolicyno(plyDto.getJqpolicyno());
                     commission.setRiskcode("交强");
@@ -366,7 +370,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         }
     }
 
-   
+
     /**
      * 生成个代费用
      * @param order
@@ -380,7 +384,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insCompanyFee.setFrameNo(order.getFrameno());
         insCompanyFee.setLicenseNo(order.getLicenseno());
         insCompanyFee.setInscompany(plyDto.getCompanyId());
-        insCompanyFee.setAgreeid(plyDto.getAgreementId());
+        insCompanyFee.setAgreeid(String.valueOf(plyDto.getAgreementId()));
         insCompanyFee.setUserid(order.getUserid());
         insCompanyFee.setUsername(order.getUsername());
         insCompanyFee.setDeptid(order.getDeptid());
@@ -388,7 +392,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insCompanyFee.setSettletype("B");
         insCompanyFee.setSettlestatus("0");
         insCompanyFee.setCreatetime(DateUtil.getDateFormat(new Date(),DateUtil.FULL_TIME_SPLIT_PATTERN));
-
+        insCompanyFee.setSignDate(DateUtil.formatFullTime(plyDto.getInsidePayTime(),DateUtil.FULL_TIME_SPLIT_PATTERN));
         BigDecimal dept_rate=insFeeOrder.getFirstDeptProportion()
                 .add(insFeeOrder.getSecondDeptProportion())
                 .add(insFeeOrder.getThirdDeptProportion())

+ 20 - 4
src/main/java/com/ydtech/modules/ins/controller/InsFeeDetailController.java

@@ -335,7 +335,7 @@ public class InsFeeDetailController extends BaseController {
             array.add(riskCode);
         }
         if (!StringUtils.isEmpty(startdate) && !StringUtils.isEmpty(enddate)) {
-            whereStr.append(" and exists(select 1 from ins_ply_income a where a.orderno=t.orderno and (DATE_FORMAT(a.pay_date, '%Y-%m-%d') between date ? and date ?))");
+            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between date ? and date ?");
             array.add(startdate);
             array.add(enddate);
         }
@@ -415,6 +415,7 @@ public class InsFeeDetailController extends BaseController {
         String inscompany = pageRequest.getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
         String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
         String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
+        String settlestatus = pageRequest.getColumnFilterValue(pageRequest, "settlestatus"); // 结算状态 0未结算 1已结算
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
@@ -454,11 +455,14 @@ public class InsFeeDetailController extends BaseController {
             array.add(riskCode);
         }
         if (!StringUtils.isEmpty(startdate) && !StringUtils.isEmpty(enddate)) {
-            whereStr.append(" and exists(select 1 from ins_ply_income a where a.orderno=t.orderno and (DATE_FORMAT(a.pay_date, '%Y-%m-%d') between date ? and date ?))");
+            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between date ? and date ?");
             array.add(startdate);
             array.add(enddate);
         }
-
+        if (!StringUtils.isEmpty(settlestatus)) {
+            whereStr.append(" and settlestatus=?");
+            array.add(settlestatus);
+        }
 
         if (!StringUtils.isEmpty(auditstatus)) {
             whereStr.append(" and auditstatus=?");
@@ -484,7 +488,9 @@ public class InsFeeDetailController extends BaseController {
 
         String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 订单号
         String policyno = pageRequest.getColumnFilterValue(pageRequest, "policyno"); // 订单号
-
+        String settlestatus = pageRequest.getColumnFilterValue(pageRequest, "settlestatus"); // 结算状态 0未结算 1已结算
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
         String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid");
         String auditstatus = pageRequest.getColumnFilterValue(pageRequest, "auditstatus");
         String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode");
@@ -495,6 +501,7 @@ public class InsFeeDetailController extends BaseController {
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
 
+
         if (!StringUtils.isEmpty(comcode)) {
             whereStr.append(" and comcode=?");
             array.add(comcode);
@@ -524,7 +531,16 @@ public class InsFeeDetailController extends BaseController {
             whereStr.append(" and auditstatus=?");
             array.add(auditstatus);
         }
+        if (!StringUtils.isEmpty(settlestatus)) {
+            whereStr.append(" and settlestatus=?");
+            array.add(settlestatus);
+        }
 
+        if (!StringUtils.isEmpty(startdate) && !StringUtils.isEmpty(enddate)) {
+            whereStr.append(" and DATE_FORMAT(signdate, '%Y-%m-%d') between date ? and date ?");
+            array.add(startdate);
+            array.add(enddate);
+        }
         PageResult pageResult = insDeptFeeService.selectPaging(pageNum, pageSize, whereStr.toString(), array.toArray());
 
         return HttpResult.ok(pageResult);

+ 36 - 11
src/main/java/com/ydtech/modules/ins/controller/InsPayApplyController.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
@@ -15,6 +16,10 @@ import com.ydtech.modules.esm.model.vo.ExtensionVO;
 import com.ydtech.modules.esm.model.vo.TeamUserQryVO;
 import com.ydtech.modules.esm.model.vo.TeamUserVO;
 import com.ydtech.modules.esm.model.vo.TeamUserVONew;
+import com.ydtech.modules.fnc.dao.FncInsCommissionMapper;
+import com.ydtech.modules.fnc.dao.FncInsCompanyfeeMapper;
+import com.ydtech.modules.fnc.entity.InsCommission;
+import com.ydtech.modules.fnc.entity.InsCompanyfee;
 import com.ydtech.modules.ins.model.InsOrder;
 import com.ydtech.modules.ins.model.InsPayApply;
 import com.ydtech.modules.ins.model.vo.AccountVo;
@@ -27,6 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
@@ -56,6 +62,10 @@ public class InsPayApplyController extends BaseController {
     @Autowired
     InsCommissionService insCommissionService;
     @Autowired
+    FncInsCommissionMapper fncInsCommissionMapper;
+    @Autowired
+    FncInsCompanyfeeMapper fncInsCompanyfeeMapper;
+    @Autowired
     InsDeptFeeService insDeptFeeService;
 //    @Autowired
 //    private EsmUserAgentService esmUserAgentService;
@@ -332,14 +342,23 @@ public class InsPayApplyController extends BaseController {
 
     /**
      * 推广费提现申请
-     *
-     * @param userid
-     * @param amount
      * @return
      */
     @PostMapping(value = "/extendApply")
-    public HttpResult extendApply(@RequestParam String userid, @RequestParam double amount) {
+    @Transactional
+    public HttpResult extendApply( @RequestBody List<String> policyNoList) {
         HttpResult httpResult = new HttpResult();
+        String applyno = IdGenerate.nextId();
+        String userid=getUserId();
+        List<InsCommission> list=fncInsCommissionMapper.selectList(new LambdaQueryWrapper<InsCommission>().in(InsCommission::getPolicyno,policyNoList));
+        BigDecimal amount_bd=new BigDecimal(0);
+        for(InsCommission t :list){
+            t.setSettlestatus("1");
+            t.setApplyno(applyno);
+            fncInsCommissionMapper.update(t,new LambdaQueryWrapper<InsCommission>().eq(InsCommission::getPolicyno,t.getPolicyno()).eq(InsCommission::getRefereescode,userid));
+            amount_bd=amount_bd.add(t.getCommissionamount());
+        }
+        double amount= amount_bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
         //推广账户总金额
         double sumAmount = insCommissionService.sumAmount(" where t.refereescode=?", new Object[]{userid});
         //已提现金额
@@ -350,7 +369,6 @@ public class InsPayApplyController extends BaseController {
             return HttpResult.error("可提现余额不足");
         }
         InsPayApply apply = new InsPayApply();
-        String applyno = IdGenerate.nextId();
         SysUser user = sysUserService.getById(userid);
         if (user == null) {
             httpResult.setMsg("userId不存在");
@@ -418,15 +436,23 @@ public class InsPayApplyController extends BaseController {
     }
 
     /**
-     * 提现申请
-     *
-     * @param userid
-     * @param amount
+     * 业务员跟单非提现申请
      * @return
      */
     @PostMapping(value = "/applyPay")
-    public HttpResult applyPay(@RequestParam String userid, @RequestParam double amount) {
+    public HttpResult applyPay( @RequestBody List<String> policyNoList) {
         HttpResult httpResult = new HttpResult();
+        String applyno = IdGenerate.nextId();
+        String userid=getUserId();
+        List<InsCompanyfee> list=fncInsCompanyfeeMapper.selectList(new LambdaQueryWrapper<InsCompanyfee>().in(InsCompanyfee::getPolicyno,policyNoList));
+        BigDecimal amount_bd=new BigDecimal(0);
+        for(InsCompanyfee t :list){
+            t.setSettlestatus("1");
+            t.setApplyno(applyno);
+            fncInsCompanyfeeMapper.update(t,new LambdaQueryWrapper<InsCompanyfee>().eq(InsCompanyfee::getPolicyno,t.getPolicyno()).eq(InsCompanyfee::getUserid,userid));
+            amount_bd=amount_bd.add(t.getFeeamount().add(t.getDisamount()));
+        }
+        double amount= amount_bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
         //账户总金额
         double sumAmount = insCompanyFeeService.sumAmount(" where t.userid=? ", new Object[]{userid});
         //已提现金额
@@ -436,7 +462,6 @@ public class InsPayApplyController extends BaseController {
             return HttpResult.error("可提现余额不足");
         }
         InsPayApply apply = new InsPayApply();
-        String applyno = IdGenerate.nextId();
         SysUser user = sysUserService.getById(userid);
         if (user == null) {
             httpResult.setMsg("userId不存在");

+ 7 - 1
src/main/java/com/ydtech/modules/ins/dao/impl/InsCommissionDaoImpl.java

@@ -53,6 +53,12 @@ public class InsCommissionDaoImpl implements InsCommissionDao {
             } else {
                 model.setInsuredtime(null);
             }
+            if (resultSet.getTimestamp("signdate") != null) {
+                Date signdate = new Date(resultSet.getTimestamp("signdate").getTime());
+                model.setSignDate(sdf.format(signdate));
+            } else {
+                model.setSignDate(null);
+            }
             return model;
         }
     }
@@ -116,7 +122,7 @@ public class InsCommissionDaoImpl implements InsCommissionDao {
     public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
 
         Dialect dialect = Dialect.guessDialect(dataSource);
-        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.policyno,t.deptid,t.deptname,t.riskcode,t.licenseno,(SELECT name from esm_ins_company where  id =t.inscompany) inscompany,t.agreeid,t.quoteno,t.refereescode,t.refereesname,t.commissionrate,t.commissionamount,t.level,t.auditstatus,t.settlestatus,t.insuredtime " +
+        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.policyno,t.deptid,t.deptname,t.riskcode,t.licenseno,(SELECT name from esm_ins_company where  id =t.inscompany) inscompany,t.agreeid,t.quoteno,t.refereescode,t.refereesname,t.commissionrate,t.commissionamount,t.level,t.auditstatus,t.settlestatus,t.insuredtime,t.signdate " +
                 "from ins_commission t  " + whereCase);
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);

+ 7 - 1
src/main/java/com/ydtech/modules/ins/dao/impl/InsCompanyFeeDaoImpl.java

@@ -75,6 +75,12 @@ public class InsCompanyFeeDaoImpl implements InsCompanyFeeDao {
             } else {
                 model.setCreatetime(null);
             }
+            if (resultSet.getTimestamp("signdate") != null) {
+                Date signdate = new Date(resultSet.getTimestamp("signdate").getTime());
+                model.setSignDate(sdf.format(signdate));
+            } else {
+                model.setSignDate(null);
+            }
             return model;
         }
     }
@@ -142,7 +148,7 @@ public class InsCompanyFeeDaoImpl implements InsCompanyFeeDao {
 
         Dialect dialect = Dialect.guessDialect(dataSource);
         String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.policyno,t.riskcode,t.settleno,t.feerate,t.disrate,t.feeamount,t.disamount,t.jqpremium,t.sypremium,t.frameNo,t.licenseno,(SELECT name from esm_ins_company where  id =t.inscompany) inscompany,t.agreeid,t.agreementcode,t.agreeprodid,t.riskcode producname,t.agreetype,t.settlestatus,t.settletime, " +
-                "t.settletype,t.userid,t.username,t.deptid,t.deptname,t.createtime from ins_companyfee t " + whereCase);
+                "t.settletype,t.userid,t.username,t.deptid,t.deptname,t.createtime,t.signdate from ins_companyfee t " + whereCase);
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
         List<InsCompanyFee> recordList = jdbcTemplate.query(sql, paramValues, new InsCompanyFeeRowMapper());

+ 8 - 1
src/main/java/com/ydtech/modules/ins/dao/impl/InsDeptFeeDaoImpl.java

@@ -45,6 +45,13 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
             model.setLicenseno(resultSet.getString("licenseno"));
             model.setRiskcode(resultSet.getString("riskcode"));
             model.setInscompany(resultSet.getString("inscompany"));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            if (resultSet.getTimestamp("signdate") != null) {
+                Date signdate = new Date(resultSet.getTimestamp("signdate").getTime());
+                model.setSignDate(sdf.format(signdate));
+            } else {
+                model.setSignDate(null);
+            }
             return model;
         }
     }
@@ -141,7 +148,7 @@ public class InsDeptFeeDaoImpl implements InsDeptFeeDao {
     public PageResult selectPaging(int pageNumber, int pageSize, String whereCase, Object[] paramValues) {
 
         Dialect dialect = Dialect.guessDialect(dataSource);
-        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.quoteno,t.policyno,t.riskcode,(SELECT name from esm_ins_company where  id =t.inscompany) inscompany,t.agreeid,t.agreeprodid,t.comlevel,t.comcode,t.keeprate,t.addrate,t.keepamount,t.addamount,t.auditstatus,t.settlestatus,t.licenseno from ins_deptfee t  " + whereCase);
+        String sql = dialect.pagin(pageNumber, pageSize, "select t.orderno,t.quoteno,t.policyno,t.riskcode,(SELECT name from esm_ins_company where  id =t.inscompany) inscompany,t.agreeid,t.agreeprodid,t.comlevel,t.comcode,t.keeprate,t.addrate,t.keepamount,t.addamount,t.auditstatus,t.settlestatus,t.licenseno,t.signdate from ins_deptfee t  " + whereCase);
 
         JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
         List<InsDeptFee> recordList = jdbcTemplate.query(sql, paramValues, new InsDeptFeeRowMapper());

+ 3 - 1
src/main/java/com/ydtech/modules/ins/model/InsCommission.java

@@ -2,6 +2,8 @@ package com.ydtech.modules.ins.model;
 
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * @author qinfenglong
  * @version 1.0.0
@@ -27,5 +29,5 @@ public class InsCommission {
     private String deptname;
     private String inscompany;
     private String agreeid;
-
+    private String signDate;
 }

+ 1 - 0
src/main/java/com/ydtech/modules/ins/model/InsCompanyFee.java

@@ -36,4 +36,5 @@ public class InsCompanyFee {
     private String createtime;
     private String policyno;
     private String riskcode;
+    private String signDate;
 }

+ 1 - 1
src/main/java/com/ydtech/modules/ins/model/InsDeptFee.java

@@ -26,5 +26,5 @@ public class InsDeptFee {
     private String policyno;
     private String riskcode;
     private String inscompany;
-
+    private String signDate;
 }

+ 61 - 0
src/main/resources/mapper/modules/fnc/InsAreaCompanyMapper.xml

@@ -0,0 +1,61 @@
+<?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.fnc.dao.FncInsAreaCompanyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.fnc.entity.InsAreaCompany">
+        <id column="id" property="id" />
+        <result column="orderno" property="orderno" />
+        <result column="agreement_id" property="agreementId" />
+        <result column="api_type" property="apiType" />
+        <result column="orderstatus" property="orderstatus" />
+        <result column="company_id" property="companyId" />
+        <result column="inscompany" property="inscompany" />
+        <result column="reqtxt" property="reqtxt" />
+        <result column="reptxt" property="reptxt" />
+        <result column="jqapplyno" property="jqapplyno" />
+        <result column="jqpolicyno" property="jqpolicyno" />
+        <result column="syapplyno" property="syapplyno" />
+        <result column="sypolicyno" property="sypolicyno" />
+        <result column="cross_insurance" property="crossInsurance" />
+        <result column="riskinfo" property="riskinfo" />
+        <result column="kindinfo" property="kindinfo" />
+        <result column="jqpremium" property="jqpremium" />
+        <result column="sypremium" property="sypremium" />
+        <result column="jypremium" property="jypremium" />
+        <result column="sumpremium" property="sumpremium" />
+        <result column="taxamount" property="taxamount" />
+        <result column="jqdiscountrate" property="jqdiscountrate" />
+        <result column="sydiscountrate" property="sydiscountrate" />
+        <result column="feerate" property="feerate" />
+        <result column="disrate" property="disrate" />
+        <result column="auditid" property="auditid" />
+        <result column="auditname" property="auditname" />
+        <result column="audittime" property="audittime" />
+        <result column="auditopinion" property="auditopinion" />
+        <result column="jqappoint" property="jqappoint" />
+        <result column="syappoint" property="syappoint" />
+        <result column="createtime" property="createtime" />
+        <result column="pay_date" property="payDate" />
+        <result column="payment_link" property="paymentLink" />
+        <result column="ins_order_no" property="insOrderNo" />
+        <result column="accident_info" property="accidentInfo" />
+        <result column="attribution_id" property="attributionId" />
+        <result column="tax_arrears" property="taxArrears" />
+        <result column="jq_start_date" property="jqStartDate" />
+        <result column="jq_end_date" property="jqEndDate" />
+        <result column="sy_start_date" property="syStartDate" />
+        <result column="sy_end_date" property="syEndDate" />
+        <result column="accident_str_info" property="accidentStrInfo" />
+        <result column="score" property="score" />
+        <result column="jq_score" property="jqScore" />
+        <result column="sy_score" property="syScore" />
+        <result column="loss_ration" property="lossRation" />
+        <result column="jq_loss_ration" property="jqLossRation" />
+        <result column="sy_loss_ration" property="syLossRation" />
+        <result column="inside_order_status" property="insideOrderStatus" />
+        <result column="inside_pay_time" property="insidePayTime" />
+        <result column="signing_time" property="signingTime" />
+    </resultMap>
+
+</mapper>

+ 28 - 0
src/main/resources/mapper/modules/fnc/InsCommissionMapper.xml

@@ -0,0 +1,28 @@
+<?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.fnc.dao.FncInsCommissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.fnc.entity.InsCommission">
+        <result column="orderno" property="orderno" />
+        <result column="policyno" property="policyno" />
+        <result column="licenseno" property="licenseno" />
+        <result column="riskcode" property="riskcode" />
+        <result column="quoteno" property="quoteno" />
+        <result column="refereescode" property="refereescode" />
+        <result column="refereesname" property="refereesname" />
+        <result column="commissionrate" property="commissionrate" />
+        <result column="commissionamount" property="commissionamount" />
+        <result column="level" property="level" />
+        <result column="auditstatus" property="auditstatus" />
+        <result column="settlestatus" property="settlestatus" />
+        <result column="insuredtime" property="insuredtime" />
+        <result column="deptid" property="deptid" />
+        <result column="deptname" property="deptname" />
+        <result column="inscompany" property="inscompany" />
+        <result column="agreeid" property="agreeid" />
+        <result column="signdate" property="signdate" />
+        <result column="applyno" property="applyno" />
+    </resultMap>
+
+</mapper>

+ 37 - 0
src/main/resources/mapper/modules/fnc/InsCompanyfeeMapper.xml

@@ -0,0 +1,37 @@
+<?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.fnc.dao.FncInsCompanyfeeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.fnc.entity.InsCompanyfee">
+        <id column="orderno" property="orderno" />
+        <id column="policyno" property="policyno" />
+        <id column="settletype" property="settletype" />
+        <result column="riskcode" property="riskcode" />
+        <result column="settleno" property="settleno" />
+        <result column="feerate" property="feerate" />
+        <result column="disrate" property="disrate" />
+        <result column="feeamount" property="feeamount" />
+        <result column="disamount" property="disamount" />
+        <result column="jqpremium" property="jqpremium" />
+        <result column="sypremium" property="sypremium" />
+        <result column="inscompany" property="inscompany" />
+        <result column="agreeid" property="agreeid" />
+        <result column="agreementcode" property="agreementcode" />
+        <result column="agreeprodid" property="agreeprodid" />
+        <result column="producname" property="producname" />
+        <result column="agreetype" property="agreetype" />
+        <result column="settlestatus" property="settlestatus" />
+        <result column="settletime" property="settletime" />
+        <result column="frameno" property="frameno" />
+        <result column="licenseno" property="licenseno" />
+        <result column="userid" property="userid" />
+        <result column="username" property="username" />
+        <result column="deptid" property="deptid" />
+        <result column="deptname" property="deptname" />
+        <result column="createtime" property="createtime" />
+        <result column="signdate" property="signdate" />
+        <result column="applyno" property="applyno" />
+    </resultMap>
+
+</mapper>